Leverage new polyfills from PolyShim

Author: Tyrrrz

DotnetRuntimeBootstrapper.AppHost.Cli/DotnetRuntimeBootstrapper.AppHost.Cli.csproj

@@ -16,7 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="CSharpier.MsBuild" Version="1.2.1" PrivateAssets="all" />
-    <PackageReference Include="PolyShim" Version="1.15.0" PrivateAssets="all" />
+    <PackageReference Include="PolyShim" Version="2.0.0" PrivateAssets="all" />
     <PackageReference Include="QuickJson" Version="1.1.0" PrivateAssets="all" />
   </ItemGroup>
 

DotnetRuntimeBootstrapper.AppHost.Core/BootstrapperBase.cs

@@ -154,7 +154,7 @@ public int Run(string[] args)
         {
             var targetAssembly = TargetAssembly.Resolve(
                 Path.Combine(
-                    Path.GetDirectoryName(Environment.GetProcessPath())
+                    Path.GetDirectoryName(Environment.ProcessPath)
                         ?? AppDomain.CurrentDomain.BaseDirectory,
                     Configuration.TargetFileName
                 )

DotnetRuntimeBootstrapper.AppHost.Core/Dotnet/DotnetHost.cs

@@ -4,7 +4,6 @@
 using System.Runtime.InteropServices;
 using System.Text;
 using DotnetRuntimeBootstrapper.AppHost.Core.Native;
-using DotnetRuntimeBootstrapper.AppHost.Core.Utils.Extensions;
 
 namespace DotnetRuntimeBootstrapper.AppHost.Core.Dotnet;
 
@@ -155,7 +154,7 @@ private static string GetHostResolverFilePath()
 
         var hostResolverFilePath = (
             from dirPath in Directory.GetDirectories(hostResolverRootDirPath)
-            let version = Version.TryParse(Path.GetFileName(dirPath))
+            let version = Version.TryParse(Path.GetFileName(dirPath), out var v) ? v : null
             let filePath = Path.Combine(dirPath, "hostfxr.dll")
             where version is not null
             where File.Exists(filePath)

DotnetRuntimeBootstrapper.AppHost.Core/Dotnet/DotnetRuntime.cs

@@ -44,7 +44,9 @@ public static DotnetRuntime[] GetAllInstalled()
             from runtimeDirPath in Directory.GetDirectories(sharedDirPath)
             let name = Path.GetFileName(runtimeDirPath)
             from runtimeVersionDirPath in Directory.GetDirectories(runtimeDirPath)
-            let version = Version.TryParse(Path.GetFileName(runtimeVersionDirPath))
+            let version = Version.TryParse(Path.GetFileName(runtimeVersionDirPath), out var v)
+                ? v
+                : null
             where version is not null
             select new DotnetRuntime(name, version)
         ).ToArray();
@@ -55,7 +57,10 @@ public static DotnetRuntime[] GetAllTargets(string runtimeConfigFilePath)
         static DotnetRuntime ParseRuntime(JsonNode json)
         {
             var name = json.TryGetChild("name")?.TryGetString();
-            var version = json.TryGetChild("version")?.TryGetString()?.Pipe(Version.TryParse);
+
+            var version = json.TryGetChild("version")
+                ?.TryGetString()
+                ?.Pipe(s => Version.TryParse(s, out var v) ? v : null);
 
             return !string.IsNullOrEmpty(name) && version is not null
                 ? new DotnetRuntime(name, version)

DotnetRuntimeBootstrapper.AppHost.Core/DotnetRuntimeBootstrapper.AppHost.Core.csproj

@@ -5,7 +5,7 @@
 
   <ItemGroup>
     <PackageReference Include="CSharpier.MsBuild" Version="1.2.1" PrivateAssets="all" />
-    <PackageReference Include="PolyShim" Version="1.15.0" PrivateAssets="all" />
+    <PackageReference Include="PolyShim" Version="2.0.0" PrivateAssets="all" />
     <PackageReference Include="QuickJson" Version="1.1.0" PrivateAssets="all" />
   </ItemGroup>
 

DotnetRuntimeBootstrapper.AppHost.Core/Utils/Extensions/EnvironmentExtensions.cs

@@ -1,16 +1,13 @@
 using System;
 using System.Collections;
 using System.Linq;
-using System.Reflection;
 
 namespace DotnetRuntimeBootstrapper.AppHost.Core.Utils.Extensions;
 
 internal static class EnvironmentExtensions
 {
     extension(Environment)
     {
-        public static string GetProcessPath() => Assembly.GetExecutingAssembly().Location;
-
         public static void RefreshEnvironmentVariables()
         {
             var machineEnvironmentVariables = Environment

DotnetRuntimeBootstrapper.AppHost.Core/Utils/Extensions/PathExtensions.cs

@@ -1,29 +1,22 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using System.Linq;
 using System.Text;
 
 namespace DotnetRuntimeBootstrapper.AppHost.Core.Utils.Extensions;
 
 internal static class PathExtensions
 {
-    private static readonly Random Random = new();
-
     extension(Path)
     {
-        public static string Combine(params IEnumerable<string> paths) =>
-            paths.Aggregate(Path.Combine);
-
         public static string GenerateTempFilePath(string fileNameBase)
         {
             static string GenerateSalt()
             {
                 var buffer = new StringBuilder(8);
 
                 for (var i = 0; i < 8; i++)
-                    buffer.Append(Random.Next(0, 10).ToString(CultureInfo.InvariantCulture));
+                    buffer.Append(Random.Shared.Next(0, 10).ToString(CultureInfo.InvariantCulture));
 
                 return buffer.ToString();
             }

DotnetRuntimeBootstrapper.AppHost.Core/Utils/Extensions/VersionExtensions.cs

@@ -17,7 +17,7 @@
 
   <ItemGroup>
     <PackageReference Include="CSharpier.MsBuild" Version="1.2.1" PrivateAssets="all" />
-    <PackageReference Include="PolyShim" Version="1.15.0" PrivateAssets="all" />
+    <PackageReference Include="PolyShim" Version="2.0.0" PrivateAssets="all" />
     <PackageReference Include="QuickJson" Version="1.1.0" PrivateAssets="all" />
   </ItemGroup>
 

DotnetRuntimeBootstrapper.AppHost.Gui/DotnetRuntimeBootstrapper.AppHost.Gui.csproj

@@ -42,7 +42,7 @@
       PrivateAssets="all"
       GeneratePathProperty="true"
     />
-    <PackageReference Include="PolyShim" Version="1.15.0" PrivateAssets="all" />
+    <PackageReference Include="PolyShim" Version="2.0.0" PrivateAssets="all" />
     <PackageReference
       Include="Ressy"
       Version="1.0.3"