diff options
Diffstat (limited to 'src/installer/managed/Microsoft.NET.HostModel/Bundle/TargetInfo.cs')
-rw-r--r-- | src/installer/managed/Microsoft.NET.HostModel/Bundle/TargetInfo.cs | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/installer/managed/Microsoft.NET.HostModel/Bundle/TargetInfo.cs b/src/installer/managed/Microsoft.NET.HostModel/Bundle/TargetInfo.cs index 87b1c65202e..1f6f61a7eee 100644 --- a/src/installer/managed/Microsoft.NET.HostModel/Bundle/TargetInfo.cs +++ b/src/installer/managed/Microsoft.NET.HostModel/Bundle/TargetInfo.cs @@ -27,6 +27,8 @@ namespace Microsoft.NET.HostModel.Bundle public TargetInfo(OSPlatform? os, Version targetFrameworkVersion) { + Version net50 = new Version(5, 0); + OS = os ?? HostOS; FrameworkVersion = targetFrameworkVersion ?? net50; @@ -69,21 +71,6 @@ namespace Microsoft.NET.HostModel.Bundle // The .net core 3 apphost doesn't care about semantics of FileType -- all files are extracted at startup. // However, the apphost checks that the FileType value is within expected bounds, so set it to the first enumeration. public FileType TargetSpecificFileType(FileType fileType) => (BundleVersion == 1) ? FileType.Unknown : fileType; - - // In .net core 3.x, bundle processing happens within the AppHost. - // Therefore HostFxr and HostPolicy can be bundled within the single-file app. - // In .net 5, bundle processing happens in HostFxr and HostPolicy libraries. - // Therefore, these libraries themselves cannot be bundled into the single-file app. - // This problem is mitigated by statically linking these host components with the AppHost. - // https://github.com/dotnet/runtime/issues/32823 - public bool ShouldExclude(string relativePath) => - (FrameworkVersion.Major != 3) && (relativePath.Equals(HostFxr) || relativePath.Equals(HostPolicy)); - - readonly Version net50 = new Version(5, 0); - string HostFxr => IsWindows ? "hostfxr.dll" : IsLinux ? "libhostfxr.so" : "libhostfxr.dylib"; - string HostPolicy => IsWindows ? "hostpolicy.dll" : IsLinux ? "libhostpolicy.so" : "libhostpolicy.dylib"; - - } } |