Merge branch 'dev'

NuGet · Aug 25, 2016 · f78be11 · f78be11
2 parents f2e05b6 + 0ad13c5
commit f78be11
Show file tree

Hide file tree

Showing 60 changed files with 977 additions and 1,528 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,7 +17,6 @@ Packages.dgml
 *.sln.docstates
 
 # Build results
-
 [Dd]ebug/
 [Rr]elease/
 x64/
@@ -149,7 +148,7 @@ Desktop.ini
 # Recycle Bin used on file shares
 $RECYCLE.BIN/
 
-# Mac crap
+# Mac
 .DS_Store
 
 # NuGetGallery Specific Ignores
@@ -175,3 +174,4 @@ src/NuGetGallery.Cloud/ecf/
 # Vs2015
 .vs/config/applicationhost.config
 src/NuGetGallery/App_Data/Files/auditing/
+artifacts/
diff --git a/.nuget/packages.config b/.nuget/packages.config
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="xunit.runner.visualstudio" version="2.0.1" />
+  <package id="Microsoft.CodeAnalysis.BinSkim" version="1.3.4-beta" />
+  <package id="xunit.runner.console" version="2.1.0" />
+  <package id="xunit.runner.visualstudio" version="2.1.0" />
 </packages>
diff --git a/Changelog.md b/Changelog.md
diff --git a/NuGet.Cloud.targets b/NuGet.Cloud.targets
diff --git a/NuGet.config b/NuGet.config
@@ -8,8 +8,8 @@
     <add key="automatic" value="True" />
   </packageRestore>
   <packageSources>
-    <add key="v2.nuget.org" value="https://nuget.org/api/v2" />
-    <add key="nugetbuild" value="https://www.myget.org/F/nugetbuild/api/v2/" />
+    <add key="nuget" value="https://api.nuget.org/v3/index.json" />
+    <add key="nugetbuild" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />
   </packageSources>
   <activePackageSource>
     <add key="All" value="(Aggregate source)" />

diff --git a/NuGetGallery.sln b/NuGetGallery.sln
@@ -24,8 +24,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGetGallery.Core", "src\Nu
 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("{CC5FD16D-436D-48AD-A40C-5A424C6E3E79}") = "NuGetGallery.Cloud", "src\NuGetGallery.Cloud\NuGetGallery.Cloud.ccproj", "{0041ACA0-30EC-4554-8C7C-0AF810F3086F}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3. Tests", "3. Tests", "{39E54EC3-CBAA-453A-BE64-748FE1559A58}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0. Shared", "0. Shared", "{155100FF-524B-4CAF-93C6-A57478B3DBAD}"
@@ -62,10 +60,6 @@ Global
 		{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
-		{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
 		{6931C2EE-E081-4518-9798-D34D83B35BF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6931C2EE-E081-4518-9798-D34D83B35BF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6931C2EE-E081-4518-9798-D34D83B35BF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -81,7 +75,6 @@ Global
 		{F240D1BC-BBFB-4F22-9DF8-3FDE36BFD665} = {2ECA1159-9B9D-4D65-95AF-F14337FD3DA6}
 		{097B2CDD-9623-4C34-93C2-D373D51F5B4E} = {155100FF-524B-4CAF-93C6-A57478B3DBAD}
 		{8AC9E39E-366C-47E5-80AE-38E71CD31386} = {39E54EC3-CBAA-453A-BE64-748FE1559A58}
-		{0041ACA0-30EC-4554-8C7C-0AF810F3086F} = {05998089-58F5-4A84-8C11-C5C6244A6F89}
 		{6931C2EE-E081-4518-9798-D34D83B35BF6} = {05998089-58F5-4A84-8C11-C5C6244A6F89}
 	EndGlobalSection
 EndGlobal