[dotnet] Correct product version in http user agent (#12061)

nvborisenko · diemol · web-flow · commit 94303e0e651f · 2023-05-19T13:46:32.000+02:00
* Correct product version in http user agent

* Remove ununsed AssemblyVersion method

---------

Co-authored-by: Diego Molina &lt;diemol@users.noreply.github.com&gt;
diff --git a/dotnet/selenium-dotnet-version.bzl b/dotnet/selenium-dotnet-version.bzl
@@ -14,5 +14,5 @@ SUPPORTED_DEVTOOLS_VERSIONS = [
 
 ASSEMBLY_COMPANY = "Selenium Committers"
 ASSEMBLY_COPYRIGHT = "Copyright © Software Freedom Conservancy 2023"
-ASSEMBLY_INFORMATIONAL_VERSION = "4"
+ASSEMBLY_INFORMATIONAL_VERSION = SE_VERSION
 ASSEMBLY_PRODUCT = "Selenium"
diff --git a/dotnet/src/support/WebDriver.Support.csproj b/dotnet/src/support/WebDriver.Support.csproj
@@ -13,7 +13,7 @@
     <Company>Selenium Committers</Company>
     <Copyright>Copyright © Software Freedom Conservancy 2018</Copyright>
     <Product>Selenium</Product>
-    <Version>4</Version>
+    <Version>4.0.0</Version>
     <PackageId>Selenium.Support</PackageId>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <FileVersion>4.0.0.0</FileVersion>
diff --git a/dotnet/src/webdriver/Internal/ResourceUtilities.cs b/dotnet/src/webdriver/Internal/ResourceUtilities.cs
@@ -32,23 +32,23 @@ namespace OpenQA.Selenium.Internal
     internal static class ResourceUtilities
     {
         private static string assemblyVersion;
+        private static string productVersion;
         private static string platformFamily;
 
         /// <summary>
-        /// Gets a string representing the version of the Selenium assembly.
+        /// Gets a string representing the informational version of the Selenium product.
         /// </summary>
-        public static string AssemblyVersion
+        public static string ProductVersion
         {
             get
             {
-                if (string.IsNullOrEmpty(assemblyVersion))
+                if (productVersion == null)
                 {
                     Assembly executingAssembly = Assembly.GetExecutingAssembly();
-                    Version versionResource = executingAssembly.GetName().Version;
-                    assemblyVersion = string.Format(CultureInfo.InvariantCulture, "{0}.{1}.{2}", versionResource.Major, versionResource.Minor, versionResource.Revision);
+                    productVersion = executingAssembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;
                 }
 
-                return assemblyVersion;
+                return productVersion;
             }
         }
 
diff --git a/dotnet/src/webdriver/Remote/HttpCommandExecutor.cs b/dotnet/src/webdriver/Remote/HttpCommandExecutor.cs
@@ -79,7 +79,7 @@ public HttpCommandExecutor(Uri addressOfRemoteServer, TimeSpan timeout, bool ena
                 addressOfRemoteServer = new Uri(addressOfRemoteServer.ToString() + "/");
             }
 
-            this.userAgent = string.Format(CultureInfo.InvariantCulture, UserAgentHeaderTemplate, ResourceUtilities.AssemblyVersion, ResourceUtilities.PlatformFamily);
+            this.userAgent = string.Format(CultureInfo.InvariantCulture, UserAgentHeaderTemplate, ResourceUtilities.ProductVersion, ResourceUtilities.PlatformFamily);
             this.remoteServerUri = addressOfRemoteServer;
             this.serverResponseTimeout = timeout;
             this.enableKeepAlive = enableKeepAlive;
diff --git a/dotnet/src/webdriver/WebDriver.csproj b/dotnet/src/webdriver/WebDriver.csproj
@@ -12,7 +12,7 @@
     <Company>Selenium Committers</Company>
     <Copyright>Copyright © Software Freedom Conservancy 2018</Copyright>
     <Product>Selenium</Product>
-    <Version>4</Version>
+    <Version>4.0.0</Version>
     <PackageId>Selenium.WebDriver</PackageId>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <FileVersion>4.0.0.0</FileVersion>

Original file line number	Diff line number	Diff line change
`@@ -32,23 +32,23 @@ namespace OpenQA.Selenium.Internal`
`32`	`32`	`internal static class ResourceUtilities`
`33`	`33`	`{`
`34`	`34`	`private static string assemblyVersion;`
	`35`	`+ private static string productVersion;`
`35`	`36`	`private static string platformFamily;`
`36`	`37`
`37`	`38`	`/// <summary>`
`38`		`- /// Gets a string representing the version of the Selenium assembly.`
	`39`	`+ /// Gets a string representing the informational version of the Selenium product.`
`39`	`40`	`/// </summary>`
`40`		`- public static string AssemblyVersion`
	`41`	`+ public static string ProductVersion`
`41`	`42`	`{`
`42`	`43`	`get`
`43`	`44`	`{`
`44`		`- if (string.IsNullOrEmpty(assemblyVersion))`
	`45`	`+ if (productVersion == null)`
`45`	`46`	`{`
`46`	`47`	`Assembly executingAssembly = Assembly.GetExecutingAssembly();`
`47`		`- Version versionResource = executingAssembly.GetName().Version;`
`48`		`- assemblyVersion = string.Format(CultureInfo.InvariantCulture, "{0}.{1}.{2}", versionResource.Major, versionResource.Minor, versionResource.Revision);`
	`48`	`+ productVersion = executingAssembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;`
`49`	`49`	`}`
`50`	`50`
`51`		`- return assemblyVersion;`
	`51`	`+ return productVersion;`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public HttpCommandExecutor(Uri addressOfRemoteServer, TimeSpan timeout, bool ena`
`79`	`79`	`addressOfRemoteServer = new Uri(addressOfRemoteServer.ToString() + "/");`
`80`	`80`	`}`
`81`	`81`
`82`		`- this.userAgent = string.Format(CultureInfo.InvariantCulture, UserAgentHeaderTemplate, ResourceUtilities.AssemblyVersion, ResourceUtilities.PlatformFamily);`
	`82`	`+ this.userAgent = string.Format(CultureInfo.InvariantCulture, UserAgentHeaderTemplate, ResourceUtilities.ProductVersion, ResourceUtilities.PlatformFamily);`
`83`	`83`	`this.remoteServerUri = addressOfRemoteServer;`
`84`	`84`	`this.serverResponseTimeout = timeout;`
`85`	`85`	`this.enableKeepAlive = enableKeepAlive;`