diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index a8652a9ce..108b4877c 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -75,9 +75,9 @@ jobs: - template: support/install-dotnet.yml@rsg parameters: DotNetSdk: - - '2.1.x' - - '3.1.x' - - '5.0.x' + - '8.0.x' + - '9.0.x' + - '10.0.x' - task: DotNetCoreCLI@2 displayName: 'dotnet tool restore' diff --git a/.build/Solution.cs b/.build/Solution.cs index 6bcbeab9a..9522d4e16 100644 --- a/.build/Solution.cs +++ b/.build/Solution.cs @@ -100,7 +100,7 @@ RocketSurgeonGitHubActionsConfiguration configuration .Jobs.OfType() .First(z => z.Name.Equals("Build", StringComparison.OrdinalIgnoreCase)) .ConfigureStep(step => step.FetchDepth = 0) - .UseDotNetSdks("3.1", "6.0", "8.0", "9.0") + .UseDotNetSdks("8.0", "9.0", "10.0") .AddNuGetCache() .AddVscodeExtensionTests() .PublishLogs() diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d699f2cc8..15044f0ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -89,22 +89,18 @@ jobs: with: path: '${{ github.workspace }}/.nuget/packages' key: "${{ runner.os }}-nuget-${{ hashFiles('**/Directory.Packages.props') }}-${{ hashFiles('**/dotnet-tools.json') }}" - - name: 🔨 Use .NET Core 3.1 SDK - uses: actions/setup-dotnet@v5.0.0 - with: - dotnet-version: '3.1.x' - - name: 🔨 Use .NET Core 6.0 SDK - uses: actions/setup-dotnet@v5.0.0 - with: - dotnet-version: '6.0.x' - - name: 🔨 Use .NET Core 8.0 SDK + - name: 🔨 Use .NET 8.0 SDK uses: actions/setup-dotnet@v5.0.0 with: dotnet-version: '8.0.x' - - name: 🔨 Use .NET Core 9.0 SDK + - name: 🔨 Use .NET 9.0 SDK uses: actions/setup-dotnet@v5.0.0 with: dotnet-version: '9.0.x' + - name: 🔨 Use .NET 10.0 SDK + uses: actions/setup-dotnet@v5.0.0 + with: + dotnet-version: '10.0.x' - name: 🎁 dotnet tool restore run: | dotnet tool restore diff --git a/Directory.Packages.props b/Directory.Packages.props index e055ccf94..2f0842839 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -28,13 +28,13 @@ - - - - - - - + + + + + + + @@ -50,15 +50,15 @@ - - + + - + diff --git a/Directory.Packages.supports.props b/Directory.Packages.supports.props index d354840f4..b132d8029 100644 --- a/Directory.Packages.supports.props +++ b/Directory.Packages.supports.props @@ -2,12 +2,12 @@ - - - - - - - + + + + + + + diff --git a/global.json b/global.json index 1b03e3c47..1e7fdfa95 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.307", + "version": "10.0.100", "rollForward": "latestMinor" } }