Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Add os supported versions to host #4700

Merged
merged 6 commits into from
Oct 31, 2018
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/corehost/cli/apphost/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,10 @@ include(../exe.cmake)
add_definitions(-DFEATURE_APPHOST=1)

install_library_and_symbols (apphost)

# Disable manifest generation into the file .exe on Windows
if(WIN32)
set_property(TARGET ${PROJECT_NAME} PROPERTY
LINK_FLAGS "/MANIFEST:NO"
)
endif()
6 changes: 6 additions & 0 deletions src/corehost/cli/dotnet/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ project(dotnet)
set(DOTNET_HOST_EXE_NAME "dotnet")
set(SOURCES
../fxr/fx_ver.cpp)

if(WIN32)
list(APPEND SOURCES
dotnet.manifest)
endif()

include(../exe.cmake)

install_library_and_symbols (dotnet)
19 changes: 19 additions & 0 deletions src/corehost/cli/dotnet/dotnet.manifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
ericstj marked this conversation as resolved.
Show resolved Hide resolved
<!-- A list of the Windows versions that this application has been tested on and is
is designed to work with. Uncomment the appropriate elements and Windows will
automatically selected the most compatible environment. -->

<!-- Windows 7 -->
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />

<!-- Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />

<!-- Windows 10 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
</application>
</compatibility>
</assembly>