diff options
author | Matt Mitchell <mmitche@microsoft.com> | 2018-08-13 13:58:42 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-13 13:58:42 -0700 |
commit | f1c935854453382d2e55b7b51934eab8c3f46d1b (patch) | |
tree | 654c82752913ea33b31abaa9f935cfd30c37c564 | |
parent | 67a2105a01c28c87c94e45cf4614530386b3eb7e (diff) | |
download | coreclr-f1c935854453382d2e55b7b51934eab8c3f46d1b.tar.gz coreclr-f1c935854453382d2e55b7b51934eab8c3f46d1b.tar.bz2 coreclr-f1c935854453382d2e55b7b51934eab8c3f46d1b.zip |
Sign api-ms-win-core-xstate-l2-1-0.dll (#19451)
This file is only catalog signed in RS4. Sign during the build. To achieve this copy the CRT binaries locally rather than referencing from the UCRT location directly.
-rw-r--r-- | src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props | 2 | ||||
-rw-r--r-- | src/build.proj | 11 | ||||
-rw-r--r-- | src/sign.builds | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props index d01c38f3bc..6c3407c9b4 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props @@ -19,7 +19,7 @@ <NativeBinary Include="$(BinDir)mscorrc.debug.dll" /> <NativeBinary Include="$(BinDir)mscorrc.dll" /> <NativeBinary Include="$(BinDir)sos.dll" /> - <NativeBinary Include="$(UniversalCRTSDKDir)Redist\ucrt\DLLs\$(BuildArch)\*.dll" Condition="'$(BuildType)'=='Release' AND '$(BuildArch)' != 'arm64'" /> + <NativeBinary Include="$(BinDir)Redist\ucrt\DLLs\$(BuildArch)\*.dll" Condition="'$(BuildType)'=='Release' AND '$(BuildArch)' != 'arm64'" /> <NativeBinary Include="$(BinDir)System.Private.CoreLib.dll" /> <ArchitectureSpecificLibFile Include="$(BinDir)SOS.NETCore.dll" /> <ArchitectureSpecificToolFile Include="$(BinDir)crossgen.exe" /> diff --git a/src/build.proj b/src/build.proj index fce6571717..ad54931c72 100644 --- a/src/build.proj +++ b/src/build.proj @@ -38,6 +38,17 @@ DestinationFolder="$(BinDir)PDB" /> </Target> + <ItemGroup> + <UcrtFilesToCopy Include="$(UniversalCRTSDKDir)Redist\ucrt\DLLs\$(BuildArch)\*.dll" /> + </ItemGroup> + <!-- Copy the UCRT files from the windows kit directory to the local directory. + The api-*xstate.dll binary needs to be signed. --> + <Target Name="CopyUcrtFiles" AfterTargets="Build"> + <Copy Condition="'$(BuildType)'=='Release' AND '$(BuildArch)' != 'arm64'" + SourceFiles="@(UcrtFilesToCopy)" + DestinationFolder="$(BinDir)Redist\ucrt\DLLs\$(BuildArch)" /> + </Target> + <PropertyGroup> <RunEnforcePGO Condition="$(__EnforcePgo) == '1'">true</RunEnforcePGO> <RunEnforcePGO Condition="$(__BuildArch) == 'arm' OR $(__BuildArch) == 'arm64'">false</RunEnforcePGO> diff --git a/src/sign.builds b/src/sign.builds index 078784e0b4..3df7b68055 100644 --- a/src/sign.builds +++ b/src/sign.builds @@ -17,6 +17,8 @@ <!-- Ensure cross targeting components are signed properly --> <WindowsNativeLocation Include="$(BinDir)$(CrossTargetComponentFolder)\*.exe" /> <WindowsNativeLocation Include="$(BinDir)$(CrossTargetComponentFolder)\*.dll" /> + <!-- Sign api-ms-win-core-xstate-l2-1-0 binary as it is only catalog signed in the current SDK. --> + <WindowsNativeLocation Include="$(BinDir)Redist\ucrt\DLLs\api-ms-win-core-xstate-l2-1-0.dll" /> </ItemGroup> <!-- sign the cross targeted files as well --> <ItemGroup Condition="'$(CrossTargetComponentFolder)' != ''"> |