diff options
Diffstat (limited to 'src/BuildIntegration/Microsoft.NETCore.Native.Windows.props')
| -rw-r--r-- | src/BuildIntegration/Microsoft.NETCore.Native.Windows.props | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/BuildIntegration/Microsoft.NETCore.Native.Windows.props b/src/BuildIntegration/Microsoft.NETCore.Native.Windows.props index eadca8826..b06165b8a 100644 --- a/src/BuildIntegration/Microsoft.NETCore.Native.Windows.props +++ b/src/BuildIntegration/Microsoft.NETCore.Native.Windows.props @@ -18,6 +18,8 @@ See the LICENSE file in the project root for more information. <CppCompiler>cl</CppCompiler> <CppLinker>link</CppLinker> <CppLibCreator>lib</CppLibCreator> + <FullRuntimeName>Runtime</FullRuntimeName> + <FullRuntimeName Condition="'$(ServerGarbageCollection)' != ''">Runtime.ServerGC</FullRuntimeName> </PropertyGroup> <!-- Part of workaround for lack of secondary build artifact import - https://github.com/Microsoft/msbuild/issues/2807 --> @@ -36,7 +38,9 @@ See the LICENSE file in the project root for more information. <ItemGroup> <NativeLibrary Condition="$(NativeCodeGen) == '' and $(NativeLib) == ''" Include="$(IlcPath)\sdk\bootstrapper.lib" /> <NativeLibrary Condition="$(NativeCodeGen) == '' and $(NativeLib) != ''" Include="$(IlcPath)\sdk\bootstrapperdll.lib" /> - <NativeLibrary Condition="$(NativeCodeGen) == ''" Include="$(IlcPath)\sdk\Runtime.lib" /> + <NativeLibrary Condition="$(NativeCodeGen) == ''" Include="$(IlcPath)\sdk\$(FullRuntimeName).lib" /> + <NativeLibrary Condition="$(NativeCodeGen) == ''" Include="$(IlcPath)\sdk\System.Private.TypeLoader.Native.lib" /> + <NativeLibrary Condition="$(NativeCodeGen) == '' and '$(ExperimentalJitSupport)' == 'true'" Include="$(IlcPath)\sdk\System.Private.Jit.Native.lib" /> <NativeLibrary Condition="$(NativeCodeGen) == 'cpp'" Include="$(IlcPath)\sdk\bootstrappercpp.lib" /> <NativeLibrary Condition="$(NativeCodeGen) == 'cpp'" Include="$(IlcPath)\sdk\PortableRuntime.lib" /> <NativeLibrary Condition="$(NativeCodeGen) == 'wasm'" Include="$(IlcPath)\sdk\bootstrappercpp.lib" /> @@ -61,10 +65,11 @@ See the LICENSE file in the project root for more information. <ItemGroup> <LinkerArg Condition="$(NativeLib) == 'Shared'" Include="/DLL" /> - <LinkerArg Include="@(NativeLibrary)" /> + <LinkerArg Include="@(NativeLibrary->'"%(Identity)"')" /> <LinkerArg Include="/NOLOGO /DEBUG /MANIFEST:NO" /> <!-- The runtime is not compatible with jump stubs inserted by incremental linking. --> <LinkerArg Include="/INCREMENTAL:NO" /> + <LinkerArg Condition="'$(OutputType)' == 'WinExe'" Include="/SUBSYSTEM:WINDOWS /ENTRY:wmainCRTStartup" /> </ItemGroup> <ItemGroup> |