Merge pull request #8370 from NuGet/master

FI of master into dev

Author: loic-sharma

src/NuGetGallery.Core/NuGetGallery.Core.csproj

@@ -34,6 +34,14 @@
     <Compile Remove="Services\CorePackageFileService.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Remove="Infrastructure\MigrateUserToOrganization.sql" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Infrastructure\MigrateUserToOrganization.sql" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="NuGet.Packaging">
       <Version>5.8.0</Version>

tests/NuGetGallery.FunctionalTests/PackageCreation/ApiPushTests.cs

@@ -35,7 +35,9 @@ public async Task DuplicatePushesAreRejectedAndNotDeleted()
             // Arrange
             var packageId = $"{nameof(DuplicatePushesAreRejectedAndNotDeleted)}.{Guid.NewGuid():N}";
 
-            int pushVersionCount = 10;
+            // TODO: Increase this back to 10.
+            // See: https://github.com/NuGet/NuGetGallery/issues/8368
+            int pushVersionCount = 1;
             var duplicatePushTasks = new List<Task>();
             for (var duplicateTaskIndex = 0; duplicateTaskIndex < pushVersionCount; duplicateTaskIndex++)
             {