Stabilize build

rosolko · rosolko · commit 2bfdfb085eb5 · 2022-09-16T15:54:26.000+03:00
diff --git a/WebDriverManager/DriverConfigs/Impl/ChromeConfig.cs b/WebDriverManager/DriverConfigs/Impl/ChromeConfig.cs
@@ -34,8 +34,11 @@ private string GetUrl()
 #if NETSTANDARD
             if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             {
-                var extension = RuntimeInformation.ProcessArchitecture == Architecture.Arm64 ? "_m1" : "";
-                return $"{BaseVersionPatternUrl}chromedriver_mac64{extension}.zip";
+                var architectureExtension =
+                    RuntimeInformation.ProcessArchitecture == System.Runtime.InteropServices.Architecture.Arm64
+                        ? "_m1"
+                        : "";
+                return $"{BaseVersionPatternUrl}chromedriver_mac64{architectureExtension}.zip";
             }
 
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
@@ -88,6 +91,7 @@ public virtual string GetMatchingBrowserVersion()
             {
                 throw new Exception("Not able to get chrome version or not installed");
             }
+
             var chromeBrowserVersion = VersionHelper.GetVersionWithoutRevision(rawChromeBrowserVersion);
             var url = ExactReleaseVersionPatternUrl.Replace("<version>", chromeBrowserVersion);
             return GetLatestVersion(url);
diff --git a/WebDriverManager/DriverConfigs/Impl/EdgeConfig.cs b/WebDriverManager/DriverConfigs/Impl/EdgeConfig.cs
@@ -26,8 +26,11 @@ public virtual string GetUrl64()
 #if NETSTANDARD
             if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             {
-                var extension = RuntimeInformation.ProcessArchitecture == Architecture.Arm64 ? "_m1" : "";
-                return $"{BaseVersionPatternUrl}edgedriver_mac64{extension}.zip";
+                var architectureExtension =
+                    RuntimeInformation.ProcessArchitecture == System.Runtime.InteropServices.Architecture.Arm64
+                        ? "_m1"
+                        : "";
+                return $"{BaseVersionPatternUrl}edgedriver_mac64{architectureExtension}.zip";
             }
 
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
diff --git a/WebDriverManager/DriverConfigs/Impl/FirefoxConfig.cs b/WebDriverManager/DriverConfigs/Impl/FirefoxConfig.cs
@@ -10,7 +10,8 @@ namespace WebDriverManager.DriverConfigs.Impl
 {
     public class FirefoxConfig : IDriverConfig
     {
-        private const string DownloadUrl = "https://github.com/mozilla/geckodriver/releases/download/v<version>/geckodriver-v<version>-";
+        private const string DownloadUrl =
+            "https://github.com/mozilla/geckodriver/releases/download/v<version>/geckodriver-v<version>-";
 
         public virtual string GetName()
         {
@@ -81,8 +82,11 @@ private static string GetUrl(Architecture architecture)
 #if NETSTANDARD
             if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             {
-                var extension = RuntimeInformation.ProcessArchitecture == Architecture.Arm64 ? "-aarch64" : "";
-                return $"{DownloadUrl}macos{extension}.tar.gz";
+                var architectureExtension =
+                    RuntimeInformation.ProcessArchitecture == System.Runtime.InteropServices.Architecture.Arm64
+                        ? "-aarch64"
+                        : "";
+                return $"{DownloadUrl}macos{architectureExtension}.tar.gz";
             }
 
             return RuntimeInformation.IsOSPlatform(OSPlatform.Linux)

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,11 @@ private string GetUrl()`
`34`	`34`	`#if NETSTANDARD`
`35`	`35`	`if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))`
`36`	`36`	`{`
`37`		`- var extension = RuntimeInformation.ProcessArchitecture == Architecture.Arm64 ? "_m1" : "";`
`38`		`- return $"{BaseVersionPatternUrl}chromedriver_mac64{extension}.zip";`
	`37`	`+ var architectureExtension =`
	`38`	`+ RuntimeInformation.ProcessArchitecture == System.Runtime.InteropServices.Architecture.Arm64`
	`39`	`+ ? "_m1"`
	`40`	`+ : "";`
	`41`	`+ return $"{BaseVersionPatternUrl}chromedriver_mac64{architectureExtension}.zip";`
`39`	`42`	`}`
`40`	`43`
`41`	`44`	`if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))`
`@@ -88,6 +91,7 @@ public virtual string GetMatchingBrowserVersion()`
`88`	`91`	`{`
`89`	`92`	`throw new Exception("Not able to get chrome version or not installed");`
`90`	`93`	`}`
	`94`	`+`
`91`	`95`	`var chromeBrowserVersion = VersionHelper.GetVersionWithoutRevision(rawChromeBrowserVersion);`
`92`	`96`	`var url = ExactReleaseVersionPatternUrl.Replace("<version>", chromeBrowserVersion);`
`93`	`97`	`return GetLatestVersion(url);`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,11 @@ public virtual string GetUrl64()`
`26`	`26`	`#if NETSTANDARD`
`27`	`27`	`if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))`
`28`	`28`	`{`
`29`		`- var extension = RuntimeInformation.ProcessArchitecture == Architecture.Arm64 ? "_m1" : "";`
`30`		`- return $"{BaseVersionPatternUrl}edgedriver_mac64{extension}.zip";`
	`29`	`+ var architectureExtension =`
	`30`	`+ RuntimeInformation.ProcessArchitecture == System.Runtime.InteropServices.Architecture.Arm64`
	`31`	`+ ? "_m1"`
	`32`	`+ : "";`
	`33`	`+ return $"{BaseVersionPatternUrl}edgedriver_mac64{architectureExtension}.zip";`
`31`	`34`	`}`
`32`	`35`
`33`	`36`	`if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,8 @@ namespace WebDriverManager.DriverConfigs.Impl`
`10`	`10`	`{`
`11`	`11`	`public class FirefoxConfig : IDriverConfig`
`12`	`12`	`{`
`13`		`- private const string DownloadUrl = "https://github.com/mozilla/geckodriver/releases/download/v<version>/geckodriver-v<version>-";`
	`13`	`+ private const string DownloadUrl =`
	`14`	`+ "https://github.com/mozilla/geckodriver/releases/download/v<version>/geckodriver-v<version>-";`
`14`	`15`
`15`	`16`	`public virtual string GetName()`
`16`	`17`	`{`
`@@ -81,8 +82,11 @@ private static string GetUrl(Architecture architecture)`
`81`	`82`	`#if NETSTANDARD`
`82`	`83`	`if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))`
`83`	`84`	`{`
`84`		`- var extension = RuntimeInformation.ProcessArchitecture == Architecture.Arm64 ? "-aarch64" : "";`
`85`		`- return $"{DownloadUrl}macos{extension}.tar.gz";`
	`85`	`+ var architectureExtension =`
	`86`	`+ RuntimeInformation.ProcessArchitecture == System.Runtime.InteropServices.Architecture.Arm64`
	`87`	`+ ? "-aarch64"`
	`88`	`+ : "";`
	`89`	`+ return $"{DownloadUrl}macos{architectureExtension}.tar.gz";`
`86`	`90`	`}`
`87`	`91`
`88`	`92`	`return RuntimeInformation.IsOSPlatform(OSPlatform.Linux)`