From fe3ce3fcffc9f317d25a8f3c2a5a2d6c18588796 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Tue, 3 Jan 2017 10:55:03 -0600 Subject: [PATCH 01/14] Use Int64 for image size Fixes #620 --- src/corelib/Compute/v2_1/Image.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/corelib/Compute/v2_1/Image.cs b/src/corelib/Compute/v2_1/Image.cs index 8872d330c..c0c2bcee6 100644 --- a/src/corelib/Compute/v2_1/Image.cs +++ b/src/corelib/Compute/v2_1/Image.cs @@ -40,19 +40,19 @@ public Image() /// The minimum disk size in GB that is required to boot the image. /// [JsonProperty("minDisk")] - public int MinimumDiskSize { get; set; } + public Int64 MinimumDiskSize { get; set; } /// /// The minimum amount of RAM in MB that is required to boot the image. /// [JsonProperty("minRam")] - public int MinimumMemorySize { get; set; } + public Int64 MinimumMemorySize { get; set; } /// /// The size of the image data, in bytes. /// [JsonProperty("OS-EXT-IMG-SIZE:size")] - public int? Size { get; set; } + public Int64? Size { get; set; } /// /// The build completion progress, as a percentage. @@ -111,7 +111,7 @@ public ImageType Type { return WaitForStatus(ImageStatus.Active, refreshDelay, timeout, progress, cancellationToken); } - + /// /// When this instance was not constructed by the , as it is missing the appropriate internal state to execute service calls. public override async Task WaitUntilDeletedAsync(TimeSpan? refreshDelay = null, TimeSpan? timeout = null, IProgress progress = null, CancellationToken cancellationToken = default(CancellationToken)) From 9fedcf397241bb6fec88350849ead6dc571730b0 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Wed, 15 Mar 2017 15:46:30 -0500 Subject: [PATCH 02/14] Set project as unmaintained --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 11d338f38..fb11d6309 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# OpenStack.NET +# OpenStack.NET - Unsupported -Need Help? Email us at [sdk-support@rackspace.com](mailto:sdk-support@rackspace.com). +**This project is in-between maintainers.** Interested? Contact sdk-support@rackspace.com. [![Join the chat at https://gitter.im/openstacknetsdk/openstack.net](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/openstacknetsdk/openstack.net?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) From 41b362fc6865c654e5ea6f9d1b46f42cecc16414 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Thu, 16 Mar 2017 09:46:08 -0500 Subject: [PATCH 03/14] Run gitversion before build --- build/build.proj | 4 ++-- pre-myget.ps1 | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 pre-myget.ps1 diff --git a/build/build.proj b/build/build.proj index 42c5ad157..5497dde2b 100644 --- a/build/build.proj +++ b/build/build.proj @@ -4,8 +4,8 @@ Debug - $(bamboo_GitVersion_NuGetVersion) - 0.0.0-dev + $(GitVersion.NuGetVersion) + 0.0.0-dev 2.66.9 $(MSBuildThisFileDirectory.Replace('build\','.paket'))\paket.bootstrapper.exe diff --git a/pre-myget.ps1 b/pre-myget.ps1 new file mode 100644 index 000000000..30defacb1 --- /dev/null +++ b/pre-myget.ps1 @@ -0,0 +1 @@ +GitVersion /Output BuildServer /UpdateAssemblyInfo From f0c46af75a92e08f4cfe0a8c8915227f9060b63f Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Thu, 16 Mar 2017 09:46:33 -0500 Subject: [PATCH 04/14] Add myget build script --- myget.ps1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 myget.ps1 diff --git a/myget.ps1 b/myget.ps1 new file mode 100644 index 000000000..2ad5c4232 --- /dev/null +++ b/myget.ps1 @@ -0,0 +1 @@ +.\build.cmd Build From 0b65fc562160db97f73c574dc73eace9a8a52f1e Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Thu, 16 Mar 2017 11:32:09 -0500 Subject: [PATCH 05/14] Apply latest paket tweaks --- paket.lock | 5 - .../FSharpCodeSamples.fsproj | 29 ++- src/Samples/FSharpCodeSamples/app.config | 2 +- src/corelib/OpenStack.csproj | 133 ++++++----- src/corelib/app.config | 2 +- src/testing/integration/App.config | 2 +- .../OpenStack.IntegrationTests.csproj | 213 ++++++++++-------- src/testing/unit/OpenStack.UnitTests.csproj | 211 +++++++++-------- src/testing/unit/app.config | 2 +- 9 files changed, 321 insertions(+), 278 deletions(-) diff --git a/paket.lock b/paket.lock index ee761675f..fc9e8a48a 100644 --- a/paket.lock +++ b/paket.lock @@ -1,10 +1,8 @@ REDIRECTS: ON NUGET remote: https://www.myget.org/F/openstacknetsdk/api/v2 - specs: EWSoftware.SHFB (2014.11.22-beta) remote: https://www.nuget.org/api/v2 - specs: Flurl.Http.Signed (0.7) Flurl.Signed (>= 1.0.10) - framework: >= net45, portable-net45+sl50+win+wpa81+wp80 Microsoft.Bcl.Async (>= 1.0.168) - framework: portable-net45+sl50+win+wpa81+wp80 @@ -204,7 +202,6 @@ STRATEGY: MIN FRAMEWORK: NET35 NUGET remote: https://www.nuget.org/api/v2 - specs: Newtonsoft.Json (5.0.8) openstack.net (1.3.6.1) Newtonsoft.Json (>= 5.0.8) @@ -220,7 +217,6 @@ STRATEGY: MIN FRAMEWORK: NET45 NUGET remote: https://www.nuget.org/api/v2 - specs: Flurl.Http.Signed (0.6.2.2015062601) Flurl.Signed (>= 1.0.8) Newtonsoft.Json (>= 6.0.3) @@ -242,7 +238,6 @@ STRATEGY: MIN FRAMEWORK: NET45 NUGET remote: https://www.nuget.org/api/v2 - specs: Flurl.Http.Signed (0.6.2.2015062601) Flurl.Signed (>= 1.0.8) Newtonsoft.Json (>= 6.0.3) diff --git a/src/Samples/FSharpCodeSamples/FSharpCodeSamples.fsproj b/src/Samples/FSharpCodeSamples/FSharpCodeSamples.fsproj index 54dacc5c1..d4752e391 100644 --- a/src/Samples/FSharpCodeSamples/FSharpCodeSamples.fsproj +++ b/src/Samples/FSharpCodeSamples/FSharpCodeSamples.fsproj @@ -82,25 +82,25 @@ --> - + - ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json\lib\net20\Newtonsoft.Json.dll True True - + - ..\..\..\packages\Newtonsoft.Json\lib\net20\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll True True - + ..\..\..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll @@ -109,7 +109,7 @@ - + ..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll @@ -118,16 +118,16 @@ - + - ..\..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81+dnxcore50\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json\lib\netcore45\Newtonsoft.Json.dll True True - + ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll @@ -136,6 +136,15 @@ + + + + ..\..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81+aspnetcore50\Newtonsoft.Json.dll + True + True + + + @@ -147,7 +156,7 @@ - + ..\..\..\packages\SimpleRESTServices\lib\net40\SimpleRESTServices.dll diff --git a/src/Samples/FSharpCodeSamples/app.config b/src/Samples/FSharpCodeSamples/app.config index 0ed82eae5..a38c807f2 100644 --- a/src/Samples/FSharpCodeSamples/app.config +++ b/src/Samples/FSharpCodeSamples/app.config @@ -5,6 +5,6 @@ True - + \ No newline at end of file diff --git a/src/corelib/OpenStack.csproj b/src/corelib/OpenStack.csproj index ac7cb0f39..557b01642 100644 --- a/src/corelib/OpenStack.csproj +++ b/src/corelib/OpenStack.csproj @@ -883,7 +883,7 @@ --> - + ..\..\packages\Flurl.Http.Signed\lib\net45\Flurl.Http.dll @@ -903,7 +903,7 @@ - + ..\..\packages\Flurl.Signed\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Flurl.dll @@ -919,7 +919,7 @@ - + ..\..\packages\Marvin.JsonPatch.Signed\lib\portable-net40+win+wpa81\Marvin.JsonPatch.dll @@ -930,39 +930,39 @@ - + - ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.IO.dll + ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.IO.dll True True - ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.Runtime.dll + ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.Runtime.dll True True - ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.Threading.Tasks.dll + ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.Threading.Tasks.dll True True - + - ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.IO.dll + ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.IO.dll True True - ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.Runtime.dll + ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.Runtime.dll True True - ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.Threading.Tasks.dll + ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.Threading.Tasks.dll True True @@ -987,39 +987,39 @@ - + - ..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.IO.dll + ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.IO.dll True True - ..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.Runtime.dll + ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.Runtime.dll True True - ..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.Threading.Tasks.dll + ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.Threading.Tasks.dll True True - + - ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.IO.dll + ..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.IO.dll True True - ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.Runtime.dll + ..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.Runtime.dll True True - ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.Threading.Tasks.dll + ..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.Threading.Tasks.dll True True @@ -1048,13 +1048,13 @@ - - ..\..\packages\Microsoft.Bcl.Async\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.Extensions.dll + + ..\..\packages\Microsoft.Bcl.Async\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.dll True True - - ..\..\packages\Microsoft.Bcl.Async\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.dll + + ..\..\packages\Microsoft.Bcl.Async\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.Extensions.dll True True @@ -1062,13 +1062,13 @@ - - ..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wp8+wpa81\Microsoft.Threading.Tasks.Extensions.dll + + ..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wp8+wpa81\Microsoft.Threading.Tasks.dll True True - - ..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wp8+wpa81\Microsoft.Threading.Tasks.dll + + ..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wp8+wpa81\Microsoft.Threading.Tasks.Extensions.dll True True @@ -1076,13 +1076,13 @@ - - ..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wpa81\Microsoft.Threading.Tasks.Extensions.dll + + ..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wpa81\Microsoft.Threading.Tasks.dll True True - - ..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wpa81\Microsoft.Threading.Tasks.dll + + ..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wpa81\Microsoft.Threading.Tasks.Extensions.dll True True @@ -1104,29 +1104,29 @@ - + - ..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8+wpa81\System.Net.Http.Extensions.dll + ..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8\System.Net.Http.Extensions.dll True True - ..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8+wpa81\System.Net.Http.Primitives.dll + ..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8\System.Net.Http.Primitives.dll True True - + - ..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8\System.Net.Http.Extensions.dll + ..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8+wpa81\System.Net.Http.Extensions.dll True True - ..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8\System.Net.Http.Primitives.dll + ..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8+wpa81\System.Net.Http.Primitives.dll True True @@ -1134,25 +1134,25 @@ - + - ..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json\lib\net20\Newtonsoft.Json.dll True True - + - ..\..\packages\Newtonsoft.Json\lib\net20\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll True True - + ..\..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll @@ -1161,7 +1161,7 @@ - + ..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll @@ -1170,16 +1170,16 @@ - + - ..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81+dnxcore50\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json\lib\netcore45\Newtonsoft.Json.dll True True - + ..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll @@ -1188,31 +1188,26 @@ - - - + - - ..\..\packages\PCLStorage\lib\portable-win8+wpa81\PCLStorage.Abstractions.dll - True - True - - - ..\..\packages\PCLStorage\lib\portable-win8+wpa81\PCLStorage.dll + + ..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81+aspnetcore50\Newtonsoft.Json.dll True True + + - - ..\..\packages\PCLStorage\lib\portable-net45+sl5+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.Abstractions.dll + + ..\..\packages\PCLStorage\lib\portable-net45+sl5+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.dll True True - - ..\..\packages\PCLStorage\lib\portable-net45+sl5+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.dll + + ..\..\packages\PCLStorage\lib\portable-net45+sl5+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.Abstractions.dll True True @@ -1220,13 +1215,27 @@ + + ..\..\packages\PCLStorage\lib\portable-net45+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.dll + True + True + ..\..\packages\PCLStorage\lib\portable-net45+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.Abstractions.dll True True + + + + - ..\..\packages\PCLStorage\lib\portable-net45+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.dll + ..\..\packages\PCLStorage\lib\portable-win8+wpa81\PCLStorage.dll + True + True + + + ..\..\packages\PCLStorage\lib\portable-win8+wpa81\PCLStorage.Abstractions.dll True True @@ -1243,7 +1252,7 @@ - + ..\..\packages\SimpleRESTServices\lib\net40\SimpleRESTServices.dll diff --git a/src/corelib/app.config b/src/corelib/app.config index 93e946be6..19027a646 100644 --- a/src/corelib/app.config +++ b/src/corelib/app.config @@ -5,6 +5,6 @@ True - + diff --git a/src/testing/integration/App.config b/src/testing/integration/App.config index 5c1fe4591..4919419b5 100644 --- a/src/testing/integration/App.config +++ b/src/testing/integration/App.config @@ -11,6 +11,6 @@ True - + \ No newline at end of file diff --git a/src/testing/integration/OpenStack.IntegrationTests.csproj b/src/testing/integration/OpenStack.IntegrationTests.csproj index 70fddbb33..7c9882a98 100644 --- a/src/testing/integration/OpenStack.IntegrationTests.csproj +++ b/src/testing/integration/OpenStack.IntegrationTests.csproj @@ -107,31 +107,42 @@ - + - <__paket__xunit_runner_visualstudio_props>win81\xunit.runner.visualstudio - <__paket__xunit_runner_visualstudio_targets>win81\xunit.runner.visualstudio + <__paket__xunit_runner_visualstudio_props>net20\xunit.runner.visualstudio - + - <__paket__xunit_runner_visualstudio_props>net20\xunit.runner.visualstudio + <__paket__xunit_runner_visualstudio_props>portable-net45+win8+wp8+wpa81\xunit.runner.visualstudio - + - <__paket__xunit_runner_visualstudio_props>wpa81\xunit.runner.visualstudio - <__paket__xunit_runner_visualstudio_targets>wpa81\xunit.runner.visualstudio + <__paket__xunit_runner_visualstudio_props>uap10.0\xunit.runner.visualstudio + <__paket__xunit_runner_visualstudio_targets>uap10.0\xunit.runner.visualstudio - + - <__paket__xunit_runner_visualstudio_props>portable-net45+win8+wp8+wpa81\xunit.runner.visualstudio + <__paket__xunit_runner_visualstudio_props>win81\xunit.runner.visualstudio + <__paket__xunit_runner_visualstudio_targets>win81\xunit.runner.visualstudio + + + + + <__paket__xunit_runner_visualstudio_props>wpa81\xunit.runner.visualstudio + <__paket__xunit_runner_visualstudio_targets>wpa81\xunit.runner.visualstudio + + + <__paket__xunit_core_props>portable-net45+win8+wp8+wpa81\xunit.core + + <__paket__xunit_core_props>win81\xunit.core @@ -142,11 +153,6 @@ <__paket__xunit_core_props>wpa81\xunit.core - - - <__paket__xunit_core_props>portable-net45+win8+wp8+wpa81\xunit.core - - - + ..\..\..\packages\Flurl.Http.Signed\lib\net45\Flurl.Http.dll @@ -178,7 +184,7 @@ - + ..\..\..\packages\Flurl.Signed\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Flurl.dll @@ -189,7 +195,7 @@ - + ..\..\..\packages\Marvin.JsonPatch.Signed\lib\portable-net40+win+wpa81\Marvin.JsonPatch.dll @@ -200,39 +206,39 @@ - + - ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.IO.dll + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.IO.dll True True - ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.Runtime.dll + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.Runtime.dll True True - ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.Threading.Tasks.dll + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.Threading.Tasks.dll True True - + - ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.IO.dll + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.IO.dll True True - ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.Runtime.dll + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.Runtime.dll True True - ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.Threading.Tasks.dll + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.Threading.Tasks.dll True True @@ -257,39 +263,39 @@ - + - ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.IO.dll + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.IO.dll True True - ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.Runtime.dll + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.Runtime.dll True True - ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.Threading.Tasks.dll + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.Threading.Tasks.dll True True - + - ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.IO.dll + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.IO.dll True True - ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.Runtime.dll + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.Runtime.dll True True - ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.Threading.Tasks.dll + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.Threading.Tasks.dll True True @@ -318,13 +324,13 @@ - - ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.Extensions.dll + + ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.dll True True - - ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.dll + + ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.Extensions.dll True True @@ -332,13 +338,13 @@ - - ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wp8+wpa81\Microsoft.Threading.Tasks.Extensions.dll + + ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wp8+wpa81\Microsoft.Threading.Tasks.dll True True - - ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wp8+wpa81\Microsoft.Threading.Tasks.dll + + ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wp8+wpa81\Microsoft.Threading.Tasks.Extensions.dll True True @@ -346,13 +352,13 @@ - - ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wpa81\Microsoft.Threading.Tasks.Extensions.dll + + ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wpa81\Microsoft.Threading.Tasks.dll True True - - ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wpa81\Microsoft.Threading.Tasks.dll + + ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wpa81\Microsoft.Threading.Tasks.Extensions.dll True True @@ -374,29 +380,29 @@ - + - ..\..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8+wpa81\System.Net.Http.Extensions.dll + ..\..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8\System.Net.Http.Extensions.dll True True - ..\..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8+wpa81\System.Net.Http.Primitives.dll + ..\..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8\System.Net.Http.Primitives.dll True True - + - ..\..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8\System.Net.Http.Extensions.dll + ..\..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8+wpa81\System.Net.Http.Extensions.dll True True - ..\..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8\System.Net.Http.Primitives.dll + ..\..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8+wpa81\System.Net.Http.Primitives.dll True True @@ -413,7 +419,7 @@ - + ..\..\..\packages\Moq\lib\net40\Moq.dll @@ -433,25 +439,25 @@ - + - ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json\lib\net20\Newtonsoft.Json.dll True True - + - ..\..\..\packages\Newtonsoft.Json\lib\net20\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll True True - + ..\..\..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll @@ -460,7 +466,7 @@ - + ..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll @@ -469,16 +475,16 @@ - + - ..\..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81+dnxcore50\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json\lib\netcore45\Newtonsoft.Json.dll True True - + ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll @@ -487,31 +493,26 @@ - - - + - - ..\..\..\packages\PCLStorage\lib\portable-win8+wpa81\PCLStorage.Abstractions.dll - True - True - - - ..\..\..\packages\PCLStorage\lib\portable-win8+wpa81\PCLStorage.dll + + ..\..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81+aspnetcore50\Newtonsoft.Json.dll True True + + - - ..\..\..\packages\PCLStorage\lib\portable-net45+sl5+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.Abstractions.dll + + ..\..\..\packages\PCLStorage\lib\portable-net45+sl5+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.dll True True - - ..\..\..\packages\PCLStorage\lib\portable-net45+sl5+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.dll + + ..\..\..\packages\PCLStorage\lib\portable-net45+sl5+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.Abstractions.dll True True @@ -519,13 +520,27 @@ + + ..\..\..\packages\PCLStorage\lib\portable-net45+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.dll + True + True + ..\..\..\packages\PCLStorage\lib\portable-net45+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.Abstractions.dll True True + + + + - ..\..\..\packages\PCLStorage\lib\portable-net45+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.dll + ..\..\..\packages\PCLStorage\lib\portable-win8+wpa81\PCLStorage.dll + True + True + + + ..\..\..\packages\PCLStorage\lib\portable-win8+wpa81\PCLStorage.Abstractions.dll True True @@ -542,7 +557,7 @@ - + ..\..\..\packages\SharpZipLib\lib\20\ICSharpCode.SharpZipLib.dll @@ -580,7 +595,7 @@ - + ..\..\..\packages\SimpleRESTServices\lib\net40\SimpleRESTServices.dll @@ -591,7 +606,7 @@ - + ..\..\..\packages\xunit.abstractions\lib\net35\xunit.abstractions.dll @@ -600,7 +615,7 @@ - + ..\..\..\packages\xunit.abstractions\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll @@ -611,7 +626,7 @@ - + ..\..\..\packages\xunit.assert\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll @@ -622,7 +637,7 @@ - + ..\..\..\packages\xunit.extensibility.core\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll @@ -633,16 +648,25 @@ - + - ..\..\..\packages\xunit.extensibility.execution\lib\win8\xunit.execution.dotnet.dll + ..\..\..\packages\xunit.extensibility.execution\lib\monoandroid\xunit.execution.dotnet.dll + True + True + + + + + + + ..\..\..\packages\xunit.extensibility.execution\lib\monotouch\xunit.execution.dotnet.dll True True - + ..\..\..\packages\xunit.extensibility.execution\lib\net45\xunit.execution.desktop.dll @@ -651,19 +675,19 @@ - + - ..\..\..\packages\xunit.extensibility.execution\lib\monoandroid\xunit.execution.dotnet.dll + ..\..\..\packages\xunit.extensibility.execution\lib\portable-net45+win8+wp8+wpa81\xunit.execution.dotnet.dll True True - + - ..\..\..\packages\xunit.extensibility.execution\lib\monotouch\xunit.execution.dotnet.dll + ..\..\..\packages\xunit.extensibility.execution\lib\win8\xunit.execution.dotnet.dll True True @@ -696,15 +720,6 @@ - - - - ..\..\..\packages\xunit.extensibility.execution\lib\portable-net45+win8+wp8+wpa81\xunit.execution.dotnet.dll - True - True - - - \ No newline at end of file diff --git a/src/testing/unit/OpenStack.UnitTests.csproj b/src/testing/unit/OpenStack.UnitTests.csproj index 0c774ebc3..88381c8e5 100644 --- a/src/testing/unit/OpenStack.UnitTests.csproj +++ b/src/testing/unit/OpenStack.UnitTests.csproj @@ -118,31 +118,42 @@ - + - <__paket__xunit_runner_visualstudio_props>win81\xunit.runner.visualstudio - <__paket__xunit_runner_visualstudio_targets>win81\xunit.runner.visualstudio + <__paket__xunit_runner_visualstudio_props>net20\xunit.runner.visualstudio - + - <__paket__xunit_runner_visualstudio_props>net20\xunit.runner.visualstudio + <__paket__xunit_runner_visualstudio_props>portable-net45+win8+wp8+wpa81\xunit.runner.visualstudio - + - <__paket__xunit_runner_visualstudio_props>wpa81\xunit.runner.visualstudio - <__paket__xunit_runner_visualstudio_targets>wpa81\xunit.runner.visualstudio + <__paket__xunit_runner_visualstudio_props>uap10.0\xunit.runner.visualstudio + <__paket__xunit_runner_visualstudio_targets>uap10.0\xunit.runner.visualstudio - + - <__paket__xunit_runner_visualstudio_props>portable-net45+win8+wp8+wpa81\xunit.runner.visualstudio + <__paket__xunit_runner_visualstudio_props>win81\xunit.runner.visualstudio + <__paket__xunit_runner_visualstudio_targets>win81\xunit.runner.visualstudio + + + + + <__paket__xunit_runner_visualstudio_props>wpa81\xunit.runner.visualstudio + <__paket__xunit_runner_visualstudio_targets>wpa81\xunit.runner.visualstudio + + + <__paket__xunit_core_props>portable-net45+win8+wp8+wpa81\xunit.core + + <__paket__xunit_core_props>win81\xunit.core @@ -153,11 +164,6 @@ <__paket__xunit_core_props>wpa81\xunit.core - - - <__paket__xunit_core_props>portable-net45+win8+wp8+wpa81\xunit.core - - - + ..\..\..\packages\Flurl.Http.Signed\lib\net45\Flurl.Http.dll @@ -189,7 +195,7 @@ - + ..\..\..\packages\Flurl.Signed\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Flurl.dll @@ -200,7 +206,7 @@ - + ..\..\..\packages\Marvin.JsonPatch.Signed\lib\portable-net40+win+wpa81\Marvin.JsonPatch.dll @@ -211,39 +217,39 @@ - + - ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.IO.dll + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.IO.dll True True - ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.Runtime.dll + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.Runtime.dll True True - ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.Threading.Tasks.dll + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.Threading.Tasks.dll True True - + - ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.IO.dll + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.IO.dll True True - ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.Runtime.dll + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.Runtime.dll True True - ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.Threading.Tasks.dll + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.Threading.Tasks.dll True True @@ -268,39 +274,39 @@ - + - ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.IO.dll + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.IO.dll True True - ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.Runtime.dll + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.Runtime.dll True True - ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.Threading.Tasks.dll + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.Threading.Tasks.dll True True - + - ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.IO.dll + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.IO.dll True True - ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.Runtime.dll + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.Runtime.dll True True - ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.Threading.Tasks.dll + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.Threading.Tasks.dll True True @@ -329,13 +335,13 @@ - - ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.Extensions.dll + + ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.dll True True - - ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.dll + + ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.Extensions.dll True True @@ -343,13 +349,13 @@ - - ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wp8+wpa81\Microsoft.Threading.Tasks.Extensions.dll + + ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wp8+wpa81\Microsoft.Threading.Tasks.dll True True - - ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wp8+wpa81\Microsoft.Threading.Tasks.dll + + ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wp8+wpa81\Microsoft.Threading.Tasks.Extensions.dll True True @@ -357,13 +363,13 @@ - - ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wpa81\Microsoft.Threading.Tasks.Extensions.dll + + ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wpa81\Microsoft.Threading.Tasks.dll True True - - ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wpa81\Microsoft.Threading.Tasks.dll + + ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wpa81\Microsoft.Threading.Tasks.Extensions.dll True True @@ -385,29 +391,29 @@ - + - ..\..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8+wpa81\System.Net.Http.Extensions.dll + ..\..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8\System.Net.Http.Extensions.dll True True - ..\..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8+wpa81\System.Net.Http.Primitives.dll + ..\..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8\System.Net.Http.Primitives.dll True True - + - ..\..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8\System.Net.Http.Extensions.dll + ..\..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8+wpa81\System.Net.Http.Extensions.dll True True - ..\..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8\System.Net.Http.Primitives.dll + ..\..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8+wpa81\System.Net.Http.Primitives.dll True True @@ -424,7 +430,7 @@ - + ..\..\..\packages\Moq\lib\net40\Moq.dll @@ -444,25 +450,25 @@ - + - ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json\lib\net20\Newtonsoft.Json.dll True True - + - ..\..\..\packages\Newtonsoft.Json\lib\net20\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll True True - + ..\..\..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll @@ -471,7 +477,7 @@ - + ..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll @@ -480,16 +486,16 @@ - + - ..\..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81+dnxcore50\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json\lib\netcore45\Newtonsoft.Json.dll True True - + ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll @@ -498,31 +504,26 @@ - - - + - - ..\..\..\packages\PCLStorage\lib\portable-win8+wpa81\PCLStorage.Abstractions.dll - True - True - - - ..\..\..\packages\PCLStorage\lib\portable-win8+wpa81\PCLStorage.dll + + ..\..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81+aspnetcore50\Newtonsoft.Json.dll True True + + - - ..\..\..\packages\PCLStorage\lib\portable-net45+sl5+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.Abstractions.dll + + ..\..\..\packages\PCLStorage\lib\portable-net45+sl5+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.dll True True - - ..\..\..\packages\PCLStorage\lib\portable-net45+sl5+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.dll + + ..\..\..\packages\PCLStorage\lib\portable-net45+sl5+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.Abstractions.dll True True @@ -530,13 +531,27 @@ + + ..\..\..\packages\PCLStorage\lib\portable-net45+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.dll + True + True + ..\..\..\packages\PCLStorage\lib\portable-net45+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.Abstractions.dll True True + + + + - ..\..\..\packages\PCLStorage\lib\portable-net45+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.dll + ..\..\..\packages\PCLStorage\lib\portable-win8+wpa81\PCLStorage.dll + True + True + + + ..\..\..\packages\PCLStorage\lib\portable-win8+wpa81\PCLStorage.Abstractions.dll True True @@ -553,7 +568,7 @@ - + ..\..\..\packages\SimpleRESTServices\lib\net40\SimpleRESTServices.dll @@ -564,7 +579,7 @@ - + ..\..\..\packages\xunit.abstractions\lib\net35\xunit.abstractions.dll @@ -573,7 +588,7 @@ - + ..\..\..\packages\xunit.abstractions\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll @@ -584,7 +599,7 @@ - + ..\..\..\packages\xunit.assert\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll @@ -595,7 +610,7 @@ - + ..\..\..\packages\xunit.extensibility.core\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll @@ -606,16 +621,25 @@ - + - ..\..\..\packages\xunit.extensibility.execution\lib\win8\xunit.execution.dotnet.dll + ..\..\..\packages\xunit.extensibility.execution\lib\monoandroid\xunit.execution.dotnet.dll + True + True + + + + + + + ..\..\..\packages\xunit.extensibility.execution\lib\monotouch\xunit.execution.dotnet.dll True True - + ..\..\..\packages\xunit.extensibility.execution\lib\net45\xunit.execution.desktop.dll @@ -624,19 +648,19 @@ - + - ..\..\..\packages\xunit.extensibility.execution\lib\monoandroid\xunit.execution.dotnet.dll + ..\..\..\packages\xunit.extensibility.execution\lib\portable-net45+win8+wp8+wpa81\xunit.execution.dotnet.dll True True - + - ..\..\..\packages\xunit.extensibility.execution\lib\monotouch\xunit.execution.dotnet.dll + ..\..\..\packages\xunit.extensibility.execution\lib\win8\xunit.execution.dotnet.dll True True @@ -669,15 +693,6 @@ - - - - ..\..\..\packages\xunit.extensibility.execution\lib\portable-net45+win8+wp8+wpa81\xunit.execution.dotnet.dll - True - True - - - \ No newline at end of file diff --git a/src/testing/unit/app.config b/src/testing/unit/app.config index 93e946be6..19027a646 100644 --- a/src/testing/unit/app.config +++ b/src/testing/unit/app.config @@ -5,6 +5,6 @@ True - + From 1b8777b7dff56f21ed165a82e28f12736ce60b00 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Thu, 16 Mar 2017 11:58:53 -0500 Subject: [PATCH 06/14] Simplify passing gitversion arg msbuild doesn't like special chars in variable names --- build.cmd | 6 ++++-- build/build.proj | 5 +---- myget.ps1 | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/build.cmd b/build.cmd index 468a85e74..1109b35c4 100644 --- a/build.cmd +++ b/build.cmd @@ -7,7 +7,9 @@ IF "%1"=="help" ( GOTO :help ) :parse IF NOT "%1"=="" ( - IF /I "%1"=="/Configuration" ( + IF /I "%1"=="/Version" ( + SET VersionArg=/p:Version=%2 + ) ELSE IF /I "%1"=="/Configuration" ( SET ConfigArg=/p:Configuration=%2 ) ELSE ( SET TargetArg=/t:%1 @@ -33,7 +35,7 @@ if not defined VisualStudioVersion ( ) :build -msbuild build\build.proj %TargetArg% %ConfigArg% /nologo +msbuild build\build.proj %TargetArg% %ConfigArg% %VersionArg% /nologo exit /b %ERRORLEVEL% :help diff --git a/build/build.proj b/build/build.proj index 5497dde2b..53710254d 100644 --- a/build/build.proj +++ b/build/build.proj @@ -3,10 +3,7 @@ Debug - - $(GitVersion.NuGetVersion) - 0.0.0-dev - + 0.0.0-dev 2.66.9 $(MSBuildThisFileDirectory.Replace('build\','.paket'))\paket.bootstrapper.exe $(MSBuildThisFileDirectory.Replace('build\','.paket'))\paket.exe diff --git a/myget.ps1 b/myget.ps1 index 2ad5c4232..2e5f833a1 100644 --- a/myget.ps1 +++ b/myget.ps1 @@ -1 +1 @@ -.\build.cmd Build +.\build.cmd Build /Version ${env:GitVersion.NuGetVersion} From f1e64d63676bd228af09cdf0fbc49098f4781252 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Thu, 16 Mar 2017 12:23:23 -0500 Subject: [PATCH 07/14] Run the full CI build on myget --- myget.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/myget.ps1 b/myget.ps1 index 2e5f833a1..047c1db7d 100644 --- a/myget.ps1 +++ b/myget.ps1 @@ -1 +1 @@ -.\build.cmd Build /Version ${env:GitVersion.NuGetVersion} +.\build.cmd CI /Version ${env:GitVersion.NuGetVersion} From 646c7e4ef8c183760420e40dc8d25ade9037310b Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Thu, 16 Mar 2017 12:23:42 -0500 Subject: [PATCH 08/14] Temporarily disable int tests until new env is set up --- build/build.proj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/build.proj b/build/build.proj index 53710254d..bf04466ea 100644 --- a/build/build.proj +++ b/build/build.proj @@ -23,7 +23,8 @@ - + + From c97d4ba412644a3bdcc531956678bb5963037986 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Thu, 16 Mar 2017 14:26:06 -0500 Subject: [PATCH 09/14] return msbuild exit code --- myget.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/myget.ps1 b/myget.ps1 index 047c1db7d..e01edbec1 100644 --- a/myget.ps1 +++ b/myget.ps1 @@ -1 +1,2 @@ .\build.cmd CI /Version ${env:GitVersion.NuGetVersion} +exit $LastExitCode From 6b606c6ef735dcb05f5d5b0a5c18d7fb73cca328 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Thu, 16 Mar 2017 14:45:42 -0500 Subject: [PATCH 10/14] Run tests before building doc --- build/build.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build.proj b/build/build.proj index bf04466ea..1ea73caaf 100644 --- a/build/build.proj +++ b/build/build.proj @@ -21,10 +21,10 @@ - + From 5528344ff2f5969f53d3eee4c4b7fcd415a40512 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Thu, 16 Mar 2017 14:57:36 -0500 Subject: [PATCH 11/14] Don't continue after tests fail Previously we needed to keep going and have the test parser bomb out. Now that we don't have a test parser, just stop immediately --- build/build.proj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/build.proj b/build/build.proj index 1ea73caaf..c738ac475 100644 --- a/build/build.proj +++ b/build/build.proj @@ -59,13 +59,13 @@ - - + + - + Date: Fri, 17 Mar 2017 09:01:54 -0500 Subject: [PATCH 12/14] Add myget badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fb11d6309..920375f46 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ **This project is in-between maintainers.** Interested? Contact sdk-support@rackspace.com. +[![MyGet Build Status](https://www.myget.org/BuildSource/Badge/openstacknetsdk?identifier=32094041-4be1-4ba5-9691-beb27c4b8f02)](https://www.myget.org/) [![Join the chat at https://gitter.im/openstacknetsdk/openstack.net](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/openstacknetsdk/openstack.net?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) OpenStack.NET is an OpenStack .NET SDK, written for the Microsoft .NET platform, is designed to enable developers to seamlessly work with From f4d2b263440f2255e7f914115a694a1ca2d66ad1 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Fri, 17 Mar 2017 09:11:18 -0500 Subject: [PATCH 13/14] Put nupkg in artifacts folder MyGet is ignoring anything in a folder named packages --- build/build.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build.proj b/build/build.proj index c738ac475..602a6b129 100644 --- a/build/build.proj +++ b/build/build.proj @@ -98,7 +98,7 @@ WorkingDirectory="..\src\corelib\bin\v4.0\$(Configuration)" /> - +