always gather binaries to sign

9f98c347 · Brett V. Forsgren · 1bf7819b · 9f98c347 · 9f98c347 · 9f98c347
23 changed file
--- a/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj
+++ b/setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj
@@ -32,7 +32,7 @@
    <Error Condition="'$(FSharpPackageVersion)' == ''" Text="A 'FSharpPackageVersion' property must be passed to the project." />
  </Target>
  
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize">
+  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
    <!-- SWIX plugin adds the built vsix to signing automatically -->
  </Target>
 </Project>
--- a/setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj
+++ b/setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj
@@ -29,7 +29,7 @@
    <Error Condition="'$(FSharpPackageVersion)' == ''" Text="A 'FSharpPackageVersion' property must be passed to the project." />
  </Target>
  
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize">
+  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
    <!-- MSI is already signed before wrapping it here -->
  </Target>
 </Project>
--- a/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj
+++ b/setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj
@@ -36,7 +36,7 @@
    <Package Include="Files.swr" />
  </ItemGroup>
  
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize">
+  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
    <!-- MSI is already signed before wrapping it here -->
  </Target>
  

--- a/setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj
+++ b/setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj
@@ -36,7 +36,7 @@
    <Package Include="Templates.swr" />
  </ItemGroup>
  
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize">
+  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
    <!-- SWIX plugin adds the built vsix to signing automatically -->
  </Target>
  

--- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj
+++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj
@@ -96,7 +96,7 @@
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize" Condition="'$(UseGatherBinaries)' == 'true'">
+  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
    <ItemGroup>
      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />

--- a/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
+++ b/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
@@ -45,7 +45,7 @@
      <Name>FSharp.Core</Name>
    </ProjectReference>
  </ItemGroup>
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize" Condition="'$(UseGatherBinaries)' == 'true'">
+  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
    <ItemGroup>
      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />

--- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
+++ b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
@@ -38,7 +38,7 @@
  <Import Project="$(FSharpSourcesRoot)\.nuget\NuGet.targets" Condition="Exists('$(FSharpSourcesRoot)\.nuget\NuGet.targets')" />
  <Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
  <Import Project="$(FsLexToolPath)\FsLexYacc.targets" />
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize" Condition="'$(UseGatherBinaries)' == 'true'">
+  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
    <ItemGroup>
      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />

--- a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
+++ b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
@@ -39,7 +39,7 @@
  </ItemGroup>
  <Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
  
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize" Condition="'$(UseGatherBinaries)' == 'true'">
+  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
    <ItemGroup>
      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
      <FilesToSign Include="@(BinariesToBeSigned)">

--- a/src/fsharp/FSharp.Core/FSharp.Core.fsproj
+++ b/src/fsharp/FSharp.Core/FSharp.Core.fsproj
@@ -259,7 +259,7 @@
    <Copy SourceFiles="$(IntermediateOutputPath)\FSharp.Core.optdata" DestinationFolder="$(OutputPath)" SkipUnchangedFiles="true" />
  </Target>

-  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize" Condition="'$(UseGatherBinaries)' == 'true'">
+  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
    <ItemGroup>
      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />

--- a/src/fsharp/Fsc/Fsc.fsproj
+++ b/src/fsharp/Fsc/Fsc.fsproj
@@ -63,7 +63,7 @@
    </ProjectReference>
  </ItemGroup>

-  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize" Condition="'$(UseGatherBinaries)' == 'true'">
+  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
    <ItemGroup>
      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).exe" />
      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />

--- a/src/fsharp/fsi/Fsi.fsproj
+++ b/src/fsharp/fsi/Fsi.fsproj
@@ -73,7 +73,7 @@
      <Private>True</Private>
    </ProjectReference>
  </ItemGroup>
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize" Condition="'$(UseGatherBinaries)' == 'true'">
+  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
    <ItemGroup>
      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).exe" />
      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />

--- a/src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
+++ b/src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
@@ -58,7 +58,7 @@
    </ProjectReference>
  </ItemGroup>

-  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize" Condition="'$(UseGatherBinaries)' == 'true'">
+  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
    <ItemGroup>
      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).exe" />
      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />

--- a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj
+++ b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj
@@ -272,7 +272,7 @@
  </ItemGroup>
  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
  <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize" Condition="'$(UseGatherBinaries)' == 'true'">
