Update Microsoft.Build.* SDKs (#83877)

Avoids net45 prebuilds in Traversal projects: https://github.com/microsoft/MSBuildSdks/pull/430

diff --git a/Directory.Build.props b/Directory.Build.props
index ba99e7051a5ffd103061b9610f6cd56405533e64..d91896c4a8faacbc19880aadaeca3d081a19c826 100644 (file)
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -450,7 +450,6 @@
 
   <PropertyGroup>
     <CustomBeforeNoTargets>$(RepositoryEngineeringDir)NoTargetsSdk.BeforeTargets.targets</CustomBeforeNoTargets>
-    <CustomAfterNoTargets>$(RepositoryEngineeringDir)NoTargetsSdk.AfterTargets.targets</CustomAfterNoTargets>
     <CustomAfterTraversalTargets>$(RepositoryEngineeringDir)TraversalSdk.AfterTargets.targets</CustomAfterTraversalTargets>
   </PropertyGroup>
 </Project>

diff --git a/eng/NoTargetsSdk.AfterTargets.targets b/eng/NoTargetsSdk.AfterTargets.targets
deleted file mode 100644 (file)
index b659aca..0000000
--- a/eng/NoTargetsSdk.AfterTargets.targets
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project>
-
-  <!-- Reset the following target to avoid copying references to an output directory.
-       TODO: Remove when https://github.com/microsoft/MSBuildSdks/pull/395 is merged. -->
-  <Target Name="CopyFilesToOutputDirectory" />
-
-</Project>

diff --git a/eng/NoTargetsSdk.BeforeTargets.targets b/eng/NoTargetsSdk.BeforeTargets.targets
index 491271b794ec701b24df0facb016cb81d2380e82..c2a86b1f2e62789bfa19cb66221f9f4d75f388c8 100644 (file)
--- a/eng/NoTargetsSdk.BeforeTargets.targets
+++ b/eng/NoTargetsSdk.BeforeTargets.targets
@@ -1,6 +1,8 @@
 <Project>
 
   <PropertyGroup>
+    <!-- NoTargets SDK shouldn't copy files into the intermediate/output directory. -->
+    <SkipCopyFilesMarkedCopyLocal>true</SkipCopyFilesMarkedCopyLocal>
     <!-- NoTargets SDK needs a TFM set. Set a default if the project doesn't multi target. -->
     <TargetFramework Condition="'$(TargetFramework)' == '' and '$(TargetFrameworks)' == ''">$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>

diff --git a/global.json b/global.json
index 29f248d183ecba78b38e7d587ddf1429a2998c05..18656f6eb59c1e82fc9828afefa3a87fcef79359 100644 (file)
--- a/global.json
+++ b/global.json
@@ -11,8 +11,8 @@
     "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23172.2",
     "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23172.2",
     "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23172.2",
-    "Microsoft.Build.NoTargets": "3.5.0",
-    "Microsoft.Build.Traversal": "3.1.6",
+    "Microsoft.Build.NoTargets": "3.7.0",
+    "Microsoft.Build.Traversal": "3.4.0",
     "Microsoft.NET.Sdk.IL": "8.0.0-preview.3.23162.2"
   }
 }