diff options
| author | Elinor Fung <47805090+elinor-fung@users.noreply.github.com> | 2019-05-28 16:09:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-28 16:09:46 -0700 |
| commit | 052042e8268d8f6e8743a7505666016c7b71f26c (patch) | |
| tree | 710baa08fabf08feac39f323b794e0070e3f3c32 | |
| parent | ff39e7f372515ecefac3f30640bffbeafc20adb6 (diff) | |
| download | coreclr-052042e8268d8f6e8743a7505666016c7b71f26c.tar.gz coreclr-052042e8268d8f6e8743a7505666016c7b71f26c.tar.bz2 coreclr-052042e8268d8f6e8743a7505666016c7b71f26c.zip | |
Stop using BuildTools for signing (#24808)
| -rw-r--r-- | dir.common.props | 4 | ||||
| -rw-r--r-- | eng/Signing.props | 48 | ||||
| -rw-r--r-- | src/.nuget/packaging.props | 3 |
3 files changed, 12 insertions, 43 deletions
diff --git a/dir.common.props b/dir.common.props index 70382d60e5..ba226cfc9b 100644 --- a/dir.common.props +++ b/dir.common.props @@ -99,6 +99,10 @@ <!-- We are only tracking Linux Distributions for Nuget RID mapping --> <DistroRid Condition="'$(TargetsLinux)' == 'true'">$(__DistroRid)</DistroRid> + <!-- Folder for cross target components --> + <CrossTargetComponentFolder Condition="'$(BuildArch)' == 'arm64'">x64</CrossTargetComponentFolder> + <CrossTargetComponentFolder Condition="'$(BuildArch)' == 'arm' and '$(TargetsWindows)' == 'true'">x86</CrossTargetComponentFolder> + <CrossTargetComponentFolder Condition="'$(BuildArch)' == 'arm' and '$(TargetsLinux)' == 'true'">x64</CrossTargetComponentFolder> </PropertyGroup> </Project> diff --git a/eng/Signing.props b/eng/Signing.props index 1ad6a4b791..659bb4a36e 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -1,56 +1,24 @@ <Project> - <Import Project="..\dir.props"/> - <Import Project="..\dir.targets" /> - - <PropertyGroup> - <!-- The SignFiles target needs OutDir to be defined --> - <OutDir>$(BinDir)</OutDir> - </PropertyGroup> - - <UsingTask AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" TaskName="ReadSigningRequired" /> - + <Import Project="..\dir.common.props"/> + <ItemGroup> - <WindowsNativeLocation Include="$(BinDir)*.dll" /> - <WindowsNativeLocation Include="$(BinDir)*.exe" /> + <ItemsToSign Include="$(BinDir)*.dll" /> + <ItemsToSign Include="$(BinDir)*.exe" /> </ItemGroup> <ItemGroup Condition="'$(BuildArch)' == 'x86'"> <!-- Sign api-ms-win-core-xstate-l2-1-0 binary as it is only catalog signed in the current SDK. --> - <WindowsNativeLocation Condition="'$(BuildType)'=='Release'" Include="$(BinDir)Redist\ucrt\DLLs\$(BuildArch)\api-ms-win-core-xstate-l2-1-0.dll" /> + <ItemsToSign Condition="'$(BuildType)'=='Release'" Include="$(BinDir)Redist\ucrt\DLLs\$(BuildArch)\api-ms-win-core-xstate-l2-1-0.dll" /> </ItemGroup> <!-- sign the cross targeted files as well --> <ItemGroup Condition="'$(CrossTargetComponentFolder)' != ''"> - <WindowsNativeLocation Include="$(BinDir)$(CrossTargetComponentFolder)/*.dll" /> - <WindowsNativeLocation Include="$(BinDir)$(CrossTargetComponentFolder)/*.exe" /> + <ItemsToSign Include="$(BinDir)$(CrossTargetComponentFolder)/*.dll" /> + <ItemsToSign Include="$(BinDir)$(CrossTargetComponentFolder)/*.exe" /> </ItemGroup> - <Target Name="GenerateSignForWindowsNative"> - <!-- - Managed assemblies should already have a requires_signing file dropped so only generate - a requires_signing file for ones that don't exist which should leave just native assembies - --> - <WriteSigningRequired AuthenticodeSig="$(AuthenticodeSig)" - MarkerFile="%(WindowsNativeLocation.Identity).requires_signing" - Condition="!Exists('%(WindowsNativeLocation.Identity).requires_signing')" /> - </Target> - - <!-- populates item group ItemsToSign with the list of files to sign --> - <Target Name="GetFilesToSignItems" - DependsOnTargets="GenerateSignForWindowsNative" - BeforeTargets="ValidateSignFileListIsNotEmpty"> - <!-- read all of the marker files and populate the ItemsToSign item group --> - <ItemGroup> - <SignMarkerFile Include="$(OutDir)**\*.requires_signing" /> - </ItemGroup> - <ReadSigningRequired MarkerFiles="@(SignMarkerFile)"> - <Output TaskParameter="SigningMetadata" ItemName="ItemsToSign" /> - </ReadSigningRequired> - - <Message Importance="High" Text="Attempting to sign %(ItemsToSign.Identity) with authenticode='%(ItemsToSign.Authenticode)' and strongname='%(ItemsToSign.StrongName)'" /> - </Target> - <Target Name="ValidateSignFileListIsNotEmpty" BeforeTargets="Sign"> <Error Condition="'@(ItemsToSign)' == ''" Text="List of files to sign is empty" /> + <Message Importance="High" Text="Attempting to sign %(ItemsToSign.Identity)" /> </Target> </Project>
\ No newline at end of file diff --git a/src/.nuget/packaging.props b/src/.nuget/packaging.props index 1770963586..9bb3668f40 100644 --- a/src/.nuget/packaging.props +++ b/src/.nuget/packaging.props @@ -21,9 +21,6 @@ <!-- Define packaging attributes for cross target components --> <HasCrossTargetComponents Condition="'$(TargetsWindows)' == 'true' and ('$(PackagePlatform)' =='arm64' or '$(PackagePlatform)' =='arm')">true</HasCrossTargetComponents> <HasCrossTargetComponents Condition="'$(TargetsLinux)' == 'true' and ('$(PackagePlatform)' =='arm64' or '$(PackagePlatform)' =='arm') and '$(__DoCrossArchBuild)' == '1'">true</HasCrossTargetComponents> - <CrossTargetComponentFolder Condition="'$(PackagePlatform)' == 'arm64'">x64</CrossTargetComponentFolder> - <CrossTargetComponentFolder Condition="'$(PackagePlatform)' == 'arm' and '$(TargetsWindows)' == 'true'">x86</CrossTargetComponentFolder> - <CrossTargetComponentFolder Condition="'$(PackagePlatform)' == 'arm' and '$(TargetsLinux)' == 'true'">x64</CrossTargetComponentFolder> <!-- Created package output locations must be kept in sync with eng/build-job.yml --> <PackageOutputPath>$(PackagesBinDir)/pkg/</PackageOutputPath> |