Skip to content

Commit 97aa150

Browse files
carolynvscarolynvs
committed
Merge branch 'release/1.7.1' into master
2 parents cc06c8f + 697cbd2 commit 97aa150

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+2187
-413
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,4 @@ docs/html/
8080
packages
8181
paket.exe
8282
paket.lock
83+
paket.bootstrapper.exe

‎.paket/paket.targets‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<!-- Enable the restore command to run before builds -->
5+
<RestorePackages Condition=" '$(RestorePackages)' == '' ">true</RestorePackages>
6+
<!-- Download Paket.exe if it does not already exist -->
7+
<DownloadPaket Condition=" '$(DownloadPaket)' == '' ">true</DownloadPaket>
8+
<PaketToolsPath>$(MSBuildThisFileDirectory)</PaketToolsPath>
9+
<PaketRootPath>$(MSBuildThisFileDirectory)..\</PaketRootPath>
10+
<MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
11+
<MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath>
12+
</PropertyGroup>
13+
<PropertyGroup>
14+
<!-- Paket command -->
15+
<PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
16+
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
17+
<PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
18+
<PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
19+
<PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)" $(PaketBootStrapperCommandArgs)</PaketBootStrapperCommand>
20+
<PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 $(PaketBootStrapperExePath) $(PaketBootStrapperCommandArgs)</PaketBootStrapperCommand>
21+
<!-- Commands -->
22+
<PaketReferences Condition="!Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectDirectory)\paket.references</PaketReferences>
23+
<PaketReferences Condition="!Exists('$(PaketReferences)')">$(MSBuildStartupDirectory)\paket.references</PaketReferences>
24+
<PaketReferences Condition="Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectFullPath).paket.references</PaketReferences>
25+
<RestoreCommand>$(PaketCommand) restore --references-files "$(PaketReferences)"</RestoreCommand>
26+
<DownloadPaketCommand>$(PaketBootStrapperCommand)</DownloadPaketCommand>
27+
<!-- We need to ensure packages are restored prior to assembly resolve -->
28+
<BuildDependsOn Condition="$(RestorePackages) == 'true'">RestorePackages; $(BuildDependsOn);</BuildDependsOn>
29+
</PropertyGroup>
30+
<Target Name="CheckPrerequisites">
31+
<!-- Raise an error if we're unable to locate paket.exe -->
32+
<Error Condition="'$(DownloadPaket)' != 'true' AND !Exists('$(PaketExePath)')" Text="Unable to locate '$(PaketExePath)'" />
33+
<MsBuild Targets="DownloadPaket" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadPaket=$(DownloadPaket)" />
34+
</Target>
35+
<Target Name="DownloadPaket">
36+
<Exec Command="$(DownloadPaketCommand)" IgnoreStandardErrorWarningFormat="true" Condition=" '$(DownloadPaket)' == 'true' AND !Exists('$(PaketExePath)')" />
37+
</Target>
38+
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
39+
<Exec Command="$(RestoreCommand)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(PaketRootPath)" Condition="Exists('$(PaketReferences)')" ContinueOnError="true" />
40+
</Target>
41+
</Project>

‎NuGet.config‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎build/build.proj‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,15 @@
77
<Version Condition=" '$(bamboo_GitVersion_NuGetVersion)' != '' ">$(bamboo_GitVersion_NuGetVersion)</Version>
88
<Version Condition=" '$(bamboo_GitVersion_NuGetVersion)' == '' ">0.0.0-dev</Version>
99

