diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 957b359b3..03a69883f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 @@ -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' @@ -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 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index edd95442f..0f08222c6 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -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 @@ -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' @@ -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 diff --git a/build/Build.CI.GitHubActions.cs b/build/Build.CI.GitHubActions.cs index 67276322f..7c270aa6e 100644 --- a/build/Build.CI.GitHubActions.cs +++ b/build/Build.CI.GitHubActions.cs @@ -46,15 +46,7 @@ protected override GitHubActionsJob GetJobs(GitHubActionsImage image, IReadOnlyC var newSteps = new List(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) @@ -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()) { diff --git a/build/_build.csproj b/build/_build.csproj index 9cdb57b58..cbaa83f38 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 CS0649;CS0169 .. @@ -16,7 +16,7 @@ - + diff --git a/global.json b/global.json index 9682ab716..ba3d1477d 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,6 @@ { "sdk": { "version": "10.0.100", - "rollForward": "latestMinor", - "allowPrerelease": true + "rollForward": "latestMinor" } } \ No newline at end of file