Skip to content

Commit 33bdb20

Browse files
authored
Merge pull request #2455 from markcowl/updatenuget
Update nuget and build infrastructure to accept CoreCLR RC2 packages
2 parents c92a051 + 5a91d90 commit 33bdb20

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

build.proj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,11 @@
111111

112112
<PropertyGroup>
113113
<NuGetCommand>$(MSBuildProjectDirectory)\tools\NuGet.exe</NuGetCommand>
114+
<LibraryNugetPackageFolder>$(LibrarySourceFolder)\packages</LibraryNugetPackageFolder>
114115
<NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\restore.config</NuGetRestoreConfigFile>
115116
<NuGetRestoreConfigSwitch>-ConfigFile &quot;$(NuGetRestoreConfigFile)&quot;</NuGetRestoreConfigSwitch>
117+
<NuGetRestorePackageSetting>-PackagesDirectory $(LibraryNugetPackageFolder)</NuGetRestorePackageSetting>
118+
116119
<PowerShellCommand>C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe</PowerShellCommand>
117120
</PropertyGroup>
118121

@@ -135,9 +138,9 @@
135138
Encoding="Unicode"/>
136139

137140
<Exec Command="$(NuGetCommand) sources add -Name LocalFeed -Source &quot;$(MSBuildProjectDirectory)\tools\LocalFeed&quot; $(NuGetRestoreConfigSwitch)"/>
138-
141+
<Exec Command="$(NuGetCommand) sources add -Name nugetRemote -Source &quot;https://api.nuget.org/v3/index.json&quot; $(NuGetRestoreConfigSwitch)"/>
139142
<!-- Restore packages -->
140-
<Exec Command="$(NuGetCommand) restore %(CmdletSolutionsToBuild.FullPath) $(NuGetRestoreConfigSwitch)"
143+
<Exec Command="$(NuGetCommand) restore %(CmdletSolutionsToBuild.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
141144
ContinueOnError="false" />
142145
<!-- Restore packages for static analysis-->
143146
<Exec Command="$(NuGetCommand) restore %(StaticAnalysis.FullPath) $(NuGetRestoreConfigSwitch)"

tools/NuGet.exe

2.17 MB
Binary file not shown.

0 commit comments

Comments
 (0)