Modified master build script to use an installed NuGet 3.x executable instead of the 2.x executable that is in the scripts directory which does not support the restore command.

StephenCWills committed 11 years ago

Commit 5312af41 parent 41fc1811 file · +2 −2Browse files

Showing the changes to Build/Scripts (1 of 1 file). Show all

Unified · Split

Build/Scripts/MasterBuild.buildproj+2−2

@@ -294,7 +294,7 @@ · 293 unmodified lines
294	294	<BuildOutputFolder Condition="'$(BuildOutputFolder)' == ''">$(LocalFolder)\Build\Output\$(BuildFlavor)</BuildOutputFolder>
295	295	<BuildInteractive Condition="'$(BuildInteractive)' == ''">true</BuildInteractive>
296	296	<VersionFile Condition="'$(VersionFile)' == ''">$(LocalFolder)\Build\Scripts\$(ProjectName).version</VersionFile>
297		− <NuGet Condition="'$(NuGet)' == ''">$(ProgramFiles64)\NuGet\nuget.exe</NuGet>
	297	+ <NuGet3 Condition="'$(NuGet3)' == ''">$(ProgramFiles64)\NuGet\nuget.exe</NuGet3>
298	298	<GitClient Condition="'$(GitClient)' == ''">$(ProgramFiles32)\Git\cmd\git.exe</GitClient>
299	299	<GitBranch Condition="'$(GitBranch)' == ''">master</GitBranch>
300	300	<VisualStudio Condition="'$(VisualStudio)' == ''">$(VS110COMNTOOLS)\..\IDE\devenv.com</VisualStudio>
@@ -345,7 +345,7 @@ · 44 unmodified lines
345	345	<Exec Command="%22$(GitClient)%22 fetch" WorkingDirectory="$(LocalFolder)"/>
346	346	<Exec Command="%22$(GitClient)%22 reset --hard %22origin/$(GitBranch)%22" WorkingDirectory="$(LocalFolder)"/>
347	347	<Exec Command="%22$(GitClient)%22 clean -f -d -x" WorkingDirectory="$(LocalFolder)"/>
348		− <Exec Command="%22$(NuGet)%22 restore %22$(ProjectSolution)%22"/>
	348	+ <Exec Command="%22$(NuGet3)%22 restore %22$(ProjectSolution)%22"/>
349	349	<CallTarget Targets="CheckForChanges"/>
350	350	</Target>
351	351