From 49ce9063c73ee8caa0f24926d84540a7c9732b1f Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@microsoft.com>
Date: Sun, 9 Feb 2020 02:06:20 -0800
Subject: [PATCH] Move DebugInformationFormat setting to Wpf.Cpp.target (#2531)

* Move DebugInformationFormat setting to Wpf.Cpp.targets; Remove version from sdk import (it's implicit)

* Set debug and optimization settings in targets so that it supersedes settings set by props files
---
 eng/Publishing.props                   |  2 --
 eng/WpfArcadeSdk/tools/Wpf.Cpp.props   | 22 ----------------------
 eng/WpfArcadeSdk/tools/Wpf.Cpp.targets | 22 ++++++++++++++++++++++
 3 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 216f44517..5f4ca0c81 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -5,11 +5,9 @@
     Use the published SDK from NuGet if available, or local files otherwise. 
     -->
   <Import Sdk="Microsoft.DotNet.Arcade.Wpf.Sdk" 
-          Version="$(MicrosoftDotNetArcadeWpfSdkVersion)"
           Project="..\tools\Publishing.props"
           Condition="'$(MicrosoftDotNetArcadeWpfSdkVersion)' != ''"/>
   <Import Sdk="Microsoft.DotNet.Arcade.Wpf.Sdk" 
-          Version="$(MicrosoftDotNetArcadeWpfSdkVersion)"
           Project="..\tools\Publishing.targets"
           Condition="'$(MicrosoftDotNetArcadeWpfSdkVersion)' != ''"/>
 
diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
index e829da762..e38d64aea 100644
--- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
+++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
@@ -57,20 +57,6 @@
       <TargetFrameworkSDKToolsDirectory Condition="'$(Platform)' == 'x64'">$(TargetFrameworkSDKToolsDirectory)$(Platform)\</TargetFrameworkSDKToolsDirectory>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <LinkIncremental>true</LinkIncremental>
-    <LinkIncremental Condition="'$(ManagedCxx)'=='true'">false</LinkIncremental>
-    <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <LinkIncremental>false</LinkIncremental>
-    <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(ManagedCxx)'=='true'">
     <!-- Works around a bug in the C++ compiler where we get the error
          'System::ReadOnlySpan::default': could not import member. -->
@@ -208,14 +194,6 @@
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       
-      <!-- 
-        Workaround for https://github.com/dotnet/arcade/issues/4763
-        Embed PDB's into the .lib files directly using /Z7 when building out of 
-        dotnet-wpf-int repo
-      -->
-      <DebugInformationFormat Condition="'$(ManagedCxx)' != 'true' and 
-                                         '$(RepoLocation)' == 'Internal'">oldStyle</DebugInformationFormat>
-      
       <!-- 
         Disambiguate the PDB produced by the compiler with a -compile suffix, so that the PDB
         produced by the linker is not accidentally clobbered by this one.
diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
index b13314ce9..88de72af2 100644
--- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
+++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
@@ -5,6 +5,20 @@
     <NativeResourceFileWithVersionInformation Condition="'$(NativeResourceFileWithVersionInformation)' == ''">$(IntermediateOutputPath)ExtendedNativeVersion.rc</NativeResourceFileWithVersionInformation>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <LinkIncremental>true</LinkIncremental>
+    <LinkIncremental Condition="'$(ManagedCxx)'=='true'">false</LinkIncremental>
+    <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <LinkIncremental>false</LinkIncremental>
+    <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+  </PropertyGroup>
+
   <Import Project="Wpf.Cpp.PrivateTools.targets" Condition="Exists('Wpf.Cpp.PrivateTools.targets') And '$(UsePrivateCppTools)'=='true'"/>
   
   <ItemDefinitionGroup>
@@ -13,6 +27,14 @@
       <AdditionalIncludeDirectories Condition="Exists('$(WpfCommonDir)inc\')">%(AdditionalIncludeDirectories);$(WpfCommonDir)inc\</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(NativeVersionFileDirectory);$(WpfTracingDir)native\</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>$(WpfSharedDir)inc\ddbanned.h</ForcedIncludeFiles>
+
+      <!-- 
+        Workaround for https://github.com/dotnet/arcade/issues/4763
+        Embed PDB's into the .lib files directly using /Z7 when building out of 
+        dotnet-wpf-int repo
+      -->
+      <DebugInformationFormat Condition="'$(ManagedCxx)' != 'true' and 
+                                         '$(RepoLocation)' == 'Internal'">oldStyle</DebugInformationFormat>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(NativeVersionFileDirectory)</AdditionalIncludeDirectories>
-- 
GitLab