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

Commit

Permalink
Add os supported versions to host (#4700)
Browse files Browse the repository at this point in the history
Add a manifest to dotnet.exe with supported versions of Windows.
Also remove any manifest from apphost.exe as it will get the one from the app when it's used.
  • Loading branch information
vitek-karas authored Oct 31, 2018
1 parent 377bbe9 commit 16fc8e9
Show file tree
Hide file tree
Showing 6 changed files with 252 additions and 0 deletions.
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>
<!-- 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>
149 changes: 149 additions & 0 deletions src/test/Assets/TestProjects/TestWindowsOsShimsApp/Program.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
using System;
using System.Runtime.InteropServices;

namespace TestWindowsOsShimsApp
{
public static class Program
{
public static void Main(string[] args)
{
Console.WriteLine("Hello World!");
Console.WriteLine(string.Join(Environment.NewLine, args));
Console.WriteLine($"Framework Version:{GetFrameworkVersionFromAppDomain()}");

#if WINDOWS
Version osVersion = RtlGetVersion();
if (osVersion == null)
{
Console.WriteLine("Failed to get OS version through RtlGetVersion.");
}
else
{
Console.WriteLine($"Detected true OS version: {osVersion.Major}.{osVersion.Minor}");
if (OsVersionIsNewerThan(osVersion))
{
Console.WriteLine($"Reported OS version is newer or equal to the true OS version - no shims.");
}
else
{
Console.WriteLine($"Reported OS version is lower than the true OS version - shims in use.");
}
}
#endif
}

private static string GetFrameworkVersionFromAppDomain()
{
return System.AppDomain.CurrentDomain.GetData("FX_PRODUCT_VERSION") as string;
}

#if WINDOWS
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
internal struct OSVERSIONINFOEX
{

internal uint dwOSVersionInfoSize;
internal uint dwMajorVersion;
internal uint dwMinorVersion;
internal uint dwBuildNumber;
internal uint dwPlatformId;
[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)] //
internal string szCSDVersion;
internal ushort wServicePackMajor;
internal ushort wServicePackMinor;
internal ushort wSuiteMask;
internal byte wProductType;
internal byte wReserved;
}

[Flags]
enum ConditionMask : byte
{
VER_EQUAL = 1,
VER_GREATER = 2,
VER_GREATER_EQUAL = 3,
VER_LESS = 4,
VER_LESS_EQUAL = 5,
VER_AND = 6,
VER_OR = 7
}

[Flags]
enum TypeMask : uint
{
VER_MINORVERSION = 0x0000001,
VER_MAJORVERSION = 0x0000002,
VER_BUILDNUMBER = 0x0000004,
VER_PLATFORMID = 0x0000008,
VER_SERVICEPACKMINOR = 0x0000010,
VER_SERVICEPACKMAJOR = 0x0000020,
VER_SUITENAME = 0x0000040,
VER_PRODUCT_TYPE = 0x0000080
}

[StructLayout(LayoutKind.Sequential, CharSet=CharSet.Unicode)]
internal unsafe struct RTL_OSVERSIONINFOEX
{
internal uint dwOSVersionInfoSize;
internal uint dwMajorVersion;
internal uint dwMinorVersion;
internal uint dwBuildNumber;
internal uint dwPlatformId;
internal fixed char szCSDVersion[128];
}

[DllImport("ntdll.dll", ExactSpelling=true)]
private static extern int RtlGetVersion(ref RTL_OSVERSIONINFOEX lpVersionInformation);

[DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
[return: MarshalAs(UnmanagedType.Bool)]
private static extern bool VerifyVersionInfo(ref OSVERSIONINFOEX lpVersionInfo, TypeMask dwTypeMask, ulong dwlConditionMask);

[DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
private static extern ulong VerSetConditionMask(ulong dwlConditionMask, TypeMask dwTypeBitMask, ConditionMask dwConditionMask);

internal unsafe static int RtlGetVersionEx(out RTL_OSVERSIONINFOEX osvi)
{
osvi = new RTL_OSVERSIONINFOEX();
osvi.dwOSVersionInfoSize = (uint)sizeof(RTL_OSVERSIONINFOEX);
return RtlGetVersion(ref osvi);
}

internal static Version RtlGetVersion()
{
if (RtlGetVersionEx(out RTL_OSVERSIONINFOEX osvi) == 0)
{
return new Version((int)osvi.dwMajorVersion, (int)osvi.dwMinorVersion);
}
else
{
return null;
}
}

internal static bool OsVersionIsNewerThan(Version osVersion)
{
// check if newer than
OSVERSIONINFOEX osv = new OSVERSIONINFOEX()
{
dwOSVersionInfoSize = (uint)Marshal.SizeOf<OSVERSIONINFOEX>(),
dwMajorVersion = (uint)osVersion.Major,
dwMinorVersion = (uint)osVersion.Minor
};

var conditionMask = 0uL;
conditionMask = VerSetConditionMask(conditionMask, TypeMask.VER_MAJORVERSION, ConditionMask.VER_GREATER_EQUAL);
conditionMask = VerSetConditionMask(conditionMask, TypeMask.VER_MINORVERSION, ConditionMask.VER_GREATER_EQUAL);

if (VerifyVersionInfo(ref osv, TypeMask.VER_MAJORVERSION | TypeMask.VER_MINORVERSION, conditionMask))
{
return true;
}
else
{
return false;
}
}
#endif
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>$(NETCoreAppFramework)</TargetFramework>
<RuntimeIdentifier>$(TestTargetRid)</RuntimeIdentifier>
<OutputType>Exe</OutputType>
<RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
<DefineConstants Condition="'$(OS)' == 'Windows_NT'">WINDOWS;$(DefineConstants)</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

</Project>
59 changes: 59 additions & 0 deletions src/test/HostActivationTests/GivenThatICareAboutWindowsOsShims.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
using System;
using System.Runtime.InteropServices;
using Xunit;

namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.WindowsOsShims
{
public class GivenThatICareAboutWindowsOsShims : IClassFixture<GivenThatICareAboutWindowsOsShims.SharedTestState>
{
private SharedTestState sharedTestState;

public GivenThatICareAboutWindowsOsShims(SharedTestState fixture)
{
sharedTestState = fixture;
}

[Fact]
public void MuxerRunsPortableAppWithoutWindowsOsShims()
{
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
// Manifests are only supported on Windows OSes.
return;
}

TestProjectFixture portableAppFixture = sharedTestState.PortableTestWindowsOsShimsAppFixture.Copy();

portableAppFixture.BuiltDotnet.Exec(portableAppFixture.TestProject.AppDll)
.CaptureStdErr()
.CaptureStdOut()
.Execute()
.Should().Pass()
.And.HaveStdOutContaining("Reported OS version is newer or equal to the true OS version - no shims.");
}

// Testing the standalone version (apphost) would require to make a copy of the entire SDK
// and overwrite the apphost.exe in it. Currently this is just too expensive for one test (160MB of data).

public class SharedTestState : IDisposable
{
private static RepoDirectoriesProvider RepoDirectories { get; set; }

public TestProjectFixture PortableTestWindowsOsShimsAppFixture { get; set; }

public SharedTestState()
{
RepoDirectories = new RepoDirectoriesProvider();

PortableTestWindowsOsShimsAppFixture = new TestProjectFixture("TestWindowsOsShimsApp", RepoDirectories)
.EnsureRestored(RepoDirectories.CorehostPackages)
.PublishProject();
}

public void Dispose()
{
PortableTestWindowsOsShimsAppFixture.Dispose();
}
}
}
}

0 comments on commit 16fc8e9

Please sign in to comment.