Merge remote-tracking branch 'origin/qa' into qa

NuGet · Aug 30, 2013 · c3c2d45 · c3c2d45
2 parents 16f185a + 1dfbebc
commit c3c2d45
Show file tree

Hide file tree

Showing 33 changed files with 393 additions and 152 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -12,7 +12,7 @@ Other changes include minor fixes in stats page, GetUpdates() API and email vali
 
 ### Nuget.org deployed on Azure Websites
 
-The nuget.org website is now deployed on Azure web sites instead of Azure cloud services. Expect a detaiked blog post from the NuGet team on the steps involed in migration and key take aways.
+The nuget.org website is now deployed on Azure web sites instead of Azure cloud services. Expect a detailed blog post from the NuGet team on the steps involed in migration and key take aways.
 A couple of bug fixes were made to enable this migration( to be compatible with Azure web sites). 
 
 - Canonical domain name for nuget.org : nuget.org will now re-direct to www.nuget.org.
@@ -32,7 +32,7 @@ Other changes include [updated terms of use and privacy policy](https://www.nuge
 
 ### Accessiblity bug fixes
 
-A bunch of accessiblity issue like sorting, highlighting and WCAG level A HTMl 5 errors in the website are fixed.
+A bunch of accessiblity issue like sorting, highlighting and WCAG level A HTML 5 errors in the website are fixed.
 
 ### Other bug fixes
 

diff --git a/NuGetGallery.sln b/NuGetGallery.sln
@@ -30,6 +30,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGetGallery.Backend.Facts"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGetGallery.Core.Facts", "tests\NuGetGallery.Core.Facts\NuGetGallery.Core.Facts.csproj", "{8AC9E39E-366C-47E5-80AE-38E71CD31386}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGetGallery.FunctionalTests", "tests\NuGetGallery.FunctionalTests\NuGetGallery.FunctionalTests.csproj", "{0A6B1A52-4D26-4946-9DDD-416D01A1ADBF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGetGallery.FunctionalTests.Helpers", "tests\NuGetGallery.FunctionalTests.Helpers\NuGetGallery.FunctionalTests.Helpers.csproj", "{8FB56455-C688-44AE-95F1-48FFCB199BFE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -130,6 +134,26 @@ Global
 		{8AC9E39E-366C-47E5-80AE-38E71CD31386}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8AC9E39E-366C-47E5-80AE-38E71CD31386}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8AC9E39E-366C-47E5-80AE-38E71CD31386}.Release|x86.ActiveCfg = Release|Any CPU
