Add workaround to sample projects (#576)

microsoft · Sep 25, 2024 · fe2d847 · fe2d847
1 parent 64721c9
commit fe2d847
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 7 deletions.
diff --git a/samples/CentralPackageVersions/Directory.Build.props b/samples/CentralPackageVersions/Directory.Build.props
diff --git a/samples/CentralPackageVersions/Directory.Build.targets b/samples/CentralPackageVersions/Directory.Build.targets
@@ -1,3 +1,4 @@
 <Project>
   <Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.1.3" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\Directory.Build.targets" />
 </Project>
diff --git a/samples/Traversal/Directory.Build.props → samples/Directory.Build.props b/samples/Traversal/Directory.Build.props → samples/Directory.Build.props
diff --git a/samples/Directory.Build.targets b/samples/Directory.Build.targets
@@ -0,0 +1,26 @@
+<Project>
+    <!-- BEGIN workaround for https://github.com/dotnet/sdk/issues/43339; remove after updated to VS 17.12 or a future 17.11 patch -->
+    <Target Name="WorkaroundDotnetSdk43339" BeforeTargets="ResolvePackageAssets" Condition=" '$(MSBuildRuntimeType)' == 'Full' and $([MSBuild]::VersionLessThan($(MSBuildVersion), 17.12.0))">
+      <PrimeSystemTextJson804 />
+    </Target>
+    <UsingTask
+      TaskName="PrimeSystemTextJson804"
+      TaskFactory="RoslynCodeTaskFactory"
+      AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll" >
+      <Task>
+        <Code Type="Fragment" Language="cs">
+  <![CDATA[
+  try
+  {
+      System.Reflection.Assembly.LoadFrom(@"$(MicrosoftNETBuildTasksDirectoryRoot)\..\..\..\DotnetTools\dotnet-format\BuildHost-net472\System.Text.Json.dll");
+  }
+  catch
+  {
+      // Best effort: if something moves in the SDK don't break the build.
+  }
+  ]]>
+        </Code>
+      </Task>
+    </UsingTask>
+    <!-- END workaround for https://github.com/dotnet/sdk/issues/43339 -->
+</Project>
diff --git a/samples/NoTargets/Directory.Build.props b/samples/NoTargets/Directory.Build.props
diff --git a/samples/NoTargets/Directory.Build.targets b/samples/NoTargets/Directory.Build.targets
diff --git a/samples/Traversal/Directory.Build.targets b/samples/Traversal/Directory.Build.targets