Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
run: |
echo "Adding GNU tar to PATH"
echo C:\Program Files\Git\usr\bin>>"%GITHUB_PATH%"
- uses: actions/setup-dotnet@v4
- uses: actions/setup-dotnet@v5
with:
dotnet-version: |
10.0
Expand Down Expand Up @@ -76,11 +76,9 @@ jobs:
name: ubuntu-latest
runs-on: ubuntu-latest
steps:
- uses: actions/setup-dotnet@v4
- uses: actions/setup-dotnet@v5
with:
dotnet-version: |
8.0
9.0
10.0
- uses: actions/checkout@v4
- name: 'Run: Compile, Test, Pack, Publish'
Expand All @@ -94,7 +92,7 @@ jobs:
name: macos-latest
runs-on: macos-latest
steps:
- uses: actions/setup-dotnet@v4
- uses: actions/setup-dotnet@v5
with:
dotnet-version: |
10.0
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
run: |
echo "Adding GNU tar to PATH"
echo C:\Program Files\Git\usr\bin>>"%GITHUB_PATH%"
- uses: actions/setup-dotnet@v4
- uses: actions/setup-dotnet@v5
with:
dotnet-version: |
10.0
Expand Down Expand Up @@ -73,11 +73,9 @@ jobs:
name: ubuntu-latest
runs-on: ubuntu-latest
steps:
- uses: actions/setup-dotnet@v4
- uses: actions/setup-dotnet@v5
with:
dotnet-version: |
8.0
9.0
10.0
- uses: actions/checkout@v4
- name: 'Run: Compile, Test, Pack'
Expand All @@ -86,7 +84,7 @@ jobs:
name: macos-latest
runs-on: macos-latest
steps:
- uses: actions/setup-dotnet@v4
- uses: actions/setup-dotnet@v5
with:
dotnet-version: |
10.0
Expand Down
12 changes: 2 additions & 10 deletions build/Build.CI.GitHubActions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,7 @@ protected override GitHubActionsJob GetJobs(GitHubActionsImage image, IReadOnlyC

var newSteps = new List<GitHubActionsStep>(job.Steps);

var onUbuntu = image.ToString().StartsWith("ubuntu", StringComparison.OrdinalIgnoreCase);
if (onUbuntu)
{
newSteps.Insert(0, new GitHubActionsSetupDotNetStep(["8.0", "9.0", "10.0"]));
}
else
{
newSteps.Insert(0, new GitHubActionsSetupDotNetStep(["10.0"]));
}
newSteps.Insert(0, new GitHubActionsSetupDotNetStep(["10.0"]));

var onWindows = image.ToString().StartsWith("windows", StringComparison.OrdinalIgnoreCase);
if (onWindows)
Expand Down Expand Up @@ -100,7 +92,7 @@ public GitHubActionsSetupDotNetStep(string[] versions)

public override void Write(CustomFileWriter writer)
{
writer.WriteLine("- uses: actions/setup-dotnet@v4");
writer.WriteLine("- uses: actions/setup-dotnet@v5");

using (writer.Indent())
{
Expand Down
4 changes: 2 additions & 2 deletions build/_build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<RootNamespace></RootNamespace>
<NoWarn>CS0649;CS0169</NoWarn>
<NukeRootDirectory>..</NukeRootDirectory>
Expand All @@ -16,7 +16,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nuke.Common" Version="9.0.4" />
<PackageReference Include="Nuke.Common" Version="10.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"sdk": {
"version": "10.0.100",
"rollForward": "latestMinor",
"allowPrerelease": true
"rollForward": "latestMinor"
}
}
Loading