Merge pull request #1336 from microsoft/dev/andarno/fixSigning

Sign the `GalleryManifest.xml` file
microsoft · Jul 9, 2024 · c6d4307 · c6d4307
2 parents a017ea7 + 31d81eb
commit c6d4307
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/src/SosThreadingTools/SosThreadingTools.targets b/src/SosThreadingTools/SosThreadingTools.targets
@@ -23,31 +23,40 @@
 
   <PropertyGroup>
     <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);PackBuildOutputs</TargetsForTfmSpecificContentInPackage>
-    <GenerateNuspecDependsOn>StampAndIncludeGalleryManifest;$(GenerateNuspecDependsOn)</GenerateNuspecDependsOn>
   </PropertyGroup>
 
+  <ItemGroup>
+    <GalleryManifest Include="$(IntermediateOutputPath)GalleryManifest.xml" Condition="'$(RuntimeIdentifier)'=='win-x64'" />
+  </ItemGroup>
   <ItemGroup>
     <FilesToSign Include="$(TargetDir)$(DnneNativeBinaryName).dll">
       <StrongName />
     </FilesToSign>
+    <FilesToSign Include="@(GalleryManifest)">
+      <Authenticode>MicrosoftXmlSHA2</Authenticode>
+      <StrongName />
+    </FilesToSign>
+  </ItemGroup>
+  <ItemGroup>
+    <SignFilesDependsOn Include="StampAndIncludeGalleryManifest" />
   </ItemGroup>
 
-  <Target Name="PackBuildOutputs" DependsOnTargets="DebugSymbolsProjectOutputGroup">
+  <Target Name="PackBuildOutputs" DependsOnTargets="DebugSymbolsProjectOutputGroup;StampAndIncludeGalleryManifest">
     <ItemGroup>
       <TfmSpecificPackageFile Include="$(TargetPath)" PackagePath="tools\$(RuntimeIdentifier)\" />
       <TfmSpecificPackageFile Include="$(TargetDir)$(TargetName).runtimeconfig.json" PackagePath="tools\$(RuntimeIdentifier)\" />
       <TfmSpecificPackageFile Include="@(DebugSymbolsProjectOutputGroupOutput->'%(FinalOutputPath)')" PackagePath="symbols\$(RuntimeIdentifier)\" />
       <TfmSpecificPackageFile Include="$(TargetDir)*.dll" PackagePath="tools\$(RuntimeIdentifier)\" />
     </ItemGroup>
   </Target>
-  <Target Name="StampAndIncludeGalleryManifest" DependsOnTargets="GetBuildVersion" BeforeTargets="_GetPackageFiles">
+  <Target Name="StampAndIncludeGalleryManifest" DependsOnTargets="GetBuildVersion" Condition="'@(GalleryManifest)'!=''">
     <ReplaceFileText
       InputFilename="GalleryManifest.xml"
-      OutputFilename="$(IntermediateOutputPath)GalleryManifest.xml"
+      OutputFilename="@(GalleryManifest)"
       MatchExpression="\$Version\$"
       ReplacementText="$(BuildVersion)" />
     <ItemGroup>
-      <None Include="$(IntermediateOutputPath)GalleryManifest.xml" Pack="true" PackagePath="" />
+      <TfmSpecificPackageFile Include="@(GalleryManifest)" PackagePath="" />
     </ItemGroup>
   </Target>
 </Project>