mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'release/5.0.2xx' into master

Browse source
This commit is contained in:
William Li 2021-01-25 21:40:24 -08:00
commit b056ae09eb
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/redist/targets/Signing.targets
View file

@ -5,7 +5,7 @@
<!-- Import Arcade's Sign.props, when then imports the eng/Signing.props for this repo --> <!-- Import Arcade's Sign.props, when then imports the eng/Signing.props for this repo -->
<Import Project="../tools/Sign.props" Sdk="Microsoft.DotNet.Arcade.Sdk" /> <Import Project="../tools/Sign.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
<Target Name="SetSignProps" <Target Name="SetSignProps"
Condition="'$(SignCoreSdk)' == 'true'"> Condition="'$(SignCoreSdk)' == 'true'">
@ -38,7 +38,7 @@
<_DesktopMSBuildPath Condition="$(_DesktopMSBuildRequired)">$(_VSInstallDir)\MSBuild\15.0\Bin\msbuild.exe</_DesktopMSBuildPath> <_DesktopMSBuildPath Condition="$(_DesktopMSBuildRequired)">$(_VSInstallDir)\MSBuild\15.0\Bin\msbuild.exe</_DesktopMSBuildPath>
</PropertyGroup> </PropertyGroup>
</Target> </Target>
<Target Name="SignLayout" <Target Name="SignLayout"
Condition="'$(SignCoreSdk)' == 'true' and '$(PostBuildSign)' != 'true'" Condition="'$(SignCoreSdk)' == 'true' and '$(PostBuildSign)' != 'true'"
DependsOnTargets="SetSignProps"> DependsOnTargets="SetSignProps">
@ -49,8 +49,8 @@
$(SdkOutputDirectory)**/VBCSCompiler.dll; $(SdkOutputDirectory)**/VBCSCompiler.dll;
$(SdkOutputDirectory)**/vbc.exe; $(SdkOutputDirectory)**/vbc.exe;
$(SdkOutputDirectory)**/vbc.dll; $(SdkOutputDirectory)**/vbc.dll;
$(SdkOutputDirectory)**/fsc.exe; $(SdkOutputDirectory)**/fsc.dll;
$(SdkOutputDirectory)**/fsi.exe; $(SdkOutputDirectory)**/fsi.dll;
$(SdkOutputDirectory)**/FSharp.*.dll; $(SdkOutputDirectory)**/FSharp.*.dll;
$(SdkOutputDirectory)**/Interactive.DependencyManager.dll; $(SdkOutputDirectory)**/Interactive.DependencyManager.dll;
$(SdkOutputDirectory)**/dotnet.dll; $(SdkOutputDirectory)**/dotnet.dll;
@ -74,12 +74,14 @@
$(SdkOutputDirectory)**/MessagePack.Annotations.dll; $(SdkOutputDirectory)**/MessagePack.Annotations.dll;
$(SdkOutputDirectory)**/MessagePack.dll; $(SdkOutputDirectory)**/MessagePack.dll;
$(SdkOutputDirectory)**/Nerdbank.Streams.dll; $(SdkOutputDirectory)**/Nerdbank.Streams.dll;
$(SdkOutputDirectory)**/StreamJsonRpc.dll" /> $(SdkOutputDirectory)**/StreamJsonRpc.dll;
$(SdkOutputDirectory)**/dotnet-watch*.dll;
$(SdkOutputDirectory)**/DotNetWatchTasks.dll;" />
</ItemGroup> </ItemGroup>
<Error Condition="'$(AllowEmptySignList)' != 'true' AND '@(LayoutFilesToSign)' == ''" <Error Condition="'$(AllowEmptySignList)' != 'true' AND '@(LayoutFilesToSign)' == ''"
Text="List of files to sign is empty. Make sure that LayoutFilesToSign is configured correctly." /> Text="List of files to sign is empty. Make sure that LayoutFilesToSign is configured correctly." />
<Microsoft.DotNet.SignTool.SignToolTask <Microsoft.DotNet.SignTool.SignToolTask
DryRun="$(_DryRun)" DryRun="$(_DryRun)"
TestSign="$(_TestSign)" TestSign="$(_TestSign)"
@ -93,7 +95,7 @@
MSBuildPath="$(_DesktopMSBuildPath)" MSBuildPath="$(_DesktopMSBuildPath)"
SNBinaryPath="$(NuGetPackageRoot)sn\$(SNVersion)\sn.exe" SNBinaryPath="$(NuGetPackageRoot)sn\$(SNVersion)\sn.exe"
MicroBuildCorePath="$(NuGetPackageRoot)microbuild.core\$(MicroBuildCoreVersion)"/> MicroBuildCorePath="$(NuGetPackageRoot)microbuild.core\$(MicroBuildCoreVersion)"/>
</Target> </Target>
<Target Name="SignSdkMsi" <Target Name="SignSdkMsi"
@ -150,7 +152,7 @@
<!-- Extract engine from bundle --> <!-- Extract engine from bundle -->
<Exec Command="$(WixRoot)/insignia.exe -ib $(CombinedFrameworkSdkHostMSIInstallerFile) -o $(CombinedFrameworkSdkHostBundleEngineName)" /> <Exec Command="$(WixRoot)/insignia.exe -ib $(CombinedFrameworkSdkHostMSIInstallerFile) -o $(CombinedFrameworkSdkHostBundleEngineName)" />
<!-- Sign engine--> <!-- Sign engine-->
<ItemGroup> <ItemGroup>
<EngineFileToSign Include="$(CombinedFrameworkSdkHostBundleEngineName)" /> <EngineFileToSign Include="$(CombinedFrameworkSdkHostBundleEngineName)" />
@ -168,10 +170,10 @@
MSBuildPath="$(_DesktopMSBuildPath)" MSBuildPath="$(_DesktopMSBuildPath)"
SNBinaryPath="$(NuGetPackageRoot)sn\$(SNVersion)\sn.exe" SNBinaryPath="$(NuGetPackageRoot)sn\$(SNVersion)\sn.exe"
MicroBuildCorePath="$(NuGetPackageRoot)microbuild.core\$(MicroBuildCoreVersion)"/> MicroBuildCorePath="$(NuGetPackageRoot)microbuild.core\$(MicroBuildCoreVersion)"/>
<!-- Reattach engine to bundle --> <!-- Reattach engine to bundle -->
<Exec Command="$(WixRoot)/insignia.exe -ab $(CombinedFrameworkSdkHostBundleEngineName) $(CombinedFrameworkSdkHostMSIInstallerFile) -o $(CombinedFrameworkSdkHostMSIInstallerFile)" /> <Exec Command="$(WixRoot)/insignia.exe -ab $(CombinedFrameworkSdkHostBundleEngineName) $(CombinedFrameworkSdkHostMSIInstallerFile) -o $(CombinedFrameworkSdkHostMSIInstallerFile)" />
<!-- Sign bundle --> <!-- Sign bundle -->
<ItemGroup> <ItemGroup>
<BundleFileToSign Include="$(CombinedFrameworkSdkHostMSIInstallerFile)" /> <BundleFileToSign Include="$(CombinedFrameworkSdkHostMSIInstallerFile)" />