First ResolveUri in NuGet.Services.Storage (#10129)

Author: joelverhagen

src/GitHubVulnerabilities2v3/Extensions/BlobStorageVulnerabilityWriter.cs

@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -113,7 +113,7 @@ public async Task FlushAsync(string outputFileName = null)
 
         public async Task<int> WriteVulnerabilitiesAsync(IEnumerable<Tuple<PackageVulnerability, bool>> vulnerabilities)
         {
-            _firstVulnWrittenTimestamp = _firstVulnWrittenTimestamp == DateTime.MinValue ? DateTimeOffset.UtcNow : _firstVulnWrittenTimestamp;
+            _firstVulnWrittenTimestamp = _firstVulnWrittenTimestamp == DateTimeOffset.MinValue ? DateTimeOffset.UtcNow : _firstVulnWrittenTimestamp;
             foreach (var vulnerability in vulnerabilities)
             {
                 await WriteVulnerabilityAsync(vulnerability.Item1, vulnerability.Item2);
@@ -124,7 +124,7 @@ public async Task<int> WriteVulnerabilitiesAsync(IEnumerable<Tuple<PackageVulner
 
         public Task WriteVulnerabilityAsync(PackageVulnerability packageVulnerability, bool wasWithdrawn)
         {
-            _firstVulnWrittenTimestamp = _firstVulnWrittenTimestamp == DateTime.MinValue ? DateTimeOffset.UtcNow : _firstVulnWrittenTimestamp;
+            _firstVulnWrittenTimestamp = _firstVulnWrittenTimestamp == DateTimeOffset.MinValue ? DateTimeOffset.UtcNow : _firstVulnWrittenTimestamp;
             try
             {
                 if (!wasWithdrawn)

src/NuGet.Services.Storage/Storage.cs

@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -190,7 +190,7 @@ public void ResetStatistics()
 
         public Uri ResolveUri(string relativeUri)
         {
-            return new Uri(BaseAddress, relativeUri);
+            return new Uri(BaseAddress.GetLeftPart(UriPartial.Path).TrimEnd('/') + "/" + relativeUri.TrimStart('/'));
         }
 
         protected string GetName(Uri uri)