Merge pull request #9136 from NuGet/dev

[ReleasePrep][2022.06.06]RI of dev into main

Author: advay26

build.ps1

@@ -116,6 +116,7 @@ Invoke-BuildStep 'Creating artifacts' { `
     New-ProjectPackage (Join-Path $PSScriptRoot "src\NuGetGallery.Core\NuGetGallery.Core.csproj") -Configuration $Configuration -Symbols -BuildNumber $BuildNumber -Version $SemanticVersion -PackageId "NuGetGallery.Core$PackageSuffix"
     New-ProjectPackage (Join-Path $PSScriptRoot "src\NuGet.Services.Entities\NuGet.Services.Entities.csproj") -Configuration $Configuration -Symbols -BuildNumber $BuildNumber -Version $SemanticVersion
     New-ProjectPackage (Join-Path $PSScriptRoot "src\NuGet.Services.DatabaseMigration\NuGet.Services.DatabaseMigration.csproj") -Configuration $Configuration -Symbols -BuildNumber $BuildNumber -Version $SemanticVersion
+    New-ProjectPackage (Join-Path $PSScriptRoot "src\NuGetGallery.Services\NuGetGallery.Services.csproj") -Configuration $Configuration -Symbols -BuildNumber $BuildNumber -Version $SemanticVersion
     New-Package (Join-Path $PSScriptRoot "src\DatabaseMigrationTools\DatabaseMigration.Gallery.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch
     New-Package (Join-Path $PSScriptRoot "src\DatabaseMigrationTools\DatabaseMigration.SupportRequest.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch
     New-Package (Join-Path $PSScriptRoot "src\DatabaseMigrationTools\DatabaseMigration.Validation.nuspec") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch

src/NuGetGallery.Core/Services/GalleryCloudBlobContainerInformationProvider.cs

@@ -11,10 +11,8 @@ public class GalleryCloudBlobContainerInformationProvider : ICloudBlobContainerI
     {
         private static readonly HashSet<string> KnownPublicFolders = new HashSet<string> {
             CoreConstants.Folders.PackagesFolderName,
-            CoreConstants.Folders.PackageBackupsFolderName,
             CoreConstants.Folders.DownloadsFolderName,
             CoreConstants.Folders.SymbolPackagesFolderName,
-            CoreConstants.Folders.SymbolPackageBackupsFolderName,
             CoreConstants.Folders.FlatContainerFolderName,
         };
 
@@ -27,6 +25,8 @@ public class GalleryCloudBlobContainerInformationProvider : ICloudBlobContainerI
             CoreConstants.Folders.RevalidationFolderName,
             CoreConstants.Folders.StatusFolderName,
             CoreConstants.Folders.PackagesContentFolderName,
+            CoreConstants.Folders.PackageBackupsFolderName,
+            CoreConstants.Folders.SymbolPackageBackupsFolderName,
         };
 
         public string GetCacheControl(string folderName)

src/NuGetGallery.Services/Configuration/ConfigurationService.cs

@@ -11,7 +11,6 @@
 using System.Threading.Tasks;
 using System.Web;
 using System.Web.Configuration;
-using Microsoft.WindowsAzure.ServiceRuntime;
 using NuGet.Services.Configuration;
 using NuGet.Services.KeyVault;
 using NuGetGallery.Configuration.SecretReader;
@@ -25,7 +24,6 @@ public class ConfigurationService : IGalleryConfigurationService, IConfiguration
         protected const string ServiceBusPrefix = "AzureServiceBus.";
         protected const string PackageDeletePrefix = "PackageDelete.";
 
-        private bool _notInCloudService;
         private readonly Lazy<string> _httpSiteRootThunk;
         private readonly Lazy<string> _httpsSiteRootThunk;
         private readonly Lazy<IAppConfiguration> _lazyAppConfiguration;
@@ -168,21 +166,8 @@ public async Task<string> ReadSettingAsync(string settingName)
 
         public string ReadRawSetting(string settingName)
         {
-            string value;
-
-            value = GetCloudServiceSetting(settingName);
-
-            if (value == "null")
-            {
-                value = null;
-            }
-            else if (string.IsNullOrEmpty(value))
-            {
-                var cstr = GetConnectionString(settingName);
-                value = cstr != null ? cstr.ConnectionString : GetAppSetting(settingName);
-            }
-
-            return value;
+            var cstr = GetConnectionString(settingName);
+            return cstr?.ConnectionString ?? GetAppSetting(settingName);
         }
 
         protected virtual HttpRequestBase GetCurrentRequest()
@@ -210,39 +195,6 @@ private async Task<IPackageDeleteConfiguration> ResolvePackageDelete()
             return await ResolveConfigObject(new PackageDeleteConfiguration(), PackageDeletePrefix);
         }
 
-        protected virtual string GetCloudServiceSetting(string settingName)
-        {
-            // Short-circuit if we've already determined we're not in the cloud
-            if (_notInCloudService)
-            {
-                return null;
-            }
-
-            string value = null;
-            try
-            {
-                if (RoleEnvironment.IsAvailable)
-                {
-                    value = RoleEnvironment.GetConfigurationSettingValue(settingName);
-                }
-                else
-                {
-                    _notInCloudService = true;
-                }
-            }
-            catch (TypeInitializationException)
-            {
-                // Not in the role environment...
-                _notInCloudService = true; // Skip future checks to save perf
-            }
-            catch (Exception)
-            {
-                // Value not present
-                return null;
-            }
-            return value;
-        }
-
         protected virtual string GetAppSetting(string settingName)
         {
             return WebConfigurationManager.AppSettings[settingName];
@@ -291,4 +243,4 @@ private string GetHttpsSiteRoot()
             return "https://" + siteRoot.Substring(7);
         }
     }
-}
+}