diff --git a/Directory.Build.props b/Directory.Build.props index 58b307a5..60e562df 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -3,7 +3,6 @@ *log true Latest - $(MSBuildThisFileDirectory)artifacts\ false $(NoWarn);NU5128;SA0001 false true - false + true true true diff --git a/Directory.Packages.props b/Directory.Packages.props index 7ca1de8e..1fd98f44 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -2,60 +2,74 @@ true true - - 17.11.4 - 16.11.0 + 17.14.28 + 17.11.48 - - - + + + + + + + + + + + + - - - + + + + + + + + + + + - - + + - - - - - - - - - + + + + + + - + - + - - - + + + - - + - + \ No newline at end of file diff --git a/MSBuildSdks.sln b/MSBuildSdks.sln index 11091969..11c4f73c 100644 --- a/MSBuildSdks.sln +++ b/MSBuildSdks.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.2.32516.85 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Build.Traversal", "src\Traversal\Microsoft.Build.Traversal.csproj", "{B93918D4-75EA-467E-8F50-393A1324FF91}" EndProject @@ -48,16 +48,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Build.Artifacts", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Build.Artifacts.UnitTests", "src\Artifacts.UnitTests\Microsoft.Build.Artifacts.UnitTests.csproj", "{359B2C2B-B9B8-496F-B4B1-9E4359729F89}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CentralPackageVersions", "CentralPackageVersions", "{FCF015C3-82E5-488D-8438-1410F6572F0B}" - ProjectSection(SolutionItems) = preProject - samples\CentralPackageVersions\Directory.Build.props = samples\CentralPackageVersions\Directory.Build.props - samples\CentralPackageVersions\Directory.Build.targets = samples\CentralPackageVersions\Directory.Build.targets - samples\CentralPackageVersions\Packages.props = samples\CentralPackageVersions\Packages.props - samples\CentralPackageVersions\README.md = samples\CentralPackageVersions\README.md - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassLibrary", "samples\CentralPackageVersions\src\ClassLibrary\ClassLibrary.csproj", "{A266FDFA-BE7C-4E3E-9BEA-EF18EF66540C}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Traversal", "Traversal", "{5AEA9E7B-4AF2-4E03-A566-7CC30318C311}" ProjectSection(SolutionItems) = preProject samples\Traversal\Directory.Build.props = samples\Traversal\Directory.Build.props @@ -74,10 +64,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectA", "samples\Travers EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectB", "samples\Traversal\ProjectB\ProjectB.csproj", "{2035141B-4345-4E79-83DB-979A43BA5C29}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{145D39C4-285A-4ACF-B86C-7E611969DE35}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClassLibrary", "ClassLibrary", "{35CEF293-5111-4017-A3BA-63FF5710C953}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SampleNoTargets", "SampleNoTargets", "{469437EE-241A-4B8A-B7E0-E0F913F5529D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Build.CopyOnWrite", "src\CopyOnWrite\Microsoft.Build.CopyOnWrite.csproj", "{153D1183-2953-4D4D-A5AD-AA2CF99B0DE3}" @@ -134,10 +120,6 @@ Global {359B2C2B-B9B8-496F-B4B1-9E4359729F89}.Debug|Any CPU.Build.0 = Debug|Any CPU {359B2C2B-B9B8-496F-B4B1-9E4359729F89}.Release|Any CPU.ActiveCfg = Release|Any CPU {359B2C2B-B9B8-496F-B4B1-9E4359729F89}.Release|Any CPU.Build.0 = Release|Any CPU - {A266FDFA-BE7C-4E3E-9BEA-EF18EF66540C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A266FDFA-BE7C-4E3E-9BEA-EF18EF66540C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A266FDFA-BE7C-4E3E-9BEA-EF18EF66540C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A266FDFA-BE7C-4E3E-9BEA-EF18EF66540C}.Release|Any CPU.Build.0 = Release|Any CPU {18C7CBF8-98D3-4C47-A11B-2905AF23A20B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {18C7CBF8-98D3-4C47-A11B-2905AF23A20B}.Debug|Any CPU.Build.0 = Debug|Any CPU {18C7CBF8-98D3-4C47-A11B-2905AF23A20B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -177,15 +159,11 @@ Global GlobalSection(NestedProjects) = preSolution {516F0D1D-C4FE-4832-9E49-903A2C57D3F3} = {867D30F7-2AEC-48E7-B167-4919EE1B0985} {48F56A6B-A285-4B40-9E96-044F7AA2C532} = {469437EE-241A-4B8A-B7E0-E0F913F5529D} - {FCF015C3-82E5-488D-8438-1410F6572F0B} = {867D30F7-2AEC-48E7-B167-4919EE1B0985} - {A266FDFA-BE7C-4E3E-9BEA-EF18EF66540C} = {35CEF293-5111-4017-A3BA-63FF5710C953} {5AEA9E7B-4AF2-4E03-A566-7CC30318C311} = {867D30F7-2AEC-48E7-B167-4919EE1B0985} {615210F2-B751-431E-B2F1-C5D3C205F899} = {5AEA9E7B-4AF2-4E03-A566-7CC30318C311} {A9CC411B-67F8-4644-873C-1ACBFC12AAA5} = {5AEA9E7B-4AF2-4E03-A566-7CC30318C311} {18C7CBF8-98D3-4C47-A11B-2905AF23A20B} = {615210F2-B751-431E-B2F1-C5D3C205F899} {2035141B-4345-4E79-83DB-979A43BA5C29} = {A9CC411B-67F8-4644-873C-1ACBFC12AAA5} - {145D39C4-285A-4ACF-B86C-7E611969DE35} = {FCF015C3-82E5-488D-8438-1410F6572F0B} - {35CEF293-5111-4017-A3BA-63FF5710C953} = {145D39C4-285A-4ACF-B86C-7E611969DE35} {469437EE-241A-4B8A-B7E0-E0F913F5529D} = {516F0D1D-C4FE-4832-9E49-903A2C57D3F3} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml index 250dae4b..10192042 100644 --- a/azure-pipelines-official.yml +++ b/azure-pipelines-official.yml @@ -8,7 +8,7 @@ variables: ArtifactsDirectoryName: 'artifacts' BuildConfiguration: 'Release' BuildPlatform: 'Any CPU' - DotNetVersion: '9.x' + DotNetVersion: '10.x' MSBuildArgs: '"/p:Platform=$(BuildPlatform)" "/p:Configuration=$(BuildConfiguration)" "/BinaryLogger:$(Build.SourcesDirectory)\$(ArtifactsDirectoryName)\msbuild.binlog"' SignType: 'Real' trigger: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6e8e23c0..969c3aca 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' @@ -46,6 +47,12 @@ jobs: version: '$(DotNet9Version)' includePreviewVersions: true + - task: UseDotNet@2 + displayName: 'Install .NET $(DotNet10Version)' + inputs: + version: '$(DotNet10Version)' + includePreviewVersions: true + - task: DotNetCoreCLI@2 displayName: 'Build Solution' inputs: @@ -76,6 +83,21 @@ jobs: testRunTitle: 'Windows .NET 9.0' condition: succeededOrFailed() + # Disabled due to MSBuild.ProjectCreation dependency issue + # - 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() + + - powershell: | + $bin = "$(Build.SourcesDirectory)\$(ArtifactsDirectoryName)\bin" + if (Test-Path $bin) { Remove-Item -LiteralPath $bin -Recurse -Force } + displayName: 'Remove artifacts/bin (Windows)' + condition: always() + - task: PublishBuildArtifacts@1 displayName: 'Publish Artifacts' inputs: @@ -100,6 +122,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: @@ -122,6 +150,21 @@ jobs: testRunTitle: 'Linux .NET 9.0' condition: succeededOrFailed() + # Disabled due to MSBuild.ProjectCreation dependency issue + # - 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() + + - bash: | + BIN_DIR="$(Build.SourcesDirectory)/$(ArtifactsDirectoryName)/bin" + [ -d "$BIN_DIR" ] && rm -rf "$BIN_DIR" + displayName: 'Remove artifacts/bin (Linux)' + condition: always() + - task: PublishBuildArtifacts@1 displayName: 'Publish Artifacts' inputs: @@ -146,6 +189,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 +217,21 @@ jobs: testRunTitle: 'MacOS .NET 9.0' condition: succeededOrFailed() + # Disabled due to MSBuild.ProjectCreation dependency issue + # - 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() + + - bash: | + BIN_DIR="$(Build.SourcesDirectory)/$(ArtifactsDirectoryName)/bin" + [ -d "$BIN_DIR" ] && rm -rf "$BIN_DIR" + displayName: 'Remove artifacts/bin (macOS)' + condition: always() + - task: PublishBuildArtifacts@1 displayName: 'Publish Artifacts' inputs: diff --git a/global.json b/global.json index c8c520be..966b8efb 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "sdk": { - "version": "9.0.201", + "version": "10.0.100", "rollForward": "latestMinor", "allowPrerelease": true }, "msbuild-sdks": { - "Microsoft.Build.NoTargets": "3.7.56" + "Microsoft.Build.NoTargets": "3.7.134" } } \ No newline at end of file diff --git a/samples/CentralPackageVersions/Directory.Build.targets b/samples/CentralPackageVersions/Directory.Build.targets deleted file mode 100644 index d4827d43..00000000 --- a/samples/CentralPackageVersions/Directory.Build.targets +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/samples/CentralPackageVersions/Packages.props b/samples/CentralPackageVersions/Packages.props deleted file mode 100644 index 97f9c590..00000000 --- a/samples/CentralPackageVersions/Packages.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/samples/CentralPackageVersions/README.md b/samples/CentralPackageVersions/README.md deleted file mode 100644 index cce75a8b..00000000 --- a/samples/CentralPackageVersions/README.md +++ /dev/null @@ -1,33 +0,0 @@ -# Central Package Versions Sample - -This sample shows how to use `Microsoft.Build.CentralPackageVersions`. - -1. [`Directory.Build.targets`](Directory.Build.targets) references the `Microsoft.Build.CentralPackageVersions` MSBuild project SDK - ```xml - - - - ``` -2. [`ClassLibrary.csproj`](src/ClassLibrary/ClassLibrary.csproj) only references packages by ID and does not specify any versions - ```xml - - - net8.0 - - - - - - ``` -3. [`Packages.props`](Packages.props) specifies package versions and "global" package references for all projects - ```xml - - - - - - - - - - ``` \ No newline at end of file diff --git a/samples/CentralPackageVersions/src/ClassLibrary/Class1.cs b/samples/CentralPackageVersions/src/ClassLibrary/Class1.cs deleted file mode 100644 index d6c34016..00000000 --- a/samples/CentralPackageVersions/src/ClassLibrary/Class1.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Newtonsoft.Json; - -namespace ClassLibrary -{ - public class Class1 - { - [JsonIgnore] - public string Name { get; set; } - } -} \ No newline at end of file diff --git a/samples/CentralPackageVersions/src/ClassLibrary/ClassLibrary.csproj b/samples/CentralPackageVersions/src/ClassLibrary/ClassLibrary.csproj deleted file mode 100644 index debdeaaf..00000000 --- a/samples/CentralPackageVersions/src/ClassLibrary/ClassLibrary.csproj +++ /dev/null @@ -1,8 +0,0 @@ - - - net8.0 - - - - - diff --git a/samples/Directory.Build.targets b/samples/Directory.Build.targets index 3c4f0d4d..c1df2220 100644 --- a/samples/Directory.Build.targets +++ b/samples/Directory.Build.targets @@ -1,26 +1,2 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/samples/NoTargets/SampleNoTargets/SampleNoTargets.csproj b/samples/NoTargets/SampleNoTargets/SampleNoTargets.csproj index 6e2e708c..c9cb4ee6 100644 --- a/samples/NoTargets/SampleNoTargets/SampleNoTargets.csproj +++ b/samples/NoTargets/SampleNoTargets/SampleNoTargets.csproj @@ -1,4 +1,4 @@ - + net8.0 diff --git a/samples/Traversal/dirs.proj b/samples/Traversal/dirs.proj index 1d20584d..30141220 100644 --- a/samples/Traversal/dirs.proj +++ b/samples/Traversal/dirs.proj @@ -1,4 +1,4 @@ - + diff --git a/src/Artifacts.UnitTests/Microsoft.Build.Artifacts.UnitTests.csproj b/src/Artifacts.UnitTests/Microsoft.Build.Artifacts.UnitTests.csproj index a77a1cfe..a92c2e6e 100644 --- a/src/Artifacts.UnitTests/Microsoft.Build.Artifacts.UnitTests.csproj +++ b/src/Artifacts.UnitTests/Microsoft.Build.Artifacts.UnitTests.csproj @@ -1,32 +1,34 @@  - 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; buildtransitive + - - - + + + diff --git a/src/Artifacts/Microsoft.Build.Artifacts.csproj b/src/Artifacts/Microsoft.Build.Artifacts.csproj index 158d8e1b..61657985 100644 --- a/src/Artifacts/Microsoft.Build.Artifacts.csproj +++ b/src/Artifacts/Microsoft.Build.Artifacts.csproj @@ -5,8 +5,6 @@ true Build logic for staging artifacts from build outputs. true - false - $(BaseArtifactsPath)$(MSBuildProjectName)\ true snupkg true @@ -18,8 +16,8 @@ - - + + - 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; buildtransitive + - + - + \ No newline at end of file diff --git a/src/Cargo/Microsoft.Build.Cargo.csproj b/src/Cargo/Microsoft.Build.Cargo.csproj index d5ab969c..ac8bb625 100644 --- a/src/Cargo/Microsoft.Build.Cargo.csproj +++ b/src/Cargo/Microsoft.Build.Cargo.csproj @@ -4,7 +4,6 @@ enable net472;net8.0;net9.0 true - $(BaseArtifactsPath)$(MSBuildProjectName)\ Microsoft.Build.Cargo Builds rust projects within msbuild using cargo. true @@ -17,10 +16,11 @@ $(NoWarn);NU1504;NU5100;NU5110;NU5111 - - - + + + + diff --git a/src/CentralPackageVersions.UnitTests/Microsoft.Build.CentralPackageVersions.UnitTests.csproj b/src/CentralPackageVersions.UnitTests/Microsoft.Build.CentralPackageVersions.UnitTests.csproj index acd5ee5c..cea5eddb 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 @@ -8,19 +8,20 @@ - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - + - - + + diff --git a/src/CentralPackageVersions/Microsoft.Build.CentralPackageVersions.csproj b/src/CentralPackageVersions/Microsoft.Build.CentralPackageVersions.csproj index 2127c8b7..0bf88a34 100644 --- a/src/CentralPackageVersions/Microsoft.Build.CentralPackageVersions.csproj +++ b/src/CentralPackageVersions/Microsoft.Build.CentralPackageVersions.csproj @@ -3,7 +3,6 @@ netstandard2.0 Provides the ability to centrally manage your NuGet package versions when using PackageReference. MSBuild MSBuildSdk - $(BaseArtifactsPath)\$(MSBuildProjectName)\ true MSBuildSdk true diff --git a/src/CopyOnWrite.UnitTests/Microsoft.Build.CopyOnWrite.UnitTests.csproj b/src/CopyOnWrite.UnitTests/Microsoft.Build.CopyOnWrite.UnitTests.csproj index 0ce9c646..2d1ee120 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 @@ -13,10 +13,16 @@ - + - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/CopyOnWrite/Microsoft.Build.CopyOnWrite.csproj b/src/CopyOnWrite/Microsoft.Build.CopyOnWrite.csproj index ff81cff8..8e53a472 100644 --- a/src/CopyOnWrite/Microsoft.Build.CopyOnWrite.csproj +++ b/src/CopyOnWrite/Microsoft.Build.CopyOnWrite.csproj @@ -7,7 +7,6 @@ true latest True - $(BaseArtifactsPath)$(MSBuildProjectName)\ true snupkg true @@ -33,7 +32,6 @@ PrivateAssets="All" /> diff --git a/src/NoTargets.UnitTests/Microsoft.Build.NoTargets.UnitTests.csproj b/src/NoTargets.UnitTests/Microsoft.Build.NoTargets.UnitTests.csproj index 6ff89f99..b0bb1769 100644 --- a/src/NoTargets.UnitTests/Microsoft.Build.NoTargets.UnitTests.csproj +++ b/src/NoTargets.UnitTests/Microsoft.Build.NoTargets.UnitTests.csproj @@ -1,25 +1,30 @@  - 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; buildtransitive + - + - + 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/NoTargets/Microsoft.Build.NoTargets.csproj b/src/NoTargets/Microsoft.Build.NoTargets.csproj index dfefebae..e4dfecc2 100644 --- a/src/NoTargets/Microsoft.Build.NoTargets.csproj +++ b/src/NoTargets/Microsoft.Build.NoTargets.csproj @@ -3,7 +3,6 @@ netstandard2.0 Provides targets for projects that do not compile an assembly. MSBuild MSBuildSdk notargets notarget - $(BaseArtifactsPath)$(MSBuildProjectName)\ true MSBuildSdk true diff --git a/src/RunTests/Microsoft.Build.RunVSTest.csproj b/src/RunTests/Microsoft.Build.RunVSTest.csproj index b0dcda8f..c558b8b2 100644 --- a/src/RunTests/Microsoft.Build.RunVSTest.csproj +++ b/src/RunTests/Microsoft.Build.RunVSTest.csproj @@ -11,7 +11,6 @@ latest true snupkg - $(BaseArtifactsPath)$(MSBuildProjectName)\ diff --git a/src/Traversal.UnitTests/Microsoft.Build.Traversal.UnitTests.csproj b/src/Traversal.UnitTests/Microsoft.Build.Traversal.UnitTests.csproj index a4fe61fc..5b438f0e 100644 --- a/src/Traversal.UnitTests/Microsoft.Build.Traversal.UnitTests.csproj +++ b/src/Traversal.UnitTests/Microsoft.Build.Traversal.UnitTests.csproj @@ -1,25 +1,30 @@  - 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; buildtransitive + - + - + diff --git a/src/Traversal/Microsoft.Build.Traversal.csproj b/src/Traversal/Microsoft.Build.Traversal.csproj index ada78b14..f38b2e9c 100644 --- a/src/Traversal/Microsoft.Build.Traversal.csproj +++ b/src/Traversal/Microsoft.Build.Traversal.csproj @@ -3,7 +3,6 @@ net472;netstandard2.0 Provides MSBuild traversal logic. MSBuild MSBuildSdk traversal dirs - $(BaseArtifactsPath)$(MSBuildProjectName)\ true MSBuildSdk true diff --git a/src/UniversalPackages/Microsoft.Build.UniversalPackages.csproj b/src/UniversalPackages/Microsoft.Build.UniversalPackages.csproj index 05c8e4ec..faa12de0 100644 --- a/src/UniversalPackages/Microsoft.Build.UniversalPackages.csproj +++ b/src/UniversalPackages/Microsoft.Build.UniversalPackages.csproj @@ -5,7 +5,6 @@ net8.0;net472 Provides targets for downloading universal packages on restore. MSBuild MSBuildSdk universalpackages - $(BaseArtifactsPath)$(MSBuildProjectName)\ true MSBuildSdk true