Removed the "RejectPackagesWithLicense" configuration option. (#7290)

Author: agr

src/NuGetGallery.Services/Configuration/AppConfiguration.cs

@@ -353,9 +353,6 @@ public string ExternalBrandingMessage
 
         public bool AsynchronousEmailServiceEnabled { get; set; }
 
-        [DefaultValue(false)]
-        public bool RejectPackagesWithLicense { get; set; }
-
         [DefaultValue(false)]
         public bool BlockLegacyLicenseUrl { get; set; }
 

src/NuGetGallery.Services/Configuration/IAppConfiguration.cs

@@ -370,11 +370,6 @@ public interface IAppConfiguration : IMessageServiceConfiguration
         /// </summary>
         bool AsynchronousEmailServiceEnabled { get; set; }
 
-        /// <summary>
-        /// Flag that indicates whether packages with `license` node in them should be rejected.
-        /// </summary>
-        bool RejectPackagesWithLicense { get; set; }
-
         /// <summary>
         /// Indicates whether packages that specify the license the "old" way (with a "licenseUrl" node only) should be rejected.
         /// </summary>

src/NuGetGallery.Services/ServicesStrings.Designer.cs

@@ -1053,9 +1053,6 @@ The {1} Team</value>
     <value>Unsupported license type '{0}'.</value>
     <comment>{0} is the license type read from the nuspec</comment>
   </data>
-  <data name="UploadPackage_LicenseFilesAreNotAllowed" xml:space="preserve">
-    <value>License files are not yet supported.</value>
-  </data>
   <data name="UploadPackage_DeprecationUrlRequiredForLicenseExpressions" xml:space="preserve">
     <value>To provide a better experience for older clients when a license expression is specified, &lt;licenseUrl&gt; must be set to '{0}'.</value>
     <comment>{0} is the licenses.nuget.org link with license expression</comment>

src/NuGetGallery.Services/ServicesStrings.resx

@@ -150,11 +150,6 @@ private async Task<PackageValidationResult> CheckLicenseMetadataAsync(PackageArc
 
             if (licenseElement != null)
             {
-                if (_config.RejectPackagesWithLicense)
-                {
-                    return PackageValidationResult.Invalid(Strings.UploadPackage_NotAcceptingPackagesWithLicense);
-                }
-
                 if (licenseElement.Value.Length > MaxAllowedLicenseNodeValueLength)
                 {
                     return PackageValidationResult.Invalid(Strings.UploadPackage_LicenseNodeValueTooLong);

src/NuGetGallery/Services/PackageUploadService.cs

@@ -1053,9 +1053,6 @@ The {1} Team</value>
     <value>Unsupported license type '{0}'.</value>
     <comment>{0} is the license type read from the nuspec</comment>
   </data>
-  <data name="UploadPackage_LicenseFilesAreNotAllowed" xml:space="preserve">
-    <value>License files are not yet supported.</value>
-  </data>
   <data name="UploadPackage_DeprecationUrlRequiredForLicenseExpressions" xml:space="preserve">
     <value>To provide a better experience for older clients when a license expression is specified, &lt;licenseUrl&gt; must be set to '{0}'.</value>
     <comment>{0} is the licenses.nuget.org link with license expression</comment>

src/NuGetGallery/Strings.Designer.cs

@@ -187,7 +187,6 @@
     <add key="PackageDelete.StatisticsUpdateFrequencyInHours" value=""/>
     <add key="PackageDelete.HourLimitWithMaximumDownloads" value=""/>
     <add key="PackageDelete.MaximumDownloadsForPackageVersion" value=""/>
-    <add key="Gallery.RejectPackagesWithLicense" value="false"/>
     <add key="Gallery.BlockLegacyLicenseUrl" value="false"/>
     <add key="Gallery.AllowLicenselessPackages" value="true"/>
   </appSettings>

src/NuGetGallery/Strings.resx

@@ -866,58 +866,6 @@ private static Uri GetLicenseExpressionDeprecationUrl(string licenseExpression)
                 return new Uri(string.Format("https://licenses.nuget.org/{0}", licenseExpression));
             }
 
-            private static string[] LicenseNodeVariants => new string[]
-            {
-                "<license/>",
-                "<license></license>",
-                "<license> </license>",
-                "<license>ttt</license>",
-                "<license type='file'>fff</license>",
-                "<license type='expression'>ee</license>",
-                "<license type='foobar'>ttt</license>",
-                "<license type='file'><someChildNode /></license>",
-                "<license type='file' version='1.0.0'>fff</license>",
-                "<license type='expression' version='1.0.0'>ee</license>",
-                "<license type='foobar' version='1.0.0'>ttt</license>",
-                "<license type='file' version='1.0.0'><someChildNode /></license>",
-                "<license type='file' version='2.0.0'>fff</license>",
-                "<license type='expression' version='2.0.0'>ee</license>",
-                "<license type='foobar' version='2.0.0'>ttt</license>",
-                "<license type='file' version='2.0.0'><someChildNode /></license>",
-            };
-
-            public static IEnumerable<object[]> RejectsLicensedPackagesWhenConfigured_Input =>
-                from licenseNode in LicenseNodeVariants
-                select new object[] { licenseNode, true, false };
-
-            [Theory]
-            [MemberData(nameof(RejectsLicensedPackagesWhenConfigured_Input))]
-            public async Task RejectsLicensedPackagesWhenConfigured(string licenseNode, bool rejectPackagesWithLicense, bool expectedSuccess)
-            {
-                _config
-                    .SetupGet(x => x.RejectPackagesWithLicense)
-                    .Returns(rejectPackagesWithLicense);
-                _nuGetPackage = GeneratePackageWithUserContent(getCustomNuspecNodes: () => licenseNode);
-
-                var result = await _target.ValidateBeforeGeneratePackageAsync(
-                    _nuGetPackage.Object,
-                    GetPackageMetadata(_nuGetPackage),
-                    _currentUser);
-
-                if (expectedSuccess)
-                {
-                    Assert.Equal(PackageValidationResultType.Accepted, result.Type);
-                    Assert.Null(result.Message);
-                    Assert.Empty(result.Warnings);
-                }
-                else
-                {
-                    Assert.Equal(PackageValidationResultType.Invalid, result.Type);
-                    Assert.Contains("license", result.Message.PlainTextMessage);
-                    Assert.Empty(result.Warnings);
-                }
-            }
-
             [Fact]
             public async Task RejectsLongLicenses()
             {