Convert gallery to C#6.0 #2815

Update latest code from `dev` as well.
NuGet · Jan 14, 2016 · c420763 · c420763
1 parent 1a94d19
commit c420763
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 4 deletions.
diff --git a/src/NuGetGallery/NuGetGallery.csproj b/src/NuGetGallery/NuGetGallery.csproj
@@ -1344,7 +1344,7 @@
     <Compile Include="Services\PackageDeleteService.cs" />
     <Compile Include="Services\PackageFileService.cs" />
     <Compile Include="Filters\RequireSslAttribute.cs" />
-    <Compile Include="Services\PackageIdAndTitleValidationService.cs" />
+    <Compile Include="Services\IPackageNamingConflictValidator.cs" />
     <Compile Include="Services\PackageNamingConflictValidator.cs" />
     <Compile Include="Services\PackageSearchResults.cs" />
     <Compile Include="Services\JsonAggregateStatsService.cs" />

diff --git a/...ces/PackageIdAndTitleValidationService.cs → ...rvices/IPackageNamingConflictValidator.cs b/...ces/PackageIdAndTitleValidationService.cs → ...rvices/IPackageNamingConflictValidator.cs
diff --git a/src/NuGetGallery/Services/PackageNamingConflictValidator.cs b/src/NuGetGallery/Services/PackageNamingConflictValidator.cs
@@ -24,7 +24,7 @@ public bool TitleConflictsWithExistingRegistrationId(string registrationId, stri
         {
             if (string.IsNullOrEmpty(registrationId))
             {
-                throw new ArgumentNullException("registrationId");
+                throw new ArgumentNullException(nameof(registrationId));
             }
 
             if (!string.IsNullOrEmpty(packageTitle))
@@ -50,7 +50,7 @@ public bool IdConflictsWithExistingPackageTitle(string registrationId)
         {
             if (string.IsNullOrEmpty(registrationId))
             {
-                throw new ArgumentNullException("registrationId");
+                throw new ArgumentNullException(nameof(registrationId));
             }
 
             registrationId = registrationId.ToLowerInvariant();

diff --git a/src/NuGetGallery/Services/PackageService.cs b/src/NuGetGallery/Services/PackageService.cs
@@ -600,7 +600,7 @@ private static void ValidateSupportedFrameworks(string[] supportedFrameworks)
             if (invalidPortableFramework != null)
             {
                 throw new EntityException(
-                    "The package framework '{0}' is not supported. Frameworks within the portable profile are not allowed to have profiles themselves.", invalidPortableFramework);
+                    Strings.InvalidPortableFramework, invalidPortableFramework);
             }
         }
 

diff --git a/src/NuGetGallery/Strings.Designer.cs b/src/NuGetGallery/Strings.Designer.cs
diff --git a/src/NuGetGallery/Strings.resx b/src/NuGetGallery/Strings.resx
@@ -362,4 +362,7 @@ The {2} Team</value>
   <data name="NewRegistrationIdMatchesExistingPackageTitle" xml:space="preserve">
     <value>The ID of your package, '{0}', is similar to the title of an existing package, which can cause confusion with our users. Please modify the ID of your package and try uploading again.</value>
   </data>
+  <data name="InvalidPortableFramework" xml:space="preserve">
+    <value>The package framework '{0}' is not supported. Frameworks within the portable profile are not allowed to have profiles themselves.</value>
+  </data>
 </root>