MS are stupid and auto download gets old version of NuGet

programcsharp · Dec 23, 2017 · c0eb057 · c0eb057
1 parent 6ee23b8
commit c0eb057
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -49,4 +49,4 @@ _ReSharper*/
 #NuGet
 packages/
 .vs
-/.nuget/NuGet.exe
+#/.nuget/NuGet.exe
diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets
@@ -13,7 +13,7 @@
         <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
 
         <!-- Download NuGet.exe if it does not already exist -->
-        <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">true</DownloadNuGetExe>
+        <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
     </PropertyGroup>
 
     <ItemGroup Condition=" '$(PackageSources)' == '' ">

diff --git a/Build/build.proj b/Build/build.proj
@@ -24,9 +24,9 @@
 
     <ItemGroup>
       <Libs Include="$(BaseDir)\Griddly.Mvc\bin\$(Configuration)\Griddly.Mvc.dll" />
-      <Content Include="$(BaseDir)\Griddly\**\griddly.js" />
-      <Content Include="$(BaseDir)\Griddly\**\editly.js" />
-      <Content Include="$(BaseDir)\Griddly\**\griddly.css" />
+      <Content Include="$(BaseDir)\Griddly\Scripts\griddly.js" />
+      <Content Include="$(BaseDir)\Griddly\Scripts\editly.js" />
+      <Content Include="$(BaseDir)\Griddly\Content\griddly.css" />
       <Content Include="$(BaseDir)\Griddly\**\Views\Shared\Griddly\*.*" />
     </ItemGroup>
 

diff --git a/Build/publish-nuget.ps1 b/Build/publish-nuget.ps1
@@ -51,7 +51,7 @@ else {
     $packages | % { 
         $package = $_.Name
         write-host "Uploading $package"
-        & $nugetpath push $package $key
+        & $nugetpath push $package $key -src nuget.org
         write-host ""
     }
   }

diff --git a/Griddly.sln b/Griddly.sln
@@ -19,6 +19,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{71734489-B8FF-4A41-BB19-1427A7935E95}"
 	ProjectSection(SolutionItems) = preProject
 		.nuget\NuGet.Config = .nuget\NuGet.Config
+		.nuget\NuGet.exe = .nuget\NuGet.exe
 		.nuget\NuGet.targets = .nuget\NuGet.targets
 	EndProjectSection
 EndProject