+  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
    <ItemGroup>
      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).vsix" />
      <FilesToSign Include="@(BinariesToBeSigned)">

--- a/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj
+++ b/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj
@@ -298,7 +298,7 @@
  </ItemGroup>
  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
  <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize" Condition="'$(UseGatherBinaries)' == 'true'">
+  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
    <ItemGroup>
      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).vsix" />
      <FilesToSign Include="@(BinariesToBeSigned)">

--- a/vsintegration/Vsix/VisualFSharpTemplates/VisualFSharpTemplates.csproj
+++ b/vsintegration/Vsix/VisualFSharpTemplates/VisualFSharpTemplates.csproj
@@ -119,7 +119,7 @@
  </ItemGroup>
  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
  <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize" Condition="'$(UseGatherBinaries)' == 'true'">
+  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
    <ItemGroup>
      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).vsix" />
      <FilesToSign Include="@(BinariesToBeSigned)">

--- a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj
+++ b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj
@@ -283,7 +283,7 @@
  <Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
  <Import Project="$(VsSDKTargets)" />
  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\vsintegration.targets" />
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize" Condition="'$(UseGatherBinaries)' == 'true'">
+  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
    <ItemGroup>
      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
      <FilesToSign Include="@(BinariesToBeSigned)">

--- a/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj
+++ b/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj
@@ -250,7 +250,7 @@
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
  <Import Project="$(VsSDKInstall)\Microsoft.VsSDK.targets" />
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize" Condition="'$(UseGatherBinaries)' == 'true'">
+  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
    <ItemGroup>
      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />

--- a/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj
+++ b/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj
@@ -32,7 +32,7 @@
  <Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\vsintegration.targets" />
  <Import Project="$(VsSDKTargets)" />
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize" Condition="'$(UseGatherBinaries)' == 'true'">
+  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
    <ItemGroup>
      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />

--- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj
+++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj
@@ -301,7 +301,7 @@
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
  <Import Project="$(VsSDKTargets)" />
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize" Condition="'$(UseGatherBinaries)' == 'true'">
+  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
    <ItemGroup>
      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />

--- a/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj
+++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj
@@ -48,7 +48,7 @@
    <Exec Command="&quot;$(ProgramFiles)\Windows Kits\10\bin\x86\rc.exe&quot; /fo $(IntermediateOutputPath)$(RCResourceFile).res $(RCResourceFile)" Condition="Exists('$(ProgramFiles)\Windows Kits\10\bin\x86\rc.exe')" />
    <Exec Command="&quot;$(ProgramFiles)\Windows Kits\10\bin\10.0.15063.0\x86\rc.exe&quot; /fo $(IntermediateOutputPath)$(RCResourceFile).res $(RCResourceFile)" Condition="Exists('$(ProgramFiles)\Windows Kits\10\bin\10.0.15063.0\x86\rc.exe')" />
  </Target>
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize" Condition="'$(UseGatherBinaries)' == 'true'">
+  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
    <ItemGroup>
      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />

--- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj
+++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj
@@ -375,7 +375,7 @@
  <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
  <Import Project="$(VsSDKInstall)\Microsoft.VsSDK.targets" />
  
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize" Condition="'$(UseGatherBinaries)' == 'true'">
+  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
    <ItemGroup>
      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />

--- a/vsintegration/src/FSharp.UIResources/FSharp.UIResources.csproj
+++ b/vsintegration/src/FSharp.UIResources/FSharp.UIResources.csproj
@@ -100,7 +100,7 @@
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize" Condition="'$(UseGatherBinaries)' == 'true'">
+  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
    <ItemGroup>
      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />

--- a/vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj
+++ b/vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj
@@ -29,7 +29,7 @@
  <Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\vsintegration.targets" />
  <Import Project="$(VsSDKInstall)\Microsoft.VsSDK.targets" />
-  <Target Name="GatherBinariesToBeSigned" AfterTargets="Localize" Condition="'$(UseGatherBinaries)' == 'true'">
+  <Target Name="GatherBinariesToBeSigned" AfterTargets="CopyFilesToOutputDirectory">
    <ItemGroup>
      <BinariesToBeSigned Include="$(OutDir)$(AssemblyName).dll" />
      <BinariesToBeSigned Include="$(OutDir)**\$(AssemblyName).resources.dll" />