fix target files to prevent batching

Author: ssparach

build/NuSpecs/WindowsAppSDK-Nuget-Native.AutoInitializer.targets

@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <Target Name="WindowsAppRuntimeAutoInitializer">
+  <Target Name="WindowsAppRuntimeAutoInitializerPreprocessorDefinitions">
     <PropertyGroup>
       <AutoInitializerPreprocessorDefinitions />
       <AutoInitializerPreprocessorDefinitions Condition="'$(WindowsAppSdkBootstrapInitialize)'=='true'">
@@ -16,18 +16,16 @@
         MICROSOFT_WINDOWSAPPSDK_AUTOINITIALIZE_COMPATIBILITY;$(AutoInitializerPreprocessorDefinitions)
       </AutoInitializerPreprocessorDefinitions>
     </PropertyGroup>
+  </Target>
 
+  <Target Name="WindowsAppRuntimeAutoInitializer">
     <ItemGroup>
-      <AutoInitializerClCompile Include="$(MSBuildThisFileDirectory)..\..\include\WindowsAppRuntimeAutoInitializer.cpp">
+      <ClCompile Include="$(MSBuildThisFileDirectory)..\..\include\WindowsAppRuntimeAutoInitializer.cpp">
         <PrecompiledHeader>NotUsing</PrecompiledHeader>
-        <PreprocessorDefinitions>$(AutoInitializerPreprocessorDefinitions)</PreprocessorDefinitions>
-      </AutoInitializerClCompile>
-    </ItemGroup>
+      </ClCompile>
 
-    <ItemGroup>
-      <ClCompile Include="@(AutoInitializerClCompile->'%(Identity)')">
-        <PrecompiledHeader>%(AutoInitializerClCompile.PrecompiledHeader)</PrecompiledHeader>
-        <PreprocessorDefinitions>%(AutoInitializerClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ClCompile>
+        <PreprocessorDefinitions>%(PreprocessorDefinitions);$(AutoInitializerPreprocessorDefinitions)</PreprocessorDefinitions>
       </ClCompile>
     </ItemGroup>
   </Target>

build/NuSpecs/WindowsAppSDK-Nuget-Native.UndockedRegFreeWinRT.targets

@@ -1,28 +1,31 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-    <Target Name="AddUndockedRegFreeWinRTCppDefines" BeforeTargets="ClCompile" Condition="'$(WindowsAppSdkUndockedRegFreeWinRTInitialize)' == 'true'">
-        <ItemGroup>
-            <ClCompile>
-                <PreprocessorDefinitions>MICROSOFT_WINDOWSAPPSDK_UNDOCKEDREGFREEWINRT_AUTO_INITIALIZE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                <PreprocessorDefinitions Condition="'$(WindowsAppSdkUndockedRegFreeWinRTInitializeLoadLibrary)' == 'true'">MICROSOFT_WINDOWSAPPSDK_UNDOCKEDREGFREEWINRT_AUTO_INITIALIZE_LOADLIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-            </ClCompile>
-        </ItemGroup>
-    </Target>
+  <Target Name="AddUndockedRegFreeWinRTCppDefines" BeforeTargets="ClCompile" Condition="'$(WindowsAppSdkUndockedRegFreeWinRTInitialize)' == 'true'">
+    <ItemGroup>
+      <ClCompile>
+        <PreprocessorDefinitions>MICROSOFT_WINDOWSAPPSDK_UNDOCKEDREGFREEWINRT_AUTO_INITIALIZE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+        <PreprocessorDefinitions Condition="'$(WindowsAppSdkUndockedRegFreeWinRTInitializeLoadLibrary)' == 'true'">MICROSOFT_WINDOWSAPPSDK_UNDOCKEDREGFREEWINRT_AUTO_INITIALIZE_LOADLIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      </ClCompile>
+    </ItemGroup>
+  </Target>
 
-    <Target Name="GenerateUndockedRegFreeWinRTCpp" Condition="'$(WindowsAppSdkUndockedRegFreeWinRTInitialize)' == 'true'">
-        <ItemGroup>
-            <ClCompile Include="$(MSBuildThisFileDirectory)..\..\include\UndockedRegFreeWinRT-AutoInitializer.cpp">
-                <PrecompiledHeader>NotUsing</PrecompiledHeader>
-                <PreprocessorDefinitions>MICROSOFT_WINDOWSAPPSDK_UNDOCKEDREGFREEWINRT_AUTO_INITIALIZE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                <PreprocessorDefinitions Condition="'$(WindowsAppSdkUndockedRegFreeWinRTInitializeLoadLibrary)' == 'true'">MICROSOFT_WINDOWSAPPSDK_UNDOCKEDREGFREEWINRT_AUTO_INITIALIZE_LOADLIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-            </ClCompile>
-        </ItemGroup>
-    </Target>
+  <Target Name="GenerateUndockedRegFreeWinRTCpp" Condition="'$(WindowsAppSdkUndockedRegFreeWinRTInitialize)' == 'true'">
+    <ItemGroup>
+      <ClCompile Include="$(MSBuildThisFileDirectory)..\..\include\UndockedRegFreeWinRT-AutoInitializer.cpp">
+        <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      </ClCompile>
 
-    <PropertyGroup>
-        <BeforeClCompileTargets>
-            $(BeforeClCompileTargets); GenerateUndockedRegFreeWinRTCpp;
-        </BeforeClCompileTargets>
-    </PropertyGroup>
+      <ClCompile>
+        <PreprocessorDefinitions>MICROSOFT_WINDOWSAPPSDK_UNDOCKEDREGFREEWINRT_AUTO_INITIALIZE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+        <PreprocessorDefinitions Condition="'$(WindowsAppSdkUndockedRegFreeWinRTInitializeLoadLibrary)' == 'true'">MICROSOFT_WINDOWSAPPSDK_UNDOCKEDREGFREEWINRT_AUTO_INITIALIZE_LOADLIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      </ClCompile>
+    </ItemGroup>
+  </Target>
+
+  <PropertyGroup>
+    <BeforeClCompileTargets>
+      $(BeforeClCompileTargets); GenerateUndockedRegFreeWinRTCpp;
+    </BeforeClCompileTargets>
+  </PropertyGroup>
 
 </Project>