-
Notifications
You must be signed in to change notification settings - Fork 101
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release/1.7.1' into master
- Loading branch information
Showing
43 changed files
with
2,187 additions
and
413 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -80,3 +80,4 @@ docs/html/ | |
| packages | ||
| paket.exe | ||
| paket.lock | ||
| paket.bootstrapper.exe | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <!-- Enable the restore command to run before builds --> | ||
| <RestorePackages Condition=" '$(RestorePackages)' == '' ">true</RestorePackages> | ||
| <!-- Download Paket.exe if it does not already exist --> | ||
| <DownloadPaket Condition=" '$(DownloadPaket)' == '' ">true</DownloadPaket> | ||
| <PaketToolsPath>$(MSBuildThisFileDirectory)</PaketToolsPath> | ||
| <PaketRootPath>$(MSBuildThisFileDirectory)..\</PaketRootPath> | ||
| <MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath> | ||
| <MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <!-- Paket command --> | ||
| <PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath> | ||
| <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath> | ||
| <PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand> | ||
| <PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand> | ||
| <PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)" $(PaketBootStrapperCommandArgs)</PaketBootStrapperCommand> | ||
| <PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 $(PaketBootStrapperExePath) $(PaketBootStrapperCommandArgs)</PaketBootStrapperCommand> | ||
| <!-- Commands --> | ||
| <PaketReferences Condition="!Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectDirectory)\paket.references</PaketReferences> | ||
| <PaketReferences Condition="!Exists('$(PaketReferences)')">$(MSBuildStartupDirectory)\paket.references</PaketReferences> | ||
| <PaketReferences Condition="Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectFullPath).paket.references</PaketReferences> | ||
| <RestoreCommand>$(PaketCommand) restore --references-files "$(PaketReferences)"</RestoreCommand> | ||
| <DownloadPaketCommand>$(PaketBootStrapperCommand)</DownloadPaketCommand> | ||
| <!-- We need to ensure packages are restored prior to assembly resolve --> | ||
| <BuildDependsOn Condition="$(RestorePackages) == 'true'">RestorePackages; $(BuildDependsOn);</BuildDependsOn> | ||
| </PropertyGroup> | ||
| <Target Name="CheckPrerequisites"> | ||
| <!-- Raise an error if we're unable to locate paket.exe --> | ||
| <Error Condition="'$(DownloadPaket)' != 'true' AND !Exists('$(PaketExePath)')" Text="Unable to locate '$(PaketExePath)'" /> | ||
| <MsBuild Targets="DownloadPaket" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadPaket=$(DownloadPaket)" /> | ||
| </Target> | ||
| <Target Name="DownloadPaket"> | ||
| <Exec Command="$(DownloadPaketCommand)" IgnoreStandardErrorWarningFormat="true" Condition=" '$(DownloadPaket)' == 'true' AND !Exists('$(PaketExePath)')" /> | ||
| </Target> | ||
| <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites"> | ||
| <Exec Command="$(RestoreCommand)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(PaketRootPath)" Condition="Exists('$(PaketReferences)')" ContinueOnError="true" /> | ||
| </Target> | ||
| </Project> |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| source https://www.myget.org/F/openstacknetsdk/api/v2 | ||
| source https://www.nuget.org/api/v2 | ||
| redirects: on | ||
|
|
||
| nuget EWSoftware.SHFB = 2014.11.22-beta | ||
| nuget Flurl.Http.Signed ~> 0.7.0 | ||
| nuget Flurl.Signed ~> 1.0 | ||
| nuget ILMerge | ||
| nuget Marvin.JsonPatch.Signed ~> 0.7.0 | ||
| nuget Moq | ||
| nuget Newtonsoft.Json ~> 6.0 | ||
| nuget NuGet.CommandLine | ||
| nuget SharpZipLib | ||
| nuget SimpleRESTServices = 1.3.0.1 | ||
| nuget xunit | ||
| nuget xunit.abstractions | ||
| nuget xunit.assert | ||
| nuget xunit.core | ||
| nuget xunit.extensibility.core | ||
| nuget xunit.runner.console | ||
| nuget xunit.runner.visualstudio | ||
|
|
||
| group History-1.5 | ||
| redirects: on | ||
| source https://www.nuget.org/api/v2 | ||
| framework: net45 | ||
| strategy: min | ||
|
|
||
| nuget openstack.net = 1.5.0.2 | ||
| nuget SimpleRESTServices = 1.3.0.1 | ||
|
|
||
| group History-1.4 | ||
| redirects: on | ||
| source https://www.nuget.org/api/v2 | ||
| framework: net45 | ||
| strategy: min | ||
|
|
||
| nuget openstack.net = 1.4.0.2 | ||
| nuget SimpleRESTServices = 1.3.0.1 | ||
|
|
||
| group History-1.3.6 | ||
| redirects: on | ||
| source https://www.nuget.org/api/v2 | ||
| framework: net35 | ||
| strategy: min | ||
|
|
||
| nuget openstack.net = 1.3.6.1 | ||
| nuget SimpleRESTServices = 1.3.0.1 |
Oops, something went wrong.