10-
<ILMerge>$(MSBuildThisFileDirectory.Replace('build\','src'))\packages\ILMerge.2.14.1208\tools\ILMerge.exe</ILMerge>
11-
<NuGet>$(LocalAppData)\NuGet\NuGet.exe</NuGet>
10+
<PaketVersion>3.4.0</PaketVersion>
11+
<PaketBootstrapper>$(MSBuildThisFileDirectory.Replace('build\','.paket'))\paket.bootstrapper.exe</PaketBootstrapper>
12+
<Paket>$(MSBuildThisFileDirectory.Replace('build\','.paket'))\paket.exe</Paket>
13+
<PackagesFolder>$(MSBuildThisFileDirectory.Replace('build\','packages'))</PackagesFolder>
14+
<NuGet>$(PackagesFolder)\NuGet.CommandLine\tools\NuGet.exe</NuGet>
1215
<MSBuild>&quot;$(MSBuildToolsPath)\MSBuild.exe&quot;</MSBuild>
13-
<XUnit>$(MSBuildThisFileDirectory.Replace('build\','src'))\packages\xunit.runner.console.2.0.0\tools\xunit.console.exe</XUnit>
14-
<XUnitXslt>$(MSBuildThisFileDirectory.Replace('build\','src'))\packages\xunit.runner.console.2.0.0\tools\NUnitXml.xslt</XUnitXslt>
16+
<XUnit>$(PackagesFolder)\xunit.runner.console\tools\xunit.console.exe</XUnit>
17+
<XUnitXslt>$(PackagesFolder)\xunit.runner.console\tools\NUnitXml.xslt</XUnitXslt>
18+
<ILMerge>$(PackagesFolder)\ILMerge\tools\ILMerge.exe</ILMerge>
1519
</PropertyGroup>
1620

1721
<Target Name="CI">
@@ -33,20 +37,20 @@
3337

3438
<Target Name="Documentation" DependsOnTargets="Build">
3539
<PropertyGroup>
36-
<SHFBROOT>$(MSBuildThisFileDirectory.Replace('build\','src'))\packages\EWSoftware.SHFB.2014.11.22-beta\tools</SHFBROOT>
40+
<SHFBROOT>$(PackagesFolder)\EWSoftware.SHFB\tools</SHFBROOT>
3741
</PropertyGroup>
3842

39-
<Exec Command="$(NuGet) restore ..\src\Documentation\Documentation.sln" />
4043
<Exec Command="(set SHFBROOT=$(SHFBROOT)) &amp; $(MSBuild) ..\src\Documentation\Documentation.sln /p:Configuration=$(Configuration) /nologo /v:minimal" />
4144
</Target>
4245

43-
<Target Name="RestorePackages" DependsOnTargets="DownloadNuGet">
44-
<Exec Command="$(NuGet) restore ..\src\openstack.net.sln" />
46+
<Target Name="RestorePackages" DependsOnTargets="DownloadPaket">
47+
<Exec Command="$(PaketBootstrapper)" />
48+
<Exec Command="$(Paket) install" />
4549
</Target>
4650

47-
<Target Name="DownloadNuGet" Condition="!Exists('$(NuGet)')">
48-
<MakeDir Directories="$(LocalAppData)\NuGet" />
49-
<Exec Command="@powershell -NoProfile -ExecutionPolicy unrestricted -Command &quot;$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest 'https://www.nuget.org/nuget.exe' -OutFile '$(NuGet)'&quot;" />
51+
<Target Name="DownloadPaket" Condition="!Exists('$(PaketBootstrapper)')">
52+
<Exec Command="@powershell -NoProfile -ExecutionPolicy unrestricted -Command &quot;$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest 'https://github.com/fsprojects/Paket/releases/download/$(PaketVersion)/paket.bootstrapper.exe' -OutFile '$(PaketBootstrapper)'&quot;" />
53+
<Exec Command="..\.paket\paket.bootstrapper.exe $(PaketVersion)" />
5054
</Target>
5155

5256
<Target Name="UnitTest" DependsOnTargets="Build">
@@ -70,7 +74,7 @@
7074
OutputPaths="..\artifacts\TestResults\integration-tests.nunit.xml" />
7175
</Target>
7276

73-
<Target Name="MigrationTest" DependsOnTargets="DownloadNuGet">
77+
<Target Name="MigrationTest" DependsOnTargets="RestorePackages">
7478
<PropertyGroup>
7579
<MigrationSln>..\src\testing\migration\migration.sln</MigrationSln>
7680
</PropertyGroup>
@@ -101,7 +105,7 @@
101105

102106
<!-- 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
103107
to happen is to publish the artifact. -->
104-
<Target Name="PublishNuGet" DependsOnTargets="DownloadNuGet">
108+
<Target Name="PublishNuGet">
105109
<Exec Command="@powershell -NoProfile -ExecutionPolicy unrestricted -File check-nuget-version-exists.ps1 $(Version)" ConsoleToMSBuild="true">
106110
<Output TaskParameter="ConsoleOutput" PropertyName="ShouldPublishToNuGet" />
107111
</Exec>
@@ -113,7 +117,7 @@
113117
Condition=" '$(ShouldPublishToNuGet)' == 'True' " />
114118
</Target>
115119

116-
<Target Name="PublishMyGet" DependsOnTargets="DownloadNuGet">
120+
<Target Name="PublishMyGet">
117121
<!-- We don't need to check for existing versions because MyGet lets you overwrite -->
118122
<!-- The environment variable BAMBOO_MYGET_PASSWORD comes from the nuget.password variable defined on the openstack.net plan in Bamboo -->
119123
<Exec Command="$(NuGet) push ..\artifacts\packages\openstack.net.$(Version).nupkg %25BAMBOO_MYGET_PASSWORD%25 -Source https://www.myget.org/F/openstacknetsdk/api/v2"/>

‎paket.dependencies‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
source https://www.myget.org/F/openstacknetsdk/api/v2
2+
source https://www.nuget.org/api/v2
3+
redirects: on
4+
5+
nuget EWSoftware.SHFB = 2014.11.22-beta
6+
nuget Flurl.Http.Signed ~> 0.7.0
7+
nuget Flurl.Signed ~> 1.0
8+
nuget ILMerge
9+
nuget Marvin.JsonPatch.Signed ~> 0.7.0
10+
nuget Moq
11+
nuget Newtonsoft.Json ~> 6.0
12+
nuget NuGet.CommandLine
13+
nuget SharpZipLib
14+
nuget SimpleRESTServices = 1.3.0.1
15+
nuget xunit
16+
nuget xunit.abstractions
17+
nuget xunit.assert
18+
nuget xunit.core
19+
nuget xunit.extensibility.core
20+
nuget xunit.runner.console
21+
nuget xunit.runner.visualstudio
22+
23+
group History-1.5
24+
redirects: on
25+
source https://www.nuget.org/api/v2
26+
framework: net45
27+
strategy: min
28+
29+
nuget openstack.net = 1.5.0.2
30+
nuget SimpleRESTServices = 1.3.0.1
31+
32+
group History-1.4
33+
redirects: on
34+
source https://www.nuget.org/api/v2
35+
framework: net45
36+
strategy: min
37+
38+
nuget openstack.net = 1.4.0.2
39+
nuget SimpleRESTServices = 1.3.0.1
40+
41+
group History-1.3.6
42+
redirects: on
43+
source https://www.nuget.org/api/v2
44+
framework: net35
45+
strategy: min
46+
47+
nuget openstack.net = 1.3.6.1
48+
nuget SimpleRESTServices = 1.3.0.1

0 commit comments

Comments
 (0)