diff --git a/Directory.Build.props b/Directory.Build.props index 58b307a5..dce806c5 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -5,7 +5,8 @@ Latest $(MSBuildThisFileDirectory)artifacts\ false - $(NoWarn);NU5128;SA0001 + false + $(NoWarn);NU5128;SA0001;NU1507 - 17.11.4 - 16.11.0 + 17.15.0-preview-25378-103 + 17.11.31 + 17.11.31 + + + + + + + + + + + + + @@ -23,30 +36,26 @@ - - - - - - + + + - - - - - - - + + + + + + @@ -58,4 +67,4 @@ - + \ No newline at end of file diff --git a/NuGet.config b/NuGet.config index ccb01edf..c56cd434 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,5 +11,6 @@ + \ No newline at end of file diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6e8e23c0..04a72200 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,6 +7,7 @@ variables: BuildPlatform: 'Any CPU' DotNet8Version: '8.x' DotNet9Version: '9.x' + DotNet10Version: '10.x' MSBuildArgs: '"/p:Platform=$(BuildPlatform)" "/p:Configuration=$(BuildConfiguration)" "/BinaryLogger:$(Build.SourcesDirectory)\$(ArtifactsDirectoryName)\msbuild.binlog"' SignType: 'Test' @@ -44,8 +45,12 @@ jobs: displayName: 'Install .NET $(DotNet9Version)' inputs: version: '$(DotNet9Version)' + includePreviewVersions: false + - task: UseDotNet@2 + displayName: 'Install .NET $(DotNet10Version)' + inputs: + version: '$(DotNet10Version)' includePreviewVersions: true - - task: DotNetCoreCLI@2 displayName: 'Build Solution' inputs: @@ -76,6 +81,13 @@ jobs: testRunTitle: 'Windows .NET 9.0' condition: succeededOrFailed() + - task: DotNetCoreCLI@2 + displayName: 'Run Unit Tests (.NET 10.0)' + inputs: + command: 'test' + arguments: '--no-restore --no-build --framework net10.0 /noautorsp' + testRunTitle: 'Windows .NET 10.0' + condition: succeededOrFailed() - task: PublishBuildArtifacts@1 displayName: 'Publish Artifacts' inputs: @@ -98,8 +110,13 @@ jobs: displayName: 'Install .NET $(DotNet9Version)' inputs: version: '$(DotNet9Version)' - includePreviewVersions: true + includePreviewVersions: false + - task: UseDotNet@2 + displayName: 'Install .NET $(DotNet10Version)' + inputs: + version: '$(DotNet10Version)' + includePreviewVersions: true - task: DotNetCoreCLI@2 displayName: 'dotnet build' inputs: @@ -122,6 +139,13 @@ jobs: testRunTitle: 'Linux .NET 9.0' condition: succeededOrFailed() + - task: DotNetCoreCLI@2 + displayName: 'Run Unit Tests (.NET 10.0)' + inputs: + command: 'test' + arguments: '--no-restore --no-build --framework net10.0 /noautorsp' + testRunTitle: 'Linux .NET 10.0' + condition: succeededOrFailed() - task: PublishBuildArtifacts@1 displayName: 'Publish Artifacts' inputs: @@ -146,6 +170,12 @@ jobs: version: '$(DotNet9Version)' includePreviewVersions: true + - task: UseDotNet@2 + displayName: 'Install .NET $(DotNet10Version)' + inputs: + version: '$(DotNet10Version)' + includePreviewVersions: true + - task: DotNetCoreCLI@2 displayName: 'dotnet build' inputs: @@ -168,6 +198,14 @@ jobs: testRunTitle: 'MacOS .NET 9.0' condition: succeededOrFailed() + - task: DotNetCoreCLI@2 + displayName: 'Run Unit Tests (.NET 10.0)' + inputs: + command: 'test' + arguments: '--no-restore --no-build --framework net10.0 /noautorsp' + testRunTitle: 'MacOS .NET 10.0' + condition: succeededOrFailed() + - task: PublishBuildArtifacts@1 displayName: 'Publish Artifacts' inputs: diff --git a/global.json b/global.json index c8c520be..e17734f0 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.201", + "version": "10.0.100-preview.6.25358.103", "rollForward": "latestMinor", "allowPrerelease": true }, diff --git a/src/Artifacts.UnitTests/Microsoft.Build.Artifacts.UnitTests.csproj b/src/Artifacts.UnitTests/Microsoft.Build.Artifacts.UnitTests.csproj index a77a1cfe..50952531 100644 --- a/src/Artifacts.UnitTests/Microsoft.Build.Artifacts.UnitTests.csproj +++ b/src/Artifacts.UnitTests/Microsoft.Build.Artifacts.UnitTests.csproj @@ -1,32 +1,40 @@  - net472;net8.0;net9.0 + net472;net8.0;net9.0;net10.0 - + - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - - - + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers + diff --git a/src/Artifacts/Microsoft.Build.Artifacts.csproj b/src/Artifacts/Microsoft.Build.Artifacts.csproj index 158d8e1b..eb9b59bc 100644 --- a/src/Artifacts/Microsoft.Build.Artifacts.csproj +++ b/src/Artifacts/Microsoft.Build.Artifacts.csproj @@ -22,42 +22,35 @@ - - + + - + - + - + - + - - + + + + + + + + all + runtime; build; native; contentfiles; analyzers + + diff --git a/src/Cargo.UnitTests/CargoTest.cs b/src/Cargo.UnitTests/CargoTest.cs index 38ad79cd..6d661415 100644 --- a/src/Cargo.UnitTests/CargoTest.cs +++ b/src/Cargo.UnitTests/CargoTest.cs @@ -105,6 +105,8 @@ public void DoNotReferenceOutputAssemblies() targetFramework: "net8.0") #elif NET9_0 targetFramework: "net9.0") +#elif NET10_0 + targetFramework: "net10.0") #endif .Save(); diff --git a/src/Cargo.UnitTests/Microsoft.Build.Cargo.UnitTests.csproj b/src/Cargo.UnitTests/Microsoft.Build.Cargo.UnitTests.csproj index 539a4364..79f2a930 100644 --- a/src/Cargo.UnitTests/Microsoft.Build.Cargo.UnitTests.csproj +++ b/src/Cargo.UnitTests/Microsoft.Build.Cargo.UnitTests.csproj @@ -1,6 +1,6 @@  - net472;net8.0;net9.0 + net472;net8.0;net9.0;net10.0 diff --git a/src/CentralPackageVersions.UnitTests/Microsoft.Build.CentralPackageVersions.UnitTests.csproj b/src/CentralPackageVersions.UnitTests/Microsoft.Build.CentralPackageVersions.UnitTests.csproj index acd5ee5c..04ca2a19 100644 --- a/src/CentralPackageVersions.UnitTests/Microsoft.Build.CentralPackageVersions.UnitTests.csproj +++ b/src/CentralPackageVersions.UnitTests/Microsoft.Build.CentralPackageVersions.UnitTests.csproj @@ -1,6 +1,6 @@  - net472;net8.0;net9.0 + net472;net8.0;net9.0;net10.0 diff --git a/src/CopyOnWrite.UnitTests/Microsoft.Build.CopyOnWrite.UnitTests.csproj b/src/CopyOnWrite.UnitTests/Microsoft.Build.CopyOnWrite.UnitTests.csproj index 0ce9c646..9b87a182 100644 --- a/src/CopyOnWrite.UnitTests/Microsoft.Build.CopyOnWrite.UnitTests.csproj +++ b/src/CopyOnWrite.UnitTests/Microsoft.Build.CopyOnWrite.UnitTests.csproj @@ -1,6 +1,6 @@  - net472;net8.0;net9.0 + net472;net8.0;net9.0;net10.0 Enable diff --git a/src/NoTargets.UnitTests/Microsoft.Build.NoTargets.UnitTests.csproj b/src/NoTargets.UnitTests/Microsoft.Build.NoTargets.UnitTests.csproj index 6ff89f99..e223880b 100644 --- a/src/NoTargets.UnitTests/Microsoft.Build.NoTargets.UnitTests.csproj +++ b/src/NoTargets.UnitTests/Microsoft.Build.NoTargets.UnitTests.csproj @@ -1,6 +1,6 @@  - net472;net8.0;net9.0 + net472;net8.0;net9.0;net10.0 diff --git a/src/NoTargets.UnitTests/NoTargetsTests.cs b/src/NoTargets.UnitTests/NoTargetsTests.cs index cfe1483f..2bbe7b3b 100644 --- a/src/NoTargets.UnitTests/NoTargetsTests.cs +++ b/src/NoTargets.UnitTests/NoTargetsTests.cs @@ -93,6 +93,8 @@ public void DoNotReferenceOutputAssemblies() targetFramework: "net8.0") #elif NET9_0 targetFramework: "net9.0") +#elif NET10_0 + targetFramework: "net10.0") #endif .Save(); diff --git a/src/Traversal.UnitTests/Microsoft.Build.Traversal.UnitTests.csproj b/src/Traversal.UnitTests/Microsoft.Build.Traversal.UnitTests.csproj index a4fe61fc..77ec5be6 100644 --- a/src/Traversal.UnitTests/Microsoft.Build.Traversal.UnitTests.csproj +++ b/src/Traversal.UnitTests/Microsoft.Build.Traversal.UnitTests.csproj @@ -1,6 +1,6 @@  - net472;net8.0;net9.0 + net472;net8.0;net9.0;net10.0