From e7421d85f14d713f9a8ed73f70661c0fbf50b65d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alex@alexrp.com>
Date: Thu, 22 Jul 2021 23:17:11 +0200
Subject: [PATCH] Properly indicate to MSBuild and the .NET SDK whether we're
 producing a separate PDB.

---
 src/sdk/Sdk/Sdk.targets               |  1 +
 src/sdk/Sdk/Support.targets           |  4 ++--
 src/sdk/build/Zig.Sdk.Hacks.targets   |  4 ++--
 src/sdk/build/Zig.Sdk.Publish.targets |  6 +++---
 src/sdk/build/Zig.Sdk.Symbols.targets | 17 +++++++++++++++++
 src/sdk/build/Zig.Sdk.Test.targets    |  4 ++--
 6 files changed, 27 insertions(+), 9 deletions(-)
 create mode 100644 src/sdk/build/Zig.Sdk.Symbols.targets

diff --git a/src/sdk/Sdk/Sdk.targets b/src/sdk/Sdk/Sdk.targets
index b81310e..3e866eb 100644
--- a/src/sdk/Sdk/Sdk.targets
+++ b/src/sdk/Sdk/Sdk.targets
@@ -8,6 +8,7 @@
 
     <Import Project="../build/Zig.Sdk.Overrides.targets" />
     <Import Project="../build/Zig.Sdk.Cross.targets" />
+    <Import Project="../build/Zig.Sdk.Symbols.targets" />
     <Import Project="Sdk.targets"
             Sdk="Microsoft.NET.Sdk" />
     <Import Project="../build/Zig.Sdk.Hacks.targets" />
diff --git a/src/sdk/Sdk/Support.targets b/src/sdk/Sdk/Support.targets
index 8cd98af..5b0721f 100644
--- a/src/sdk/Sdk/Support.targets
+++ b/src/sdk/Sdk/Support.targets
@@ -1,6 +1,6 @@
 <Project>
     <!--
-    This file is meant to be imported in regular .NET SDK projects. It injects
-    some build logic to make ZigReference items work as expected.
+    This file is meant to be imported in regular Microsoft.NET.Sdk projects. It
+    injects some build logic to make ZigReference items work as expected.
     -->
 </Project>
diff --git a/src/sdk/build/Zig.Sdk.Hacks.targets b/src/sdk/build/Zig.Sdk.Hacks.targets
index 8daae3f..cebb52f 100644
--- a/src/sdk/build/Zig.Sdk.Hacks.targets
+++ b/src/sdk/build/Zig.Sdk.Hacks.targets
@@ -1,7 +1,7 @@
 <Project>
     <!--
-    The .NET SDK unconditionally sets TargetExt to force a .dll suffix. We work
-    around that nonsense here.
+    Microsoft.NET.Sdk unconditionally sets TargetExt to force a .dll suffix. We
+    work around that nonsense here.
     -->
     <PropertyGroup>
         <TargetExt>$(TargetSuffix)</TargetExt>
diff --git a/src/sdk/build/Zig.Sdk.Publish.targets b/src/sdk/build/Zig.Sdk.Publish.targets
index 2a911aa..ba67f48 100644
--- a/src/sdk/build/Zig.Sdk.Publish.targets
+++ b/src/sdk/build/Zig.Sdk.Publish.targets
@@ -21,9 +21,9 @@
     </Target>
 
     <!--
-    Unfortunately, the publish logic in the .NET SDK is not factored as well as
-    the build and clean logic in MSBuild, so we have to duplicate some of the
-    logic in the default Publish target here.
+    Unfortunately, the publish logic in Microsoft.NET.Sdk is not factored as
+    well as the build and clean logic in MSBuild, so we have to duplicate some
+    of the logic in the default Publish target here.
     -->
     <Target Name="_InnerPublish"
             DependsOnTargets="_PublishBuildAlternative; _PublishNoBuildAlternative">
diff --git a/src/sdk/build/Zig.Sdk.Symbols.targets b/src/sdk/build/Zig.Sdk.Symbols.targets
new file mode 100644
index 0000000..4ced490
--- /dev/null
+++ b/src/sdk/build/Zig.Sdk.Symbols.targets
@@ -0,0 +1,17 @@
+<Project>
+    <!--
+    We need to set these properties up here since Microsoft.NET.Sdk defaults
+    them very early and sets _DebugSymbolsProduced to indicate whether a
+    separate PDB file is produced.
+    -->
+
+    <PropertyGroup Condition="'$(DebugSymbols)' == ''">
+        <DebugSymbols>false</DebugSymbols>
+        <DebugSymbols Condition="'$(Configuration)' == 'Debug'">true</DebugSymbols>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(DebugSymbols)' == 'true'">
+        <DebugType>embedded</DebugType>
+        <DebugType Condition="'$(TargetSystem)' == 'windows'">full</DebugType>
+    </PropertyGroup>
+</Project>
diff --git a/src/sdk/build/Zig.Sdk.Test.targets b/src/sdk/build/Zig.Sdk.Test.targets
index 4e4d213..de9d4b5 100644
--- a/src/sdk/build/Zig.Sdk.Test.targets
+++ b/src/sdk/build/Zig.Sdk.Test.targets
@@ -4,8 +4,8 @@
     </ItemGroup>
 
     <!--
-    Most of the test logic in the .NET SDK is superfluous for our purposes, so
-    we will just override the target entirely.
+    Most of the test logic in Microsoft.NET.Sdk is superfluous for our purposes,
+    so we will just override the target entirely.
     -->
     <Target Name="VSTest"
             DependsOnTargets="$(VSTestDependsOn)"