diff --git a/Directory.Build.props b/Directory.Build.props index 58c7f876aeafe8..d3e3029c23a6f2 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -52,6 +52,10 @@ $(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion) Microsoft.NETCore.App .NET $(NetCoreAppCurrentVersion) + + net472 + + diff --git a/eng/Subsets.props b/eng/Subsets.props index a7c5fb0e96e365..b2292ac98e61c8 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 94a3045e604d9c..d2c0d1410562f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,16 +146,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 15d09343b05035..09069935a00cfa 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props @@ -238,7 +238,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 0d3728bcac0e6b..c4c29046201f0a 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 3872248843d79d..b941586e3d6733 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj +++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppToolCurrent);net472 + $(NetCoreAppToolCurrent);$(NetFrameworkToolCurrent) false $(MSBuildProjectName) @@ -21,7 +21,7 @@ $(AdditionalRuntimeIdentifiers);$(OutputRID) - + @@ -44,9 +44,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 22d8ee7e815c7a..00e2f561d82625 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 @@ -20,6 +20,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 4b7f0bc75cee0c..bba18ce24edd2a 100644 --- a/src/libraries/System.Text.Json/src/System.Text.Json.csproj +++ b/src/libraries/System.Text.Json/src/System.Text.Json.csproj @@ -351,7 +351,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/ILStripTask/ILStrip.csproj b/src/tasks/ILStripTask/ILStrip.csproj index bb9c41f692e1cc..91b63a8c0a63cc 100644 --- a/src/tasks/ILStripTask/ILStrip.csproj +++ b/src/tasks/ILStripTask/ILStrip.csproj @@ -8,10 +8,7 @@ false - - - - + diff --git a/src/tasks/JsonToItemsTaskFactory/JsonToItemsTaskFactory.csproj b/src/tasks/JsonToItemsTaskFactory/JsonToItemsTaskFactory.csproj index 17799fbf6570c1..579682fd84f704 100644 --- a/src/tasks/JsonToItemsTaskFactory/JsonToItemsTaskFactory.csproj +++ b/src/tasks/JsonToItemsTaskFactory/JsonToItemsTaskFactory.csproj @@ -9,10 +9,7 @@ - - - - + diff --git a/src/tasks/RuntimeConfigParser/RuntimeConfigParser.csproj b/src/tasks/RuntimeConfigParser/RuntimeConfigParser.csproj index c07e367def62ec..074f89c415ac35 100644 --- a/src/tasks/RuntimeConfigParser/RuntimeConfigParser.csproj +++ b/src/tasks/RuntimeConfigParser/RuntimeConfigParser.csproj @@ -10,10 +10,8 @@ $(NoWarn),CS8604,CS8602 - - - - + + diff --git a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj index 22a530b7de3d99..358de5541e354d 100644 --- a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj +++ b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj @@ -19,10 +19,7 @@ - - - - + 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 - - - - + - - - - + - $(TargetFrameworkForNETCoreTasks);net461 + $(NetCoreAppToolCurrent);$(NetFrameworkToolCurrent) false false - + - - - + + + - + diff --git a/src/tasks/tasks.proj b/src/tasks/tasks.proj index 9c62f8b76b989f..03a049e1bf46f9 100644 --- a/src/tasks/tasks.proj +++ b/src/tasks/tasks.proj @@ -1,6 +1,11 @@ + + + +