diff --git a/Directory.Build.props b/Directory.Build.props index 6b65e2ce0ba..66e304efa5a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,17 +1,17 @@ - - - + $(CopyrightNetFoundation) MIT - True + true embedded true Latest - net8.0 + + + net472 - $(MicrosoftCodeAnalysisCSharpVersion) - - diff --git a/Directory.Build.targets b/Directory.Build.targets index 177d64c47ad..53f78966da3 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,4 +1,14 @@ - + + + + + + + diff --git a/Documentation/Darc.md b/Documentation/Darc.md index 897ca2bed7d..e942cab38dd 100644 --- a/Documentation/Darc.md +++ b/Documentation/Darc.md @@ -286,7 +286,6 @@ index a1d683c1..dbf3fe0e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,6 +60,7 @@ - 2.0.4 1.1.0-beta1-62810-01 1.7.0 + 3.0.0-preview-27401-3 diff --git a/Documentation/UnifiedBuild/TFM-Trimming-And-Targeting.md b/Documentation/UnifiedBuild/TFM-Trimming-And-Targeting.md index 149172041d2..3b294d1e0eb 100644 --- a/Documentation/UnifiedBuild/TFM-Trimming-And-Targeting.md +++ b/Documentation/UnifiedBuild/TFM-Trimming-And-Targeting.md @@ -145,9 +145,8 @@ With this invocation, projects will only produce assets that target `net7*` and - net472;$(TargetFrameworkForNETSDK) + $(NetCurrent);net472 true - Latest true Build artifact signing tool Arcade Build Tool Signing diff --git a/eng/BuildTask.targets b/eng/BuildTask.targets index 499265a2317..554438d5ece 100644 --- a/eng/BuildTask.targets +++ b/eng/BuildTask.targets @@ -7,6 +7,7 @@ true true + tools - %(RecursiveDir)%(Filename)%(Extension) - + Include="**/*.props;**/*.targets" + Pack="true" + PackagePath="%(RecursiveDir)%(Filename)%(Extension)" /> @@ -26,19 +27,26 @@ + + + + + + + + - All true runtime - All true @@ -46,21 +54,8 @@ Update all Reference items to have Pack="false" This removes the frameworkDependency nodes from the generated nuspec --> - - false - - - - - - - - - - - + @@ -69,16 +64,16 @@ - + + PackagePath="$(BuildTaskTargetFolder)/$(TargetFramework)/%(RecursiveDir)%(FileName)%(Extension)"/> - - + + diff --git a/eng/Versions.props b/eng/Versions.props index d6da951ae28..c5cb8c3cae3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,5 +1,5 @@ - + 8.0.0 @@ -7,77 +7,60 @@ false - 2.2.1 + 2.5.0 1.0.2 1.10.1 0.25.2 2.0.10 - 4.3.4 1.31.0 1.8.0 4.4.0 12.13.0 12.8.0 5.10.3 - 1.6.1 + 2.0.3 2.21.0 - 1.3.1 - 0.1.0 5.8.4 - 5.8.4 - 15.7.179 - 15.7.179 - 15.7.179 - 15.7.179 - 2.6.3 - 2.9.0 - 3.8.0 - 4.3.0 - 2.0.0-beta4.22272.1 + 5.8.5 + 17.3.2 + 17.3.2 + 17.3.2 + 17.3.2 + 4.4.0 + 3.17.2 - 2.3.13 6.0.0 6.0.0 6.0.0 - 2.0.0 6.0.0 - 2.1.0 + 5.0.0 4.5.2-3.23152.4 17.5.0 6.0.100-1.22103.2 1.0.0-v3.14.0.5722 - 4.8.3 + 4.18.4 5.3.0.1 2.3.0 13.0.1 7.0.2 + 6.2.2 6.2.2 - 0.32.0 - 3.0.0 - 4.5.1 + 6.2.2 + 0.41.0 1.5.0 - 4.0.0 - 4.3.0 4.5.0 - 4.3.0 4.5.5 - 4.5.0 - 1.6.0 - 6.0.0 + 6.0.1 4.3.0 - 4.3.0 6.0.0 - 4.5.4 - 4.5.0 + 8.5.0 2.4.2 2.0.3 8.0.0-beta.23219.2 8.0.0-beta.23219.2 - 2.0.0 - 1.6.0 - 1.0.0 - 2.0.4 1.1.0-beta2-19575-01 1.1.0-beta.21553.1 8.0.0-beta.23218.3 @@ -91,5 +74,17 @@ 8.0.100-preview.3.23178.3 1.0.0-preview6.1.23159.4 8.0.100-preview.4.23224.3 + 6.0.3 + 15.2.302-preview.14.122 + 6.0.4 + 6.0.4 + 6.0.4 + 6.0.4 + 1.0.1 + 1.1.4 + 1.1.4 + 1.1.1 + 2018.2.1 + diff --git a/global.json b/global.json index c3ea778df44..783e7b046ce 100644 --- a/global.json +++ b/global.json @@ -4,6 +4,7 @@ }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23219.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23219.2" + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23219.2", + "Microsoft.Build.NoTargets": "3.7.0" } } diff --git a/src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj b/src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj index bfdf1c6a834..a86e8f59acf 100644 --- a/src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj +++ b/src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj @@ -1,17 +1,13 @@ - $(TargetFrameworkForNETSDK) + $(NetCurrent) enable true - - - - - + diff --git a/src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj b/src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj index 8b90ff620bf..9b040acb2b1 100644 --- a/src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj +++ b/src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj @@ -1,30 +1,21 @@ - net472;netstandard2.0 + netstandard2.0;$(NetFrameworkToolCurrent) true + **/*.Desktop.* - - - - - - + - - - - - - + diff --git a/src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj b/src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj index 53b29706e62..135f004c669 100644 --- a/src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj +++ b/src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj @@ -1,17 +1,16 @@ - $(TargetFrameworkForNETSDK);net472 + $(NetCurrent);$(NetFrameworkToolCurrent) true true - - + diff --git a/src/Directory.Build.props b/src/Directory.Build.props deleted file mode 100644 index 1bd8a98d7ca..00000000000 --- a/src/Directory.Build.props +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/Microsoft.Cci.Extensions/Microsoft.Cci.Extensions.csproj b/src/Microsoft.Cci.Extensions/Microsoft.Cci.Extensions.csproj index eee12ec6696..560b62a7ae6 100644 --- a/src/Microsoft.Cci.Extensions/Microsoft.Cci.Extensions.csproj +++ b/src/Microsoft.Cci.Extensions/Microsoft.Cci.Extensions.csproj @@ -1,14 +1,12 @@ + - true netstandard2.0 + true $(PackageTargetFallback)portable-net45+win8; true true true - - - NU1701 $(DefineConstants);COREFX @@ -18,6 +16,7 @@ + diff --git a/src/Microsoft.DotNet.ApiCompat/src/Microsoft.DotNet.ApiCompat.Core/Microsoft.DotNet.ApiCompat.Core.csproj b/src/Microsoft.DotNet.ApiCompat/src/Microsoft.DotNet.ApiCompat.Core/Microsoft.DotNet.ApiCompat.Core.csproj index 552ab4b984b..f3a882b685a 100644 --- a/src/Microsoft.DotNet.ApiCompat/src/Microsoft.DotNet.ApiCompat.Core/Microsoft.DotNet.ApiCompat.Core.csproj +++ b/src/Microsoft.DotNet.ApiCompat/src/Microsoft.DotNet.ApiCompat.Core/Microsoft.DotNet.ApiCompat.Core.csproj @@ -1,16 +1,10 @@ - net472;$(TargetFrameworkForNETSDK) + $(NetCurrent);$(NetFrameworkToolCurrent) true - - - - - - diff --git a/src/Microsoft.DotNet.ApiCompat/src/Microsoft.DotNet.ApiCompat.csproj b/src/Microsoft.DotNet.ApiCompat/src/Microsoft.DotNet.ApiCompat.csproj index 320db7efb8a..37cf4941471 100644 --- a/src/Microsoft.DotNet.ApiCompat/src/Microsoft.DotNet.ApiCompat.csproj +++ b/src/Microsoft.DotNet.ApiCompat/src/Microsoft.DotNet.ApiCompat.csproj @@ -1,39 +1,30 @@  - Exe - net472;$(TargetFrameworkForNETSDK) - true + $(NetCurrent);$(NetFrameworkToolCurrent) true - false - MSBuildSdk true - $(NoWarn);0436 - Major - - Microsoft.DotNet.ApiCompat.Core\**\* + Microsoft.DotNet.ApiCompat.Core\**\* - - - - - + + + + + - - - + diff --git a/src/Microsoft.DotNet.ApiCompat/src/build/Microsoft.DotNet.ApiCompat.targets b/src/Microsoft.DotNet.ApiCompat/src/build/Microsoft.DotNet.ApiCompat.targets index 384abb3fba3..c0c02d9f68c 100644 --- a/src/Microsoft.DotNet.ApiCompat/src/build/Microsoft.DotNet.ApiCompat.targets +++ b/src/Microsoft.DotNet.ApiCompat/src/build/Microsoft.DotNet.ApiCompat.targets @@ -1,8 +1,9 @@ + $(MSBuildThisFileDirectory)..\tools\net8.0\Microsoft.DotNet.ApiCompat.dll - $(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.ApiCompat.exe + $(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.ApiCompat.dll true diff --git a/src/Microsoft.DotNet.ApiCompat/tests/Microsoft.DotNet.ApiCompat.Tests.csproj b/src/Microsoft.DotNet.ApiCompat/tests/Microsoft.DotNet.ApiCompat.Tests.csproj index 399ab773f39..1fe5312c3cf 100644 --- a/src/Microsoft.DotNet.ApiCompat/tests/Microsoft.DotNet.ApiCompat.Tests.csproj +++ b/src/Microsoft.DotNet.ApiCompat/tests/Microsoft.DotNet.ApiCompat.Tests.csproj @@ -1,16 +1,17 @@ - $(TargetFrameworkForNETSDK);net472 - Latest + $(NetCurrent);$(NetFrameworkToolCurrent) false - <_testProjectHelper Include="TestProjects\**\*.csproj" /> + + + <_testProjectHelper Include="TestProjects\**\*.csproj" /> <_testProjectHelper Update="@(_testProjectHelper)"> Implementation\ Contract\ @@ -19,22 +20,6 @@ - - - - - - - - - - - - - - - diff --git a/src/Microsoft.DotNet.ApiCompat/tests/TestProjects/AttributeDifference/Contract/AttributeDifference.Contract.csproj b/src/Microsoft.DotNet.ApiCompat/tests/TestProjects/AttributeDifference/Contract/AttributeDifference.Contract.csproj index 2259ff6fcc4..82f57cb7ace 100644 --- a/src/Microsoft.DotNet.ApiCompat/tests/TestProjects/AttributeDifference/Contract/AttributeDifference.Contract.csproj +++ b/src/Microsoft.DotNet.ApiCompat/tests/TestProjects/AttributeDifference/Contract/AttributeDifference.Contract.csproj @@ -2,7 +2,6 @@ netstandard2.0 - Latest false AttributeDifference diff --git a/src/Microsoft.DotNet.ApiCompat/tests/TestProjects/AttributeDifference/Implementation/AttributeDifference.Implementation.csproj b/src/Microsoft.DotNet.ApiCompat/tests/TestProjects/AttributeDifference/Implementation/AttributeDifference.Implementation.csproj index 2259ff6fcc4..82f57cb7ace 100644 --- a/src/Microsoft.DotNet.ApiCompat/tests/TestProjects/AttributeDifference/Implementation/AttributeDifference.Implementation.csproj +++ b/src/Microsoft.DotNet.ApiCompat/tests/TestProjects/AttributeDifference/Implementation/AttributeDifference.Implementation.csproj @@ -2,7 +2,6 @@ netstandard2.0 - Latest false AttributeDifference diff --git a/src/Microsoft.DotNet.Arcade.Sdk.Tests/Microsoft.DotNet.Arcade.Sdk.Tests.csproj b/src/Microsoft.DotNet.Arcade.Sdk.Tests/Microsoft.DotNet.Arcade.Sdk.Tests.csproj index 672a72de94a..77d6982b359 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk.Tests/Microsoft.DotNet.Arcade.Sdk.Tests.csproj +++ b/src/Microsoft.DotNet.Arcade.Sdk.Tests/Microsoft.DotNet.Arcade.Sdk.Tests.csproj @@ -1,7 +1,7 @@ - $(TargetFrameworkForNETSDK) + $(NetCurrent) $(DefaultItemExcludes);testassets\**\* @@ -13,18 +13,14 @@ - - - - - + - + diff --git a/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj b/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj index 75795d6e341..76bd2550cc5 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj +++ b/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj @@ -1,8 +1,7 @@ - + - net472;$(TargetFrameworkForNETSDK) - preview + $(NetCurrent);$(NetFrameworkToolCurrent) true false @@ -16,7 +15,6 @@ MSBuildSdk false - false <_GeneratedVersionFilePath>$(IntermediateOutputPath)DefaultVersions.Generated.props 3021;NU5105;SYSLIB0013 @@ -25,20 +23,11 @@ - - - - - - - - - - - - + + + @@ -46,17 +35,17 @@ - - sdk/%(Filename)%(Extension) - - - tools/%(RecursiveDir)%(Filename)%(Extension) - + + + - - tools\DefaultVersions.Generated.props - @@ -70,7 +59,6 @@ - <_SdkVersionPropsContent> @@ -98,5 +86,6 @@ - + + diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.props b/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.props index ce0d0e70b3e..10e1fe67ea4 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.props +++ b/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.props @@ -1,6 +1,6 @@ - + diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Compiler.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/Compiler.props index 8d2e21f5fb7..79e161d1216 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Compiler.props +++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Compiler.props @@ -1,4 +1,3 @@ - diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props index 1240e5f4071..587f95ad29e 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props +++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props @@ -1,4 +1,3 @@ - diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/InstallDotNetCore.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/InstallDotNetCore.targets index 5103c5b2dc1..8710ed27585 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/tools/InstallDotNetCore.targets +++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/InstallDotNetCore.targets @@ -13,7 +13,7 @@ Command="chmod +x "$(_DotNetInstallScript)"" /> diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectDefaults.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectDefaults.props index acaf5c8d836..a65aa3c675e 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectDefaults.props +++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectDefaults.props @@ -1,4 +1,3 @@ - diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectLayout.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectLayout.props index efa180d6484..3f877dccd65 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectLayout.props +++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/ProjectLayout.props @@ -1,4 +1,3 @@ - diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Settings.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/Settings.props index 4d9764ed44a..60c0892fc7f 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Settings.props +++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Settings.props @@ -1,6 +1,6 @@ - + <_ArcadeOverriddenCustomBeforeMicrosoftCommonTargets>$(CustomBeforeMicrosoftCommonTargets) <_ArcadeOverriddenCustomBeforeMicrosoftCommonCrossTargetingTargets>$(CustomBeforeMicrosoftCommonCrossTargetingTargets) diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.props index bdd8ebf8558..fcee7720523 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.props +++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.props @@ -1,4 +1,3 @@ - diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/StrongName.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/StrongName.props index 39ec3498097..b5401455493 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/tools/StrongName.props +++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/StrongName.props @@ -1,4 +1,3 @@ - diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/TargetFrameworkDefaults.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/TargetFrameworkDefaults.props index a4c374bf7cf..ffcce1573ec 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/tools/TargetFrameworkDefaults.props +++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/TargetFrameworkDefaults.props @@ -1,4 +1,3 @@ - + net8.0 net7.0 net6.0 + + net462 + net472 + net481 diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Tests.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/Tests.props index 51e9c6c3d8f..f104d84c91e 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Tests.props +++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Tests.props @@ -1,4 +1,3 @@ - diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.props index ff6e21e3746..8ea309b424c 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.props +++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.props @@ -1,4 +1,3 @@ - diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Workarounds.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/Workarounds.props index 259a5c65733..7223a06042c 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Workarounds.props +++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Workarounds.props @@ -1,4 +1,3 @@ - diff --git a/src/Microsoft.DotNet.ArcadeLogging/Microsoft.DotNet.ArcadeLogging.csproj b/src/Microsoft.DotNet.ArcadeLogging/Microsoft.DotNet.ArcadeLogging.csproj index afc8eed15ca..339de7d12df 100644 --- a/src/Microsoft.DotNet.ArcadeLogging/Microsoft.DotNet.ArcadeLogging.csproj +++ b/src/Microsoft.DotNet.ArcadeLogging/Microsoft.DotNet.ArcadeLogging.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Microsoft.DotNet.AsmDiff/Microsoft.DotNet.AsmDiff.csproj b/src/Microsoft.DotNet.AsmDiff/Microsoft.DotNet.AsmDiff.csproj index 2653ea7e632..34449b1e3d9 100644 --- a/src/Microsoft.DotNet.AsmDiff/Microsoft.DotNet.AsmDiff.csproj +++ b/src/Microsoft.DotNet.AsmDiff/Microsoft.DotNet.AsmDiff.csproj @@ -1,10 +1,9 @@ - - + + $(NetCurrent) Exe - $(TargetFrameworkForNETSDK) true true dotnet-asmdiff @@ -27,4 +26,5 @@ + diff --git a/src/Microsoft.DotNet.Build.Tasks.Archives/Microsoft.DotNet.Build.Tasks.Archives.csproj b/src/Microsoft.DotNet.Build.Tasks.Archives/Microsoft.DotNet.Build.Tasks.Archives.csproj index 8dce0a84eb2..0370fe81e68 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Archives/Microsoft.DotNet.Build.Tasks.Archives.csproj +++ b/src/Microsoft.DotNet.Build.Tasks.Archives/Microsoft.DotNet.Build.Tasks.Archives.csproj @@ -1,17 +1,14 @@ - - + + - $(TargetFrameworkForNETSDK) + $(NetCurrent) false - true false - Targets for producing an archive of file outputs. MSBuildSdk - - false - + + diff --git a/src/Microsoft.DotNet.Build.Tasks.Archives/build/Microsoft.DotNet.Build.Tasks.Archives.props b/src/Microsoft.DotNet.Build.Tasks.Archives/build/Microsoft.DotNet.Build.Tasks.Archives.props index 9767a553d21..f6a41b80468 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Archives/build/Microsoft.DotNet.Build.Tasks.Archives.props +++ b/src/Microsoft.DotNet.Build.Tasks.Archives/build/Microsoft.DotNet.Build.Tasks.Archives.props @@ -1,3 +1,4 @@ + diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/Microsoft.DotNet.Build.Tasks.Feed.Tests.csproj b/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/Microsoft.DotNet.Build.Tasks.Feed.Tests.csproj index 77592118874..798834f44db 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/Microsoft.DotNet.Build.Tasks.Feed.Tests.csproj +++ b/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/Microsoft.DotNet.Build.Tasks.Feed.Tests.csproj @@ -1,26 +1,19 @@ - $(TargetFrameworkForNETSDK) + $(NetCurrent) - - - - - - - - - + + @@ -32,9 +25,8 @@ - - Always - + diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/Microsoft.DotNet.Build.Tasks.Feed.csproj b/src/Microsoft.DotNet.Build.Tasks.Feed/Microsoft.DotNet.Build.Tasks.Feed.csproj index a6d386e6652..51fc9d2163e 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Feed/Microsoft.DotNet.Build.Tasks.Feed.csproj +++ b/src/Microsoft.DotNet.Build.Tasks.Feed/Microsoft.DotNet.Build.Tasks.Feed.csproj @@ -1,42 +1,32 @@ - - $(TargetFrameworkForNETSDK);net472 + $(NetCurrent);$(NetFrameworkToolCurrent) true - This package provides support for publishing assets to a NuGet protocol based feed. true MSBuildSdk true - <_ExcludeNuGetAssembliesTargetFramework>$(TargetFrameworkForNETSDK) - - - - - - - + - - - - - + + + - - + + + @@ -49,14 +39,6 @@ - - - - <_PackageFilesToExclude Include="%(_PackageFiles.Identity)" Condition="$([System.String]::Copy('%(_PackageFiles.FileName)').StartsWith('NuGet')) and $([System.String]::Copy('%(_PackageFiles.Directory)').Contains('$(_ExcludeNuGetAssembliesTargetFramework)'))" /> - - + - diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/build/Microsoft.DotNet.Build.Tasks.Feed.targets b/src/Microsoft.DotNet.Build.Tasks.Feed/build/Microsoft.DotNet.Build.Tasks.Feed.targets index 43742ea5210..143175cda25 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Feed/build/Microsoft.DotNet.Build.Tasks.Feed.targets +++ b/src/Microsoft.DotNet.Build.Tasks.Feed/build/Microsoft.DotNet.Build.Tasks.Feed.targets @@ -1,5 +1,5 @@ - + + - net472;$(TargetFrameworkForNETSDK) + $(NetCurrent);$(NetFrameworkToolCurrent) true - Latest true Installer task package Arcade Build Tool Installer @@ -13,7 +12,6 @@ - @@ -21,15 +19,19 @@ - - build - - + + - + + @@ -40,10 +42,7 @@ - - - - - + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/Microsoft.DotNet.Build.Tasks.Installers.props b/src/Microsoft.DotNet.Build.Tasks.Installers/build/Microsoft.DotNet.Build.Tasks.Installers.props index e9c58a96c95..a79104884c9 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/Microsoft.DotNet.Build.Tasks.Installers.props +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/Microsoft.DotNet.Build.Tasks.Installers.props @@ -1,4 +1,6 @@ - + + + $(MSBuildThisFileDirectory)..\tools\net8.0\Microsoft.DotNet.Build.Tasks.Installers.dll $(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.Build.Tasks.Installers.dll @@ -6,4 +8,5 @@ + diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/Microsoft.DotNet.Build.Tasks.Installers.targets b/src/Microsoft.DotNet.Build.Tasks.Installers/build/Microsoft.DotNet.Build.Tasks.Installers.targets index 1d307053518..4f956d67504 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/Microsoft.DotNet.Build.Tasks.Installers.targets +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/Microsoft.DotNet.Build.Tasks.Installers.targets @@ -1,3 +1,6 @@ + + + diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/acquisition/Directory.Build.props b/src/Microsoft.DotNet.Build.Tasks.Installers/build/acquisition/Directory.Build.props index c3a6b88d86f..2a40aa34fc9 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/acquisition/Directory.Build.props +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/acquisition/Directory.Build.props @@ -1,3 +1,4 @@ + diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/installer.props b/src/Microsoft.DotNet.Build.Tasks.Installers/build/installer.props index 5fc6934544b..c765f0985ab 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/installer.props +++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/installer.props @@ -1,3 +1,4 @@ + true diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/ApplyPreReleaseSuffix.cs b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/ApplyPreReleaseSuffix.cs index f1efe21d50c..a53e7a3a31e 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/ApplyPreReleaseSuffix.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/ApplyPreReleaseSuffix.cs @@ -1,7 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Arcade.Common; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; using System; diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/CreateTrimDependencyGroups.cs b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/CreateTrimDependencyGroups.cs index 95bd7b255bc..5d5474ca934 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/CreateTrimDependencyGroups.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/CreateTrimDependencyGroups.cs @@ -1,7 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Arcade.Common; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; using NuGet.Frameworks; diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/FilterUnknownPackages.cs b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/FilterUnknownPackages.cs index 061269271fb..eaab3911ff2 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/FilterUnknownPackages.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/FilterUnknownPackages.cs @@ -1,7 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Arcade.Common; using Microsoft.Build.Framework; using System; using System.Collections.Generic; diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GeneratePackageReport.cs b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GeneratePackageReport.cs index 1ebaaffdec3..53b7b4a3c5a 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GeneratePackageReport.cs +++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/GeneratePackageReport.cs @@ -1,7 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Arcade.Common; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; using NuGet.Frameworks; diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj index 48daaa583fa..a639fe52157 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj +++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj @@ -1,15 +1,10 @@ - net472;$(TargetFrameworkForNETSDK) - true - MSBuildSdk - false + $(NetCurrent);$(NetFrameworkToolCurrent) true - - + MSBuildSdk Packaging Targets and Tasks used by Dotnet repos - 2.8.1 This package provides the following MSBuild tasks: - ApplyBaseLine @@ -38,8 +33,6 @@ - SplitReferences - UpdatePackageIndex - ValidationTask - - **/*.Desktop.* $(BeforePack);AddRuntimeJson @@ -47,26 +40,24 @@ - + - + - - - - - - + + @@ -74,30 +65,21 @@ - - - - - - <_candidatPackageFolders Include="$(NuGetPackageFolders)" /> - - - - + - <_candidatePackageFolder>%(_candidatPackageFolders.Identity) - <_runtimeJsonSubPath>Microsoft.NETCore.Platforms\$(MicrosoftNETCorePlatformsVersion)\runtime.json - <_runtimeJsonPath Condition="'$(_runtimeJsonPath)' == '' AND Exists('$(_candidatePackageFolder)\$(_runtimeJsonSubPath)')">$(_candidatePackageFolder)\$(_runtimeJsonSubPath) - <_runtimeJsonPath Condition="'$(_runtimeJsonPath)' == '' AND Exists('$(_candidatePackageFolder)\$(_runtimeJsonSubPath.ToLower())')">$(_candidatePackageFolder)\$(_runtimeJsonSubPath.ToLower()) + <_runtimeJsonPath>$(NuGetPackageRoot)microsoft.netcore.platforms\$(MicrosoftNETCorePlatformsVersion)\runtime.json - - - + + - + - + + diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Microsoft.DotNet.Build.Tasks.Packaging.props b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Microsoft.DotNet.Build.Tasks.Packaging.props index e6168f347c5..5faf6a4eddb 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Microsoft.DotNet.Build.Tasks.Packaging.props +++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Microsoft.DotNet.Build.Tasks.Packaging.props @@ -1,4 +1,4 @@ - + true diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/tests/Microsoft.DotNet.Build.Tasks.Packaging.Tests.csproj b/src/Microsoft.DotNet.Build.Tasks.Packaging/tests/Microsoft.DotNet.Build.Tasks.Packaging.Tests.csproj index 5d975bc5503..836072e09bd 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Packaging/tests/Microsoft.DotNet.Build.Tasks.Packaging.Tests.csproj +++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/tests/Microsoft.DotNet.Build.Tasks.Packaging.Tests.csproj @@ -1,26 +1,25 @@  + - $(TargetFrameworkForNETSDK);net472 - Latest + $(NetCurrent);$(NetFrameworkToolCurrent) false xUnit2013 + + + - + - - - - - - - <_candidatePackageFolder>%(_candidatPackageFolders.Identity) - + + - $(_candidatePackageFolder)\%(Identity)\%(Version) - - $(_candidatePackageFolder)\$([System.String]::new("%(Identity)\%(Version)").ToLower()) + $(NuGetPackageRoot)$([System.String]::new('%(Identity)').ToLowerInvariant())\%(Version) - - - - + + diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/Microsoft.DotNet.Build.Tasks.TargetFramework.csproj b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/Microsoft.DotNet.Build.Tasks.TargetFramework.csproj index 94925e3f46d..b0a4a87f810 100644 --- a/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/Microsoft.DotNet.Build.Tasks.TargetFramework.csproj +++ b/src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/Microsoft.DotNet.Build.Tasks.TargetFramework.csproj @@ -1,34 +1,27 @@ - net472;$(TargetFrameworkForNETSDK) - true - false + $(NetCurrent);$(NetFrameworkToolCurrent) true Configuration system for cross-targeting projects. This package provides the following MSBuild tasks: ChooseBestTargetFrameworksTask and ChooseBestP2PTargetFrameworkTask. - **/*.Desktop.* enable - - - - - + + + + + - - - - - + diff --git a/src/Microsoft.DotNet.Build.Tasks.Templating/src/Microsoft.DotNet.Build.Tasks.Templating.csproj b/src/Microsoft.DotNet.Build.Tasks.Templating/src/Microsoft.DotNet.Build.Tasks.Templating.csproj index 5ff51a445ad..bd70048f865 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Templating/src/Microsoft.DotNet.Build.Tasks.Templating.csproj +++ b/src/Microsoft.DotNet.Build.Tasks.Templating/src/Microsoft.DotNet.Build.Tasks.Templating.csproj @@ -1,29 +1,18 @@ - netstandard2.0 Templating task package + true Arcade Build Tool Templating false - false - true - tools\ true - true - false - - build - - - - - - + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Build.Tasks.Templating/test/Microsoft.DotNet.Build.Tasks.Templating.Tests.csproj b/src/Microsoft.DotNet.Build.Tasks.Templating/test/Microsoft.DotNet.Build.Tasks.Templating.Tests.csproj index 02d3f59f065..debd70e4e13 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Templating/test/Microsoft.DotNet.Build.Tasks.Templating.Tests.csproj +++ b/src/Microsoft.DotNet.Build.Tasks.Templating/test/Microsoft.DotNet.Build.Tasks.Templating.Tests.csproj @@ -1,25 +1,22 @@ - net472;$(TargetFrameworkForNETSDK) + $(NetCurrent);$(NetFrameworkToolCurrent) - - - - - Always - + + diff --git a/src/Microsoft.DotNet.Build.Tasks.VisualStudio.Tests/Microsoft.DotNet.Build.Tasks.VisualStudio.Tests.csproj b/src/Microsoft.DotNet.Build.Tasks.VisualStudio.Tests/Microsoft.DotNet.Build.Tasks.VisualStudio.Tests.csproj index 1a9f8812061..e5fcf2e1139 100644 --- a/src/Microsoft.DotNet.Build.Tasks.VisualStudio.Tests/Microsoft.DotNet.Build.Tasks.VisualStudio.Tests.csproj +++ b/src/Microsoft.DotNet.Build.Tasks.VisualStudio.Tests/Microsoft.DotNet.Build.Tasks.VisualStudio.Tests.csproj @@ -1,14 +1,13 @@ - net472 + $(NetFrameworkToolCurrent) - diff --git a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Microsoft.DotNet.Build.Tasks.VisualStudio.csproj b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Microsoft.DotNet.Build.Tasks.VisualStudio.csproj index ef3b7fb6bb9..0d6232e0a01 100644 --- a/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Microsoft.DotNet.Build.Tasks.VisualStudio.csproj +++ b/src/Microsoft.DotNet.Build.Tasks.VisualStudio/Microsoft.DotNet.Build.Tasks.VisualStudio.csproj @@ -1,25 +1,26 @@ - - - net472 - + + $(NetFrameworkToolCurrent) true Arcade SDK build tasks for Visual Studio profile guided optimization training Roslyn Build Task OptProf Optimization Training true true + - + + - + + diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/Microsoft.DotNet.Build.Tasks.Workloads.Tests.csproj b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/Microsoft.DotNet.Build.Tasks.Workloads.Tests.csproj index 8e479dbb3ed..b7884eea17a 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/Microsoft.DotNet.Build.Tasks.Workloads.Tests.csproj +++ b/src/Microsoft.DotNet.Build.Tasks.Workloads.Tests/Microsoft.DotNet.Build.Tasks.Workloads.Tests.csproj @@ -1,7 +1,7 @@  - net472;$(TargetFrameworkForNETSDK) + $(NetCurrent);$(NetFrameworkToolCurrent) @@ -9,35 +9,37 @@ - - - - - - - - - + + + + + + + - - - - + + + + + + + + - - - - - - - + + + + + + + @@ -54,4 +56,5 @@ + diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj index 68efb30ffcf..5086bb1406e 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj +++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj @@ -1,13 +1,7 @@ - + - net472;$(TargetFrameworkForNETSDK) - - $(TargetFrameworkForNETSDK) + $(NetCurrent);$(NetFrameworkToolCurrent) true true Workload pack installer generation task package @@ -15,7 +9,6 @@ true $(NoWarn);NU5127 false - Microsoft.DotNet.Build.Tasks.Workloads true + $(DefaultExcludesInProjectFolder);**\*.wix.cs;*.wix.cs - - - - - - + + - - + + + + + @@ -59,11 +52,6 @@ - - - - - @@ -71,30 +59,19 @@ + - - - True - True - Strings.resx - - - - - - ResXFileCodeGenerator - Strings.Designer.cs - - - + - - - + - \ No newline at end of file diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/build/Microsoft.DotNet.Build.Tasks.Workloads.props b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/build/Microsoft.DotNet.Build.Tasks.Workloads.props index e1eae45e7da..6362efa55d4 100644 --- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/build/Microsoft.DotNet.Build.Tasks.Workloads.props +++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/build/Microsoft.DotNet.Build.Tasks.Workloads.props @@ -1,9 +1,11 @@ + + - $(MSBuildThisFileDirectory)..\tools\net8.0\Microsoft.DotNet.Build.Tasks.Workloads.dll $(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.Build.Tasks.Workloads.dll + diff --git a/src/Microsoft.DotNet.CMake.Sdk/Microsoft.DotNet.CMake.Sdk.csproj b/src/Microsoft.DotNet.CMake.Sdk/Microsoft.DotNet.CMake.Sdk.csproj index 398f3e3db7a..750c0d37372 100644 --- a/src/Microsoft.DotNet.CMake.Sdk/Microsoft.DotNet.CMake.Sdk.csproj +++ b/src/Microsoft.DotNet.CMake.Sdk/Microsoft.DotNet.CMake.Sdk.csproj @@ -1,18 +1,19 @@ - - - - $(TargetFrameworkForNETSDK) - false + + + $(NetCurrent) true - false - Common toolset for calling into CMake from MSBuild and easily reference native assets from managed projects. MSBuildSdk - - false - $(NoWarn);NU5105 + $(NoWarn);NU5128 + true - + + + + + diff --git a/src/Microsoft.DotNet.CMake.Sdk/build/Microsoft.DotNet.CMake.Sdk.props b/src/Microsoft.DotNet.CMake.Sdk/build/Microsoft.DotNet.CMake.Sdk.props index 9180dfc6a3e..8e61de796d6 100644 --- a/src/Microsoft.DotNet.CMake.Sdk/build/Microsoft.DotNet.CMake.Sdk.props +++ b/src/Microsoft.DotNet.CMake.Sdk/build/Microsoft.DotNet.CMake.Sdk.props @@ -1,4 +1,6 @@ + + netstandard2.0 false @@ -20,4 +22,5 @@ + diff --git a/src/Microsoft.DotNet.CMake.Sdk/build/Microsoft.DotNet.CMake.Sdk.targets b/src/Microsoft.DotNet.CMake.Sdk/build/Microsoft.DotNet.CMake.Sdk.targets index a35307b2c11..c34dc5d02ed 100644 --- a/src/Microsoft.DotNet.CMake.Sdk/build/Microsoft.DotNet.CMake.Sdk.targets +++ b/src/Microsoft.DotNet.CMake.Sdk/build/Microsoft.DotNet.CMake.Sdk.targets @@ -1,3 +1,4 @@ + @@ -206,4 +207,5 @@ + diff --git a/src/Microsoft.DotNet.CMake.Sdk/sdk/ProjectReference.targets b/src/Microsoft.DotNet.CMake.Sdk/sdk/ProjectReference.targets index 5e58ba92f33..ad3c2720d8c 100644 --- a/src/Microsoft.DotNet.CMake.Sdk/sdk/ProjectReference.targets +++ b/src/Microsoft.DotNet.CMake.Sdk/sdk/ProjectReference.targets @@ -1,3 +1,4 @@ + diff --git a/src/Microsoft.DotNet.CMake.Sdk/sdk/Sdk.props b/src/Microsoft.DotNet.CMake.Sdk/sdk/Sdk.props index 69a623912ee..75ef09ee4c5 100644 --- a/src/Microsoft.DotNet.CMake.Sdk/sdk/Sdk.props +++ b/src/Microsoft.DotNet.CMake.Sdk/sdk/Sdk.props @@ -1,3 +1,6 @@ + + + diff --git a/src/Microsoft.DotNet.CMake.Sdk/sdk/Sdk.targets b/src/Microsoft.DotNet.CMake.Sdk/sdk/Sdk.targets index bd8aaa63920..2e03e8533b1 100644 --- a/src/Microsoft.DotNet.CMake.Sdk/sdk/Sdk.targets +++ b/src/Microsoft.DotNet.CMake.Sdk/sdk/Sdk.targets @@ -1,3 +1,6 @@ + + + diff --git a/src/Microsoft.DotNet.CodeAnalysis/Analyzers/AppContextDefaultsAnalyzer.cs b/src/Microsoft.DotNet.CodeAnalysis/Analyzers/AppContextDefaultsAnalyzer.cs index 789c34a1899..b669b3f2688 100644 --- a/src/Microsoft.DotNet.CodeAnalysis/Analyzers/AppContextDefaultsAnalyzer.cs +++ b/src/Microsoft.DotNet.CodeAnalysis/Analyzers/AppContextDefaultsAnalyzer.cs @@ -18,7 +18,7 @@ public class AppContextDefaultsAnalyzer : BaseAnalyzer private static string s_title = @"Ensure AppContext defaults are correctly setup"; private static string s_analyzerName = "AppContextDefaults"; - private static string s_description = @"Ensures AppContext default values are correctly setup"; + private static string s_description = @"Ensures AppContext default values are correctly setup."; private static string s_defaultValueNotInitializedToTrue = @"AppContext default value expected to be 'true' in the call: '{0}'."; private static string s_defaultValueInsideUnexpectedIfCondition = @"AppContext default value is defined inside an if statement that does not use the '<=' pattern."; private static string s_defaultValueDefinedOutsideIfCondition = @"AppContext default value should be defined inside an if statement at the root of the switch case."; @@ -77,7 +77,7 @@ private void AnalyzeCodeBlock(SyntaxNodeAnalysisContext context) } // check that we are doing this inside an if statement - var containingIfStatement = call.Ancestors().FirstOrDefault(n => n.Kind() == SyntaxKind.IfStatement) as IfStatementSyntax; + var containingIfStatement = call.Ancestors().FirstOrDefault(n => n.IsKind(SyntaxKind.IfStatement)) as IfStatementSyntax; if (containingIfStatement == null) { context.ReportDiagnostic(Diagnostic.Create(s_appContextDefaultValueDefinedOutsideIfConditionDiagnostic, args.GetLocation(), call)); @@ -85,8 +85,8 @@ private void AnalyzeCodeBlock(SyntaxNodeAnalysisContext context) else { // are we inside the switch? either as a block or as a switchcase? - if (!(containingIfStatement.Parent.Kind() == SyntaxKind.SwitchSection || - containingIfStatement.Parent.Parent.Kind() == SyntaxKind.SwitchSection)) + if (!(containingIfStatement.Parent.IsKind(SyntaxKind.SwitchSection) || + containingIfStatement.Parent.Parent.IsKind(SyntaxKind.SwitchSection))) { context.ReportDiagnostic(Diagnostic.Create(s_appContextDefaultValueDefinedOutsideIfConditionDiagnostic, args.GetLocation(), call)); } diff --git a/src/Microsoft.DotNet.CodeAnalysis/Analyzers/BaseAnalyzer.cs b/src/Microsoft.DotNet.CodeAnalysis/Analyzers/BaseAnalyzer.cs index 62eb83a1533..da9028b88d8 100644 --- a/src/Microsoft.DotNet.CodeAnalysis/Analyzers/BaseAnalyzer.cs +++ b/src/Microsoft.DotNet.CodeAnalysis/Analyzers/BaseAnalyzer.cs @@ -3,7 +3,6 @@ using Microsoft.CodeAnalysis.Diagnostics; using System; -using System.Collections.Generic; using System.Linq; namespace Microsoft.DotNet.CodeAnalysis.Analyzers @@ -14,6 +13,8 @@ public abstract class BaseAnalyzer : DiagnosticAnalyzer public sealed override void Initialize(AnalysisContext context) { + context.EnableConcurrentExecution(); + context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.Analyze | GeneratedCodeAnalysisFlags.ReportDiagnostics); context.RegisterCompilationStartAction(InitializeAnalyzer); } diff --git a/src/Microsoft.DotNet.CodeAnalysis/Analyzers/ResourceUsageAnalyzer.cs b/src/Microsoft.DotNet.CodeAnalysis/Analyzers/ResourceUsageAnalyzer.cs index 077f9d35a82..17df156bfb7 100644 --- a/src/Microsoft.DotNet.CodeAnalysis/Analyzers/ResourceUsageAnalyzer.cs +++ b/src/Microsoft.DotNet.CodeAnalysis/Analyzers/ResourceUsageAnalyzer.cs @@ -44,7 +44,7 @@ private void AnalyzeNode(SyntaxNodeAnalysisContext context) if (memberSymbol == null) return; if (memberSymbol.Name.Equals("Format") && - memberSymbol.ContainingType.Equals(SRSymbol) && + SymbolEqualityComparer.Default.Equals(memberSymbol.ContainingType, SRSymbol) && memberSymbol.Parameters.Length == 1) { // There's no valid reason to call SR.Format(singleArg). This generally happens accidentally diff --git a/src/Microsoft.DotNet.CodeAnalysis/Microsoft.DotNet.CodeAnalysis.csproj b/src/Microsoft.DotNet.CodeAnalysis/Microsoft.DotNet.CodeAnalysis.csproj index d1ac5ccbb96..bf60155e52b 100644 --- a/src/Microsoft.DotNet.CodeAnalysis/Microsoft.DotNet.CodeAnalysis.csproj +++ b/src/Microsoft.DotNet.CodeAnalysis/Microsoft.DotNet.CodeAnalysis.csproj @@ -1,39 +1,27 @@ - netstandard2.0 + netstandard2.0 false true $(MSBuildThisFileDirectory)CodeAnalysis.ruleset true + $(TargetsForTfmSpecificContentInPackage);_AddAnalyzerToOutput - - - - - - - - $(TargetsForTfmSpecificContentInPackage);_AddAnalyzerToOutput - - - + + diff --git a/src/Microsoft.DotNet.CodeAnalysis/build/Microsoft.DotNet.CodeAnalysis.targets b/src/Microsoft.DotNet.CodeAnalysis/build/Microsoft.DotNet.CodeAnalysis.targets index 40c86671cc2..6ef14bde378 100644 --- a/src/Microsoft.DotNet.CodeAnalysis/build/Microsoft.DotNet.CodeAnalysis.targets +++ b/src/Microsoft.DotNet.CodeAnalysis/build/Microsoft.DotNet.CodeAnalysis.targets @@ -1,5 +1,6 @@ + diff --git a/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj b/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj index e1a84b2f1f7..fa6e60a8fac 100644 --- a/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj +++ b/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj @@ -1,9 +1,7 @@ - - $(TargetFrameworkForNETSDK);net472 - + $(NetCurrent);$(NetFrameworkToolCurrent) true Aka.ms link manager Arcade aka.ms @@ -13,46 +11,18 @@ - - - - + - - - + + - - - false - $(TargetsForTfmSpecificContentInPackage);_PublishCore;_GetFilesToPackage - - true - - - - - - - <_Dir>$(OutDir) - <_Dir Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">$(PublishDir) - - - - <_Files Include="$(_Dir)*" /> + - - build/$(TargetFramework)/%(_Files.Filename)%(_Files.Extension) - - - diff --git a/src/Microsoft.DotNet.Deployment.Tasks.Links/build/Microsoft.DotNet.Deployment.Tasks.Links.props b/src/Microsoft.DotNet.Deployment.Tasks.Links/build/Microsoft.DotNet.Deployment.Tasks.Links.props index ac4acd644dc..3ff65b8ca02 100644 --- a/src/Microsoft.DotNet.Deployment.Tasks.Links/build/Microsoft.DotNet.Deployment.Tasks.Links.props +++ b/src/Microsoft.DotNet.Deployment.Tasks.Links/build/Microsoft.DotNet.Deployment.Tasks.Links.props @@ -1,4 +1,6 @@ - + + + $(MSBuildThisFileDirectory)net8.0\Microsoft.DotNet.Deployment.Tasks.Links.dll $(MSBuildThisFileDirectory)net472\Microsoft.DotNet.Deployment.Tasks.Links.dll @@ -6,4 +8,5 @@ + diff --git a/src/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj b/src/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj index b93bf81dbcd..f0afc2edb15 100644 --- a/src/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj +++ b/src/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj @@ -1,36 +1,26 @@ - $(TargetFrameworkForNETSDK);net472 + $(NetCurrent);$(NetFrameworkToolCurrent) true MSBuildSdk true An msbuild task to generate code for the API surface of an assembly. $(NoWarn);0436 - Major - false - - - - - - - - - + - + diff --git a/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj b/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj index d73f6abd254..3ef364cd3a8 100644 --- a/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj +++ b/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj @@ -1,33 +1,25 @@ - $(TargetFrameworkForNETSDK);net472 + $(NetCurrent);$(NetFrameworkToolCurrent) MSBuildSdk - false true - $(MicrosoftCodeAnalysisCSharpVersion) - - + - - - + + - + - - - - - + diff --git a/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenFacades.targets b/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenFacades.targets index a6fec0440f0..65045a3ae14 100644 --- a/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenFacades.targets +++ b/src/Microsoft.DotNet.GenFacades/build/Microsoft.DotNet.GenFacades.targets @@ -21,4 +21,5 @@ + diff --git a/src/Microsoft.DotNet.Git.IssueManager/src/Microsoft.DotNet.Git.IssueManager.csproj b/src/Microsoft.DotNet.Git.IssueManager/src/Microsoft.DotNet.Git.IssueManager.csproj index 10bdd3b34c1..9a138e632c3 100644 --- a/src/Microsoft.DotNet.Git.IssueManager/src/Microsoft.DotNet.Git.IssueManager.csproj +++ b/src/Microsoft.DotNet.Git.IssueManager/src/Microsoft.DotNet.Git.IssueManager.csproj @@ -1,7 +1,7 @@ - net472;$(TargetFrameworkForNETSDK) + $(NetCurrent);$(NetFrameworkToolCurrent) false true true @@ -10,7 +10,10 @@ - - + + + + + diff --git a/src/Microsoft.DotNet.GitSync.CommitManager/Microsoft.DotNet.GitSync.CommitManager.csproj b/src/Microsoft.DotNet.GitSync.CommitManager/Microsoft.DotNet.GitSync.CommitManager.csproj index a737bce3996..f485971a1da 100644 --- a/src/Microsoft.DotNet.GitSync.CommitManager/Microsoft.DotNet.GitSync.CommitManager.csproj +++ b/src/Microsoft.DotNet.GitSync.CommitManager/Microsoft.DotNet.GitSync.CommitManager.csproj @@ -1,22 +1,17 @@ + $(NetCurrent) Exe - $(TargetFrameworkForNETSDK) - latest true + - - - - - - + diff --git a/src/Microsoft.DotNet.GitSync/Microsoft.DotNet.GitSync.csproj b/src/Microsoft.DotNet.GitSync/Microsoft.DotNet.GitSync.csproj index 950380951ea..a8072bb8009 100644 --- a/src/Microsoft.DotNet.GitSync/Microsoft.DotNet.GitSync.csproj +++ b/src/Microsoft.DotNet.GitSync/Microsoft.DotNet.GitSync.csproj @@ -1,23 +1,21 @@ + + $(NetFrameworkToolCurrent) Exe - net472 false - latest true - - - - - - - + + + + + diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/Microsoft.DotNet.Helix.Client.csproj b/src/Microsoft.DotNet.Helix/Client/CSharp/Microsoft.DotNet.Helix.Client.csproj index 2fb5e6683b6..b10c1f39dea 100644 --- a/src/Microsoft.DotNet.Helix/Client/CSharp/Microsoft.DotNet.Helix.Client.csproj +++ b/src/Microsoft.DotNet.Helix/Client/CSharp/Microsoft.DotNet.Helix.Client.csproj @@ -1,10 +1,9 @@ + - netstandard2.0;net472 + netstandard2.0;$(NetFrameworkToolCurrent) true This package provides access to the Helix Api located at https://helix.dot.net/ - 8.0 - https://helix.dot.net/api/openapi.json HelixApi true @@ -22,4 +21,5 @@ + diff --git a/src/Microsoft.DotNet.Helix/JobSender.Tests/Microsoft.DotNet.Helix.JobSender.Tests.csproj b/src/Microsoft.DotNet.Helix/JobSender.Tests/Microsoft.DotNet.Helix.JobSender.Tests.csproj index a47be43461c..7e6d2eb6f35 100644 --- a/src/Microsoft.DotNet.Helix/JobSender.Tests/Microsoft.DotNet.Helix.JobSender.Tests.csproj +++ b/src/Microsoft.DotNet.Helix/JobSender.Tests/Microsoft.DotNet.Helix.JobSender.Tests.csproj @@ -1,8 +1,7 @@ - $(TargetFrameworkForNETSDK) - false + $(NetCurrent) diff --git a/src/Microsoft.DotNet.Helix/JobSender/Microsoft.DotNet.Helix.JobSender.csproj b/src/Microsoft.DotNet.Helix/JobSender/Microsoft.DotNet.Helix.JobSender.csproj index 49b068fe253..ac5baca901b 100644 --- a/src/Microsoft.DotNet.Helix/JobSender/Microsoft.DotNet.Helix.JobSender.csproj +++ b/src/Microsoft.DotNet.Helix/JobSender/Microsoft.DotNet.Helix.JobSender.csproj @@ -11,7 +11,6 @@ - diff --git a/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj b/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj index 02955ef3b3d..6a4e5f24a2b 100644 --- a/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj +++ b/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj @@ -1,20 +1,15 @@ - $(TargetFrameworkForNETSDK) - false + $(NetCurrent) - + - - - - diff --git a/src/Microsoft.DotNet.Helix/Sdk/Microsoft.DotNet.Helix.Sdk.csproj b/src/Microsoft.DotNet.Helix/Sdk/Microsoft.DotNet.Helix.Sdk.csproj index 4382966a9fb..2d83205a5dc 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/Microsoft.DotNet.Helix.Sdk.csproj +++ b/src/Microsoft.DotNet.Helix/Sdk/Microsoft.DotNet.Helix.Sdk.csproj @@ -1,10 +1,9 @@ - net472;$(TargetFrameworkForNETSDK) + $(NetCurrent);$(NetFrameworkToolCurrent) MSBuildSdk - latest - **/*.Desktop.* + **/*.Desktop.* true @@ -13,8 +12,9 @@ - - + + + @@ -22,36 +22,33 @@ - + + + + + + + + - - %(RecursiveDir)%(Filename)%(Extension) - + - - Never - - - Never - - - Never - - - Never - - - Never - - - Never - + - + + diff --git a/src/Microsoft.DotNet.Helix/Sdk/build/Microsoft.DotNet.Helix.Sdk.props b/src/Microsoft.DotNet.Helix/Sdk/build/Microsoft.DotNet.Helix.Sdk.props index 8a4dc663313..75c631ea36e 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/build/Microsoft.DotNet.Helix.Sdk.props +++ b/src/Microsoft.DotNet.Helix/Sdk/build/Microsoft.DotNet.Helix.Sdk.props @@ -1,4 +1,4 @@ - + diff --git a/src/Microsoft.DotNet.Helix/Sdk/sdk/Sdk.props b/src/Microsoft.DotNet.Helix/Sdk/sdk/Sdk.props index 8a4dc663313..75c631ea36e 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/sdk/Sdk.props +++ b/src/Microsoft.DotNet.Helix/Sdk/sdk/Sdk.props @@ -1,4 +1,4 @@ - + diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.props b/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.props index fb5c420b43f..1c51c1822e8 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.props +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.props @@ -1,4 +1,4 @@ - + diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/AzurePipelines.props b/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/AzurePipelines.props index 84d8f1ce6f4..902f939d1f6 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/AzurePipelines.props +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/azure-pipelines/AzurePipelines.props @@ -1,3 +1,4 @@ + true diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props index bd7d64efa56..f54318659a8 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props @@ -1,3 +1,4 @@ + false diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/download-results/DownloadFromResultsContainer.props b/src/Microsoft.DotNet.Helix/Sdk/tools/download-results/DownloadFromResultsContainer.props index 70712c6b520..6539706c3c0 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/download-results/DownloadFromResultsContainer.props +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/download-results/DownloadFromResultsContainer.props @@ -1,3 +1,4 @@ + <_HelixMultiQueueTargets>$(_HelixMultiQueueTargets);$(MSBuildThisFileDirectory)DownloadFromResultsContainer.targets diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.props b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.props index 10b6f9624b3..7d249082754 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.props +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.props @@ -1,3 +1,4 @@ + <_XHarnessPackageName>Microsoft.DotNet.XHarness.CLI diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.props b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.props index 4262ae5e5ea..a3a90b52e28 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.props +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.props @@ -1,3 +1,4 @@ + <_HelixMonoQueueTargets>$(_HelixMonoQueueTargets);$(MSBuildThisFileDirectory)XUnitRunner.targets diff --git a/src/Microsoft.DotNet.Internal.DependencyInjection.Testing/Microsoft.DotNet.Internal.DependencyInjection.Testing.csproj b/src/Microsoft.DotNet.Internal.DependencyInjection.Testing/Microsoft.DotNet.Internal.DependencyInjection.Testing.csproj index 341f28fba81..35e670d4c13 100644 --- a/src/Microsoft.DotNet.Internal.DependencyInjection.Testing/Microsoft.DotNet.Internal.DependencyInjection.Testing.csproj +++ b/src/Microsoft.DotNet.Internal.DependencyInjection.Testing/Microsoft.DotNet.Internal.DependencyInjection.Testing.csproj @@ -1,11 +1,10 @@ - $(TargetFrameworkForNETSDK) + $(NetCurrent) - diff --git a/src/Microsoft.DotNet.NuGetRepack/Directory.Build.props b/src/Microsoft.DotNet.NuGetRepack/Directory.Build.props index da0dcf51214..8c1b165c35a 100644 --- a/src/Microsoft.DotNet.NuGetRepack/Directory.Build.props +++ b/src/Microsoft.DotNet.NuGetRepack/Directory.Build.props @@ -1,4 +1,4 @@ - + diff --git a/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj b/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj index 90ea9eef3db..da34b308fd6 100644 --- a/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj +++ b/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj @@ -1,11 +1,9 @@ - - - net472;$(TargetFrameworkForNETSDK) + + $(NetCurrent);$(NetFrameworkToolCurrent) true MSBuildSdk - Build task for updating version of NuGet packages. Arcade Build Tool NuGet version true @@ -13,19 +11,22 @@ - - - + + + + + - - + + + - + diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj b/src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj index da249e88867..822995a085f 100644 --- a/src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj +++ b/src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj @@ -1,23 +1,15 @@ - + - $(TargetFrameworkForNETSDK) + $(NetCurrent) + $(DefaultExcludesInProjectFolder);Resources\*.cs - - - - + - - - - - - - + TestPackageA.1.0.0-beta-12345-01.nupkg @@ -80,8 +72,10 @@ DotnetTool.1.0.0-beta-12345-01.nupkg + + diff --git a/src/Microsoft.DotNet.PackageTesting.Tests/Microsoft.DotNet.PackageTesting.Tests.csproj b/src/Microsoft.DotNet.PackageTesting.Tests/Microsoft.DotNet.PackageTesting.Tests.csproj index 8b6cd50405f..f2bfdac2862 100644 --- a/src/Microsoft.DotNet.PackageTesting.Tests/Microsoft.DotNet.PackageTesting.Tests.csproj +++ b/src/Microsoft.DotNet.PackageTesting.Tests/Microsoft.DotNet.PackageTesting.Tests.csproj @@ -1,17 +1,12 @@ - $(TargetFrameworkForNETSDK);net472 - false + $(NetCurrent);$(NetFrameworkToolCurrent) - - - - diff --git a/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj b/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj index f9325403f04..3c5a8e0613e 100644 --- a/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj +++ b/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj @@ -1,27 +1,25 @@ - $(TargetFrameworkForNETSDK);net472 + $(NetCurrent);$(NetFrameworkToolCurrent) MSBuildSdk - false true - - + - - + + - + diff --git a/src/Microsoft.DotNet.PackageTesting/build/Microsoft.DotNet.PackageTesting.props b/src/Microsoft.DotNet.PackageTesting/build/Microsoft.DotNet.PackageTesting.props index 2b46c866b66..171406f2be0 100644 --- a/src/Microsoft.DotNet.PackageTesting/build/Microsoft.DotNet.PackageTesting.props +++ b/src/Microsoft.DotNet.PackageTesting/build/Microsoft.DotNet.PackageTesting.props @@ -1,4 +1,6 @@ + + $(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.PackageTesting.dll $(MSBuildThisFileDirectory)..\tools\net8.0\Microsoft.DotNet.PackageTesting.dll @@ -25,4 +27,5 @@ + diff --git a/src/Microsoft.DotNet.RemoteExecutor/src/Microsoft.DotNet.RemoteExecutor.csproj b/src/Microsoft.DotNet.RemoteExecutor/src/Microsoft.DotNet.RemoteExecutor.csproj index 9f2d2c9c205..9f0fd96db74 100644 --- a/src/Microsoft.DotNet.RemoteExecutor/src/Microsoft.DotNet.RemoteExecutor.csproj +++ b/src/Microsoft.DotNet.RemoteExecutor/src/Microsoft.DotNet.RemoteExecutor.csproj @@ -1,10 +1,9 @@  + $(NetCurrent);$(NetFrameworkMinimum) Exe - - $(TargetFrameworkForNETSDK);net461 This package provides support for running tests out-of-process. true true @@ -13,13 +12,13 @@ - - + + - + @@ -27,8 +26,8 @@ - - + + diff --git a/src/Microsoft.DotNet.RemoteExecutor/src/build/Microsoft.DotNet.RemoteExecutor.targets b/src/Microsoft.DotNet.RemoteExecutor/src/build/Microsoft.DotNet.RemoteExecutor.targets index 903155033c7..ad489b50acf 100644 --- a/src/Microsoft.DotNet.RemoteExecutor/src/build/Microsoft.DotNet.RemoteExecutor.targets +++ b/src/Microsoft.DotNet.RemoteExecutor/src/build/Microsoft.DotNet.RemoteExecutor.targets @@ -1,6 +1,6 @@ - + Microsoft.DotNet.RemoteExecutor @@ -14,7 +14,6 @@ Inputs="@(AppConfigWithTargetPath)" Outputs="$(RemoteHostAppConfigFile)" Condition="'@(AppConfigWithTargetPath)' != '' and '$(RemoteHostAppConfigFile)' != ''"> - - + diff --git a/src/Microsoft.DotNet.RemoteExecutor/tests/Microsoft.DotNet.RemoteExecutor.Tests.csproj b/src/Microsoft.DotNet.RemoteExecutor/tests/Microsoft.DotNet.RemoteExecutor.Tests.csproj index e0c0b019588..266f7867d87 100644 --- a/src/Microsoft.DotNet.RemoteExecutor/tests/Microsoft.DotNet.RemoteExecutor.Tests.csproj +++ b/src/Microsoft.DotNet.RemoteExecutor/tests/Microsoft.DotNet.RemoteExecutor.Tests.csproj @@ -1,14 +1,13 @@ + - $(TargetFrameworkForNETSDK) - Latest + $(NetCurrent) false - True + true + - - diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj b/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj index 2271432a856..ca20ddbd975 100644 --- a/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj +++ b/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj @@ -1,57 +1,42 @@ - - - net472;$(TargetFrameworkForNETSDK) - preview - false + + $(NetCurrent);$(NetFrameworkToolCurrent) true - Common toolset for building shared frameworks and framework packs. MSBuildSdk - false - false $(NoWarn);3021;NU5105 - - **/*.Desktop.* - - - - - - - - - sdk/%(RecursiveDir)%(Filename)%(Extension) - - - targets - + + - - - - + + + - + + diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props b/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props index 06bc6188ff4..44951b96d49 100644 --- a/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props +++ b/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props @@ -1,3 +1,4 @@ + diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/targets/sharedfx.props b/src/Microsoft.DotNet.SharedFramework.Sdk/targets/sharedfx.props index e67e5cc9c98..27edbaba1fb 100644 --- a/src/Microsoft.DotNet.SharedFramework.Sdk/targets/sharedfx.props +++ b/src/Microsoft.DotNet.SharedFramework.Sdk/targets/sharedfx.props @@ -1,3 +1,4 @@ + $(RepoRoot)LICENSE.TXT diff --git a/src/Microsoft.DotNet.SignTool.Tests/Microsoft.DotNet.SignTool.Tests.csproj b/src/Microsoft.DotNet.SignTool.Tests/Microsoft.DotNet.SignTool.Tests.csproj index f155eaa521e..0539eff9d76 100644 --- a/src/Microsoft.DotNet.SignTool.Tests/Microsoft.DotNet.SignTool.Tests.csproj +++ b/src/Microsoft.DotNet.SignTool.Tests/Microsoft.DotNet.SignTool.Tests.csproj @@ -1,36 +1,31 @@ - + - net472;$(TargetFrameworkForNETSDK) - Latest + $(NetCurrent);$(NetFrameworkToolCurrent) - - - - - - - - - + - + + + + + + + - - Always - - - Always - tools\wix\%(RecursiveDir)%(Filename)%(Extension) - + + diff --git a/src/Microsoft.DotNet.SignTool.Tests/SignToolTests.cs b/src/Microsoft.DotNet.SignTool.Tests/SignToolTests.cs index fce1522ccc6..25d2d9d437a 100644 --- a/src/Microsoft.DotNet.SignTool.Tests/SignToolTests.cs +++ b/src/Microsoft.DotNet.SignTool.Tests/SignToolTests.cs @@ -756,11 +756,10 @@ public void ThirdPartyLibraryMicrosoftCertificate() }); } - [SkippableFact] + [WindowsOnlyFact] [Trait("Category", "SkipWhenLiveUnitTesting")] public void DoubleNestedContainer() { - Skip.IfNot(RuntimeInformation.IsOSPlatform(OSPlatform.Windows)); // List of files to be considered for signing var itemsToSign = new ITaskItem[] { @@ -1206,11 +1205,10 @@ public void SignNupkgWithUnsignedContents() }); } #endif - [SkippableFact] + [WindowsOnlyFact] [Trait("Category", "SkipWhenLiveUnitTesting")] public void SignMsiEngine() { - Skip.IfNot(RuntimeInformation.IsOSPlatform(OSPlatform.Windows)); // List of files to be considered for signing var itemsToSign = new ITaskItem[] { @@ -1254,11 +1252,10 @@ public void SignMsiEngine() } - [SkippableFact] + [WindowsOnlyFact] [Trait("Category", "SkipWhenLiveUnitTesting")] public void MsiWithWixpack() { - Skip.IfNot(RuntimeInformation.IsOSPlatform(OSPlatform.Windows)); // List of files to be considered for signing var itemsToSign = new ITaskItem[] { @@ -1302,11 +1299,9 @@ public void MsiWithWixpack() /// /// Validate that an invalid wix toolset path causes an error /// - [SkippableFact] + [WindowsOnlyFact] public void BadWixToolsetPath() { - Skip.IfNot(RuntimeInformation.IsOSPlatform(OSPlatform.Windows)); - var badPath = Path.Combine(GetWixToolPath(), "badpath"); var fakeBuildEngine = new FakeBuildEngine(_output); @@ -2216,13 +2211,12 @@ public void CrossGeneratedLibraryWithoutPKT() /// Verify that running the wixpack returns passing result and that the expected output file /// is created, or a negative result if the wix tool fails. /// - [SkippableTheory] + [WindowsOnlyTheory] [InlineData(true)] [InlineData(false)] [Trait("Category", "SkipWhenLiveUnitTesting")] public void RunWixToolRunsOrFailsProperly(bool deleteWixobjBeforeRunningTool) { - Skip.IfNot(RuntimeInformation.IsOSPlatform(OSPlatform.Windows)); var task = new SignToolTask { BuildEngine = new FakeBuildEngine() }; const string expectedExe = "MsiBootstrapper.exe"; diff --git a/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj b/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj index a5049856117..7783c24bf9b 100644 --- a/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj +++ b/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj @@ -1,14 +1,15 @@ - + - net472;$(TargetFrameworkForNETSDK) + $(NetCurrent);$(NetFrameworkToolCurrent) true - Latest true Build artifact signing tool Arcade Build Tool Signing false $(NoWarn);NU5128 + + lib @@ -21,29 +22,16 @@ - - - - - + - - - + + - - - - <_PackageFiles Include="@(_PackageFiles)" Condition="$([System.String]::Copy(%(_PackageFiles.PackagePath)).Contains('tools/'))"> - $([System.String]::Copy('%(PackagePath)').Replace('tools', 'lib')) - - - + - diff --git a/src/Microsoft.DotNet.SignTool/build/Microsoft.DotNet.SignTool.props b/src/Microsoft.DotNet.SignTool/build/Microsoft.DotNet.SignTool.props index bfcda30086a..0660a1a13b1 100644 --- a/src/Microsoft.DotNet.SignTool/build/Microsoft.DotNet.SignTool.props +++ b/src/Microsoft.DotNet.SignTool/build/Microsoft.DotNet.SignTool.props @@ -1,8 +1,11 @@ - + + + $(MSBuildThisFileDirectory)..\tools\net8.0\Microsoft.DotNet.SignTool.dll $(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.SignTool.dll + diff --git a/src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj b/src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj index 0da010c93e0..7ff2931f23d 100644 --- a/src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj +++ b/src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj @@ -1,7 +1,7 @@ - net472;$(TargetFrameworkForNETSDK) + $(NetCurrent);$(NetFrameworkToolCurrent) MSBuildSdk @@ -10,17 +10,12 @@ - - + - - - - - + diff --git a/src/Microsoft.DotNet.SourceBuild/tasks/build/Microsoft.DotNet.SourceBuild.Tasks.props b/src/Microsoft.DotNet.SourceBuild/tasks/build/Microsoft.DotNet.SourceBuild.Tasks.props index 493d6ffb902..9dc4c6ccc2a 100644 --- a/src/Microsoft.DotNet.SourceBuild/tasks/build/Microsoft.DotNet.SourceBuild.Tasks.props +++ b/src/Microsoft.DotNet.SourceBuild/tasks/build/Microsoft.DotNet.SourceBuild.Tasks.props @@ -1,3 +1,4 @@ + diff --git a/src/Microsoft.DotNet.SourceBuild/tests/Microsoft.DotNet.SourceBuild.Tasks.Tests.csproj b/src/Microsoft.DotNet.SourceBuild/tests/Microsoft.DotNet.SourceBuild.Tasks.Tests.csproj index 11a8416b37b..035561aef62 100644 --- a/src/Microsoft.DotNet.SourceBuild/tests/Microsoft.DotNet.SourceBuild.Tasks.Tests.csproj +++ b/src/Microsoft.DotNet.SourceBuild/tests/Microsoft.DotNet.SourceBuild.Tasks.Tests.csproj @@ -1,11 +1,8 @@ - $(TargetFrameworkForNETSDK) - Latest + $(NetCurrent) false - - Major @@ -14,15 +11,9 @@ - - - - - - diff --git a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CmdLine/Microsoft.DotNet.SwaggerGenerator.CmdLine.csproj b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CmdLine/Microsoft.DotNet.SwaggerGenerator.CmdLine.csproj index 6e2dfb91ec3..2398e6fcf7d 100644 --- a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CmdLine/Microsoft.DotNet.SwaggerGenerator.CmdLine.csproj +++ b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CmdLine/Microsoft.DotNet.SwaggerGenerator.CmdLine.csproj @@ -1,9 +1,8 @@  + $(NetCurrent) Exe - $(TargetFrameworkForNETSDK) - latest true true dotnet-swaggergen @@ -12,6 +11,7 @@ + diff --git a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CodeGenerator/Microsoft.DotNet.SwaggerGenerator.CodeGenerator.csproj b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CodeGenerator/Microsoft.DotNet.SwaggerGenerator.CodeGenerator.csproj index cf0e94db847..692d6e1599f 100644 --- a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CodeGenerator/Microsoft.DotNet.SwaggerGenerator.CodeGenerator.csproj +++ b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CodeGenerator/Microsoft.DotNet.SwaggerGenerator.CodeGenerator.csproj @@ -9,21 +9,17 @@ - - + + + - - - - - - PreserveNewest - true - + diff --git a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/Microsoft.DotNet.SwaggerGenerator.MSBuild.csproj b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/Microsoft.DotNet.SwaggerGenerator.MSBuild.csproj index 0fd303ac406..1a466384641 100644 --- a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/Microsoft.DotNet.SwaggerGenerator.MSBuild.csproj +++ b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/Microsoft.DotNet.SwaggerGenerator.MSBuild.csproj @@ -1,8 +1,7 @@ - $(TargetFrameworkForNETSDK);net472 - + $(NetCurrent);$(NetFrameworkToolCurrent) true This package provides support for generating client library code from a swagger document. true @@ -10,11 +9,14 @@ - - - + + + + + + diff --git a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/build/Microsoft.DotNet.SwaggerGenerator.MSBuild.props b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/build/Microsoft.DotNet.SwaggerGenerator.MSBuild.props index 9fc99384030..5362d800fc7 100644 --- a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/build/Microsoft.DotNet.SwaggerGenerator.MSBuild.props +++ b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/build/Microsoft.DotNet.SwaggerGenerator.MSBuild.props @@ -1,4 +1,6 @@ + + $(MSBuildThisFileDirectory)../tools/net8.0/Microsoft.DotNet.SwaggerGenerator.MSBuild.dll $(MSBuildThisFileDirectory)../tools/net472/Microsoft.DotNet.SwaggerGenerator.MSBuild.dll @@ -7,4 +9,5 @@ $(MSBuildProjectDirectory)\generated-code\ + diff --git a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/build/Microsoft.DotNet.SwaggerGenerator.MSBuild.targets b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/build/Microsoft.DotNet.SwaggerGenerator.MSBuild.targets index 0c3b0c66012..651d9f453c4 100644 --- a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/build/Microsoft.DotNet.SwaggerGenerator.MSBuild.targets +++ b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/build/Microsoft.DotNet.SwaggerGenerator.MSBuild.targets @@ -1,4 +1,6 @@ + + @@ -14,4 +16,5 @@ + diff --git a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/buildCrossTargeting/Microsoft.DotNet.SwaggerGenerator.MSBuild.props b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/buildCrossTargeting/Microsoft.DotNet.SwaggerGenerator.MSBuild.props index a992a67dde0..f301c902b40 100644 --- a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/buildCrossTargeting/Microsoft.DotNet.SwaggerGenerator.MSBuild.props +++ b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/buildCrossTargeting/Microsoft.DotNet.SwaggerGenerator.MSBuild.props @@ -1,3 +1,6 @@ + - + + + diff --git a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/buildCrossTargeting/Microsoft.DotNet.SwaggerGenerator.MSBuild.targets b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/buildCrossTargeting/Microsoft.DotNet.SwaggerGenerator.MSBuild.targets index b5bd31d15a7..fe346c8ad6b 100644 --- a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/buildCrossTargeting/Microsoft.DotNet.SwaggerGenerator.MSBuild.targets +++ b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/buildCrossTargeting/Microsoft.DotNet.SwaggerGenerator.MSBuild.targets @@ -1,3 +1,6 @@ + - + + + diff --git a/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj b/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj index 43fc619b221..60394fe6fd7 100644 --- a/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj +++ b/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj @@ -1,14 +1,13 @@ - $(TargetFrameworkForNETSDK) + $(NetCurrent) - - + diff --git a/src/Microsoft.DotNet.VersionTools/Directory.Build.props b/src/Microsoft.DotNet.VersionTools/Directory.Build.props index 06bcb1356df..efc9852000c 100644 --- a/src/Microsoft.DotNet.VersionTools/Directory.Build.props +++ b/src/Microsoft.DotNet.VersionTools/Directory.Build.props @@ -1,4 +1,4 @@ - + diff --git a/src/Microsoft.DotNet.VersionTools/lib/Microsoft.DotNet.VersionTools.csproj b/src/Microsoft.DotNet.VersionTools/lib/Microsoft.DotNet.VersionTools.csproj index 101d83c78c7..b41d086f259 100644 --- a/src/Microsoft.DotNet.VersionTools/lib/Microsoft.DotNet.VersionTools.csproj +++ b/src/Microsoft.DotNet.VersionTools/lib/Microsoft.DotNet.VersionTools.csproj @@ -15,9 +15,9 @@ + - - + diff --git a/src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj b/src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj index 0834f93968d..74aff1ad06a 100644 --- a/src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj +++ b/src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj @@ -1,13 +1,13 @@  - net472;$(TargetFrameworkForNETSDK) + $(NetCurrent);$(NetFrameworkToolCurrent) + true MSBuildSdk - - + @@ -15,6 +15,6 @@ - + diff --git a/src/Microsoft.DotNet.VersionTools/tasks/build/Microsoft.DotNet.VersionTools.Tasks.props b/src/Microsoft.DotNet.VersionTools/tasks/build/Microsoft.DotNet.VersionTools.Tasks.props index 2cab568ba8e..39e19a9ab9e 100644 --- a/src/Microsoft.DotNet.VersionTools/tasks/build/Microsoft.DotNet.VersionTools.Tasks.props +++ b/src/Microsoft.DotNet.VersionTools/tasks/build/Microsoft.DotNet.VersionTools.Tasks.props @@ -1,5 +1,5 @@ - - + + $(MSBuildThisFileDirectory)..\tools\net8.0\$(MSBuildThisFileName).dll diff --git a/src/Microsoft.DotNet.VersionTools/tasks/build/Microsoft.DotNet.VersionTools.Tasks.targets b/src/Microsoft.DotNet.VersionTools/tasks/build/Microsoft.DotNet.VersionTools.Tasks.targets index 4bf363558f1..423dd3f28a4 100644 --- a/src/Microsoft.DotNet.VersionTools/tasks/build/Microsoft.DotNet.VersionTools.Tasks.targets +++ b/src/Microsoft.DotNet.VersionTools/tasks/build/Microsoft.DotNet.VersionTools.Tasks.targets @@ -1,5 +1,5 @@ - - + + @@ -218,4 +218,5 @@ + \ No newline at end of file diff --git a/src/Microsoft.DotNet.VersionTools/tests/Microsoft.DotNet.VersionTools.Tests.csproj b/src/Microsoft.DotNet.VersionTools/tests/Microsoft.DotNet.VersionTools.Tests.csproj index 9163fe16044..6e49479b773 100644 --- a/src/Microsoft.DotNet.VersionTools/tests/Microsoft.DotNet.VersionTools.Tests.csproj +++ b/src/Microsoft.DotNet.VersionTools/tests/Microsoft.DotNet.VersionTools.Tests.csproj @@ -1,7 +1,7 @@ - $(TargetFrameworkForNETSDK) + $(NetCurrent) @@ -14,9 +14,8 @@ - - Always - + diff --git a/src/Microsoft.DotNet.XUnitConsoleRunner/src/Microsoft.DotNet.XUnitConsoleRunner.csproj b/src/Microsoft.DotNet.XUnitConsoleRunner/src/Microsoft.DotNet.XUnitConsoleRunner.csproj index b06bf3dee1b..309c99c8e9c 100644 --- a/src/Microsoft.DotNet.XUnitConsoleRunner/src/Microsoft.DotNet.XUnitConsoleRunner.csproj +++ b/src/Microsoft.DotNet.XUnitConsoleRunner/src/Microsoft.DotNet.XUnitConsoleRunner.csproj @@ -1,12 +1,12 @@ + $(NetCurrent) Microsoft.DotNet.XUnitConsoleRunner xunit.console true Exe Xunit.ConsoleClient - $(TargetFrameworkForNETSDK) true 2.5.1 true @@ -24,10 +24,8 @@ - - - + diff --git a/src/Microsoft.DotNet.XUnitConsoleRunner/src/build/Microsoft.DotNet.XUnitConsoleRunner.props b/src/Microsoft.DotNet.XUnitConsoleRunner/src/build/Microsoft.DotNet.XUnitConsoleRunner.props index e3c43170158..09142a05336 100644 --- a/src/Microsoft.DotNet.XUnitConsoleRunner/src/build/Microsoft.DotNet.XUnitConsoleRunner.props +++ b/src/Microsoft.DotNet.XUnitConsoleRunner/src/build/Microsoft.DotNet.XUnitConsoleRunner.props @@ -1,4 +1,5 @@ - + + $(MSBuildThisFileDirectory)..\tools\net8.0\xunit.console.dll diff --git a/src/Microsoft.DotNet.XUnitExtensions/src/Microsoft.DotNet.XUnitExtensions.csproj b/src/Microsoft.DotNet.XUnitExtensions/src/Microsoft.DotNet.XUnitExtensions.csproj index 37de37ece8a..1d6b02e2ca6 100644 --- a/src/Microsoft.DotNet.XUnitExtensions/src/Microsoft.DotNet.XUnitExtensions.csproj +++ b/src/Microsoft.DotNet.XUnitExtensions/src/Microsoft.DotNet.XUnitExtensions.csproj @@ -1,7 +1,7 @@ + - netstandard2.0;net461 - Microsoft.DotNet.XUnitExtensions + netstandard2.0;$(NetFrameworkMinimum) true This package provides things like various traits and discovers like OuterLoop/ActiveIssue that are used by .NET test projects. true @@ -10,11 +10,12 @@ - + + diff --git a/src/Microsoft.DotNet.XUnitExtensions/tests/Microsoft.DotNet.XUnitExtensions.Tests.csproj b/src/Microsoft.DotNet.XUnitExtensions/tests/Microsoft.DotNet.XUnitExtensions.Tests.csproj index 97072a5fdb5..2d5e3f33614 100644 --- a/src/Microsoft.DotNet.XUnitExtensions/tests/Microsoft.DotNet.XUnitExtensions.Tests.csproj +++ b/src/Microsoft.DotNet.XUnitExtensions/tests/Microsoft.DotNet.XUnitExtensions.Tests.csproj @@ -1,15 +1,9 @@ - $(TargetFrameworkForNETSDK);net472 - false + $(NetCurrent);$(NetFrameworkToolCurrent) - - - - - diff --git a/src/SignCheck/Microsoft.SignCheck/Microsoft.DotNet.SignCheckLibrary.csproj b/src/SignCheck/Microsoft.SignCheck/Microsoft.DotNet.SignCheckLibrary.csproj index a6db0dde62b..e72a345c55e 100644 --- a/src/SignCheck/Microsoft.SignCheck/Microsoft.DotNet.SignCheckLibrary.csproj +++ b/src/SignCheck/Microsoft.SignCheck/Microsoft.DotNet.SignCheckLibrary.csproj @@ -1,30 +1,29 @@ - - + + + - net472 + $(NetFrameworkToolCurrent) x86 - Release;Debug false Microsoft.SignCheck false - true - - true + true + - + - + @@ -33,31 +32,30 @@ + - - PreserveNewest - + + - - True - True - SignCheckResources.resx - - - True - True - JarResources.resx - + + + - - ResXFileCodeGenerator - SignCheckResources.Designer.cs - - - ResXFileCodeGenerator - JarResources.Designer.cs - + + + diff --git a/src/SignCheck/SignCheck/Microsoft.DotNet.SignCheck.csproj b/src/SignCheck/SignCheck/Microsoft.DotNet.SignCheck.csproj index 6c7b257e95b..db6bcbc5537 100644 --- a/src/SignCheck/SignCheck/Microsoft.DotNet.SignCheck.csproj +++ b/src/SignCheck/SignCheck/Microsoft.DotNet.SignCheck.csproj @@ -1,12 +1,12 @@ - - + + + - net472 - EXE + $(NetFrameworkToolCurrent) + Exe x86 True - Release;Debug false true @@ -17,49 +17,35 @@ true - - true - - - - - - - - + + + - + + - - - - - - True - True - SignCheckResources.resx - - - - - - ResXFileCodeGenerator - SignCheckResources.Designer.cs - + - - tools/ - + + diff --git a/src/WinShimmer/WinShimmer.csproj b/src/WinShimmer/WinShimmer.csproj index cfe866484a3..ffbed1ae9d2 100644 --- a/src/WinShimmer/WinShimmer.csproj +++ b/src/WinShimmer/WinShimmer.csproj @@ -1,11 +1,13 @@ - + + $(NetFrameworkToolCurrent) Exe - net472 true + - + +