diff --git a/Build.proj b/Build.proj
index 28444c19ca67a0c12c5e42d124446fcc9e9488c7..bff94b97a7a7994ef00368287f70080759c1c1a9 100644
--- a/Build.proj
+++ b/Build.proj
@@ -7,9 +7,6 @@
-
-
-
@@ -21,4 +18,4 @@
-
\ No newline at end of file
+
diff --git a/Directory.Build.props b/Directory.Build.props
index 1b44d591a9a7021f8998d022b133bd13e036a80b..4269a63738d24776f9046f94ced50d3039b63765 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -278,6 +278,7 @@
+ $(RepositoryEngineeringDir)NoTargetsSdk.BeforeTargets.targets
$(RepositoryEngineeringDir)TraversalSdk.AfterProps.props
diff --git a/eng/NoTargetsSdk.BeforeTargets.targets b/eng/NoTargetsSdk.BeforeTargets.targets
new file mode 100644
index 0000000000000000000000000000000000000000..9afaad0e75e786db11619465f2f32ccc690683c4
--- /dev/null
+++ b/eng/NoTargetsSdk.BeforeTargets.targets
@@ -0,0 +1,9 @@
+
+
+
+
+ $(NetCoreAppToolCurrent)
+
+
+
\ No newline at end of file
diff --git a/eng/regenerate-download-table.proj b/eng/regenerate-download-table.proj
index 892ae9f25ad4702dc5182c0db18b8fb082508a7e..a6fb68a867ef896c4b2204396daea43d1863b818 100644
--- a/eng/regenerate-download-table.proj
+++ b/eng/regenerate-download-table.proj
@@ -1,7 +1,4 @@
-
- netstandard2.0
-
diff --git a/global.json b/global.json
index e14e03eaa98a82a94e60217f384f759b5affeb6e..b772842dab0f18947ef80a60ffc59a0107ad0dba 100644
--- a/global.json
+++ b/global.json
@@ -16,8 +16,8 @@
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21264.2",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21264.2",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21264.2",
- "Microsoft.Build.NoTargets": "2.0.17",
- "Microsoft.Build.Traversal": "2.1.1",
+ "Microsoft.Build.NoTargets": "3.0.4",
+ "Microsoft.Build.Traversal": "3.0.23",
"Microsoft.NET.Sdk.IL": "6.0.0-preview.5.21267.1"
}
}
diff --git a/src/coreclr/crossgen-corelib.proj b/src/coreclr/crossgen-corelib.proj
index 53c4e57c72eb5809826674aaba0cbd2f9635ff4d..8ffbaae33220a36055764fa5d0fb8667748a1436 100644
--- a/src/coreclr/crossgen-corelib.proj
+++ b/src/coreclr/crossgen-corelib.proj
@@ -1,8 +1,4 @@
-
-
- $(NetCoreAppToolCurrent)
-
diff --git a/src/coreclr/runtime.proj b/src/coreclr/runtime.proj
index 7eb627e56efc5ce7d797ca196fa70b67e8f4f481..3d4705a92f6fdd7855d4100f9d6e8e3d4e33964b 100644
--- a/src/coreclr/runtime.proj
+++ b/src/coreclr/runtime.proj
@@ -1,8 +1,4 @@
-
-
- $(NetCoreAppToolCurrent)
-
diff --git a/src/installer/corehost.proj b/src/installer/corehost.proj
index 9a6068ea45fe62656fb14e58e979209a26fddcd0..accbd5e2e791bdb4931e19e2b086430b16358754 100644
--- a/src/installer/corehost.proj
+++ b/src/installer/corehost.proj
@@ -5,7 +5,6 @@
package's targets into the build.
-->
- $(NetCoreAppCurrent)
true
GetProductVersions;GenerateNativeVersionFile
$(BuildCoreHostDependsOn);InitializeSourceControlInformationFromSourceControlManager
diff --git a/src/installer/prepare-artifacts.proj b/src/installer/prepare-artifacts.proj
index 54226e506f73920b7d67e6f2fae58cde17f3d55e..74c44fe87203a9dc5c9b19e968da347d06541eef 100644
--- a/src/installer/prepare-artifacts.proj
+++ b/src/installer/prepare-artifacts.proj
@@ -1,7 +1,5 @@
- $(NetCoreAppCurrent)
-
false
true
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 79cfc08ad6e7283aacc63dc9deddcff132b771ae..cb27773a52aae9871ae7d5e0426f4212241474ab 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -66,12 +66,16 @@
true
true
true
+ $(GetBinPlaceItemsDependsOn);AddDocumentationFileAsBinPlaceItemForExtensionsProjects
-
-
-
-
+
+
+
+
+
+
diff --git a/src/libraries/Microsoft.AspNetCore.Internal.Transport/src/Microsoft.AspNetCore.Internal.Transport.proj b/src/libraries/Microsoft.AspNetCore.Internal.Transport/src/Microsoft.AspNetCore.Internal.Transport.proj
index d35ecf77b56d6014fe7e9f84e708df18f213df98..8d90792dd6ffe1a23c165f795344759aafc6af34 100644
--- a/src/libraries/Microsoft.AspNetCore.Internal.Transport/src/Microsoft.AspNetCore.Internal.Transport.proj
+++ b/src/libraries/Microsoft.AspNetCore.Internal.Transport/src/Microsoft.AspNetCore.Internal.Transport.proj
@@ -1,6 +1,6 @@
- netstandard1.0
+ netstandard2.0
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/Microsoft.Extensions.HostFactoryResolver.Sources.csproj b/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/Microsoft.Extensions.HostFactoryResolver.Sources.csproj
index 63de3229f94c50411ed18926a3b4b242d6f21ae0..33e2af9634fc6573f44ec2ebbee501658cf53136 100644
--- a/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/Microsoft.Extensions.HostFactoryResolver.Sources.csproj
+++ b/src/libraries/Microsoft.Extensions.HostFactoryResolver/src/Microsoft.Extensions.HostFactoryResolver.Sources.csproj
@@ -1,8 +1,8 @@
- netstandard2.0
-
- false
+ netstandard2.0
+
+ true
false
true
true
@@ -10,6 +10,6 @@
-
+
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 8e13e283ca9f13668dbb4d282a504e61e645fa68..56f2f777c2832ddac711eb3ff0f68b5bac52eddb 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
@@ -1,10 +1,11 @@
-
$(NetCoreAppToolCurrent);net472
$(MSBuildProjectName)
true
Microsoft.NETCore.Platforms.BuildTasks
+
+ true
false
true
diff --git a/src/libraries/System.Composition/src/System.Composition.csproj b/src/libraries/System.Composition/src/System.Composition.proj
similarity index 67%
rename from src/libraries/System.Composition/src/System.Composition.csproj
rename to src/libraries/System.Composition/src/System.Composition.proj
index 451efe8c9ce8e1d45e19b4edcbe8bc4f80c69fe6..8d90792dd6ffe1a23c165f795344759aafc6af34 100644
--- a/src/libraries/System.Composition/src/System.Composition.csproj
+++ b/src/libraries/System.Composition/src/System.Composition.proj
@@ -1,6 +1,6 @@
- netstandard2.0
+ netstandard2.0
\ No newline at end of file
diff --git a/src/libraries/externals.csproj b/src/libraries/externals.csproj
index f1a13cb78d375c8f49ec310249625d2d91c379a3..6ef3ddc0f190154d8ad45802f3e592c72f2bba94 100644
--- a/src/libraries/externals.csproj
+++ b/src/libraries/externals.csproj
@@ -8,7 +8,6 @@
false
true
false
- true
true
diff --git a/src/libraries/libraries-packages.proj b/src/libraries/libraries-packages.proj
index 023b57e37c1368b3d269c9e32846a704134eb595..7c870d603ad8ab61cb4a637884f5f0c0ad29769a 100644
--- a/src/libraries/libraries-packages.proj
+++ b/src/libraries/libraries-packages.proj
@@ -13,8 +13,6 @@
-
diff --git a/src/libraries/shims/ApiCompat.proj b/src/libraries/shims/ApiCompat.proj
index 94ded8a0e05625600678e02480054b10a8fb0eab..4b620071d217fd30b87fa43e349465026a0f92f7 100644
--- a/src/libraries/shims/ApiCompat.proj
+++ b/src/libraries/shims/ApiCompat.proj
@@ -1,7 +1,6 @@
- $(NetCoreAppCurrent)
false
net5.0
@@ -20,17 +19,17 @@
+
-
+
$(IntermediateOutputPath)apicompat.rsp
- $(TargetFrameworkIdentifier.Substring(1).ToLower())
- $(MSBuildThisFileDirectory)ApiCompatBaseline.$(ApiCompatTarget).netfx461.txt
- $(MSBuildThisFileDirectory)ApiCompatBaseline.$(ApiCompatTarget).netfx461.ignore.txt
- $(MSBuildThisFileDirectory)ApiCompatBaseline.$(ApiCompatTarget).netstandard.txt
- $(MSBuildThisFileDirectory)ApiCompatBaseline.$(ApiCompatTarget).netstandardOnly.txt
+ $(MSBuildThisFileDirectory)ApiCompatBaseline.netcoreapp.netfx461.txt
+ $(MSBuildThisFileDirectory)ApiCompatBaseline.netcoreapp.netfx461.ignore.txt
+ $(MSBuildThisFileDirectory)ApiCompatBaseline.netcoreapp.netstandard.txt
+ $(MSBuildThisFileDirectory)ApiCompatBaseline.netcoreapp.netstandardOnly.txt
@@ -53,37 +52,25 @@
-
+
False
- False
- <_netStandardLibraryRefPath>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'netstandard.library.ref', '$(NETStandardLibraryRefVersion)', 'ref', 'netstandard2.1'))
<_netStandardLibrary20RefPath>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'netstandard.library', '$(NetStandardLibraryVersion)', 'build', 'netstandard2.0', 'ref'))
- <_netStandard21OnlyRef>$(_netStandardLibraryRefPath)netstandard.dll
- <_netStandard21OnlyRef Condition="$(UpdateNETStandardBaselineLocally)">$(MSBuildThisFileDirectory)..\..\..\standard\artifacts\bin\ref\netstandard\Debug\netstandard.dll
+ <_netStandard21OnlyRef>$(NETStandard21RefPath)netstandard.dll
<_netStandard21BaselineModifer>--baseline
- <_netStandard21BaselineModifer Condition="$(UpdateNETStandardBaseline) or $(UpdateNETStandardBaselineLocally)">>
+ <_netStandard21BaselineModifer Condition="$(UpdateNETStandardBaseline)">>
-
+
+ net48
+ $(NuGetPackageRoot)microsoft.netframework.referenceassemblies.$(NETFrameworkReferenceAssemblyTFM)\$(MicrosoftNetFrameworkReferenceAssembliesVersion)\build\.NETFramework\v4.8\
+ $([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'netstandard.library.ref', '$(NETStandardLibraryRefVersion)', 'ref', 'netstandard2.1'))
+
+
+
true
true
-
-
true
true
true
true
- net48
- $(NuGetPackageRoot)microsoft.netframework.referenceassemblies.$(NETFrameworkReferenceAssemblyTFM)\$(MicrosoftNetFrameworkReferenceAssembliesVersion)\build\.NETFramework\v4.8\
- $(NuGetPackageRoot)netstandard.library.ref\$(NETStandardLibraryRefVersion)\ref\netstandard2.1\
-
+
+
diff --git a/src/libraries/shims/Directory.Build.targets b/src/libraries/shims/Directory.Build.targets
index 2974cea4f2d7113c5f69917821c2cf3415f3bca7..ecf410556b169a8d09f6006aa3beca7ebe4f2474 100644
--- a/src/libraries/shims/Directory.Build.targets
+++ b/src/libraries/shims/Directory.Build.targets
@@ -1,5 +1,5 @@
-
+
diff --git a/src/libraries/shims/generated/Directory.Build.props b/src/libraries/shims/generated/Directory.Build.props
index 3034fd5027bc22d78cd3e4c091b93c36c8165293..c18e9ecb1d22f4c46cb17b31d4b1a6c38f851e6d 100644
--- a/src/libraries/shims/generated/Directory.Build.props
+++ b/src/libraries/shims/generated/Directory.Build.props
@@ -2,6 +2,7 @@
true
+ true
true
diff --git a/src/libraries/shims/manual/Directory.Build.props b/src/libraries/shims/manual/Directory.Build.props
index 69066861fd30edc0f9ab236d7d6a2bf6483df912..e5f08175e8c44f95b25aa5d5a2fc7a0cc4b8643c 100644
--- a/src/libraries/shims/manual/Directory.Build.props
+++ b/src/libraries/shims/manual/Directory.Build.props
@@ -2,6 +2,7 @@
manual.$(MSBuildProjectName)
+ true
diff --git a/src/libraries/slngen.proj b/src/libraries/slngen.proj
index 1e8a2002e4845fd23fa86b7ef1e632468d5c1259..594631af6fa0d87fa1cc9ab3899b9f459de82f7d 100644
--- a/src/libraries/slngen.proj
+++ b/src/libraries/slngen.proj
@@ -5,7 +5,6 @@
-->
- $(NetCoreAppToolCurrent)
$(RepositoryEngineeringDir)slngen.template.proj
$(RepositoryEngineeringDir)slngen.nuget.config
diff --git a/src/mono/llvm/llvm-init.proj b/src/mono/llvm/llvm-init.proj
index f7dafa8d2d9469d5977a97d8d6511b42ccf47acd..6f7477b1e5b3c16b7cd33c49f4e126a581fc9bc1 100644
--- a/src/mono/llvm/llvm-init.proj
+++ b/src/mono/llvm/llvm-init.proj
@@ -1,7 +1,4 @@
-
- $(NetCoreAppToolCurrent)
-
linux
diff --git a/src/mono/monoaotcross.proj b/src/mono/monoaotcross.proj
index b87ba94bdd6b2e07b0c16771467d6c697c141b7a..cc8adc6c580f317f0717ded5b0802d6c1eaf7e6c 100644
--- a/src/mono/monoaotcross.proj
+++ b/src/mono/monoaotcross.proj
@@ -1,7 +1,4 @@
-
- $(NetCoreAppToolCurrent)
-
diff --git a/src/mono/wasm/wasm.proj b/src/mono/wasm/wasm.proj
index dda6fa29f6272310b166d0f000f31f88fb0fd4cd..86da385e608e5e02490617d0cf3636c9dc836db5 100644
--- a/src/mono/wasm/wasm.proj
+++ b/src/mono/wasm/wasm.proj
@@ -1,9 +1,6 @@
-
-
- $(NetCoreAppToolCurrent)
-
+