diff options
| author | wtgodbe <wigodbe@microsoft.com> | 2017-04-03 13:29:27 -0700 |
|---|---|---|
| committer | wtgodbe <wigodbe@microsoft.com> | 2017-04-03 14:07:30 -0700 |
| commit | 32aa2184cd26942aa01a6d44fc3eea1f80dc6600 (patch) | |
| tree | c18726e7a7ae4a13b35eabba70e2d7a1b053c702 /src/.nuget | |
| parent | fe7a5f082ca14f5945eedc8d0d23311c0d3701a0 (diff) | |
| download | coreclr-32aa2184cd26942aa01a6d44fc3eea1f80dc6600.tar.gz coreclr-32aa2184cd26942aa01a6d44fc3eea1f80dc6600.tar.bz2 coreclr-32aa2184cd26942aa01a6d44fc3eea1f80dc6600.zip | |
Publish VC Redist DLLs as part of CoreCLR Package
Diffstat (limited to 'src/.nuget')
| -rw-r--r-- | src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props | 1 | ||||
| -rw-r--r-- | src/.nuget/dir.targets | 4 |
2 files changed, 5 insertions, 0 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 9c46df94aa..436901ebd2 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 @@ -20,6 +20,7 @@ <NativeBinary Include="$(BinDir)mscorrc.dll" /> <NativeBinary Include="$(BinDir)sos.dll" /> <NativeBinary Include="$(BinDir)System.Private.CoreLib.ni.dll" /> + <NativeBinary Include="$(UniversalCRTSDKDir)Redist\ucrt\DLLs\$(BuildArch)\*.dll" Condition="'$(BuildType)'=='Release' AND '$(BuildArch)' != 'arm64'" /> <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll" /> <ArchitectureSpecificLibFile Include="$(BinDir)SOS.NETCore.dll" /> <ArchitectureSpecificToolFile Include="$(BinDir)crossgen.exe" /> diff --git a/src/.nuget/dir.targets b/src/.nuget/dir.targets index 6f7bae6b10..49e550a4b7 100644 --- a/src/.nuget/dir.targets +++ b/src/.nuget/dir.targets @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + + <Target Name="VerifyVCRedist" BeforeTargets="GetSymbolPackageFiles" Condition="'$(_runtimeOSFamily)' == 'win'"> + <Error Condition="'$(UniversalCRTSDKDir)' == ''" Text="Unable to find VC Redist binaries - check that UniversalCRTSDKDir environment variable is set" /> + </Target> <!-- Finds symbol files and injects them into the package build. --> |