Cleanup targets

microsoft · May 20, 2021 · d6f5c04 · d6f5c04
1 parent 10229f4
commit d6f5c04
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/nuget/Microsoft.Windows.CsWinRT.targets b/nuget/Microsoft.Windows.CsWinRT.targets
@@ -166,23 +166,23 @@ $(CsWinRTFilters)
 
     <PropertyGroup Condition="'$(CsWinRTInRepo)' != 'true'">
       <CsWinRTGuidPatchExePath>$(CsWinRTPath)build\tools\</CsWinRTGuidPatchExePath>
-      <CsWinRTGuidPatchRuntimeDll>$(CsWinRTPath)lib\net5.0\</CsWinRTGuidPatchRuntimeDll> <!-- used to end with WinRT.Runtime.dll -->
+      <CsWinRTGuidPatchRuntimeDll>$(CsWinRTPath)lib\net5.0\</CsWinRTGuidPatchRuntimeDll>
     </PropertyGroup>
 
     <PropertyGroup>
       <CsWinRTGuidPatchInput Condition="'$(CsWinRTGuidPatchInput)' == ''">@(BuiltProjectOutputGroupKeyOutput->'%(Identity)')</CsWinRTGuidPatchInput>
     </PropertyGroup>
 
-    <!-- The WinRT.Runtime.dll will be placed next to GuidPatch in the .nupkg, so we only need to copy in the case that we are building in the repo 
-    <Copy Condition="'$(CsWinRTInRepo)' == 'true'" SourceFiles="$(CsWinRTGuidPatchRuntimeDll)" DestinationFolder="$(CsWinRTGuidPatchExePath)" UseHardlinksIfPossible="false" SkipUnchangedFiles="true"/>
-    -->
-
-    <!-- Give it to the patcher, then copy it from there to the output dir ? or update the path? -->
     <Exec Command="$(CsWinRTGuidPatchExePath)GuidPatch.exe $(CsWinRTGuidPatchInput) $(CsWinRTGuidPatchRuntimeDll)" ConsoleToMsBuild="true">
       <Output TaskParameter="ConsoleOutput" PropertyName="CsWinRTGuidPatchOutput" />
     </Exec>
 
-    <Message Text="Output of invocation: $(CsWinRTGuidPatchOutput)" />
+    <ItemGroup>
+      <PatchedFiles Include="$(_DirectoryBuildTargetsBasePath)\GuidPatcherOutput\*.dll" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(PatchedFiles)" DestinationFolder="$(TargetDir)" />
+
   </Target>
 
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.Windows.CsWinRT.Prerelease.targets" Condition="Exists('$(MSBuildThisFileDirectory)Microsoft.Windows.CsWinRT.Prerelease.targets')"/>