|
11 | 11 | <PaketBootstrapper>$(MSBuildThisFileDirectory.Replace('build\','.paket'))\paket.bootstrapper.exe</PaketBootstrapper> |
12 | 12 | <Paket>$(MSBuildThisFileDirectory.Replace('build\','.paket'))\paket.exe</Paket> |
13 | 13 | <PackagesFolder>$(MSBuildThisFileDirectory.Replace('build\','packages'))</PackagesFolder> |
14 | | - <NuGet>$(PackagesFolder)\NuGet.CommandLine\tools$(LocalAppData)\NuGet.exe</NuGet> |
| 14 | + <NuGet>$(PackagesFolder)\NuGet.CommandLine\tools\NuGet.exe</NuGet> |
15 | 15 | <MSBuild>"$(MSBuildToolsPath)\MSBuild.exe"</MSBuild> |
16 | 16 | <XUnit>$(PackagesFolder)\xunit.runner.console\tools\xunit.console.exe</XUnit> |
17 | 17 | <XUnitXslt>$(PackagesFolder)\xunit.runner.console\tools\NUnitXml.xslt</XUnitXslt> |
|
48 | 48 | <Exec Command="$(Paket) install" /> |
49 | 49 | </Target> |
50 | 50 |
|
51 | | - <Target Name="DownloadNuGet" Condition="!Exists('$(NuGet)')"> |
52 | | - <MakeDir Directories="$(LocalAppData)\NuGet" /> |
53 | | - <Exec Command="@powershell -NoProfile -ExecutionPolicy unrestricted -Command "$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest 'https://www.nuget.org/nuget.exe' -OutFile '$(NuGet)'"" /> |
54 | | - </Target> |
55 | | - |
56 | 51 | <Target Name="DownloadPaket" Condition="!Exists('$(PaketBootstrapper)')"> |
57 | 52 | <Exec Command="@powershell -NoProfile -ExecutionPolicy unrestricted -Command "$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest 'https://github.com/fsprojects/Paket/releases/download/$(PaketVersion)/paket.bootstrapper.exe' -OutFile '$(PaketBootstrapper)'"" /> |
58 | 53 | <Exec Command="..\.paket\paket.bootstrapper.exe $(PaketVersion)" /> |
|
79 | 74 | OutputPaths="..\artifacts\TestResults\integration-tests.nunit.xml" /> |
80 | 75 | </Target> |
81 | 76 |
|
82 | | - <Target Name="MigrationTest" DependsOnTargets="DownloadNuGet"> |
| 77 | + <Target Name="MigrationTest" DependsOnTargets="RestorePackages"> |
83 | 78 | <PropertyGroup> |
84 | 79 | <MigrationSln>..\src\testing\migration\migration.sln</MigrationSln> |
85 | 80 | </PropertyGroup> |
|
110 | 105 |
|
111 | 106 | <!-- The publish targets don't depend upon Package because of how they are used on the CI server. At this point the code has been packaged and all that needs |
112 | 107 | to happen is to publish the artifact. --> |
113 | | - <Target Name="PublishNuGet" DependsOnTargets="DownloadNuGet"> |
| 108 | + <Target Name="PublishNuGet" DependsOnTargets="RestorePackages"> |
114 | 109 | <Exec Command="@powershell -NoProfile -ExecutionPolicy unrestricted -File check-nuget-version-exists.ps1 $(Version)" ConsoleToMSBuild="true"> |
115 | 110 | <Output TaskParameter="ConsoleOutput" PropertyName="ShouldPublishToNuGet" /> |
116 | 111 | </Exec> |
|
122 | 117 | Condition=" '$(ShouldPublishToNuGet)' == 'True' " /> |
123 | 118 | </Target> |
124 | 119 |
|
125 | | - <Target Name="PublishMyGet" DependsOnTargets="DownloadNuGet"> |
| 120 | + <Target Name="PublishMyGet" DependsOnTargets="RestorePackages"> |
126 | 121 | <!-- We don't need to check for existing versions because MyGet lets you overwrite --> |
127 | 122 | <!-- The environment variable BAMBOO_MYGET_PASSWORD comes from the nuget.password variable defined on the openstack.net plan in Bamboo --> |
128 | 123 | <Exec Command="$(NuGet) push ..\artifacts\packages\openstack.net.$(Version).nupkg %25BAMBOO_MYGET_PASSWORD%25 -Source https://www.myget.org/F/openstacknetsdk/api/v2"/> |
|
0 commit comments