+		{0A6B1A52-4D26-4946-9DDD-416D01A1ADBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A6B1A52-4D26-4946-9DDD-416D01A1ADBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A6B1A52-4D26-4946-9DDD-416D01A1ADBF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0A6B1A52-4D26-4946-9DDD-416D01A1ADBF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0A6B1A52-4D26-4946-9DDD-416D01A1ADBF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0A6B1A52-4D26-4946-9DDD-416D01A1ADBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0A6B1A52-4D26-4946-9DDD-416D01A1ADBF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0A6B1A52-4D26-4946-9DDD-416D01A1ADBF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{0A6B1A52-4D26-4946-9DDD-416D01A1ADBF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{0A6B1A52-4D26-4946-9DDD-416D01A1ADBF}.Release|x86.ActiveCfg = Release|Any CPU
+		{8FB56455-C688-44AE-95F1-48FFCB199BFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8FB56455-C688-44AE-95F1-48FFCB199BFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8FB56455-C688-44AE-95F1-48FFCB199BFE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8FB56455-C688-44AE-95F1-48FFCB199BFE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8FB56455-C688-44AE-95F1-48FFCB199BFE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8FB56455-C688-44AE-95F1-48FFCB199BFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8FB56455-C688-44AE-95F1-48FFCB199BFE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8FB56455-C688-44AE-95F1-48FFCB199BFE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{8FB56455-C688-44AE-95F1-48FFCB199BFE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{8FB56455-C688-44AE-95F1-48FFCB199BFE}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/NuGetGallery.Backend/Jobs/HandleQueuedPackageEditsJob.cs b/src/NuGetGallery.Backend/Jobs/HandleQueuedPackageEditsJob.cs
@@ -18,12 +18,12 @@ public override TimeSpan Period
 
         public override void RunOnce()
         {
-            new HandleQueuedPackageEditsTask
+            ExecuteTask(new HandleQueuedPackageEditsTask
             {
                 ConnectionString = new SqlConnectionStringBuilder(Settings.MainConnectionString),
                 StorageAccount = Settings.MainStorage,
                 WhatIf = Settings.WhatIf
-            }.Execute();
+            });
         }
     }
 } 
diff --git a/src/NuGetGallery.Core/Entities/PackageEdit.cs b/src/NuGetGallery.Core/Entities/PackageEdit.cs
@@ -28,6 +28,7 @@ public class PackageEdit : IEntity
         /// Count so that the worker role can tell itself not to retry processing this edit forever if it gets stuck.
         /// </summary>
         public int TriedCount { get; set; }
+        public string LastError { get; set; }
 
         //////////////// The rest are same as on Package ////////////
 

diff --git a/src/NuGetGallery.Core/NuGetGallery.Core.csproj b/src/NuGetGallery.Core/NuGetGallery.Core.csproj
@@ -37,9 +37,9 @@
     <Reference Include="EntityFramework">
       <HintPath>..\..\packages\EntityFramework.5.0.0\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
-    <Reference Include="NuGet.Core, Version=2.7.40807.165, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="NuGet.Core, Version=2.7.40808.167, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\NuGet.Core.2.7.0-alpha\lib\net40-Client\NuGet.Core.dll</HintPath>
+      <HintPath>..\..\packages\Nuget.Core.2.7.0\lib\net40-Client\NuGet.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />

diff --git a/src/NuGetGallery.Core/packages.config b/src/NuGetGallery.Core/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="EntityFramework" version="5.0.0" targetFramework="net45" />
   <package id="Microsoft.Web.Xdt" version="1.0.0" targetFramework="net45" />
-  <package id="NuGet.Core" version="2.7.0-alpha" targetFramework="net45" />
+  <package id="Nuget.Core" version="2.7.0" targetFramework="net45" />
 </packages>
diff --git a/src/NuGetGallery.Operations/NuGetGallery.Operations.csproj b/src/NuGetGallery.Operations/NuGetGallery.Operations.csproj
@@ -68,9 +68,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\NLog.2.0.0.2000\lib\net40\NLog.dll</HintPath>
     </Reference>
-    <Reference Include="NuGet.Core, Version=2.7.40807.165, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="NuGet.Core, Version=2.7.40808.167, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\NuGet.Core.2.7.0-alpha\lib\net40-Client\NuGet.Core.dll</HintPath>
+      <HintPath>..\..\packages\NuGet.Core.2.7.0\lib\net40-Client\NuGet.Core.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="System" />

diff --git a/src/NuGetGallery.Operations/Tasks/Backups/ExportDailyBackupsTask.cs b/src/NuGetGallery.Operations/Tasks/Backups/ExportDailyBackupsTask.cs
@@ -84,9 +84,11 @@ public override void ExecuteCommand()
                         Log.Info("Exporting '{0}'...", dailyBackup.DatabaseName);
                         (new ExportDatabaseTask()
                         {
-                            ConnectionString = ConnectionString,
+                            ConnectionString = new SqlConnectionStringBuilder(ConnectionString.ConnectionString)
+                            {
+                                InitialCatalog = dailyBackup.DatabaseName
+                            },
                             DestinationStorage = StorageAccount,
-                            DatabaseName = dailyBackup.DatabaseName,
                             DestinationContainer = "database-backups",
                             SqlDacEndpoint = SqlDacEndpoint,
                             WhatIf = WhatIf

diff --git a/src/NuGetGallery.Operations/Tasks/Backups/ExportWarehouseBackupsTask.cs b/src/NuGetGallery.Operations/Tasks/Backups/ExportWarehouseBackupsTask.cs
@@ -68,9 +68,11 @@ public override void ExecuteCommand()
                     Log.Info("Exporting '{0}'...", dailyBackup.DatabaseName);
                     (new ExportDatabaseTask()
                     {
-                        ConnectionString = ConnectionString,
+                        ConnectionString = new SqlConnectionStringBuilder(ConnectionString.ConnectionString)
+                        {
+                            InitialCatalog = dailyBackup.DatabaseName
+                        },
                         DestinationStorage = StorageAccount,
-                        DatabaseName = dailyBackup.DatabaseName,
                         DestinationContainer = "warehouse-backups",
                         SqlDacEndpoint = SqlDacEndpoint,
                         WhatIf = WhatIf

diff --git a/src/NuGetGallery.Operations/Tasks/ExportDatabaseTask.cs b/src/NuGetGallery.Operations/Tasks/ExportDatabaseTask.cs
@@ -24,9 +24,6 @@ public class ExportDatabaseTask : DatabaseTask
         [Option("Blob container in which the backup should be placed", AltName = "c")]
         public string DestinationContainer { get; set; }
 
-        [Option("The name of the database to export (if not specified, the one in the connection string will be used)", AltName = "dbname")]
-        public string DatabaseName { get; set; }
-
         [Option("URL of the SQL DAC endpoint to talk to", AltName = "dac")]
         public Uri SqlDacEndpoint { get; set; }
 
@@ -53,10 +50,6 @@ public override void ValidateArguments()
 
         public override void ExecuteCommand()
         {
-            if (!String.IsNullOrEmpty(DatabaseName))
-            {
-                ConnectionString.InitialCatalog = DatabaseName;
-            }
             Log.Info("Exporting {0} on {1} to {2}", ConnectionString.InitialCatalog, Util.GetDatabaseServerName(ConnectionString), DestinationStorage.Credentials.AccountName);
 
             string serverName = ConnectionString.DataSource;