diff options
author | Matt Mitchell <mmitche@microsoft.com> | 2018-08-13 11:15:05 -0700 |
---|---|---|
committer | Matt Mitchell <mmitche@microsoft.com> | 2018-11-20 14:34:12 -0800 |
commit | 557c8f0078b01a220077f02bc703c4a16c3e4e41 (patch) | |
tree | 54ab427d22a03da56e529583c2bbf64a67d51ca0 /src | |
parent | a9b57bd4fe194b30b3c6e9a85a316fc218f474be (diff) | |
download | coreclr-557c8f0078b01a220077f02bc703c4a16c3e4e41.tar.gz coreclr-557c8f0078b01a220077f02bc703c4a16c3e4e41.tar.bz2 coreclr-557c8f0078b01a220077f02bc703c4a16c3e4e41.zip |
Sign api-ms-win-core-xstate-l2-1-0.dll
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.
Diffstat (limited to 'src')
-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 | 6 |
3 files changed, 18 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 200ca18fcf..648d7aac2b 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'" /> <CrossGenBinary 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 4f34707c43..b7d0e8b797 100644 --- a/src/build.proj +++ b/src/build.proj @@ -43,6 +43,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 413eb60c1a..e1540c005f 100644 --- a/src/sign.builds +++ b/src/sign.builds @@ -15,6 +15,12 @@ <WindowsNativeLocation Include="$(BinDir)*.dll" /> <WindowsNativeLocation 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 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" /> |