diff --git a/src/NuGetGallery.Core/CoreConstants.cs b/src/NuGetGallery.Core/CoreConstants.cs index a0b28545c6..420d61bc64 100644 --- a/src/NuGetGallery.Core/CoreConstants.cs +++ b/src/NuGetGallery.Core/CoreConstants.cs @@ -33,7 +33,6 @@ public static class Folders { public const string UserCertificatesFolderName = "user-certificates"; public const string ContentFolderName = "content"; - public const string DownloadsFolderName = "downloads"; public const string PackageBackupsFolderName = "package-backups"; public const string PackageReadMesFolderName = "readmes"; public const string PackagesFolderName = "packages"; @@ -41,7 +40,6 @@ public static class Folders public const string UploadsFolderName = "uploads"; public const string ValidationFolderName = "validation"; public const string RevalidationFolderName = "revalidation"; - public const string StatusFolderName = "status"; public const string SymbolPackagesFolderName = "symbol-packages"; public const string SymbolPackageBackupsFolderName = "symbol-package-backups"; public const string FlatContainerFolderName = "v3-flatcontainer"; @@ -57,4 +55,4 @@ public static class Folders public const string LoginDiscontinuationConfigFileName = "Login-Discontinuation-Configuration.json"; } -} \ No newline at end of file +} diff --git a/src/NuGetGallery.Core/Services/GalleryCloudBlobContainerInformationProvider.cs b/src/NuGetGallery.Core/Services/GalleryCloudBlobContainerInformationProvider.cs index bc74ff7725..269f6a7d92 100644 --- a/src/NuGetGallery.Core/Services/GalleryCloudBlobContainerInformationProvider.cs +++ b/src/NuGetGallery.Core/Services/GalleryCloudBlobContainerInformationProvider.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; @@ -11,7 +11,6 @@ public class GalleryCloudBlobContainerInformationProvider : ICloudBlobContainerI { private static readonly HashSet KnownPublicFolders = new HashSet { CoreConstants.Folders.PackagesFolderName, - CoreConstants.Folders.DownloadsFolderName, CoreConstants.Folders.SymbolPackagesFolderName, CoreConstants.Folders.FlatContainerFolderName, }; @@ -23,7 +22,6 @@ public class GalleryCloudBlobContainerInformationProvider : ICloudBlobContainerI CoreConstants.Folders.ValidationFolderName, CoreConstants.Folders.UserCertificatesFolderName, CoreConstants.Folders.RevalidationFolderName, - CoreConstants.Folders.StatusFolderName, CoreConstants.Folders.PackagesContentFolderName, CoreConstants.Folders.PackageBackupsFolderName, CoreConstants.Folders.SymbolPackageBackupsFolderName, @@ -41,11 +39,9 @@ public string GetCacheControl(string folderName) case CoreConstants.Folders.PackageBackupsFolderName: case CoreConstants.Folders.UploadsFolderName: case CoreConstants.Folders.SymbolPackageBackupsFolderName: - case CoreConstants.Folders.DownloadsFolderName: case CoreConstants.Folders.PackageReadMesFolderName: case CoreConstants.Folders.ContentFolderName: case CoreConstants.Folders.RevalidationFolderName: - case CoreConstants.Folders.StatusFolderName: case CoreConstants.Folders.UserCertificatesFolderName: case CoreConstants.Folders.PackagesContentFolderName: case CoreConstants.Folders.FlatContainerFolderName: @@ -70,15 +66,11 @@ public string GetContentType(string folderName) case CoreConstants.Folders.FlatContainerFolderName: return CoreConstants.PackageContentType; - case CoreConstants.Folders.DownloadsFolderName: - return CoreConstants.OctetStreamContentType; - case CoreConstants.Folders.PackageReadMesFolderName: return CoreConstants.TextContentType; case CoreConstants.Folders.ContentFolderName: case CoreConstants.Folders.RevalidationFolderName: - case CoreConstants.Folders.StatusFolderName: return CoreConstants.JsonContentType; case CoreConstants.Folders.UserCertificatesFolderName: diff --git a/src/NuGetGallery/Services/FileSystemFileStorageService.cs b/src/NuGetGallery/Services/FileSystemFileStorageService.cs index 0b8c02b594..4c246c5f65 100644 --- a/src/NuGetGallery/Services/FileSystemFileStorageService.cs +++ b/src/NuGetGallery/Services/FileSystemFileStorageService.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 NuGetGallery.Configuration; @@ -309,13 +309,10 @@ private static string GetContentType(string folderName) case CoreConstants.Folders.SymbolPackagesFolderName: return CoreConstants.PackageContentType; - case CoreConstants.Folders.DownloadsFolderName: - return CoreConstants.OctetStreamContentType; - default: throw new InvalidOperationException( string.Format(CultureInfo.CurrentCulture, "The folder name {0} is not supported.", folderName)); } } } -} \ No newline at end of file +} diff --git a/tests/NuGetGallery.Core.Facts/Services/FolderNamesDataAttribute.cs b/tests/NuGetGallery.Core.Facts/Services/FolderNamesDataAttribute.cs index 8423bac206..a2debf14b5 100644 --- a/tests/NuGetGallery.Core.Facts/Services/FolderNamesDataAttribute.cs +++ b/tests/NuGetGallery.Core.Facts/Services/FolderNamesDataAttribute.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.Collections.Generic; @@ -26,7 +26,6 @@ public override IEnumerable GetData(MethodInfo testMethod) { // Folder name, is public, content type new object[] { CoreConstants.Folders.ContentFolderName, false, CoreConstants.JsonContentType, }, - new object[] { CoreConstants.Folders.DownloadsFolderName, true, CoreConstants.OctetStreamContentType }, new object[] { CoreConstants.Folders.PackageBackupsFolderName, false, CoreConstants.PackageContentType }, new object[] { CoreConstants.Folders.PackageReadMesFolderName, false, CoreConstants.TextContentType }, new object[] { CoreConstants.Folders.PackagesFolderName, true, CoreConstants.PackageContentType }, @@ -37,7 +36,6 @@ public override IEnumerable GetData(MethodInfo testMethod) new object[] { CoreConstants.Folders.ValidationFolderName, false, CoreConstants.PackageContentType }, new object[] { CoreConstants.Folders.PackagesContentFolderName, false, CoreConstants.OctetStreamContentType }, new object[] { CoreConstants.Folders.RevalidationFolderName, false, CoreConstants.JsonContentType }, - new object[] { CoreConstants.Folders.StatusFolderName, false, CoreConstants.JsonContentType }, new object[] { CoreConstants.Folders.FlatContainerFolderName, true, CoreConstants.PackageContentType }, };