From fe2d8478381f53c152bbb92f374bb3a923cff723 Mon Sep 17 00:00:00 2001
From: Andy Gerlicher <angerlic@microsoft.com>
Date: Wed, 25 Sep 2024 12:03:12 -0700
Subject: [PATCH] Add workaround to sample projects (#576)

---
 .../Directory.Build.props                     |  3 ---
 .../Directory.Build.targets                   |  1 +
 samples/{Traversal => }/Directory.Build.props |  0
 samples/Directory.Build.targets               | 26 +++++++++++++++++++
 samples/NoTargets/Directory.Build.props       |  1 -
 samples/NoTargets/Directory.Build.targets     |  1 -
 samples/Traversal/Directory.Build.targets     |  2 --
 7 files changed, 27 insertions(+), 7 deletions(-)
 delete mode 100644 samples/CentralPackageVersions/Directory.Build.props
 rename samples/{Traversal => }/Directory.Build.props (100%)
 create mode 100644 samples/Directory.Build.targets
 delete mode 100644 samples/NoTargets/Directory.Build.props
 delete mode 100644 samples/NoTargets/Directory.Build.targets
 delete mode 100644 samples/Traversal/Directory.Build.targets

diff --git a/samples/CentralPackageVersions/Directory.Build.props b/samples/CentralPackageVersions/Directory.Build.props
deleted file mode 100644
index 4de98b5c..00000000
--- a/samples/CentralPackageVersions/Directory.Build.props
+++ /dev/null
@@ -1,3 +0,0 @@
-<Project>
-
-</Project>
\ No newline at end of file
diff --git a/samples/CentralPackageVersions/Directory.Build.targets b/samples/CentralPackageVersions/Directory.Build.targets
index 3b6a6781..d4827d43 100644
--- 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 b/samples/Directory.Build.props
similarity index 100%
rename from samples/Traversal/Directory.Build.props
rename to samples/Directory.Build.props
diff --git a/samples/Directory.Build.targets b/samples/Directory.Build.targets
new file mode 100644
index 00000000..3c4f0d4d
--- /dev/null
+++ 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>
\ No newline at end of file
diff --git a/samples/NoTargets/Directory.Build.props b/samples/NoTargets/Directory.Build.props
deleted file mode 100644
index 058246e4..00000000
--- a/samples/NoTargets/Directory.Build.props
+++ /dev/null
@@ -1 +0,0 @@
-<Project />
diff --git a/samples/NoTargets/Directory.Build.targets b/samples/NoTargets/Directory.Build.targets
deleted file mode 100644
index 42309161..00000000
--- a/samples/NoTargets/Directory.Build.targets
+++ /dev/null
@@ -1 +0,0 @@
-<Project />
\ No newline at end of file
diff --git a/samples/Traversal/Directory.Build.targets b/samples/Traversal/Directory.Build.targets
deleted file mode 100644
index c1df2220..00000000
--- a/samples/Traversal/Directory.Build.targets
+++ /dev/null
@@ -1,2 +0,0 @@
-<Project>
-</Project>
\ No newline at end of file