diff --git a/Directory.Build.props b/Directory.Build.props index 42d713f8e0d22d..92bcbf935a9c58 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -62,6 +62,8 @@ net462 net472 + + diff --git a/eng/Subsets.props b/eng/Subsets.props index 3fd61d12f163b5..7638fc78f59010 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -72,7 +72,7 @@ host.native packs.product - $(DefaultPacksSubsets)+packs.tests + $(DefaultPacksSubsets)+packs.tests $(DefaultPacksSubsets)+packs.installers diff --git a/eng/Versions.props b/eng/Versions.props index d3834b14544734..bd1d554d434cc3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -145,16 +145,10 @@ 1.0.0-beta-build0015 1.0.4-preview6.19326.1 0.2.61701 - - 16.10.0 - $(RefOnlyMicrosoftBuildVersion) - $(RefOnlyMicrosoftBuildVersion) - $(RefOnlyMicrosoftBuildVersion) - 5.8.0 - 5.8.0 + 16.10.0 + $(MicrosoftBuildVersion) + 5.8.0 + 5.8.0 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props index 3d070f437073bf..a3652b85989d9d 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props @@ -237,7 +237,7 @@ - + - + diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj index 52552742827700..c1785b80c287c5 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj @@ -36,7 +36,8 @@ Microsoft.Extensions.Logging.Abstractions.NullLogger - + diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj index b846ab63ea730b..1351a67f30f3e0 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj +++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj @@ -48,9 +48,8 @@ - - - + + diff --git a/src/libraries/Microsoft.NETCore.Platforms/tests/Microsoft.NETCore.Platforms.Tests.csproj b/src/libraries/Microsoft.NETCore.Platforms/tests/Microsoft.NETCore.Platforms.Tests.csproj index a2a273ed6e042f..4148acef7d7802 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/tests/Microsoft.NETCore.Platforms.Tests.csproj +++ b/src/libraries/Microsoft.NETCore.Platforms/tests/Microsoft.NETCore.Platforms.Tests.csproj @@ -6,6 +6,7 @@ + diff --git a/src/libraries/System.Text.Json/src/System.Text.Json.csproj b/src/libraries/System.Text.Json/src/System.Text.Json.csproj index 5063d0f8da85f8..9bf231b6e54d50 100644 --- a/src/libraries/System.Text.Json/src/System.Text.Json.csproj +++ b/src/libraries/System.Text.Json/src/System.Text.Json.csproj @@ -350,7 +350,8 @@ System.Text.Json.Utf8JsonReader - + diff --git a/src/libraries/src.proj b/src/libraries/src.proj index 8b38ce5b449390..4e0fea066f7507 100644 --- a/src/libraries/src.proj +++ b/src/libraries/src.proj @@ -14,6 +14,11 @@ Microsoft.Windows.Compatibility\src\Microsoft.Windows.Compatibility.csproj" Condition="'$(BuildAllConfigurations)' != 'true'" /> + + <_allSrc Remove="Microsoft.Extensions.DependencyInjection.Specification.Tests\src\Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj; + Microsoft.Windows.Compatibility\src\Microsoft.Windows.Compatibility.csproj" + Condition="'$(DotNetBuildFromSource)' == 'true'" /> + - - - - + diff --git a/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj b/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj index 840115ca71b909..caf34787a2d4a4 100644 --- a/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj +++ b/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj @@ -11,10 +11,8 @@ $(NoWarn),CS8604,CS8602 - - - - + + diff --git a/src/tasks/AppleAppBuilder/AppleAppBuilder.csproj b/src/tasks/AppleAppBuilder/AppleAppBuilder.csproj index 7ceb4480e1ce78..e28dafef5d8fd5 100644 --- a/src/tasks/AppleAppBuilder/AppleAppBuilder.csproj +++ b/src/tasks/AppleAppBuilder/AppleAppBuilder.csproj @@ -11,10 +11,7 @@ - - - - + diff --git a/src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj b/src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj index fcd5b20ab2cf31..ddddfadb59358e 100644 --- a/src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj +++ b/src/tasks/Crossgen2Tasks/Crossgen2Tasks.csproj @@ -9,11 +9,8 @@ $(NoWarn),CS8604,CS8602 - - - - - + + diff --git a/src/tasks/Directory.Build.props b/src/tasks/Directory.Build.props index 695833da3dbcd7..887be3a86036fb 100644 --- a/src/tasks/Directory.Build.props +++ b/src/tasks/Directory.Build.props @@ -3,6 +3,9 @@ net472 + + + net6.0 diff --git a/src/tasks/MonoTargetsTasks/MonoTargetsTasks.csproj b/src/tasks/MonoTargetsTasks/MonoTargetsTasks.csproj index 23b128cf333caf..d470c822c08e96 100644 --- a/src/tasks/MonoTargetsTasks/MonoTargetsTasks.csproj +++ b/src/tasks/MonoTargetsTasks/MonoTargetsTasks.csproj @@ -6,18 +6,14 @@ $(NoWarn),CA1050 - - - - + + - - - - + + diff --git a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj index e51e138961ef08..44dec10c67b23a 100644 --- a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj +++ b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj @@ -18,10 +18,8 @@ - - - - + + diff --git a/src/tasks/WasmBuildTasks/WasmBuildTasks.csproj b/src/tasks/WasmBuildTasks/WasmBuildTasks.csproj index 0f8b6c93993a47..fd88116ca0a855 100644 --- a/src/tasks/WasmBuildTasks/WasmBuildTasks.csproj +++ b/src/tasks/WasmBuildTasks/WasmBuildTasks.csproj @@ -6,10 +6,7 @@ $(NoWarn),CA1050 - - - - + - - - - + - + - - + + diff --git a/src/tasks/tasks.proj b/src/tasks/tasks.proj index 9c62f8b76b989f..4c96f1d79253a7 100644 --- a/src/tasks/tasks.proj +++ b/src/tasks/tasks.proj @@ -1,6 +1,11 @@ + + + +