Permalink
Browse files

Merge branch 'master' into jeffhand/commandtimeout

Conflicts:
	src/NuGetGallery/Controllers/ApiController.cs
  • Loading branch information...
2 parents 1f2ecfd + 77acab0 commit 0428afe085d1aff4e0d2130bfdb433d9c55ac4ca @anurse anurse committed Jan 30, 2014
Showing 346 changed files with 6,377 additions and 20,521 deletions.
View
@@ -1,86 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{96E4AFF8-D3A1-4102-ADCF-05F186F916A9}"
- ProjectSection(SolutionItems) = preProject
- .nuget\packages.config = .nuget\packages.config
- EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Frontend", "Frontend", "{05998089-58F5-4A84-8C11-C5C6244A6F89}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Operations", "Operations", "{2ECA1159-9B9D-4D65-95AF-F14337FD3DA6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGetGallery", "src\NuGetGallery\NuGetGallery.csproj", "{1DACF781-5CD0-4123-8BAC-CD385D864BE5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGetGallery.Facts", "tests\NuGetGallery.Facts\NuGetGallery.Facts.csproj", "{FDC76BEF-3360-45AC-A13E-AE8F14D343D5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGetGallery.Operations", "src\NuGetGallery.Operations\NuGetGallery.Operations.csproj", "{DBECF66B-8F2F-4B32-9143-E243BAFF12DF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "galops", "src\galops\galops.csproj", "{F240D1BC-BBFB-4F22-9DF8-3FDE36BFD665}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGetGallery.Core", "src\NuGetGallery.Core\NuGetGallery.Core.csproj", "{097B2CDD-9623-4C34-93C2-D373D51F5B4E}"
-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
-Project("{CC5FD16D-436D-48AD-A40C-5A424C6E3E79}") = "NuGetGallery.Cloud", "src\NuGetGallery.Cloud\NuGetGallery.Cloud.ccproj", "{0041ACA0-30EC-4554-8C7C-0AF810F3086F}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {1DACF781-5CD0-4123-8BAC-CD385D864BE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1DACF781-5CD0-4123-8BAC-CD385D864BE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1DACF781-5CD0-4123-8BAC-CD385D864BE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1DACF781-5CD0-4123-8BAC-CD385D864BE5}.Release|Any CPU.Build.0 = Release|Any CPU
- {FDC76BEF-3360-45AC-A13E-AE8F14D343D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {FDC76BEF-3360-45AC-A13E-AE8F14D343D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {FDC76BEF-3360-45AC-A13E-AE8F14D343D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {FDC76BEF-3360-45AC-A13E-AE8F14D343D5}.Release|Any CPU.Build.0 = Release|Any CPU
- {DBECF66B-8F2F-4B32-9143-E243BAFF12DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DBECF66B-8F2F-4B32-9143-E243BAFF12DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DBECF66B-8F2F-4B32-9143-E243BAFF12DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DBECF66B-8F2F-4B32-9143-E243BAFF12DF}.Release|Any CPU.Build.0 = Release|Any CPU
- {F240D1BC-BBFB-4F22-9DF8-3FDE36BFD665}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F240D1BC-BBFB-4F22-9DF8-3FDE36BFD665}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F240D1BC-BBFB-4F22-9DF8-3FDE36BFD665}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F240D1BC-BBFB-4F22-9DF8-3FDE36BFD665}.Release|Any CPU.Build.0 = Release|Any CPU
- {097B2CDD-9623-4C34-93C2-D373D51F5B4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {097B2CDD-9623-4C34-93C2-D373D51F5B4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {097B2CDD-9623-4C34-93C2-D373D51F5B4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {097B2CDD-9623-4C34-93C2-D373D51F5B4E}.Release|Any CPU.Build.0 = Release|Any CPU
- {8AC9E39E-366C-47E5-80AE-38E71CD31386}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8AC9E39E-366C-47E5-80AE-38E71CD31386}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8AC9E39E-366C-47E5-80AE-38E71CD31386}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8AC9E39E-366C-47E5-80AE-38E71CD31386}.Release|Any CPU.Build.0 = 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}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0A6B1A52-4D26-4946-9DDD-416D01A1ADBF}.Release|Any CPU.Build.0 = 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}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8FB56455-C688-44AE-95F1-48FFCB199BFE}.Release|Any CPU.Build.0 = Release|Any CPU
- {0041ACA0-30EC-4554-8C7C-0AF810F3086F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0041ACA0-30EC-4554-8C7C-0AF810F3086F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0041ACA0-30EC-4554-8C7C-0AF810F3086F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0041ACA0-30EC-4554-8C7C-0AF810F3086F}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {1DACF781-5CD0-4123-8BAC-CD385D864BE5} = {05998089-58F5-4A84-8C11-C5C6244A6F89}
- {FDC76BEF-3360-45AC-A13E-AE8F14D343D5} = {05998089-58F5-4A84-8C11-C5C6244A6F89}
- {0041ACA0-30EC-4554-8C7C-0AF810F3086F} = {05998089-58F5-4A84-8C11-C5C6244A6F89}
- {DBECF66B-8F2F-4B32-9143-E243BAFF12DF} = {2ECA1159-9B9D-4D65-95AF-F14337FD3DA6}
- {F240D1BC-BBFB-4F22-9DF8-3FDE36BFD665} = {2ECA1159-9B9D-4D65-95AF-F14337FD3DA6}
- EndGlobalSection
-EndGlobal
View
@@ -1,81 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Work", "Work", "{69E0B03C-B1FE-47E2-BFFD-5B9474BED386}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Services.Platform", "src\Services\NuGet.Services.Platform\NuGet.Services.Platform.csproj", "{EF86883E-A1B4-4052-9222-51A01C6C41CD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Services.Platform.Facts", "src\Services\NuGet.Services.Platform.Facts\NuGet.Services.Platform.Facts.csproj", "{304B7FDA-3111-4670-9E77-4E5F20C89A8C}"
-EndProject
-Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "NuGet.Services.Work.Database", "src\Services\Work\NuGet.Services.Work.Database\NuGet.Services.Work.Database.sqlproj", "{A8B0845E-CF36-4ADB-B641-CA8542202878}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Services.Work", "src\Services\Work\NuGet.Services.Work\NuGet.Services.Work.csproj", "{7F92C174-5310-4090-A6A3-3CC7C67C19D6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Services.Work.Facts", "src\Services\Work\NuGet.Services.Work.Facts\NuGet.Services.Work.Facts.csproj", "{4405C24C-7F57-4826-831F-D5D7E139F02E}"
-EndProject
-Project("{CC5FD16D-436D-48AD-A40C-5A424C6E3E79}") = "NuGet.Services.Work.Cloud", "src\Services\Work\NuGet.Services.Work.Cloud\NuGet.Services.Work.Cloud.ccproj", "{1D0164B6-92D4-455A-AC68-C30B61733748}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Services.Work.Client", "src\Services\Work\NuGet.Services.Work.Client\NuGet.Services.Work.Client.csproj", "{19324B97-1C22-49E2-8C1A-E4EAB682A974}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Services.Platform.Client", "src\Services\NuGet.Services.Platform.Client\NuGet.Services.Platform.Client.csproj", "{3BE823F7-53AA-4263-A953-06BF643F0E43}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuCmd", "src\Services\NuCmd\NuCmd.csproj", "{9752C50D-2DDE-4DC3-8A06-A01EC68FEDC0}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {EF86883E-A1B4-4052-9222-51A01C6C41CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {EF86883E-A1B4-4052-9222-51A01C6C41CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {EF86883E-A1B4-4052-9222-51A01C6C41CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {EF86883E-A1B4-4052-9222-51A01C6C41CD}.Release|Any CPU.Build.0 = Release|Any CPU
- {304B7FDA-3111-4670-9E77-4E5F20C89A8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {304B7FDA-3111-4670-9E77-4E5F20C89A8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {304B7FDA-3111-4670-9E77-4E5F20C89A8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {304B7FDA-3111-4670-9E77-4E5F20C89A8C}.Release|Any CPU.Build.0 = Release|Any CPU
- {A8B0845E-CF36-4ADB-B641-CA8542202878}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A8B0845E-CF36-4ADB-B641-CA8542202878}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A8B0845E-CF36-4ADB-B641-CA8542202878}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
- {A8B0845E-CF36-4ADB-B641-CA8542202878}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A8B0845E-CF36-4ADB-B641-CA8542202878}.Release|Any CPU.Build.0 = Release|Any CPU
- {A8B0845E-CF36-4ADB-B641-CA8542202878}.Release|Any CPU.Deploy.0 = Release|Any CPU
- {7F92C174-5310-4090-A6A3-3CC7C67C19D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7F92C174-5310-4090-A6A3-3CC7C67C19D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7F92C174-5310-4090-A6A3-3CC7C67C19D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7F92C174-5310-4090-A6A3-3CC7C67C19D6}.Release|Any CPU.Build.0 = Release|Any CPU
- {4405C24C-7F57-4826-831F-D5D7E139F02E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4405C24C-7F57-4826-831F-D5D7E139F02E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4405C24C-7F57-4826-831F-D5D7E139F02E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4405C24C-7F57-4826-831F-D5D7E139F02E}.Release|Any CPU.Build.0 = Release|Any CPU
- {1D0164B6-92D4-455A-AC68-C30B61733748}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1D0164B6-92D4-455A-AC68-C30B61733748}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1D0164B6-92D4-455A-AC68-C30B61733748}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1D0164B6-92D4-455A-AC68-C30B61733748}.Release|Any CPU.Build.0 = Release|Any CPU
- {19324B97-1C22-49E2-8C1A-E4EAB682A974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {19324B97-1C22-49E2-8C1A-E4EAB682A974}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {19324B97-1C22-49E2-8C1A-E4EAB682A974}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {19324B97-1C22-49E2-8C1A-E4EAB682A974}.Release|Any CPU.Build.0 = Release|Any CPU
- {3BE823F7-53AA-4263-A953-06BF643F0E43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3BE823F7-53AA-4263-A953-06BF643F0E43}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3BE823F7-53AA-4263-A953-06BF643F0E43}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3BE823F7-53AA-4263-A953-06BF643F0E43}.Release|Any CPU.Build.0 = Release|Any CPU
- {9752C50D-2DDE-4DC3-8A06-A01EC68FEDC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {9752C50D-2DDE-4DC3-8A06-A01EC68FEDC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {9752C50D-2DDE-4DC3-8A06-A01EC68FEDC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {9752C50D-2DDE-4DC3-8A06-A01EC68FEDC0}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {A8B0845E-CF36-4ADB-B641-CA8542202878} = {69E0B03C-B1FE-47E2-BFFD-5B9474BED386}
- {7F92C174-5310-4090-A6A3-3CC7C67C19D6} = {69E0B03C-B1FE-47E2-BFFD-5B9474BED386}
- {4405C24C-7F57-4826-831F-D5D7E139F02E} = {69E0B03C-B1FE-47E2-BFFD-5B9474BED386}
- {1D0164B6-92D4-455A-AC68-C30B61733748} = {69E0B03C-B1FE-47E2-BFFD-5B9474BED386}
- {19324B97-1C22-49E2-8C1A-E4EAB682A974} = {69E0B03C-B1FE-47E2-BFFD-5B9474BED386}
- EndGlobalSection
-EndGlobal
View
@@ -6,7 +6,7 @@ website for the NuGet client. For information about the NuGet clients, visit htt
## Build and Run the Gallery in (arbitrary number) easy steps
1. Prerequisites. Install these if you don't already have them:
- 1. Visual Studio 2012
+ 1. Visual Studio 2013
2. PowerShell 2.0 (comes with Windows 7+)
3. [NuGet](http://docs.nuget.org/docs/start-here/installing-nuget)
4. [Windows Azure SDK v2.2](http://www.microsoft.com/windowsazure/sdk/) - Note that later versions may be supported, but will require you to manually upgrade the ".Cloud" projects in the solution.
@@ -37,14 +37,9 @@ website for the NuGet client. For information about the NuGet clients, visit htt
```
If this fails, you are likely to get more useful output by passing -Debug than -Verbose.
-6. Set up the website in IIS Express!
- 1. We highly recommend using IIS Express. Use the [Web Platform Installer](microsoft.com/web) to install it if you don't have it already (it comes with recent versions of VS and WebMatrix though)
- 2. In an ADMIN powershell prompt, run the .\build\Enable-LocalTestMe.ps1 file. It allows non-admins to host websites at: http://nuget.localtest.me, it configures an IIS Express site at that URL and creates a self-signed SSL certificate. For more information on localtest.me, check out [readme.localtest.me](readme.localtest.me)
- 3. If you're having trouble, go to the Project Properties for the Website project, click on the Web tab and change the URL to localhost:port where _port_ is some port number above 1024.
-
-7. Change the value of Gallery.ConfirmEmailAddresses to false in Web.Config file under src\NuGetGallery, this is required to upload the packages after registration.
+6. Change the value of Gallery.ConfirmEmailAddresses to false in Web.Config file under src\NuGetGallery, this is required to upload the packages after registration.
-8. Ensure the 'NuGetGallery' project (under the Frontend folder) is set to the Startup Project
+7. Ensure the 'NuGetGallery' project (under the Frontend folder) is set to the Startup Project
That's it! You should now be able to press Ctrl-F5 to run the site!
Oops, something went wrong.

0 comments on commit 0428afe

Please sign in to comment.