remove some redundant ToString (#10051)

SimonCropp · web-flow · commit 2c16faee1422 · 2024-07-09T11:45:57.000-07:00
diff --git a/src/GitHubVulnerabilities2v3/Extensions/BlobStorageVulnerabilityWriter.cs b/src/GitHubVulnerabilities2v3/Extensions/BlobStorageVulnerabilityWriter.cs
@@ -279,7 +279,7 @@ private async Task RunUpdate(string stringContentOutput, Uri indexStorageUri, st
             {
                 if (indexEntries[i].Name.Equals(UPDATE_ENTRY_NAME))
                 {
-                    indexEntries[i].Id = updateUriBuilder.Uri.AbsoluteUri.ToString();
+                    indexEntries[i].Id = updateUriBuilder.Uri.AbsoluteUri;
                     indexEntries[i].Updated = DateTime.UtcNow;
                     break;
                 }
@@ -320,14 +320,14 @@ private async Task RunRegenerate(string stringContentOutput, Uri indexStorageUri
                 new IndexEntry
                 {
                     Name=BASE_ENTRY_NAME,
-                    Id=baseUriBuilder.Uri.AbsoluteUri.ToString(),
+                    Id=baseUriBuilder.Uri.AbsoluteUri,
                     Updated=updatedTime,
                     Comment="The base data for vulnerability update periodically"
                 },
                 new IndexEntry
                 {
                     Name=UPDATE_ENTRY_NAME,
-                    Id=updateUriBuilder.Uri.AbsoluteUri.ToString(),
+                    Id=updateUriBuilder.Uri.AbsoluteUri,
                     Updated=updatedTime,
                     Comment="The patch data for the vulnerability. Contains all the vulnerabilities since base was last updated."
                 },
diff --git a/src/NuGetGallery.Core/Diagnostics/DiagnosticsServiceExtensions.cs b/src/NuGetGallery.Core/Diagnostics/DiagnosticsServiceExtensions.cs
@@ -19,7 +19,7 @@ public static IDiagnosticsSource SafeGetSource(this IDiagnosticsService self, st
             }
             catch(Exception ex)
             {
-                System.Diagnostics.Trace.WriteLine("Error getting trace source: " + ex.ToString());
+                System.Diagnostics.Trace.WriteLine($"Error getting trace source: {ex}");
                 return NullDiagnosticsSource.Instance;
             }
         }
diff --git a/src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs b/src/NuGetGallery.Core/Services/CloudBlobCoreFileStorageService.cs
@@ -197,14 +197,14 @@ private async Task<string> CopyFileAsync(
                         _trace.TraceEvent(
                            LogLevel.Information,
                            eventId: 0,
-                           message: $"Source blob ('{srcBlob.Uri.ToString()}') doesn't have the Sha512 hash.");
+                           message: $"Source blob ('{srcBlob.Uri}') doesn't have the Sha512 hash.");
                     }
                     if (!destinationBlobHasSha512Hash)
                     {
                         _trace.TraceEvent(
                            LogLevel.Information,
                            eventId: 0,
-                           message: $"Destination blob ('{destBlob.Uri.ToString()}') doesn't have the Sha512 hash.");
+                           message: $"Destination blob ('{destBlob.Uri}') doesn't have the Sha512 hash.");
                     }
                     if (sourceBlobHasSha512Hash && destinationBlobHasSha512Hash && sourceBlobSha512Hash == destinationBlobSha512Hash && srcBlob.Properties.Length == destBlob.Properties.Length)
                     {
diff --git a/src/NuGetGallery.Services/Storage/ContentService.cs b/src/NuGetGallery.Services/Storage/ContentService.cs
@@ -75,7 +75,7 @@ private async Task<IHtmlString> GetContentItemCore(string name, string[] extensi
                 ContentItem cachedItem = null;
                 if (ContentCache.TryGetValue(name, out cachedItem) && DateTime.UtcNow < cachedItem.ExpiryUtc)
                 {
-                    Trace.Verbose("Cache Valid. Expires at: " + cachedItem.ExpiryUtc.ToString());
+                    Trace.Verbose("Cache Valid. Expires at: " + cachedItem.ExpiryUtc);
                     return cachedItem.Content;
                 }
                 Trace.Verbose("Cache Expired.");
diff --git a/src/NuGetGallery/App_Code/ViewHelpers.cshtml b/src/NuGetGallery/App_Code/ViewHelpers.cshtml
@@ -415,7 +415,7 @@ string dataKey = "___AccordionCounter_" + groupName;
 int lastId = (int)(HttpContext.Current.Items[dataKey] ?? 0);
 int id = lastId + 1;
 HttpContext.Current.Items[dataKey] = id;
-string name = groupName + "-" + id.ToString();
+string name = groupName + "-" + id;
 string actionsId = name + "-actions"; 
 
 var hlp = new AccordionHelper(name, formModelStatePrefix, expanded, page);
diff --git a/src/NuGetGallery/Helpers/ViewModelExtensions/ListPackageItemViewModelFactory.cs b/src/NuGetGallery/Helpers/ViewModelExtensions/ListPackageItemViewModelFactory.cs
@@ -71,7 +71,7 @@ private ListPackageItemViewModel SetupInternal(ListPackageItemViewModel viewMode
             viewModel.CanDeprecate = CanPerformAction(currentUser, package, ActionsRequiringPermissions.DeprecatePackage);
             viewModel.CanDisplayTfmBadges = _featureFlagService.IsDisplayTfmBadgesEnabled(currentUser);
 
-            PackageFrameworkCompatibility packageFrameworkCompatibility = _frameworkCompatibilityFactory.Create(package.SupportedFrameworks, package.Id, package.Version.ToString(), includeComputedBadges);
+            PackageFrameworkCompatibility packageFrameworkCompatibility = _frameworkCompatibilityFactory.Create(package.SupportedFrameworks, package.Id, package.Version, includeComputedBadges);
             viewModel.FrameworkBadges = viewModel.CanDisplayTfmBadges ? packageFrameworkCompatibility?.Badges : new PackageFrameworkCompatibilityBadges();
 
             viewModel.SetShortDescriptionFrom(viewModel.Description);
diff --git a/src/NuGetGallery/Infrastructure/Lucene/ExternalSearchService.cs b/src/NuGetGallery/Infrastructure/Lucene/ExternalSearchService.cs
@@ -162,7 +162,7 @@ private async Task EnsureDiagnostics()
                 var resp = await _searchClient.GetDiagnostics();
                 if (!resp.IsSuccessStatusCode)
                 {
-                    Trace.Error("HTTP Error when retrieving diagnostics: " + ((int)resp.StatusCode).ToString());
+                    Trace.Error("HTTP Error when retrieving diagnostics: " + ((int)resp.StatusCode));
                     _diagCache = new JObject();
                 }
                 else
diff --git a/src/NuGetGallery/Infrastructure/TracingHttpHandler.cs b/src/NuGetGallery/Infrastructure/TracingHttpHandler.cs
@@ -25,7 +25,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
                 resp = await base.SendAsync(request, cancellationToken);
             }
 
-            string message = ((int)resp.StatusCode).ToString() + " " + request.RequestUri.AbsoluteUri;
+            string message = ((int)resp.StatusCode) + " " + request.RequestUri.AbsoluteUri;
             if (resp.IsSuccessStatusCode)
             {
                 Trace.Information(message);
diff --git a/src/NuGetGallery/Telemetry/CustomerResourceIdEnricher.cs b/src/NuGetGallery/Telemetry/CustomerResourceIdEnricher.cs
@@ -15,7 +15,7 @@ public class CustomerResourceIdEnricher : ITelemetryInitializer
         private const string CustomerResourceId = "CustomerResourceId";
         private const string CustomerResourceIdConstant = "CustomerResourceIdConstant";
         private const string Prefix = "/tenants/";
-        private static readonly string Empty = Prefix + Guid.Empty.ToString();
+        private static readonly string Empty = Prefix + Guid.Empty;
 
         private static readonly HashSet<string> CustomMetricNames = new HashSet<string>
         {
diff --git a/tests/NuGetGallery.Core.Facts/TestUtils/BlobStorageFixture.cs b/tests/NuGetGallery.Core.Facts/TestUtils/BlobStorageFixture.cs
@@ -76,7 +76,7 @@ private void DeleteTestBlobs(string connectionString)
             foreach (var container in containers)
             {
                 var blobs = container.ListBlobs(
-                    prefix: TestRunId.ToString(),
+                    prefix: TestRunId,
                     useFlatBlobListing: true);
 
                 foreach (var blob in blobs.OfType<CloudBlockBlob>())
diff --git a/tests/NuGetGallery.Core.Facts/TestUtils/TestPackage.cs b/tests/NuGetGallery.Core.Facts/TestUtils/TestPackage.cs
@@ -156,7 +156,7 @@ private static string WritePackageTypes(IEnumerable<NuGet.Packaging.Core.Package
 
                 if (packageType.Version != null)
                 {
-                    output.AppendFormat(" version=\"{0}\"", packageType.Version.ToString());
+                    output.AppendFormat(" version=\"{0}\"", packageType.Version);
                 }
 
                 output.Append("/>");
diff --git a/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs b/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs
@@ -472,7 +472,7 @@ public TheDisplayPackageMethod()
             public async Task IsIndexCheckOnlyHappensForRecentlyChangedPackages(DateTime created, DateTime? lastEdited, int searchTimes)
             {
                 // Arrange
-                var id = "Test" + Guid.NewGuid().ToString();
+                var id = "Test" + Guid.NewGuid();
                 var packageService = new Mock<IPackageService>();
                 var diagnosticsService = new Mock<IDiagnosticsService>();
                 var searchClient = new Mock<ISearchClient>();
@@ -9614,7 +9614,7 @@ public async Task WillRedirectToPackageDetailsPageAfterSuccessfullyCreatingSymbo
 
         public class TheUploadProgressAction : TestContainer
         {
-            private static readonly string FakeUploadName = "upload-" + TestUtility.FakeUserName + Guid.Empty.ToString();
+            private static readonly string FakeUploadName = "upload-" + TestUtility.FakeUserName + Guid.Empty;
 
             [Fact]
             public void WillReturnHttpNotFoundForUnknownUser()
diff --git a/tests/NuGetGallery.Facts/OData/Serializers/V2FeedPackageAnnotationStrategyFacts.cs b/tests/NuGetGallery.Facts/OData/Serializers/V2FeedPackageAnnotationStrategyFacts.cs
@@ -117,7 +117,7 @@ public void NormalizesNavigationLinksWhenSet(string requestUri)
             // Assert
             Assert.Equal(expectedNormalizedLink, oDataEntry.ReadLink.ToString());
             Assert.Equal(expectedNormalizedLink, oDataEntry.EditLink.ToString());
-            Assert.Equal(expectedNormalizedLink, oDataEntry.Id.ToString());
+            Assert.Equal(expectedNormalizedLink, oDataEntry.Id);
         }
 
         [Fact]
diff --git a/tests/NuGetGallery.Facts/Services/PackageUploadServiceFacts.cs b/tests/NuGetGallery.Facts/Services/PackageUploadServiceFacts.cs
@@ -615,7 +615,7 @@ public async Task CleansUpLicenseIfDbUpdateFails(PackageStatus packageStatus, bo
                 await Assert.ThrowsAsync<Exception>(() => _target.CommitPackageAsync(_package, _packageFile));
 
                 _licenseFileService.Verify(
-                    lfs => lfs.DeleteLicenseFileAsync(_package.Id, _package.NormalizedVersion.ToString()),
+                    lfs => lfs.DeleteLicenseFileAsync(_package.Id, _package.NormalizedVersion),
                     expectedLicenseDelete ? Times.Once() : Times.Never());
             }
 
@@ -720,11 +720,11 @@ public async Task CleansUpReadmeIfDbUpdateFails(PackageStatus packageStatus, boo
                 await Assert.ThrowsAsync<Exception>(() => _target.CommitPackageAsync(_package, _packageFile));
 
                 _licenseFileService.Verify(
-                    lfs => lfs.DeleteLicenseFileAsync(_package.Id, _package.NormalizedVersion.ToString()),
+                    lfs => lfs.DeleteLicenseFileAsync(_package.Id, _package.NormalizedVersion),
                     expectedFileDelete ? Times.Once() : Times.Never());
 
                 _readmeFileService.Verify(
-                    lfs => lfs.DeleteReadmeFileAsync(_package.Id, _package.NormalizedVersion.ToString()),
+                    lfs => lfs.DeleteReadmeFileAsync(_package.Id, _package.NormalizedVersion),
                     expectedFileDelete ? Times.Once() : Times.Never());
             }
         }
diff --git a/tests/NuGetGallery.Facts/Telemetry/ClientTelemetryPIIProcessorTests.cs b/tests/NuGetGallery.Facts/Telemetry/ClientTelemetryPIIProcessorTests.cs
@@ -240,7 +240,7 @@ private List<string> GetPIIOperationsFromRoute()
             var piiRoutes = _currentRoutes.Where((r) =>
             {
                 Route webRoute = r as Route;
-                return webRoute != null ? IsPIIUrl(webRoute.Url.ToString()) : false;
+                return webRoute != null ? IsPIIUrl(webRoute.Url) : false;
             }).Select((r) =>
             {
                 var dd = ((Route)r).Defaults;
@@ -255,7 +255,7 @@ private List<string> GetPIIRoutesUrls()
             var piiRoutes = _currentRoutes.Where((r) =>
             {
                 Route webRoute = r as Route;
-                return webRoute != null ? IsPIIUrl(webRoute.Url.ToString()) : false;
+                return webRoute != null ? IsPIIUrl(webRoute.Url) : false;
             }).Select((r) => ((Route)r).Url).Distinct().ToList();
 
             return piiRoutes;
diff --git a/tests/NuGetGallery.Facts/Views/Packages/ValidationIssueFacts.cs b/tests/NuGetGallery.Facts/Views/Packages/ValidationIssueFacts.cs
@@ -30,7 +30,7 @@ public void HasACaseForAllIssueTypes(ValidationIssue issue)
             var template = GetTemplate();
 
             // Assert
-            Assert.Contains("case ValidationIssueCode." + issue.IssueCode.ToString(), template);
+            Assert.Contains("case ValidationIssueCode." + issue.IssueCode, template);
         }
 
         [Theory]

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ private async Task RunUpdate(string stringContentOutput, Uri indexStorageUri, st`
`279`	`279`	`{`
`280`	`280`	`if (indexEntries[i].Name.Equals(UPDATE_ENTRY_NAME))`
`281`	`281`	`{`
`282`		`- indexEntries[i].Id = updateUriBuilder.Uri.AbsoluteUri.ToString();`
	`282`	`+ indexEntries[i].Id = updateUriBuilder.Uri.AbsoluteUri;`
`283`	`283`	`indexEntries[i].Updated = DateTime.UtcNow;`
`284`	`284`	`break;`
`285`	`285`	`}`
`@@ -320,14 +320,14 @@ private async Task RunRegenerate(string stringContentOutput, Uri indexStorageUri`
`320`	`320`	`new IndexEntry`
`321`	`321`	`{`
`322`	`322`	`Name=BASE_ENTRY_NAME,`
`323`		`- Id=baseUriBuilder.Uri.AbsoluteUri.ToString(),`
	`323`	`+ Id=baseUriBuilder.Uri.AbsoluteUri,`
`324`	`324`	`Updated=updatedTime,`
`325`	`325`	`Comment="The base data for vulnerability update periodically"`
`326`	`326`	`},`
`327`	`327`	`new IndexEntry`
`328`	`328`	`{`
`329`	`329`	`Name=UPDATE_ENTRY_NAME,`
`330`		`- Id=updateUriBuilder.Uri.AbsoluteUri.ToString(),`
	`330`	`+ Id=updateUriBuilder.Uri.AbsoluteUri,`
`331`	`331`	`Updated=updatedTime,`
`332`	`332`	`Comment="The patch data for the vulnerability. Contains all the vulnerabilities since base was last updated."`
`333`	`333`	`},`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public static IDiagnosticsSource SafeGetSource(this IDiagnosticsService self, st`
`19`	`19`	`}`
`20`	`20`	`catch(Exception ex)`
`21`	`21`	`{`
`22`		`- System.Diagnostics.Trace.WriteLine("Error getting trace source: " + ex.ToString());`
	`22`	`+ System.Diagnostics.Trace.WriteLine($"Error getting trace source: {ex}");`
`23`	`23`	`return NullDiagnosticsSource.Instance;`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -197,14 +197,14 @@ private async Task<string> CopyFileAsync(`
`197`	`197`	`_trace.TraceEvent(`
`198`	`198`	`LogLevel.Information,`
`199`	`199`	`eventId: 0,`
`200`		`- message: $"Source blob ('{srcBlob.Uri.ToString()}') doesn't have the Sha512 hash.");`
	`200`	`+ message: $"Source blob ('{srcBlob.Uri}') doesn't have the Sha512 hash.");`
`201`	`201`	`}`
`202`	`202`	`if (!destinationBlobHasSha512Hash)`
`203`	`203`	`{`
`204`	`204`	`_trace.TraceEvent(`
`205`	`205`	`LogLevel.Information,`
`206`	`206`	`eventId: 0,`
`207`		`- message: $"Destination blob ('{destBlob.Uri.ToString()}') doesn't have the Sha512 hash.");`
	`207`	`+ message: $"Destination blob ('{destBlob.Uri}') doesn't have the Sha512 hash.");`
`208`	`208`	`}`
`209`	`209`	`if (sourceBlobHasSha512Hash && destinationBlobHasSha512Hash && sourceBlobSha512Hash == destinationBlobSha512Hash && srcBlob.Properties.Length == destBlob.Properties.Length)`
`210`	`210`	`{`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ private async Task<IHtmlString> GetContentItemCore(string name, string[] extensi`
`75`	`75`	`ContentItem cachedItem = null;`
`76`	`76`	`if (ContentCache.TryGetValue(name, out cachedItem) && DateTime.UtcNow < cachedItem.ExpiryUtc)`
`77`	`77`	`{`
`78`		`- Trace.Verbose("Cache Valid. Expires at: " + cachedItem.ExpiryUtc.ToString());`
	`78`	`+ Trace.Verbose("Cache Valid. Expires at: " + cachedItem.ExpiryUtc);`
`79`	`79`	`return cachedItem.Content;`
`80`	`80`	`}`
`81`	`81`	`Trace.Verbose("Cache Expired.");`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ private async Task EnsureDiagnostics()`
`162`	`162`	`var resp = await _searchClient.GetDiagnostics();`
`163`	`163`	`if (!resp.IsSuccessStatusCode)`
`164`	`164`	`{`
`165`		`- Trace.Error("HTTP Error when retrieving diagnostics: " + ((int)resp.StatusCode).ToString());`
	`165`	`+ Trace.Error("HTTP Error when retrieving diagnostics: " + ((int)resp.StatusCode));`
`166`	`166`	`_diagCache = new JObject();`
`167`	`167`	`}`
`168`	`168`	`else`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage`
`25`	`25`	`resp = await base.SendAsync(request, cancellationToken);`
`26`	`26`	`}`
`27`	`27`
`28`		`- string message = ((int)resp.StatusCode).ToString() + " " + request.RequestUri.AbsoluteUri;`
	`28`	`+ string message = ((int)resp.StatusCode) + " " + request.RequestUri.AbsoluteUri;`
`29`	`29`	`if (resp.IsSuccessStatusCode)`
`30`	`30`	`{`
`31`	`31`	`Trace.Information(message);`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public class CustomerResourceIdEnricher : ITelemetryInitializer`
`15`	`15`	`private const string CustomerResourceId = "CustomerResourceId";`
`16`	`16`	`private const string CustomerResourceIdConstant = "CustomerResourceIdConstant";`
`17`	`17`	`private const string Prefix = "/tenants/";`
`18`		`- private static readonly string Empty = Prefix + Guid.Empty.ToString();`
	`18`	`+ private static readonly string Empty = Prefix + Guid.Empty;`
`19`	`19`
`20`	`20`	`private static readonly HashSet<string> CustomMetricNames = new HashSet<string>`
`21`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ private void DeleteTestBlobs(string connectionString)`
`76`	`76`	`foreach (var container in containers)`
`77`	`77`	`{`
`78`	`78`	`var blobs = container.ListBlobs(`
`79`		`- prefix: TestRunId.ToString(),`
	`79`	`+ prefix: TestRunId,`
`80`	`80`	`useFlatBlobListing: true);`
`81`	`81`
`82`	`82`	`foreach (var blob in blobs.OfType<CloudBlockBlob>())`