Skip to content

Commit 4eecdd0

Browse files
committed
Update to net10.0
1 parent 0cfbf66 commit 4eecdd0

8 files changed

Lines changed: 23 additions & 6 deletions

File tree

.github/workflows/CI.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ env:
1818
ContinuousIntegrationBuild: 'true'
1919
DotNet8Version: '8.x'
2020
DotNet9Version: '9.x'
21+
DotNet10Version: '10.x'
2122

2223
jobs:
2324
BuildAndTest:
@@ -52,7 +53,11 @@ jobs:
5253
uses: actions/setup-dotnet@v4
5354
with:
5455
dotnet-version: ${{ env.DotNet9Version }}
55-
dotnet-quality: 'preview'
56+
57+
- name: Install .NET ${{ env.DotNet10Version }}
58+
uses: actions/setup-dotnet@v4
59+
with:
60+
dotnet-version: ${{ env.DotNet10Version }}
5661

5762
- name: Build Solution
5863
run: dotnet build "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}/build.binlog"
@@ -67,6 +72,12 @@ jobs:
6772
- name: Run Unit Tests (.NET 9)
6873
run: dotnet test --no-restore --no-build --framework net9.0 "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}/test-net9.0.binlog"
6974

75+
- name: Run Unit Tests (.NET 10)
76+
run: dotnet test --no-restore --no-build --framework net10.0 "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}/test-net10.0.binlog"
77+
78+
- name: Run Unit Tests (.NET 10)
79+
run: dotnet test --no-restore --no-build --framework net10.0 "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}/test-net10.0.binlog"
80+
7081
- name: Upload Artifacts
7182
uses: actions/upload-artifact@v4
7283
if: success()

Directory.Packages.props

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5-
<MicrosoftBuildPackageVersion>17.12.6</MicrosoftBuildPackageVersion>
6-
<MicrosoftBuildPackageVersion Condition="'$(TargetFramework)' == 'net8.0' ">17.11.4</MicrosoftBuildPackageVersion>
5+
<MicrosoftBuildPackageVersion Condition="'$(TargetFramework)' == 'net472' ">18.0.2</MicrosoftBuildPackageVersion>
6+
<MicrosoftBuildPackageVersion Condition="'$(TargetFramework)' == 'net10.0' ">18.0.2</MicrosoftBuildPackageVersion>
7+
<MicrosoftBuildPackageVersion Condition="'$(TargetFramework)' == 'net9.0' ">17.14.28</MicrosoftBuildPackageVersion>
8+
<MicrosoftBuildPackageVersion Condition="'$(TargetFramework)' == 'net8.0' ">17.11.48</MicrosoftBuildPackageVersion>
79
<SystemTextJsonVersion>9.0.1</SystemTextJsonVersion>
810
</PropertyGroup>
911
<ItemGroup>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0",
3+
"version": "10.0.100",
44
"rollForward": "latestMinor",
55
"allowPrerelease": true
66
}

src/Microsoft.Build.Utilities.ProjectCreation.UnitTests/Microsoft.Build.Utilities.ProjectCreation.UnitTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net472;net8.0;net9.0</TargetFrameworks>
3+
<TargetFrameworks>net472;net8.0;net9.0;net10.0</TargetFrameworks>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66
<Import Project="..\Microsoft.Build.Utilities.ProjectCreation\build\MSBuild.ProjectCreation.props" Condition="'$(TargetFramework)' == 'net472'" />

src/Microsoft.Build.Utilities.ProjectCreation.UnitTests/TestBase.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ public string DotNetSdkVersion
2222
"8.0.100";
2323
#elif NET9_0 || NETFRAMEWORK
2424
"9.0.0";
25+
#elif NET10_0 || NETFRAMEWORK
26+
"10.0.100";
2527
#else
2628
#error Unknown target framework!
2729
#endif
@@ -34,6 +36,8 @@ public string TargetFramework
3436
"net8.0";
3537
#elif NET9_0
3638
"net9.0";
39+
#elif NET10_0
40+
"net10.0";
3741
#elif NETFRAMEWORK
3842
"net472";
3943
#else

src/Microsoft.Build.Utilities.ProjectCreation/Microsoft.Build.Utilities.ProjectCreation.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net472;net8.0;net9.0</TargetFrameworks>
3+
<TargetFrameworks>net472;net8.0;net9.0;net10.0</TargetFrameworks>
44
<GenerateDocumentationFile>true</GenerateDocumentationFile>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<ArtifactsPath>..\..\artifacts\$(MSBuildProjectName)</ArtifactsPath>

src/Microsoft.Build.Utilities.ProjectCreation/PublicAPI/net6.0/PublicAPI.Shipped.txt renamed to src/Microsoft.Build.Utilities.ProjectCreation/PublicAPI/net10.0/PublicAPI.Shipped.txt

File renamed without changes.

src/Microsoft.Build.Utilities.ProjectCreation/PublicAPI/net6.0/PublicAPI.Unshipped.txt renamed to src/Microsoft.Build.Utilities.ProjectCreation/PublicAPI/net10.0/PublicAPI.Unshipped.txt

File renamed without changes.

0 commit comments

Comments
 (0)