Fix signing of swix project output

This fixes a signing regression caused be #25751. That changed us to
directly call the SWIX build props / targets vs. getting them implicitly
from the microbuild props / targets. One of the behaviors that the
microbuild props / targets had that wasn't accounted for was the signing
of the VSIX after they are constructed. Hence this lead to signing
errors on insertion.

This PR fixes that by making the following changes:

1. Adds SWIX VSIX to SignToolData.json so they are accounted for during
normal batch signing.
1. Moves the SWIX build to the pre-sign portion of our build.
1. Removes the references from VSMAN -> SWIX. These references are there
only to enforce ordering which is unnecessary. Having them remain risks
that building the VSMAN will cause the SWIX to be re-built which could
possibly invalidate signing.
上级 0ad00b27
...@@ -144,7 +144,9 @@ ...@@ -144,7 +144,9 @@
"Vsix\\VisualStudioSetup.Next\\Roslyn.VisualStudio.Setup.Next.vsix", "Vsix\\VisualStudioSetup.Next\\Roslyn.VisualStudio.Setup.Next.vsix",
"Vsix\\VisualStudioSetup\\Roslyn.VisualStudio.Setup.vsix", "Vsix\\VisualStudioSetup\\Roslyn.VisualStudio.Setup.vsix",
"Vsix\\Roslyn\\RoslynDeployment.vsix", "Vsix\\Roslyn\\RoslynDeployment.vsix",
"Vsix\\VisualStudioIntegrationTestSetup\\Microsoft.VisualStudio.IntegrationTest.Setup.vsix" "Vsix\\VisualStudioIntegrationTestSetup\\Microsoft.VisualStudio.IntegrationTest.Setup.vsix",
"Vsix\\CodeAnalysisCompilers\\Microsoft.CodeAnalysis.Compilers.vsix",
"Vsix\\PortableFacades\\PortableFacades.vsix"
] ]
}, },
{ {
...@@ -224,14 +226,19 @@ ...@@ -224,14 +226,19 @@
"System.IO.Pipes.AccessControl.dll", "System.IO.Pipes.AccessControl.dll",
"System.IO.Pipes.dll", "System.IO.Pipes.dll",
"System.IO.dll", "System.IO.dll",
"System.Net.Security.dll",
"System.Net.Sockets.dll",
"System.Reflection.Metadata.1.0.21.nupkg", "System.Reflection.Metadata.1.0.21.nupkg",
"System.Reflection.Metadata.dll", "System.Reflection.Metadata.dll",
"System.Reflection.TypeExtensions.dll",
"System.Reflection.dll", "System.Reflection.dll",
"System.Resources.Reader.dll", "System.Resources.Reader.dll",
"System.Runtime.InteropServices.RuntimeInformation.dll", "System.Runtime.InteropServices.RuntimeInformation.dll",
"System.Runtime.Serialization.Primitives.dll",
"System.Security.AccessControl.dll", "System.Security.AccessControl.dll",
"System.Security.Claims.dll", "System.Security.Claims.dll",
"System.Security.Cryptography.Algorithms.dll", "System.Security.Cryptography.Algorithms.dll",
"System.Security.Cryptography.Csp.dll",
"System.Security.Cryptography.Encoding.dll", "System.Security.Cryptography.Encoding.dll",
"System.Security.Cryptography.Primitives.dll", "System.Security.Cryptography.Primitives.dll",
"System.Security.Cryptography.X509Certificates.dll", "System.Security.Cryptography.X509Certificates.dll",
......
...@@ -286,6 +286,10 @@ function Build-ExtraSignArtifacts() { ...@@ -286,6 +286,10 @@ function Build-ExtraSignArtifacts() {
Run-MSBuild "..\Compilers\Server\VBCSCompiler\VBCSCompiler.csproj" "/p:TargetFramework=netcoreapp2.0 /t:PublishWithoutBuilding" Run-MSBuild "..\Compilers\Server\VBCSCompiler\VBCSCompiler.csproj" "/p:TargetFramework=netcoreapp2.0 /t:PublishWithoutBuilding"
Write-Host "Publishing MSBuildTask" Write-Host "Publishing MSBuildTask"
Run-MSBuild "..\Compilers\Core\MSBuildTask\MSBuildTask.csproj" "/p:TargetFramework=netcoreapp2.0 /t:PublishWithoutBuilding" Run-MSBuild "..\Compilers\Core\MSBuildTask\MSBuildTask.csproj" "/p:TargetFramework=netcoreapp2.0 /t:PublishWithoutBuilding"
Write-Host "Building PortableFacades Swix"
Run-MSBuild "DevDivVsix\PortableFacades\PortableFacades.swixproj"
Write-Host "Building CompilersCodeAnalysis Swix"
Run-MSBuild "DevDivVsix\CompilersPackage\Microsoft.CodeAnalysis.Compilers.swixproj"
$dest = @($configDir) $dest = @($configDir)
foreach ($dir in $dest) { foreach ($dir in $dest) {
......
...@@ -22,10 +22,6 @@ ...@@ -22,10 +22,6 @@
<Import Project="$(SwixBuildPath)build\MicroBuild.Plugins.*.targets" /> <Import Project="$(SwixBuildPath)build\MicroBuild.Plugins.*.targets" />
<Target Name="BeforeBuild">
<MSBuild Projects="Microsoft.CodeAnalysis.Compilers.swixproj" Targets="Build" />
</Target>
<Target Name="ValidateManifest" /> <Target Name="ValidateManifest" />
<!-- Disable automatic signing. This will be signed in the batch phase --> <!-- Disable automatic signing. This will be signed in the batch phase -->
......
...@@ -22,10 +22,6 @@ ...@@ -22,10 +22,6 @@
<Import Project="$(SwixBuildPath)build\MicroBuild.Plugins.*.targets" /> <Import Project="$(SwixBuildPath)build\MicroBuild.Plugins.*.targets" />
<Target Name="BeforeBuild">
<MSBuild Projects="PortableFacades.swixproj" Targets="Build" />
</Target>
<Target Name="ValidateManifest" /> <Target Name="ValidateManifest" />
<!-- Disable automatic signing. This will be signed in the batch phase --> <!-- Disable automatic signing. This will be signed in the batch phase -->
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册