From a773686d54d6ac8477373a77ffc213e94eca24f8 Mon Sep 17 00:00:00 2001 From: Zehua Jiang Date: Fri, 8 Apr 2016 12:15:24 +0800 Subject: [PATCH 01/34] Network.listSecurityGroupAsync --- .../NetworkingService_Layer3_Extensions.cs | 23 +++++ .../Networking/v2/Layer3/SecurityGroup.cs | 48 +++++++++++ .../Networking/v2/Layer3/SecurityGroupRule.cs | 83 +++++++++++++++++++ .../Networking/v2/NetworkingApiBuilder.cs | 20 +++++ .../NetSecurityGroupCollection.cs | 37 +++++++++ src/corelib/OpenStack.csproj | 3 + .../unit/Networking/v2/Layer3/Layer3Tests.cs | 28 +++++++ 7 files changed, 242 insertions(+) create mode 100644 src/corelib/Networking/v2/Layer3/SecurityGroup.cs create mode 100644 src/corelib/Networking/v2/Layer3/SecurityGroupRule.cs create mode 100644 src/corelib/Networking/v2/Serialization/NetSecurityGroupCollection.cs diff --git a/src/corelib/Networking/v2/Layer3/NetworkingService_Layer3_Extensions.cs b/src/corelib/Networking/v2/Layer3/NetworkingService_Layer3_Extensions.cs index 4cff952a9..0ae60f16d 100644 --- a/src/corelib/Networking/v2/Layer3/NetworkingService_Layer3_Extensions.cs +++ b/src/corelib/Networking/v2/Layer3/NetworkingService_Layer3_Extensions.cs @@ -6,6 +6,8 @@ using OpenStack.Networking.v2.Serialization; using OpenStack.Serialization; using OpenStack.Synchronous.Extensions; +using Flurl.Extensions; +using Flurl.Http; namespace OpenStack.Networking.v2.Layer3 { @@ -102,6 +104,18 @@ public static class NetworkingService_Layer3_Extensions return service._networkingApiBuilder.DeleteFloatingIPAsync(floatingIPId, cancellationToken); } #endregion + + #region Security Groups + /// + public static async Task> ListSecurityGroupAsync(this NetworkingService service, CancellationToken cancellationToken = default(CancellationToken)) + { + return await service._networkingApiBuilder + .ListSecurityGroupAsync(cancellationToken) + .SendAsync() + .ReceiveJson() + .ConfigureAwait(false); + } + #endregion } } @@ -200,5 +214,14 @@ public static void DeleteFloatingIP(this NetworkingService service, Identifier f service._networkingApiBuilder.DeleteFloatingIPAsync(floatingIPId).ForceSynchronous(); } #endregion + + #region Security Group + /// + public static IEnumerable ListSecurityGroup (this NetworkingService service) + { + return service._networkingApiBuilder.ListSecurityGroupAsync().SendAsync().ReceiveJson().ForceSynchronous(); + } + #endregion + } } diff --git a/src/corelib/Networking/v2/Layer3/SecurityGroup.cs b/src/corelib/Networking/v2/Layer3/SecurityGroup.cs new file mode 100644 index 000000000..bb42aeb66 --- /dev/null +++ b/src/corelib/Networking/v2/Layer3/SecurityGroup.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Newtonsoft.Json; +using OpenStack.Networking.v2; +using OpenStack.Serialization; + +namespace OpenStack.Networking.v2.Layer3 +{ + /// + ///Regpresents the security group of the + /// + [JsonConverterWithConstructor(typeof(RootWrapperConverter), "securitygroup")] + public class SecurityGroup + { + /// + ///the security group description + /// + [JsonProperty("description")] + public string Description; + + /// + ///the UUID of security group + /// + [JsonProperty("id")] + public Identifier Id; + + /// + /// the security group name + /// + [JsonProperty("name")] + public string Name; + + /// + ///A list of objects. + /// + [JsonProperty("security_group_rules")] + public IList SecurityGroupRules; + + /// + ///The UUId of tenant who owns the scurity group + /// + [JsonProperty("tenant_id")] + public string TenantId; + } +} diff --git a/src/corelib/Networking/v2/Layer3/SecurityGroupRule.cs b/src/corelib/Networking/v2/Layer3/SecurityGroupRule.cs new file mode 100644 index 000000000..d2a1f5baa --- /dev/null +++ b/src/corelib/Networking/v2/Layer3/SecurityGroupRule.cs @@ -0,0 +1,83 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Newtonsoft.Json; +namespace OpenStack.Networking.v2.Layer3 +{ + /// + /// + /// + public class SecurityGroupRule + { + /// + ///ngress or egress: the direction in which the security group rule is applied. + ///For a compute instance, an ingress security group rule is applied to incoming (ingress) traffic for that instance. + ///An egress rule is applied to traffic leaving the instance. + /// + [JsonProperty("direction")] + public string Direction; + + /// + ///Must be IPv4 or IPv6, and addresses represented in CIDR must match the ingress or egress rules. + /// + [JsonProperty("ethertype")] + public string Ethertype; + + /// + /// The UUID of the security group rule. + /// + [JsonProperty("id")] + public Identifier Id; + + /// + ///The maximum port number in the range that is matched by the security group rule. + ///The port_range_min attribute constrains the port_range_max attribute. + ///If the protocol is ICMP, this value must be an ICMP type. + /// + [JsonProperty("port_range_max")] + public int PortRangeMax; + + /// + ///The minimum port number in the range that is matched by the security group rule. + ///If the protocol is TCP or UDP, this value must be less than or equal to the port_range_max attribute value. + ///If the protocol is ICMP, this value must be an ICMP type. + /// + [JsonProperty("port_range_min")] + public int PortRangeMin; + + /// + ///The protocol that is matched by the security group rule. Value is null, icmp, icmpv6, tcp, or udp. + /// + [JsonProperty("protocol")] + public string Protocol; + + /// + ///The remote group UUID to associate with this security group rule. + ///You can specify either the remote_group_id or remote_ip_prefix attribute in the request body. + /// + [JsonProperty("remote_group_id")] + public string RemoteGroupId; + + /// + ///The remote IP prefix to associate with this security group rule. + ///You can specify either the remote_group_id or remote_ip_prefix attribute in the request body. + ///This attribute value matches the IP prefix as the source IP address of the IP packet. + /// + [JsonProperty("remote_ip_prefix")] + public string RemoteIpPrefix; + + /// + ///The UUId of security group + /// + [JsonProperty("security_group_id")] + public string SecurityGroupId; + + /// + /// The UUID of the tenant who owns the security group rule. Only administrative users can specify a tenant UUID other than their own. + /// + [JsonProperty("tenant_id")] + public string TenantId; + } +} diff --git a/src/corelib/Networking/v2/NetworkingApiBuilder.cs b/src/corelib/Networking/v2/NetworkingApiBuilder.cs index cc86c88d0..1610c7ca0 100644 --- a/src/corelib/Networking/v2/NetworkingApiBuilder.cs +++ b/src/corelib/Networking/v2/NetworkingApiBuilder.cs @@ -667,6 +667,26 @@ public NetworkingApiBuilder(IServiceType serviceType, IAuthenticationProvider au } #endregion + #region SecurityGroup + /// + /// Lists all networks security groups associated with the account. + /// + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// A collection of network resources associated with the account. + /// + public async Task ListSecurityGroupAsync(CancellationToken cancellationToken = default(CancellationToken)) + { + Url endpoint = await Endpoint.GetEndpoint(cancellationToken).ConfigureAwait(false); + + return endpoint + .AppendPathSegments("security-groups") + .Authenticate(AuthenticationProvider) + .PrepareGet(cancellationToken); + } + + #endregion + #region Floating IPs /// /// Shows details for a server group. diff --git a/src/corelib/Networking/v2/Serialization/NetSecurityGroupCollection.cs b/src/corelib/Networking/v2/Serialization/NetSecurityGroupCollection.cs new file mode 100644 index 000000000..8243a6d10 --- /dev/null +++ b/src/corelib/Networking/v2/Serialization/NetSecurityGroupCollection.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using OpenStack.Serialization; +using OpenStack.Networking.v2.Layer3; + +namespace OpenStack.Networking.v2.Serialization +{ + /// + /// Represents a collection of security groups resources returned by the . + /// Intended for custom implementations and stubbing responses in unit tests. + /// + [JsonConverterWithConstructor(typeof(RootWrapperConverter), "security_groups")] + public class NetSecurityGroupCollection : List + { + + /// + ///Initializes a new instance of the class. + /// + public NetSecurityGroupCollection() + { + + } + + /// + ///Initializes a new instance of the class. + /// + /// + public NetSecurityGroupCollection(IEnumerable securityGroups) : base(securityGroups) + { + + } + + } +} diff --git a/src/corelib/OpenStack.csproj b/src/corelib/OpenStack.csproj index f2e0c7a99..1e69e4dce 100644 --- a/src/corelib/OpenStack.csproj +++ b/src/corelib/OpenStack.csproj @@ -194,6 +194,8 @@ + + @@ -234,6 +236,7 @@ + diff --git a/src/testing/unit/Networking/v2/Layer3/Layer3Tests.cs b/src/testing/unit/Networking/v2/Layer3/Layer3Tests.cs index fa8141f17..31d91179b 100644 --- a/src/testing/unit/Networking/v2/Layer3/Layer3Tests.cs +++ b/src/testing/unit/Networking/v2/Layer3/Layer3Tests.cs @@ -313,5 +313,33 @@ public void DeleteFloatingIP(HttpStatusCode responseCode) } #endregion + #region Security Groups + [Fact] + public void ListSecurityGroupAsync() + { + using (var httpTest = new HttpTest()) + { + Identifier securityGroupId = Guid.NewGuid(); + Identifier securityGroupRuleId = Guid.NewGuid(); + SecurityGroupRule rule = new SecurityGroupRule { Id = securityGroupRuleId }; + List rules = new List { rule }; + + httpTest.RespondWithJson(new NetSecurityGroupCollection + { + new SecurityGroup { Id = securityGroupId, SecurityGroupRules = rules } + }); + + var results = _networking.ListSecurityGroup(); + + httpTest.ShouldHaveCalled("*/security-groups"); + Assert.Equal(1, results.Count()); + var result = results.First(); + var resultRule = result.SecurityGroupRules.First(); + Assert.Equal(securityGroupId, result.Id); + Assert.Equal(rule.Id, resultRule.Id); + } + } + #endregion + } } From d9ba13804a4d9aef00fb8616323b2763418ddf55 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Tue, 7 Jun 2016 14:05:27 -0500 Subject: [PATCH 02/34] Reuse ip protocol between compute and networking --- src/corelib/Compute/v2_1/IPProtocol.cs | 26 ++---------------- src/corelib/Networking/v2/IPProtocol.cs | 8 ++++++ .../Networking/v2/Serialization/IPProtocol.cs | 27 +++++++++++++++++++ src/corelib/OpenStack.csproj | 2 ++ 4 files changed, 39 insertions(+), 24 deletions(-) create mode 100644 src/corelib/Networking/v2/IPProtocol.cs create mode 100644 src/corelib/Networking/v2/Serialization/IPProtocol.cs diff --git a/src/corelib/Compute/v2_1/IPProtocol.cs b/src/corelib/Compute/v2_1/IPProtocol.cs index 2c8a87b40..5455a39c7 100644 --- a/src/corelib/Compute/v2_1/IPProtocol.cs +++ b/src/corelib/Compute/v2_1/IPProtocol.cs @@ -1,30 +1,8 @@ -using OpenStack.Serialization; - namespace OpenStack.Compute.v2_1 { /// /// Internet Protocols. /// - public class IPProtocol : StringEnumeration - { - /// - protected IPProtocol(string displayName) - : base(displayName) - { } - - /// - /// ICMP - /// - public static readonly IPProtocol ICMP = new IPProtocol("icmp"); - - /// - /// TCP - /// - public static readonly IPProtocol TCP = new IPProtocol("tcp"); - - /// - /// UDP - /// - public static readonly IPProtocol UDP = new IPProtocol("udp"); - } + public class IPProtocol : Networking.v2.Serialization.IPProtocol + { } } \ No newline at end of file diff --git a/src/corelib/Networking/v2/IPProtocol.cs b/src/corelib/Networking/v2/IPProtocol.cs new file mode 100644 index 000000000..3a1f37096 --- /dev/null +++ b/src/corelib/Networking/v2/IPProtocol.cs @@ -0,0 +1,8 @@ +using OpenStack.Networking.v2.Serialization; + +namespace OpenStack.Networking.v2 +{ + /// + public class IPProtocol : IPProtocol + { } +} \ No newline at end of file diff --git a/src/corelib/Networking/v2/Serialization/IPProtocol.cs b/src/corelib/Networking/v2/Serialization/IPProtocol.cs new file mode 100644 index 000000000..58dc7c80e --- /dev/null +++ b/src/corelib/Networking/v2/Serialization/IPProtocol.cs @@ -0,0 +1,27 @@ +using OpenStack.Serialization; + +namespace OpenStack.Networking.v2.Serialization +{ + /// + /// Internet Protocols. + /// + /// + public class IPProtocol : StringEnumeration + where T : IPProtocol, new() + { + /// + /// ICMP + /// + public static readonly T ICMP = new T {DisplayName = "icmp"}; + + /// + /// TCP + /// + public static readonly T TCP = new T {DisplayName = "tcp"}; + + /// + /// UDP + /// + public static readonly T UDP = new T {DisplayName = "udp"}; + } +} diff --git a/src/corelib/OpenStack.csproj b/src/corelib/OpenStack.csproj index 1e69e4dce..513783491 100644 --- a/src/corelib/OpenStack.csproj +++ b/src/corelib/OpenStack.csproj @@ -194,6 +194,7 @@ + @@ -224,6 +225,7 @@ + From c1b5a2d18f6aaaaa3811c3bf0d54925d01e50c64 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Tue, 7 Jun 2016 14:06:21 -0500 Subject: [PATCH 03/34] Standardize Networking.ListSecurityGroups * Enable filtering by name * Expose a builder and executor on the API * Implement IHaveExtraData and IServiceResource --- .../NetworkingService_Layer3_Extensions.cs | 18 ++--- .../Networking/v2/Layer3/SecurityGroup.cs | 31 ++++---- .../v2/Layer3/SecurityGroupListOptions.cs | 26 +++++++ .../Networking/v2/Layer3/SecurityGroupRule.cs | 74 +++++++++---------- .../Networking/v2/NetworkingApiBuilder.cs | 29 ++++++-- ...llection.cs => SecurityGroupCollection.cs} | 21 ++---- .../v2/Serialization/TrafficDirection.cs | 22 ++++++ src/corelib/Networking/v2/TrafficDirection.cs | 8 ++ src/corelib/OpenStack.csproj | 5 +- .../unit/Networking/v2/Layer3/Layer3Tests.cs | 7 +- 10 files changed, 149 insertions(+), 92 deletions(-) create mode 100644 src/corelib/Networking/v2/Layer3/SecurityGroupListOptions.cs rename src/corelib/Networking/v2/Serialization/{NetSecurityGroupCollection.cs => SecurityGroupCollection.cs} (51%) create mode 100644 src/corelib/Networking/v2/Serialization/TrafficDirection.cs create mode 100644 src/corelib/Networking/v2/TrafficDirection.cs diff --git a/src/corelib/Networking/v2/Layer3/NetworkingService_Layer3_Extensions.cs b/src/corelib/Networking/v2/Layer3/NetworkingService_Layer3_Extensions.cs index 0ae60f16d..bd0df24b9 100644 --- a/src/corelib/Networking/v2/Layer3/NetworkingService_Layer3_Extensions.cs +++ b/src/corelib/Networking/v2/Layer3/NetworkingService_Layer3_Extensions.cs @@ -106,14 +106,10 @@ public static class NetworkingService_Layer3_Extensions #endregion #region Security Groups - /// - public static async Task> ListSecurityGroupAsync(this NetworkingService service, CancellationToken cancellationToken = default(CancellationToken)) + /// + public static async Task> ListSecurityGroupsAsync(this NetworkingService service, SecurityGroupListOptions options = null, CancellationToken cancellationToken = default(CancellationToken)) { - return await service._networkingApiBuilder - .ListSecurityGroupAsync(cancellationToken) - .SendAsync() - .ReceiveJson() - .ConfigureAwait(false); + return await service._networkingApiBuilder.ListSecurityGroupsAsync(options, cancellationToken).ConfigureAwait(false); } #endregion } @@ -215,11 +211,11 @@ public static void DeleteFloatingIP(this NetworkingService service, Identifier f } #endregion - #region Security Group - /// - public static IEnumerable ListSecurityGroup (this NetworkingService service) + #region Security Groups + /// + public static IEnumerable ListSecurityGroups(this NetworkingService service, SecurityGroupListOptions options = null) { - return service._networkingApiBuilder.ListSecurityGroupAsync().SendAsync().ReceiveJson().ForceSynchronous(); + return service.ListSecurityGroupsAsync(options).ForceSynchronous(); } #endregion diff --git a/src/corelib/Networking/v2/Layer3/SecurityGroup.cs b/src/corelib/Networking/v2/Layer3/SecurityGroup.cs index bb42aeb66..03e27eabd 100644 --- a/src/corelib/Networking/v2/Layer3/SecurityGroup.cs +++ b/src/corelib/Networking/v2/Layer3/SecurityGroup.cs @@ -1,48 +1,43 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; using Newtonsoft.Json; -using OpenStack.Networking.v2; +using Newtonsoft.Json.Linq; using OpenStack.Serialization; namespace OpenStack.Networking.v2.Layer3 { /// - ///Regpresents the security group of the + /// Represents the security group of the /// - [JsonConverterWithConstructor(typeof(RootWrapperConverter), "securitygroup")] - public class SecurityGroup + [JsonConverterWithConstructor(typeof(RootWrapperConverter), "security_group")] + public class SecurityGroup : IHaveExtraData, IServiceResource { /// - ///the security group description + /// The security group description /// [JsonProperty("description")] public string Description; /// - ///the UUID of security group + /// The UUID of security group /// [JsonProperty("id")] public Identifier Id; /// - /// the security group name + /// The security group name /// [JsonProperty("name")] public string Name; /// - ///A list of objects. + /// A list of objects. /// [JsonProperty("security_group_rules")] public IList SecurityGroupRules; - /// - ///The UUId of tenant who owns the scurity group - /// - [JsonProperty("tenant_id")] - public string TenantId; + [JsonExtensionData] + IDictionary IHaveExtraData.Data { get; set; } = new Dictionary(); + + object IServiceResource.Owner { get; set; } } } diff --git a/src/corelib/Networking/v2/Layer3/SecurityGroupListOptions.cs b/src/corelib/Networking/v2/Layer3/SecurityGroupListOptions.cs new file mode 100644 index 000000000..47ed19ba6 --- /dev/null +++ b/src/corelib/Networking/v2/Layer3/SecurityGroupListOptions.cs @@ -0,0 +1,26 @@ +using System.Collections.Generic; + +namespace OpenStack.Networking.v2.Layer3 +{ + /// + /// Optional filter and paging options when listing security groups. + /// + public class SecurityGroupListOptions : FilterOptions + { + /// + /// Filter by the group name. + /// + public string Name { get; set; } + + /// + protected override IDictionary BuildQueryString() + { + var queryString = new Dictionary + { + ["name"] = Name + }; + + return queryString; + } + } +} diff --git a/src/corelib/Networking/v2/Layer3/SecurityGroupRule.cs b/src/corelib/Networking/v2/Layer3/SecurityGroupRule.cs index d2a1f5baa..d904c2f55 100644 --- a/src/corelib/Networking/v2/Layer3/SecurityGroupRule.cs +++ b/src/corelib/Networking/v2/Layer3/SecurityGroupRule.cs @@ -1,29 +1,27 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Newtonsoft.Json; +using Newtonsoft.Json; +using OpenStack.Serialization; + namespace OpenStack.Networking.v2.Layer3 { /// /// /// + [JsonConverterWithConstructor(typeof(RootWrapperConverter), "security_group_rule")] public class SecurityGroupRule { /// - ///ngress or egress: the direction in which the security group rule is applied. - ///For a compute instance, an ingress security group rule is applied to incoming (ingress) traffic for that instance. - ///An egress rule is applied to traffic leaving the instance. + /// ingress or egress: the direction in which the security group rule is applied. + /// For a compute instance, an ingress security group rule is applied to incoming (ingress) traffic for that instance. + /// An egress rule is applied to traffic leaving the instance. /// [JsonProperty("direction")] - public string Direction; + public TrafficDirection Direction; /// - ///Must be IPv4 or IPv6, and addresses represented in CIDR must match the ingress or egress rules. + /// The internet protocol version. Addresses represented in CIDR must match the ingress or egress rules. /// [JsonProperty("ethertype")] - public string Ethertype; + public IPVersion Ethertype; /// /// The UUID of the security group rule. @@ -32,52 +30,46 @@ public class SecurityGroupRule public Identifier Id; /// - ///The maximum port number in the range that is matched by the security group rule. - ///The port_range_min attribute constrains the port_range_max attribute. - ///If the protocol is ICMP, this value must be an ICMP type. + /// The minimum port number in the range that is matched by the security group rule. + /// If the protocol is TCP or UDP, this value must be less than or equal to the port_range_max attribute value. + /// If the protocol is ICMP, this value must be an ICMP type. /// - [JsonProperty("port_range_max")] - public int PortRangeMax; + [JsonProperty("port_range_min")] + public int MinPort { get; set; } - /// - ///The minimum port number in the range that is matched by the security group rule. - ///If the protocol is TCP or UDP, this value must be less than or equal to the port_range_max attribute value. - ///If the protocol is ICMP, this value must be an ICMP type. + /// + /// The maximum port number in the range that is matched by the security group rule. + /// The port_range_min attribute constrains the port_range_max attribute. + /// If the protocol is ICMP, this value must be an ICMP type. /// - [JsonProperty("port_range_min")] - public int PortRangeMin; + [JsonProperty("port_range_max")] + public int MaxPort { get; set; } /// - ///The protocol that is matched by the security group rule. Value is null, icmp, icmpv6, tcp, or udp. + /// The protocol that is matched by the security group rule. /// [JsonProperty("protocol")] - public string Protocol; + public IPProtocol Protocol; - /// - ///The remote group UUID to associate with this security group rule. - ///You can specify either the remote_group_id or remote_ip_prefix attribute in the request body. + /// + /// The remote group UUID to associate with this security group rule. + /// You can specify either the remote_group_id or remote_ip_prefix attribute in the request body. /// [JsonProperty("remote_group_id")] - public string RemoteGroupId; + public Identifier RemoteGroupId; /// - ///The remote IP prefix to associate with this security group rule. - ///You can specify either the remote_group_id or remote_ip_prefix attribute in the request body. - ///This attribute value matches the IP prefix as the source IP address of the IP packet. + /// The remote IP prefix or CIDR to associate with this security group rule. + /// You can specify either the remote_group_id or remote_ip_prefix attribute in the request body. + /// This attribute value matches the IP prefix as the source IP address of the IP packet. /// [JsonProperty("remote_ip_prefix")] - public string RemoteIpPrefix; + public string RemoteCIDR; /// - ///The UUId of security group + /// The UUId of security group /// [JsonProperty("security_group_id")] - public string SecurityGroupId; - - /// - /// The UUID of the tenant who owns the security group rule. Only administrative users can specify a tenant UUID other than their own. - /// - [JsonProperty("tenant_id")] - public string TenantId; + public Identifier SecurityGroupId; } } diff --git a/src/corelib/Networking/v2/NetworkingApiBuilder.cs b/src/corelib/Networking/v2/NetworkingApiBuilder.cs index 1610c7ca0..9ae7d44dd 100644 --- a/src/corelib/Networking/v2/NetworkingApiBuilder.cs +++ b/src/corelib/Networking/v2/NetworkingApiBuilder.cs @@ -384,7 +384,7 @@ public NetworkingApiBuilder(IServiceType serviceType, IAuthenticationProvider au } #endregion - #region Level 3 Extension + #region Layer 3 Extension #region Routers /// @@ -669,20 +669,39 @@ public NetworkingApiBuilder(IServiceType serviceType, IAuthenticationProvider au #region SecurityGroup /// - /// Lists all networks security groups associated with the account. + /// Lists all network security groups associated with the account. /// + /// Options for filtering. /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// - /// A collection of network resources associated with the account. + /// A collection of network security group resources associated with the account. /// - public async Task ListSecurityGroupAsync(CancellationToken cancellationToken = default(CancellationToken)) + public async Task ListSecurityGroupsAsync(IQueryStringBuilder queryString, CancellationToken cancellationToken = default(CancellationToken)) + where T : IEnumerable + { + return await BuildListSecurityGroupsRequest(queryString, cancellationToken) + .SendAsync() + .ReceiveJson() + .PropogateOwnerToChildren(this).ConfigureAwait(false); + } + + /// + /// Builds a request. + /// + /// Options for filtering. + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + public async Task BuildListSecurityGroupsRequest(IQueryStringBuilder queryString, CancellationToken cancellationToken = default(CancellationToken)) { Url endpoint = await Endpoint.GetEndpoint(cancellationToken).ConfigureAwait(false); - return endpoint + var request = endpoint .AppendPathSegments("security-groups") .Authenticate(AuthenticationProvider) .PrepareGet(cancellationToken); + + request.Url.SetQueryParams(queryString?.Build()); + + return request; } #endregion diff --git a/src/corelib/Networking/v2/Serialization/NetSecurityGroupCollection.cs b/src/corelib/Networking/v2/Serialization/SecurityGroupCollection.cs similarity index 51% rename from src/corelib/Networking/v2/Serialization/NetSecurityGroupCollection.cs rename to src/corelib/Networking/v2/Serialization/SecurityGroupCollection.cs index 8243a6d10..4e8a5785d 100644 --- a/src/corelib/Networking/v2/Serialization/NetSecurityGroupCollection.cs +++ b/src/corelib/Networking/v2/Serialization/SecurityGroupCollection.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; using OpenStack.Serialization; using OpenStack.Networking.v2.Layer3; @@ -13,25 +9,24 @@ namespace OpenStack.Networking.v2.Serialization /// Intended for custom implementations and stubbing responses in unit tests. /// [JsonConverterWithConstructor(typeof(RootWrapperConverter), "security_groups")] - public class NetSecurityGroupCollection : List + public class SecurityGroupCollection : List { - /// - ///Initializes a new instance of the class. + /// Initializes a new instance of the class. /// - public NetSecurityGroupCollection() + public SecurityGroupCollection() { } /// - ///Initializes a new instance of the class. + /// Initializes a new instance of the class. /// - /// - public NetSecurityGroupCollection(IEnumerable securityGroups) : base(securityGroups) + /// items + public SecurityGroupCollection(IEnumerable items) + : base(items) { } - } } diff --git a/src/corelib/Networking/v2/Serialization/TrafficDirection.cs b/src/corelib/Networking/v2/Serialization/TrafficDirection.cs new file mode 100644 index 000000000..fc39d32c7 --- /dev/null +++ b/src/corelib/Networking/v2/Serialization/TrafficDirection.cs @@ -0,0 +1,22 @@ +using OpenStack.Serialization; + +namespace OpenStack.Networking.v2.Serialization +{ + /// + /// Direction of network traffic. + /// + /// + public class TrafficDirection : StringEnumeration + where T : TrafficDirection, new() + { + /// + /// Incoming network traffic (ingress). + /// + public static readonly T Incoming = new T { DisplayName = "ingress" }; + + /// + /// Outgoing network traffic (egress). + /// + public static readonly T Outgoing = new T { DisplayName = "egress" }; + } +} diff --git a/src/corelib/Networking/v2/TrafficDirection.cs b/src/corelib/Networking/v2/TrafficDirection.cs new file mode 100644 index 000000000..1a41e415e --- /dev/null +++ b/src/corelib/Networking/v2/TrafficDirection.cs @@ -0,0 +1,8 @@ +using OpenStack.Networking.v2.Serialization; + +namespace OpenStack.Networking.v2 +{ + /// + public class TrafficDirection : TrafficDirection + { } +} \ No newline at end of file diff --git a/src/corelib/OpenStack.csproj b/src/corelib/OpenStack.csproj index 513783491..28ca3ebf7 100644 --- a/src/corelib/OpenStack.csproj +++ b/src/corelib/OpenStack.csproj @@ -195,6 +195,7 @@ + @@ -238,12 +239,14 @@ - + + + diff --git a/src/testing/unit/Networking/v2/Layer3/Layer3Tests.cs b/src/testing/unit/Networking/v2/Layer3/Layer3Tests.cs index 31d91179b..00de8024d 100644 --- a/src/testing/unit/Networking/v2/Layer3/Layer3Tests.cs +++ b/src/testing/unit/Networking/v2/Layer3/Layer3Tests.cs @@ -11,6 +11,7 @@ using OpenStack.Synchronous; using OpenStack.Testing; using Xunit; +using SecurityGroupCollection = OpenStack.Networking.v2.Serialization.SecurityGroupCollection; namespace OpenStack.Networking.v2.Layer3 { @@ -315,7 +316,7 @@ public void DeleteFloatingIP(HttpStatusCode responseCode) #region Security Groups [Fact] - public void ListSecurityGroupAsync() + public void ListSecurityGroups() { using (var httpTest = new HttpTest()) { @@ -324,12 +325,12 @@ public void ListSecurityGroupAsync() SecurityGroupRule rule = new SecurityGroupRule { Id = securityGroupRuleId }; List rules = new List { rule }; - httpTest.RespondWithJson(new NetSecurityGroupCollection + httpTest.RespondWithJson(new SecurityGroupCollection { new SecurityGroup { Id = securityGroupId, SecurityGroupRules = rules } }); - var results = _networking.ListSecurityGroup(); + var results = _networking.ListSecurityGroups(); httpTest.ShouldHaveCalled("*/security-groups"); Assert.Equal(1, results.Count()); From 4965b95b9d1f8ac6f8fa00a82ed2334a5ca008f0 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Tue, 7 Jun 2016 14:53:38 -0500 Subject: [PATCH 04/34] Add Security Group integration test --- .../v2/Layer3/Layer3ExtensionTests.cs | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/testing/integration/Networking/v2/Layer3/Layer3ExtensionTests.cs b/src/testing/integration/Networking/v2/Layer3/Layer3ExtensionTests.cs index 53774e54b..c86fcd2eb 100644 --- a/src/testing/integration/Networking/v2/Layer3/Layer3ExtensionTests.cs +++ b/src/testing/integration/Networking/v2/Layer3/Layer3ExtensionTests.cs @@ -1,5 +1,6 @@ using System; using System.Diagnostics; +using System.Linq; using System.Threading.Tasks; using OpenStack.Compute.v2_1; using Xunit; @@ -80,5 +81,26 @@ public async Task AssignFloatingIP() // 8. Disassociate the floating ip from the server await server.DisassociateFloatingIPAsync(floatingIP.FloatingIPAddress); } + + [Fact] + public async Task ListSecurityGroups() + { + var groups = await _networkingService.ListSecurityGroupsAsync(new SecurityGroupListOptions {Name = "default"}); + + Assert.NotEmpty(groups); + + var defaultGroup = groups.First(); + Assert.NotNull(defaultGroup); + Assert.NotNull(defaultGroup.Name); + Assert.NotNull(defaultGroup.Description); + Assert.NotNull(defaultGroup.Id); + Assert.NotEmpty(defaultGroup.SecurityGroupRules); + + var defaultRule = defaultGroup.SecurityGroupRules.First(); + Assert.NotNull(defaultRule.Id); + Assert.NotNull(defaultRule.Direction); + Assert.NotNull(defaultRule.Ethertype); + Assert.NotNull(defaultRule.SecurityGroupId); + } } } \ No newline at end of file From 7ce4d0b5ecd9891fe5d4487d316879036b83ff59 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Tue, 7 Jun 2016 15:33:09 -0500 Subject: [PATCH 05/34] NetworkService.ListSecurityGroupRules --- .../NetworkingService_Layer3_Extensions.cs | 11 ++++++ .../Networking/v2/Layer3/SecurityGroupRule.cs | 11 ++++-- .../v2/Layer3/SecurityGroupRuleListOptions.cs | 26 ++++++++++++++ .../Networking/v2/NetworkingApiBuilder.cs | 35 +++++++++++++++++++ .../SecurityGroupRuleCollection.cs | 32 +++++++++++++++++ src/corelib/OpenStack.csproj | 2 ++ .../unit/Networking/v2/Layer3/Layer3Tests.cs | 22 ++++++++++++ 7 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 src/corelib/Networking/v2/Layer3/SecurityGroupRuleListOptions.cs create mode 100644 src/corelib/Networking/v2/Serialization/SecurityGroupRuleCollection.cs diff --git a/src/corelib/Networking/v2/Layer3/NetworkingService_Layer3_Extensions.cs b/src/corelib/Networking/v2/Layer3/NetworkingService_Layer3_Extensions.cs index bd0df24b9..0ad8e74bf 100644 --- a/src/corelib/Networking/v2/Layer3/NetworkingService_Layer3_Extensions.cs +++ b/src/corelib/Networking/v2/Layer3/NetworkingService_Layer3_Extensions.cs @@ -111,6 +111,12 @@ public static class NetworkingService_Layer3_Extensions { return await service._networkingApiBuilder.ListSecurityGroupsAsync(options, cancellationToken).ConfigureAwait(false); } + + /// + public static async Task> ListSecurityGroupRulesAsync(this NetworkingService service, SecurityGroupRuleListOptions options = null, CancellationToken cancellationToken = default(CancellationToken)) + { + return await service._networkingApiBuilder.ListSecurityGroupRulesAsync(options, cancellationToken).ConfigureAwait(false); + } #endregion } } @@ -217,6 +223,11 @@ public static IEnumerable ListSecurityGroups(this NetworkingServi { return service.ListSecurityGroupsAsync(options).ForceSynchronous(); } + /// + public static IEnumerable ListSecurityGroupRules(this NetworkingService service, SecurityGroupRuleListOptions options = null) + { + return service.ListSecurityGroupRulesAsync(options).ForceSynchronous(); + } #endregion } diff --git a/src/corelib/Networking/v2/Layer3/SecurityGroupRule.cs b/src/corelib/Networking/v2/Layer3/SecurityGroupRule.cs index d904c2f55..04c46f79c 100644 --- a/src/corelib/Networking/v2/Layer3/SecurityGroupRule.cs +++ b/src/corelib/Networking/v2/Layer3/SecurityGroupRule.cs @@ -1,4 +1,6 @@ -using Newtonsoft.Json; +using System.Collections.Generic; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using OpenStack.Serialization; namespace OpenStack.Networking.v2.Layer3 @@ -7,7 +9,7 @@ namespace OpenStack.Networking.v2.Layer3 /// /// [JsonConverterWithConstructor(typeof(RootWrapperConverter), "security_group_rule")] - public class SecurityGroupRule + public class SecurityGroupRule : IHaveExtraData, IServiceResource { /// /// ingress or egress: the direction in which the security group rule is applied. @@ -71,5 +73,10 @@ public class SecurityGroupRule /// [JsonProperty("security_group_id")] public Identifier SecurityGroupId; + + [JsonExtensionData] + IDictionary IHaveExtraData.Data { get; set; } = new Dictionary(); + + object IServiceResource.Owner { get; set; } } } diff --git a/src/corelib/Networking/v2/Layer3/SecurityGroupRuleListOptions.cs b/src/corelib/Networking/v2/Layer3/SecurityGroupRuleListOptions.cs new file mode 100644 index 000000000..32144f2c5 --- /dev/null +++ b/src/corelib/Networking/v2/Layer3/SecurityGroupRuleListOptions.cs @@ -0,0 +1,26 @@ +using System.Collections.Generic; + +namespace OpenStack.Networking.v2.Layer3 +{ + /// + /// Optional filter and paging options when listing security group rules. + /// + public class SecurityGroupRuleListOptions : FilterOptions + { + /// + /// Filter by the group name. + /// + public TrafficDirection Direction { get; set; } + + /// + protected override IDictionary BuildQueryString() + { + var queryString = new Dictionary + { + ["direction"] = Direction + }; + + return queryString; + } + } +} \ No newline at end of file diff --git a/src/corelib/Networking/v2/NetworkingApiBuilder.cs b/src/corelib/Networking/v2/NetworkingApiBuilder.cs index 9ae7d44dd..d5a2fbaf1 100644 --- a/src/corelib/Networking/v2/NetworkingApiBuilder.cs +++ b/src/corelib/Networking/v2/NetworkingApiBuilder.cs @@ -704,6 +704,41 @@ public NetworkingApiBuilder(IServiceType serviceType, IAuthenticationProvider au return request; } + /// + /// Lists all network security group rules associated with the account. + /// + /// Options for filtering. + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + /// + /// A collection of network security group rule resources associated with the account. + /// + public async Task ListSecurityGroupRulesAsync(IQueryStringBuilder queryString, CancellationToken cancellationToken = default(CancellationToken)) + where T : IEnumerable + { + return await BuildListSecurityGroupRulesRequest(queryString, cancellationToken) + .SendAsync() + .ReceiveJson() + .PropogateOwnerToChildren(this).ConfigureAwait(false); + } + + /// + /// Builds a request. + /// + /// Options for filtering. + /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. + public async Task BuildListSecurityGroupRulesRequest(IQueryStringBuilder queryString, CancellationToken cancellationToken = default(CancellationToken)) + { + Url endpoint = await Endpoint.GetEndpoint(cancellationToken).ConfigureAwait(false); + + var request = endpoint + .AppendPathSegments("security-group-rules") + .Authenticate(AuthenticationProvider) + .PrepareGet(cancellationToken); + + request.Url.SetQueryParams(queryString?.Build()); + + return request; + } #endregion #region Floating IPs diff --git a/src/corelib/Networking/v2/Serialization/SecurityGroupRuleCollection.cs b/src/corelib/Networking/v2/Serialization/SecurityGroupRuleCollection.cs new file mode 100644 index 000000000..3f1aff34e --- /dev/null +++ b/src/corelib/Networking/v2/Serialization/SecurityGroupRuleCollection.cs @@ -0,0 +1,32 @@ +using System.Collections.Generic; +using OpenStack.Networking.v2.Layer3; +using OpenStack.Serialization; + +namespace OpenStack.Networking.v2.Serialization +{ + /// + /// Represents a collection of security group rule resources returned by the . + /// Intended for custom implementations and stubbing responses in unit tests. + /// + [JsonConverterWithConstructor(typeof(RootWrapperConverter), "security_group_rules")] + public class SecurityGroupRuleCollection : List + { + + /// + /// Initializes a new instance of the class. + /// + public SecurityGroupRuleCollection() + { + + } + + /// + /// Initializes a new instance of the class. + /// + /// + public SecurityGroupRuleCollection(IEnumerable items) : base(items) + { + + } + } +} \ No newline at end of file diff --git a/src/corelib/OpenStack.csproj b/src/corelib/OpenStack.csproj index 28ca3ebf7..707ee13b1 100644 --- a/src/corelib/OpenStack.csproj +++ b/src/corelib/OpenStack.csproj @@ -200,6 +200,7 @@ + @@ -240,6 +241,7 @@ + diff --git a/src/testing/unit/Networking/v2/Layer3/Layer3Tests.cs b/src/testing/unit/Networking/v2/Layer3/Layer3Tests.cs index 00de8024d..7a3c70d28 100644 --- a/src/testing/unit/Networking/v2/Layer3/Layer3Tests.cs +++ b/src/testing/unit/Networking/v2/Layer3/Layer3Tests.cs @@ -340,6 +340,28 @@ public void ListSecurityGroups() Assert.Equal(rule.Id, resultRule.Id); } } + + [Fact] + public void ListSecurityGroupRules() + { + using (var httpTest = new HttpTest()) + { + Identifier securityGroupId = Guid.NewGuid(); + Identifier securityGroupRuleId = Guid.NewGuid(); + httpTest.RespondWithJson(new SecurityGroupRuleCollection + { + new SecurityGroupRule {Id = securityGroupRuleId, SecurityGroupId = securityGroupId} + }); + + var results = _networking.ListSecurityGroupRules(); + + httpTest.ShouldHaveCalled("*/security-group-rules"); + Assert.Equal(1, results.Count()); + var result = results.First(); + Assert.Equal(securityGroupRuleId, result.Id); + Assert.Equal(securityGroupId, result.SecurityGroupId); + } + } #endregion } From af3cf246cda2d4433e3fbbf38c20a56b33fbc3a7 Mon Sep 17 00:00:00 2001 From: Gauthier Segay Date: Thu, 26 May 2016 04:40:58 +0200 Subject: [PATCH 06/34] Initial commit to start sharing work on this migration --- .paket/paket.targets | 41 ++ NuGet.config | 17 - build/build.proj | 17 +- paket.dependencies | 44 ++ samples/NuGet.config | 17 - ...alReferenceDocumentation.Portable.shfbproj | 8 +- .../AdditionalReferenceDocumentation.shfbproj | 8 +- .../1.3.6/Documentation.1.3.6.shfbproj | 16 +- .../History/1.3.6/packages.config | 8 - .../History/1.4/Documentation.1.4.shfbproj | 28 +- src/Documentation/History/1.4/packages.config | 10 - .../History/1.5/Documentation.1.5.shfbproj | 28 +- src/Documentation/History/1.5/packages.config | 10 - .../Current/Documentation.Current.shfbproj | 3 - .../History/Current/packages.config | 9 - src/Documentation/NuGet.config | 1 - src/Documentation/packages.config | 4 - .../FSharpCodeSamples.fsproj | 87 ++- src/Samples/FSharpCodeSamples/app.config | 9 +- src/Samples/FSharpCodeSamples/packages.config | 5 - .../FSharpCodeSamples/paket.references | 2 + src/corelib/OpenStack.csproj | 395 ++++++++++- src/corelib/app.config | 9 +- src/corelib/packages.config | 9 - src/corelib/paket.references | 6 + src/openstack.net.sln | 6 +- src/testing/integration/App.config | 9 +- .../OpenStack.IntegrationTests.csproj | 643 ++++++++++++++++-- src/testing/integration/packages.config | 17 - src/testing/integration/paket.references | 14 + src/testing/migration/NuGet.config | 17 - src/testing/migration/migration.csproj | 78 ++- src/testing/migration/migration.sln | 5 + src/testing/migration/packages.config | 8 - src/testing/migration/paket.references | 2 + src/testing/unit/OpenStack.UnitTests.csproj | 603 ++++++++++++++-- src/testing/unit/app.config | 9 +- src/testing/unit/packages.config | 16 - src/testing/unit/paket.references | 13 + 39 files changed, 1850 insertions(+), 381 deletions(-) create mode 100644 .paket/paket.targets delete mode 100644 NuGet.config create mode 100644 paket.dependencies delete mode 100644 samples/NuGet.config delete mode 100644 src/Documentation/History/1.3.6/packages.config delete mode 100644 src/Documentation/History/1.4/packages.config delete mode 100644 src/Documentation/History/1.5/packages.config delete mode 100644 src/Documentation/History/Current/packages.config delete mode 100644 src/Documentation/NuGet.config delete mode 100644 src/Documentation/packages.config delete mode 100644 src/Samples/FSharpCodeSamples/packages.config create mode 100644 src/Samples/FSharpCodeSamples/paket.references delete mode 100644 src/corelib/packages.config create mode 100644 src/corelib/paket.references delete mode 100644 src/testing/integration/packages.config create mode 100644 src/testing/integration/paket.references delete mode 100644 src/testing/migration/NuGet.config delete mode 100644 src/testing/migration/packages.config create mode 100644 src/testing/migration/paket.references delete mode 100644 src/testing/unit/packages.config create mode 100644 src/testing/unit/paket.references diff --git a/.paket/paket.targets b/.paket/paket.targets new file mode 100644 index 000000000..0fd370f90 --- /dev/null +++ b/.paket/paket.targets @@ -0,0 +1,41 @@ + + + + + true + + true + $(MSBuildThisFileDirectory) + $(MSBuildThisFileDirectory)..\ + /Library/Frameworks/Mono.framework/Commands/mono + mono + + + + $(PaketToolsPath)paket.exe + $(PaketToolsPath)paket.bootstrapper.exe + "$(PaketExePath)" + $(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)" + "$(PaketBootStrapperExePath)" $(PaketBootStrapperCommandArgs) + $(MonoPath) --runtime=v4.0.30319 $(PaketBootStrapperExePath) $(PaketBootStrapperCommandArgs) + + $(MSBuildProjectDirectory)\paket.references + $(MSBuildStartupDirectory)\paket.references + $(MSBuildProjectFullPath).paket.references + $(PaketCommand) restore --references-files "$(PaketReferences)" + $(PaketBootStrapperCommand) + + RestorePackages; $(BuildDependsOn); + + + + + + + + + + + + + diff --git a/NuGet.config b/NuGet.config deleted file mode 100644 index 19982907e..000000000 --- a/NuGet.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/build/build.proj b/build/build.proj index 547282d62..b1bcb762a 100644 --- a/build/build.proj +++ b/build/build.proj @@ -8,10 +8,13 @@ 0.0.0-dev $(MSBuildThisFileDirectory.Replace('build\','src'))\packages\ILMerge.2.14.1208\tools\ILMerge.exe - $(LocalAppData)\NuGet\NuGet.exe + $(MSBuildThisFileDirectory.Replace('build\','.paket'))\paket.bootstrapper.exe + $(MSBuildThisFileDirectory.Replace('build\','.paket'))\paket.exe + $(MSBuildThisFileDirectory.Replace('build\','packages')) + $(PackagesFolder)\NuGet.CommandLine\tools$(LocalAppData)\NuGet.exe "$(MSBuildToolsPath)\MSBuild.exe" - $(MSBuildThisFileDirectory.Replace('build\','src'))\packages\xunit.runner.console.2.0.0\tools\xunit.console.exe - $(MSBuildThisFileDirectory.Replace('build\','src'))\packages\xunit.runner.console.2.0.0\tools\NUnitXml.xslt + $(PackagesFolder)\xunit.runner.console\tools\xunit.console.exe + $(PackagesFolder)\xunit.runner.console\tools\NUnitXml.xslt @@ -33,15 +36,15 @@ - $(MSBuildThisFileDirectory.Replace('build\','src'))\packages\EWSoftware.SHFB.2014.11.22-beta\tools + $(PackagesFolder)\EWSoftware.SHFB\tools - - - + + + diff --git a/paket.dependencies b/paket.dependencies new file mode 100644 index 000000000..882345d9a --- /dev/null +++ b/paket.dependencies @@ -0,0 +1,44 @@ +source https://www.myget.org/F/openstacknetsdk/api/v2 +source https://www.nuget.org/api/v2 + +nuget EWSoftware.SHFB = 2014.11.22 +nuget Flurl.Http.Signed +nuget Flurl.Signed +nuget ILMerge +nuget Marvin.JsonPatch.Signed +nuget Moq +nuget Newtonsoft.Json +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 + source https://www.nuget.org/api/v2 + framework: net45 + strategy: min + + nuget openstack.net 1.5.0.2 + nuget SimpleRESTServices + +group History-1.4 + source https://www.nuget.org/api/v2 + framework: net45 + strategy: min + + nuget openstack.net 1.4.0.2 + nuget SimpleRESTServices + +group History-1.3.6 + source https://www.nuget.org/api/v2 + framework: net35 + strategy: min + + nuget openstack.net = 1.3.6.1 + nuget SimpleRESTServices \ No newline at end of file diff --git a/samples/NuGet.config b/samples/NuGet.config deleted file mode 100644 index acfd54951..000000000 --- a/samples/NuGet.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/Documentation/AdditionalReferenceDocumentation.Portable.shfbproj b/src/Documentation/AdditionalReferenceDocumentation.Portable.shfbproj index 2d0cf45db..b4eb33022 100644 --- a/src/Documentation/AdditionalReferenceDocumentation.Portable.shfbproj +++ b/src/Documentation/AdditionalReferenceDocumentation.Portable.shfbproj @@ -27,10 +27,10 @@ - - - - + + + + OnlyWarningsAndErrors HtmlHelp1 diff --git a/src/Documentation/AdditionalReferenceDocumentation.shfbproj b/src/Documentation/AdditionalReferenceDocumentation.shfbproj index 4fae5189c..37200aa9f 100644 --- a/src/Documentation/AdditionalReferenceDocumentation.shfbproj +++ b/src/Documentation/AdditionalReferenceDocumentation.shfbproj @@ -27,10 +27,10 @@ - - - - + + + + diff --git a/src/Documentation/History/1.3.6/Documentation.1.3.6.shfbproj b/src/Documentation/History/1.3.6/Documentation.1.3.6.shfbproj index 4f99ab45b..1ce0a8ca0 100644 --- a/src/Documentation/History/1.3.6/Documentation.1.3.6.shfbproj +++ b/src/Documentation/History/1.3.6/Documentation.1.3.6.shfbproj @@ -20,8 +20,8 @@ API Reference Documentation en-US - - + + OnlyWarningsAndErrors Website @@ -88,16 +88,16 @@ - - ..\..\..\packages\Newtonsoft.Json.5.0.8\lib\net35\Newtonsoft.Json.dll + + ..\..\..\packages\history-1.3.6\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll True - - ..\..\..\packages\SimpleRESTServices.1.3.0.1\lib\net35\SimpleRESTServices.dll + + ..\..\..\packages\history-1.3.6\SimpleRESTServices\lib\net35\SimpleRESTServices.dll True - - ..\..\..\packages\TaskParallelLibrary.1.0.2856.0\lib\Net35\System.Threading.dll + + ..\..\..\packages\history-1.3.6\TaskParallelLibrary\lib\Net35\System.Threading.dll True diff --git a/src/Documentation/History/1.3.6/packages.config b/src/Documentation/History/1.3.6/packages.config deleted file mode 100644 index 5dcd6cfa9..000000000 --- a/src/Documentation/History/1.3.6/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/Documentation/History/1.4/Documentation.1.4.shfbproj b/src/Documentation/History/1.4/Documentation.1.4.shfbproj index f69808eb3..933635f3c 100644 --- a/src/Documentation/History/1.4/Documentation.1.4.shfbproj +++ b/src/Documentation/History/1.4/Documentation.1.4.shfbproj @@ -20,8 +20,8 @@ API Reference Documentation en-US - - + + OnlyWarningsAndErrors Website @@ -88,28 +88,28 @@ - - ..\..\..\packages\Flurl.Signed.1.0.8\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Flurl.dll + + ..\..\..\packages\history-1.4\Flurl.Signed\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Flurl.dll True - - ..\..\..\packages\Flurl.Http.Signed.0.6.2.2015062601\lib\net45\Flurl.Http.dll + + ..\..\..\packages\history-1.4\Flurl.Http.Signed\lib\net45\Flurl.Http.dll True - - ..\..\..\packages\Marvin.JsonPatch.Signed.0.7.0\lib\portable-net40+win+wpa81\Marvin.JsonPatch.dll + + ..\..\..\packages\history-1.4\Marvin.JsonPatch.Signed\lib\portable-net40+win+wpa81\Marvin.JsonPatch.dll True - - ..\..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + + ..\..\..\packages\history-1.4\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll True - - ..\..\..\packages\SimpleRESTServices.1.3.0.1\lib\net35\SimpleRESTServices.dll + + ..\..\..\packages\history-1.4\SimpleRESTServices\lib\net35\SimpleRESTServices.dll True - - ..\..\..\packages\TaskParallelLibrary.1.0.2856.0\lib\Net35\System.Threading.dll + + ..\..\..\packages\history-1.4\TaskParallelLibrary\lib\Net35\System.Threading.dll True diff --git a/src/Documentation/History/1.4/packages.config b/src/Documentation/History/1.4/packages.config deleted file mode 100644 index c35eb401b..000000000 --- a/src/Documentation/History/1.4/packages.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/Documentation/History/1.5/Documentation.1.5.shfbproj b/src/Documentation/History/1.5/Documentation.1.5.shfbproj index 9c8bc1711..9a46036f3 100644 --- a/src/Documentation/History/1.5/Documentation.1.5.shfbproj +++ b/src/Documentation/History/1.5/Documentation.1.5.shfbproj @@ -20,8 +20,8 @@ API Reference Documentation en-US - - + + OnlyWarningsAndErrors Website @@ -88,28 +88,28 @@ - - ..\..\..\packages\Flurl.Signed.1.0.8\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Flurl.dll + + ..\..\..\packages\history-1.5\Flurl.Signed\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Flurl.dll True - - ..\..\..\packages\Flurl.Http.Signed.0.6.2.2015062601\lib\net45\Flurl.Http.dll + + ..\..\..\packages\history-1.5\Flurl.Http.Signed\lib\net45\Flurl.Http.dll True - - ..\..\..\packages\Marvin.JsonPatch.Signed.0.7.0\lib\portable-net40+win+wpa81\Marvin.JsonPatch.dll + + ..\..\..\packages\history-1.5\Marvin.JsonPatch.Signed\lib\portable-net40+win+wpa81\Marvin.JsonPatch.dll True - - ..\..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + + ..\..\..\packages\history-1.5\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll True - - ..\..\..\packages\SimpleRESTServices.1.3.0.1\lib\net35\SimpleRESTServices.dll + + ..\..\..\packages\history-1.5\SimpleRESTServices\lib\net35\SimpleRESTServices.dll True - - ..\..\..\packages\TaskParallelLibrary.1.0.2856.0\lib\Net35\System.Threading.dll + + ..\..\..\packages\history-1.5\TaskParallelLibrary\lib\Net35\System.Threading.dll True diff --git a/src/Documentation/History/1.5/packages.config b/src/Documentation/History/1.5/packages.config deleted file mode 100644 index a2150cdfc..000000000 --- a/src/Documentation/History/1.5/packages.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/Documentation/History/Current/Documentation.Current.shfbproj b/src/Documentation/History/Current/Documentation.Current.shfbproj index 9162374a8..114c2b182 100644 --- a/src/Documentation/History/Current/Documentation.Current.shfbproj +++ b/src/Documentation/History/Current/Documentation.Current.shfbproj @@ -93,9 +93,6 @@ False ..\..\ - - - diff --git a/src/Documentation/History/Current/packages.config b/src/Documentation/History/Current/packages.config deleted file mode 100644 index 445d1f16e..000000000 --- a/src/Documentation/History/Current/packages.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/Documentation/NuGet.config b/src/Documentation/NuGet.config deleted file mode 100644 index 278737ecf..000000000 --- a/src/Documentation/NuGet.config +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/Documentation/packages.config b/src/Documentation/packages.config deleted file mode 100644 index b915eaadf..000000000 --- a/src/Documentation/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/Samples/FSharpCodeSamples/FSharpCodeSamples.fsproj b/src/Samples/FSharpCodeSamples/FSharpCodeSamples.fsproj index 376f0d377..54dacc5c1 100644 --- a/src/Samples/FSharpCodeSamples/FSharpCodeSamples.fsproj +++ b/src/Samples/FSharpCodeSamples/FSharpCodeSamples.fsproj @@ -54,7 +54,7 @@ - + @@ -62,14 +62,6 @@ True - - ..\..\packages\Newtonsoft.Json.6.0.4\lib\net40\Newtonsoft.Json.dll - True - - - ..\..\packages\SimpleRESTServices.1.3.0.1-json6\lib\net40\SimpleRESTServices.dll - True - @@ -88,4 +80,81 @@ --> + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net20\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81+dnxcore50\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll + True + True + + + + + + + + + ..\..\..\packages\SimpleRESTServices\lib\net35\SimpleRESTServices.dll + True + True + + + + + + + ..\..\..\packages\SimpleRESTServices\lib\net40\SimpleRESTServices.dll + True + True + + + + \ No newline at end of file diff --git a/src/Samples/FSharpCodeSamples/app.config b/src/Samples/FSharpCodeSamples/app.config index 44298137a..c5c407bdb 100644 --- a/src/Samples/FSharpCodeSamples/app.config +++ b/src/Samples/FSharpCodeSamples/app.config @@ -1,11 +1,4 @@  - - - - - - - - + \ No newline at end of file diff --git a/src/Samples/FSharpCodeSamples/packages.config b/src/Samples/FSharpCodeSamples/packages.config deleted file mode 100644 index 37f0597d1..000000000 --- a/src/Samples/FSharpCodeSamples/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/Samples/FSharpCodeSamples/paket.references b/src/Samples/FSharpCodeSamples/paket.references new file mode 100644 index 000000000..c74a3de10 --- /dev/null +++ b/src/Samples/FSharpCodeSamples/paket.references @@ -0,0 +1,2 @@ +Newtonsoft.Json +SimpleRESTServices \ No newline at end of file diff --git a/src/corelib/OpenStack.csproj b/src/corelib/OpenStack.csproj index 707ee13b1..ac7cb0f39 100644 --- a/src/corelib/OpenStack.csproj +++ b/src/corelib/OpenStack.csproj @@ -48,27 +48,7 @@ ..\..\build\keys\OpenStackNetV1.dev.snk - - ..\packages\Flurl.Signed.1.0.10\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Flurl.dll - True - - - ..\packages\Flurl.Http.Signed.0.7.0\lib\net45\Flurl.Http.dll - True - - - ..\packages\Marvin.JsonPatch.Signed.0.7.0\lib\portable-net40+win+wpa81\Marvin.JsonPatch.dll - True - - - ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - True - - - False - ..\packages\SimpleRESTServices.1.3.0.1-json6\lib\net40\SimpleRESTServices.dll - @@ -888,12 +868,11 @@ - + - + + + + + + ..\..\packages\Flurl.Http.Signed\lib\net45\Flurl.Http.dll + True + True + + + + + + + ..\..\packages\Flurl.Http.Signed\lib\portable-net45+sl50+win+wpa81+wp80\Flurl.Http.dll + True + True + + + + + + + + + ..\..\packages\Flurl.Signed\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Flurl.dll + True + True + + + + + + + True + + + + + + + ..\..\packages\Marvin.JsonPatch.Signed\lib\portable-net40+win+wpa81\Marvin.JsonPatch.dll + True + True + + + + + + + + + ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.IO.dll + True + True + + + ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.Runtime.dll + True + True + + + ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.Threading.Tasks.dll + True + True + + + + + + + ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.IO.dll + True + True + + + ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.Runtime.dll + True + True + + + ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.Threading.Tasks.dll + True + True + + + + + + + ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp8+wpa81\System.IO.dll + True + True + + + ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp8+wpa81\System.Runtime.dll + True + True + + + ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp8+wpa81\System.Threading.Tasks.dll + True + True + + + + + + + ..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.IO.dll + True + True + + + ..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.Runtime.dll + True + True + + + ..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.Threading.Tasks.dll + True + True + + + + + + + ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.IO.dll + True + True + + + ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.Runtime.dll + True + True + + + ..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.Threading.Tasks.dll + True + True + + + + + + + ..\..\packages\Microsoft.Bcl\lib\portable-net40+win8+wp8+wpa81\System.IO.dll + True + True + + + ..\..\packages\Microsoft.Bcl\lib\portable-net40+win8+wp8+wpa81\System.Runtime.dll + True + True + + + ..\..\packages\Microsoft.Bcl\lib\portable-net40+win8+wp8+wpa81\System.Threading.Tasks.dll + True + True + + + + + + + + + ..\..\packages\Microsoft.Bcl.Async\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.Extensions.dll + True + True + + + ..\..\packages\Microsoft.Bcl.Async\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.dll + True + True + + + + + + + ..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wp8+wpa81\Microsoft.Threading.Tasks.Extensions.dll + True + True + + + ..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wp8+wpa81\Microsoft.Threading.Tasks.dll + True + True + + + + + + + ..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wpa81\Microsoft.Threading.Tasks.Extensions.dll + True + True + + + ..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wpa81\Microsoft.Threading.Tasks.dll + True + True + + + + + + + + + ..\..\packages\Microsoft.Net.Http\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Extensions.dll + True + True + + + ..\..\packages\Microsoft.Net.Http\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Primitives.dll + True + True + + + + + + + ..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8+wpa81\System.Net.Http.Extensions.dll + True + True + + + ..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8+wpa81\System.Net.Http.Primitives.dll + True + True + + + + + + + ..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8\System.Net.Http.Extensions.dll + True + True + + + ..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8\System.Net.Http.Primitives.dll + True + True + + + + + + + + + ..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\packages\Newtonsoft.Json\lib\net20\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81+dnxcore50\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll + True + True + + + + + + + + + ..\..\packages\PCLStorage\lib\portable-win8+wpa81\PCLStorage.Abstractions.dll + True + True + + + ..\..\packages\PCLStorage\lib\portable-win8+wpa81\PCLStorage.dll + True + True + + + + + + + ..\..\packages\PCLStorage\lib\portable-net45+sl5+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.Abstractions.dll + True + True + + + ..\..\packages\PCLStorage\lib\portable-net45+sl5+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 + True + True + + + + + + + + + ..\..\packages\SimpleRESTServices\lib\net35\SimpleRESTServices.dll + True + True + + + + + + + ..\..\packages\SimpleRESTServices\lib\net40\SimpleRESTServices.dll + True + True + + + + \ No newline at end of file diff --git a/src/corelib/app.config b/src/corelib/app.config index 5ac8598cf..2ebde5a16 100644 --- a/src/corelib/app.config +++ b/src/corelib/app.config @@ -1,11 +1,4 @@  - - - - - - - - + diff --git a/src/corelib/packages.config b/src/corelib/packages.config deleted file mode 100644 index 167200d48..000000000 --- a/src/corelib/packages.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/corelib/paket.references b/src/corelib/paket.references new file mode 100644 index 000000000..0eb4a8c65 --- /dev/null +++ b/src/corelib/paket.references @@ -0,0 +1,6 @@ +Flurl.Http.Signed +Flurl.Signed +ILMerge +Marvin.JsonPatch.Signed +Newtonsoft.Json +SimpleRESTServices \ No newline at end of file diff --git a/src/openstack.net.sln b/src/openstack.net.sln index 0ab3aadc4..42d94cf18 100644 --- a/src/openstack.net.sln +++ b/src/openstack.net.sln @@ -3,6 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{AB148713-068A-48E0-B8D9-4D53310809FC}" + ProjectSection(SolutionItems) = preProject + ..\paket.dependencies = ..\paket.dependencies + EndProjectSection +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DD863CE0-64D7-43AC-9DDD-C745B36CCD2C}" ProjectSection(SolutionItems) = preProject ..\appveyor.yml = ..\appveyor.yml @@ -16,7 +21,6 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{EFFA0DAE-1829-4783-92CF-390CFCE22E43}" ProjectSection(SolutionItems) = preProject ..\build\build.proj = ..\build\build.proj - ..\NuGet.config = ..\NuGet.config EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenStack", "corelib\OpenStack.csproj", "{1A4FB67F-8642-4402-B931-118955AE7538}" diff --git a/src/testing/integration/App.config b/src/testing/integration/App.config index f43e940d0..76896fcd7 100644 --- a/src/testing/integration/App.config +++ b/src/testing/integration/App.config @@ -1,13 +1,6 @@  - - - - - - - - + diff --git a/src/testing/integration/OpenStack.IntegrationTests.csproj b/src/testing/integration/OpenStack.IntegrationTests.csproj index 28d72787c..70fddbb33 100644 --- a/src/testing/integration/OpenStack.IntegrationTests.csproj +++ b/src/testing/integration/OpenStack.IntegrationTests.csproj @@ -1,7 +1,5 @@  - - Debug AnyCPU @@ -48,36 +46,10 @@ ..\..\..\build\keys\SDKTestingKey.snk - - ..\..\packages\Flurl.Signed.1.0.10\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Flurl.dll - True - - - ..\..\packages\Flurl.Http.Signed.0.7.0\lib\net45\Flurl.Http.dll - True - - - ..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - - - ..\..\packages\Marvin.JsonPatch.Signed.0.7.0\lib\portable-net40+win+wpa81\Marvin.JsonPatch.dll - True - - - ..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - - - ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - True - ..\..\lib\Security.Cryptography\Security.Cryptography.dll - - False - ..\..\packages\SimpleRESTServices.1.3.0.1-json6\lib\net40\SimpleRESTServices.dll - @@ -86,18 +58,6 @@ - - ..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - True - - - ..\..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll - True - - - ..\..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll - True - @@ -143,16 +103,52 @@ Designer - + - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + <__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>wpa81\xunit.runner.visualstudio + <__paket__xunit_runner_visualstudio_targets>wpa81\xunit.runner.visualstudio + + + + + <__paket__xunit_runner_visualstudio_props>portable-net45+win8+wp8+wpa81\xunit.runner.visualstudio + + + + + + + + <__paket__xunit_core_props>win81\xunit.core + + + + + <__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 + True + True + + + + + + + ..\..\..\packages\Flurl.Http.Signed\lib\portable-net45+sl50+win+wpa81+wp80\Flurl.Http.dll + True + True + + + + + + + + + ..\..\..\packages\Flurl.Signed\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Flurl.dll + True + True + + + + + + + + + ..\..\..\packages\Marvin.JsonPatch.Signed\lib\portable-net40+win+wpa81\Marvin.JsonPatch.dll + True + True + + + + + + + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.IO.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.Runtime.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.Threading.Tasks.dll + True + True + + + + + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.IO.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.Runtime.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.Threading.Tasks.dll + True + True + + + + + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp8+wpa81\System.IO.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp8+wpa81\System.Runtime.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp8+wpa81\System.Threading.Tasks.dll + True + True + + + + + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.IO.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.Runtime.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.Threading.Tasks.dll + True + True + + + + + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.IO.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.Runtime.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.Threading.Tasks.dll + True + True + + + + + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+win8+wp8+wpa81\System.IO.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+win8+wp8+wpa81\System.Runtime.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+win8+wp8+wpa81\System.Threading.Tasks.dll + True + True + + + + + + + + + ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.Extensions.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.dll + True + True + + + + + + + ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wp8+wpa81\Microsoft.Threading.Tasks.Extensions.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wp8+wpa81\Microsoft.Threading.Tasks.dll + True + True + + + + + + + ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wpa81\Microsoft.Threading.Tasks.Extensions.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wpa81\Microsoft.Threading.Tasks.dll + True + True + + + + + + + + + ..\..\..\packages\Microsoft.Net.Http\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Extensions.dll + True + True + + + ..\..\..\packages\Microsoft.Net.Http\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Primitives.dll + True + True + + + + + + + ..\..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8+wpa81\System.Net.Http.Extensions.dll + True + True + + + ..\..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8+wpa81\System.Net.Http.Primitives.dll + True + True + + + + + + + ..\..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8\System.Net.Http.Extensions.dll + True + True + + + ..\..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8\System.Net.Http.Primitives.dll + True + True + + + + + + + + + ..\..\..\packages\Moq\lib\net35\Moq.dll + True + True + + + + + + + ..\..\..\packages\Moq\lib\net40\Moq.dll + True + True + + + + + + + ..\..\..\packages\Moq\lib\sl5\Moq.Silverlight.dll + True + True + + + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net20\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81+dnxcore50\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll + True + True + + + + + + + + + ..\..\..\packages\PCLStorage\lib\portable-win8+wpa81\PCLStorage.Abstractions.dll + True + True + + + ..\..\..\packages\PCLStorage\lib\portable-win8+wpa81\PCLStorage.dll + True + True + + + + + + + ..\..\..\packages\PCLStorage\lib\portable-net45+sl5+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.Abstractions.dll + True + True + + + ..\..\..\packages\PCLStorage\lib\portable-net45+sl5+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 + True + True + + + + + + + + + ..\..\..\packages\SharpZipLib\lib\11\ICSharpCode.SharpZipLib.dll + True + True + + + + + + + ..\..\..\packages\SharpZipLib\lib\20\ICSharpCode.SharpZipLib.dll + True + True + + + + + + + ..\..\..\packages\SharpZipLib\lib\SL3\SharpZipLib.Silverlight3.dll + True + True + + + + + + + ..\..\..\packages\SharpZipLib\lib\SL4\SharpZipLib.Silverlight4.dll + True + True + + + + + + + + + ..\..\..\packages\SimpleRESTServices\lib\net35\SimpleRESTServices.dll + True + True + + + + + + + ..\..\..\packages\SimpleRESTServices\lib\net40\SimpleRESTServices.dll + True + True + + + + + + + + + ..\..\..\packages\xunit.abstractions\lib\net35\xunit.abstractions.dll + True + True + + + + + + + ..\..\..\packages\xunit.abstractions\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll + True + True + + + + + + + + + ..\..\..\packages\xunit.assert\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll + True + True + + + + + + + + + ..\..\..\packages\xunit.extensibility.core\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll + True + True + + + + + + + + + ..\..\..\packages\xunit.extensibility.execution\lib\win8\xunit.execution.dotnet.dll + True + True + + + + + + + ..\..\..\packages\xunit.extensibility.execution\lib\net45\xunit.execution.desktop.dll + True + True + + + + + + + ..\..\..\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\wp8\xunit.execution.dotnet.dll + True + True + + + + + + + ..\..\..\packages\xunit.extensibility.execution\lib\wpa81\xunit.execution.dotnet.dll + True + True + + + + + + + ..\..\..\packages\xunit.extensibility.execution\lib\xamarinios\xunit.execution.dotnet.dll + True + True + + + + + + + ..\..\..\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/integration/packages.config b/src/testing/integration/packages.config deleted file mode 100644 index 815e1c581..000000000 --- a/src/testing/integration/packages.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/testing/integration/paket.references b/src/testing/integration/paket.references new file mode 100644 index 000000000..d4b064a17 --- /dev/null +++ b/src/testing/integration/paket.references @@ -0,0 +1,14 @@ +Flurl.Http.Signed +Flurl.Signed +Marvin.JsonPatch.Signed +Moq +Newtonsoft.Json +SharpZipLib +SimpleRESTServices +xunit +xunit.abstractions +xunit.assert +xunit.core +xunit.extensibility.core +xunit.runner.console +xunit.runner.visualstudio \ No newline at end of file diff --git a/src/testing/migration/NuGet.config b/src/testing/migration/NuGet.config deleted file mode 100644 index acfd54951..000000000 --- a/src/testing/migration/NuGet.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/testing/migration/migration.csproj b/src/testing/migration/migration.csproj index e20994c36..c61660132 100644 --- a/src/testing/migration/migration.csproj +++ b/src/testing/migration/migration.csproj @@ -33,26 +33,6 @@ 4 - - ..\..\packages\Flurl.Signed.1.0.8\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Flurl.dll - True - - - ..\..\packages\Flurl.Http.Signed.0.6.2.2015062601\lib\net45\Flurl.Http.dll - True - - - ..\..\packages\Marvin.JsonPatch.Signed.0.7.0\lib\portable-net40+win+wpa81\Marvin.JsonPatch.dll - True - - - ..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll - True - - - ..\..\packages\openstack.net.1.5.0.2\lib\net45\openstacknet.dll - True - @@ -69,7 +49,7 @@ - + + + + + + + ..\..\..\packages\history-1.5\Flurl.Http.Signed\lib\net45\Flurl.Http.dll + True + True + + + + + + + + + ..\..\..\packages\history-1.5\Flurl.Signed\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Flurl.dll + True + True + + + + + + + + + ..\..\..\packages\history-1.5\Marvin.JsonPatch.Signed\lib\portable-net40+win+wpa81\Marvin.JsonPatch.dll + True + True + + + + + + + + + ..\..\..\packages\history-1.5\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll + True + True + + + + + + + + + ..\..\..\packages\history-1.5\openstack.net\lib\net45\openstacknet.dll + True + True + + + + \ No newline at end of file diff --git a/src/testing/migration/migration.sln b/src/testing/migration/migration.sln index d2d49d8ab..017a3d4f2 100644 --- a/src/testing/migration/migration.sln +++ b/src/testing/migration/migration.sln @@ -3,6 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{54A07A31-92EE-43F5-8505-9B7D023EE650}" + ProjectSection(SolutionItems) = preProject + ..\..\..\paket.dependencies = ..\..\..\paket.dependencies + EndProjectSection +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "migration", "migration.csproj", "{3C26C430-5553-4B34-AF5A-C99EF44ED756}" EndProject Global diff --git a/src/testing/migration/packages.config b/src/testing/migration/packages.config deleted file mode 100644 index b3174070c..000000000 --- a/src/testing/migration/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/testing/migration/paket.references b/src/testing/migration/paket.references new file mode 100644 index 000000000..6a377c254 --- /dev/null +++ b/src/testing/migration/paket.references @@ -0,0 +1,2 @@ +group History-1.5 + openstack.net \ No newline at end of file diff --git a/src/testing/unit/OpenStack.UnitTests.csproj b/src/testing/unit/OpenStack.UnitTests.csproj index 4302b4e98..0c774ebc3 100644 --- a/src/testing/unit/OpenStack.UnitTests.csproj +++ b/src/testing/unit/OpenStack.UnitTests.csproj @@ -1,7 +1,5 @@  - - Debug AnyCPU @@ -47,49 +45,14 @@ ..\..\..\build\keys\SDKTestingKey.snk - - ..\..\packages\Flurl.Signed.1.0.10\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Flurl.dll - True - - - ..\..\packages\Flurl.Http.Signed.0.7.0\lib\net45\Flurl.Http.dll - True - - - ..\..\packages\Marvin.JsonPatch.Signed.0.7.0\lib\portable-net40+win+wpa81\Marvin.JsonPatch.dll - True - - - ..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - - - ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - True - - - False - ..\..\packages\SimpleRESTServices.1.3.0.1-json6\lib\net40\SimpleRESTServices.dll - 3.5 - - ..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - True - - - ..\..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll - True - - - ..\..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll - True - @@ -145,7 +108,7 @@ SDKTestingKey.snk - + @@ -153,15 +116,50 @@ OpenStack - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + <__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>wpa81\xunit.runner.visualstudio + <__paket__xunit_runner_visualstudio_targets>wpa81\xunit.runner.visualstudio + + + + + <__paket__xunit_runner_visualstudio_props>portable-net45+win8+wp8+wpa81\xunit.runner.visualstudio + + + + + + + + <__paket__xunit_core_props>win81\xunit.core + + + + + <__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 + True + True + + + + + + + ..\..\..\packages\Flurl.Http.Signed\lib\portable-net45+sl50+win+wpa81+wp80\Flurl.Http.dll + True + True + + + + + + + + + ..\..\..\packages\Flurl.Signed\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Flurl.dll + True + True + + + + + + + + + ..\..\..\packages\Marvin.JsonPatch.Signed\lib\portable-net40+win+wpa81\Marvin.JsonPatch.dll + True + True + + + + + + + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.IO.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.Runtime.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl5+win8+wp8+wpa81\System.Threading.Tasks.dll + True + True + + + + + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.IO.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.Runtime.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8\System.Threading.Tasks.dll + True + True + + + + + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp8+wpa81\System.IO.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp8+wpa81\System.Runtime.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp8+wpa81\System.Threading.Tasks.dll + True + True + + + + + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.IO.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.Runtime.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+win8\System.Threading.Tasks.dll + True + True + + + + + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.IO.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.Runtime.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+sl4+win8+wp71+wpa81\System.Threading.Tasks.dll + True + True + + + + + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+win8+wp8+wpa81\System.IO.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+win8+wp8+wpa81\System.Runtime.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl\lib\portable-net40+win8+wp8+wpa81\System.Threading.Tasks.dll + True + True + + + + + + + + + ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.Extensions.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.dll + True + True + + + + + + + ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wp8+wpa81\Microsoft.Threading.Tasks.Extensions.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wp8+wpa81\Microsoft.Threading.Tasks.dll + True + True + + + + + + + ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wpa81\Microsoft.Threading.Tasks.Extensions.dll + True + True + + + ..\..\..\packages\Microsoft.Bcl.Async\lib\portable-net45+win8+wpa81\Microsoft.Threading.Tasks.dll + True + True + + + + + + + + + ..\..\..\packages\Microsoft.Net.Http\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Extensions.dll + True + True + + + ..\..\..\packages\Microsoft.Net.Http\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Primitives.dll + True + True + + + + + + + ..\..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8+wpa81\System.Net.Http.Extensions.dll + True + True + + + ..\..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8+wpa81\System.Net.Http.Primitives.dll + True + True + + + + + + + ..\..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8\System.Net.Http.Extensions.dll + True + True + + + ..\..\..\packages\Microsoft.Net.Http\lib\portable-net45+win8\System.Net.Http.Primitives.dll + True + True + + + + + + + + + ..\..\..\packages\Moq\lib\net35\Moq.dll + True + True + + + + + + + ..\..\..\packages\Moq\lib\net40\Moq.dll + True + True + + + + + + + ..\..\..\packages\Moq\lib\sl5\Moq.Silverlight.dll + True + True + + + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net20\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81+dnxcore50\Newtonsoft.Json.dll + True + True + + + + + + + ..\..\..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll + True + True + + + + + + + + + ..\..\..\packages\PCLStorage\lib\portable-win8+wpa81\PCLStorage.Abstractions.dll + True + True + + + ..\..\..\packages\PCLStorage\lib\portable-win8+wpa81\PCLStorage.dll + True + True + + + + + + + ..\..\..\packages\PCLStorage\lib\portable-net45+sl5+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.Abstractions.dll + True + True + + + ..\..\..\packages\PCLStorage\lib\portable-net45+sl5+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 + True + True + + + + + + + + + ..\..\..\packages\SimpleRESTServices\lib\net35\SimpleRESTServices.dll + True + True + + + + + + + ..\..\..\packages\SimpleRESTServices\lib\net40\SimpleRESTServices.dll + True + True + + + + + + + + + ..\..\..\packages\xunit.abstractions\lib\net35\xunit.abstractions.dll + True + True + + + + + + + ..\..\..\packages\xunit.abstractions\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll + True + True + + + + + + + + + ..\..\..\packages\xunit.assert\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll + True + True + + + + + + + + + ..\..\..\packages\xunit.extensibility.core\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll + True + True + + + + + + + + + ..\..\..\packages\xunit.extensibility.execution\lib\win8\xunit.execution.dotnet.dll + True + True + + + + + + + ..\..\..\packages\xunit.extensibility.execution\lib\net45\xunit.execution.desktop.dll + True + True + + + + + + + ..\..\..\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\wp8\xunit.execution.dotnet.dll + True + True + + + + + + + ..\..\..\packages\xunit.extensibility.execution\lib\wpa81\xunit.execution.dotnet.dll + True + True + + + + + + + ..\..\..\packages\xunit.extensibility.execution\lib\xamarinios\xunit.execution.dotnet.dll + True + True + + + + + + + ..\..\..\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 5ac8598cf..2ebde5a16 100644 --- a/src/testing/unit/app.config +++ b/src/testing/unit/app.config @@ -1,11 +1,4 @@  - - - - - - - - + diff --git a/src/testing/unit/packages.config b/src/testing/unit/packages.config deleted file mode 100644 index 5a2c1906d..000000000 --- a/src/testing/unit/packages.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/testing/unit/paket.references b/src/testing/unit/paket.references new file mode 100644 index 000000000..c37c4c738 --- /dev/null +++ b/src/testing/unit/paket.references @@ -0,0 +1,13 @@ +Flurl.Http.Signed +Flurl.Signed +Marvin.JsonPatch.Signed +Moq +Newtonsoft.Json +SimpleRESTServices +xunit +xunit.abstractions +xunit.assert +xunit.core +xunit.extensibility.core +xunit.runner.console +xunit.runner.visualstudio \ No newline at end of file From 9e76a61913cd2dfe801fd3b3ce3225fff7939fad Mon Sep 17 00:00:00 2001 From: Gauthier Segay Date: Thu, 26 May 2016 18:03:41 +0200 Subject: [PATCH 07/34] * add crucial missing paket.lock * set redirects: on * fix one folder pathj in Documentation.1.3.6.shfbproj --- paket.dependencies | 4 + paket.lock | 256 ++++++++++++++++++ .../1.3.6/Documentation.1.3.6.shfbproj | 4 +- .../CPPCodeSamples/CPPCodeSamples.vcxproj | 1 - src/Samples/FSharpCodeSamples/app.config | 8 +- src/corelib/app.config | 8 +- src/testing/integration/App.config | 8 +- src/testing/unit/app.config | 8 +- 8 files changed, 290 insertions(+), 7 deletions(-) create mode 100644 paket.lock diff --git a/paket.dependencies b/paket.dependencies index 882345d9a..94ae4e4ba 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -1,5 +1,6 @@ source https://www.myget.org/F/openstacknetsdk/api/v2 source https://www.nuget.org/api/v2 +redirects: on nuget EWSoftware.SHFB = 2014.11.22 nuget Flurl.Http.Signed @@ -20,6 +21,7 @@ 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 @@ -28,6 +30,7 @@ group History-1.5 nuget SimpleRESTServices group History-1.4 + redirects: on source https://www.nuget.org/api/v2 framework: net45 strategy: min @@ -36,6 +39,7 @@ group History-1.4 nuget SimpleRESTServices group History-1.3.6 + redirects: on source https://www.nuget.org/api/v2 framework: net35 strategy: min diff --git a/paket.lock b/paket.lock new file mode 100644 index 000000000..41efbfea2 --- /dev/null +++ b/paket.lock @@ -0,0 +1,256 @@ +REDIRECTS: ON +NUGET + remote: https://www.nuget.org/api/v2 + specs: + EWSoftware.SHFB (2014.11.22) + 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 + Microsoft.Net.Http (>= 2.2.22) - framework: portable-net45+sl50+win+wpa81+wp80 + Newtonsoft.Json (>= 6.0.3) - framework: >= net45, portable-net45+sl50+win+wpa81+wp80 + PCLStorage (>= 0.9.6) - framework: portable-net45+sl50+win+wpa81+wp80 + Flurl.Signed (1.0.10) + ilmerge (2.14.1208) + Marvin.JsonPatch.Signed (0.9) + Newtonsoft.Json (>= 6.0.4) + Microsoft.Bcl (1.1.10) - framework: portable-net45+sl50+win+wpa81+wp80 + Microsoft.Bcl.Build (>= 1.0.14) + Microsoft.Bcl.Async (1.0.168) - framework: portable-net45+sl50+win+wpa81+wp80 + Microsoft.Bcl (>= 1.1.8) + Microsoft.Bcl.Build (1.0.21) - import_targets: false, framework: portable-net45+sl50+win+wpa81+wp80 + Microsoft.Net.Http (2.2.29) - framework: portable-net45+sl50+win+wpa81+wp80 + Microsoft.Bcl (>= 1.1.10) + Microsoft.Bcl.Build (>= 1.0.14) + Moq (4.2.1510.2205) + Newtonsoft.Json (8.0.3) + NuGet.CommandLine (3.4.3) + PCLStorage (1.0.2) - framework: portable-net45+sl50+win+wpa81+wp80 + Microsoft.Bcl (>= 1.1.6) - framework: net10, net11, net20, net30, net35, net40, net40-full + Microsoft.Bcl.Async (>= 1.0.165) - framework: net10, net11, net20, net30, net35, net40, net40-full + SharpZipLib (0.86) + SimpleRESTServices (1.3.0.1) + Newtonsoft.Json (>= 5.0.6) + System.Collections (4.0.10) - framework: dnxcore50 + System.Diagnostics.Debug (>= 4.0) - framework: dnxcore50 + System.Resources.ResourceManager (>= 4.0) - framework: dnxcore50 + System.Runtime (>= 4.0) - framework: dnxcore50 + System.Runtime (>= 4.0.20) - framework: dnxcore50 + System.Runtime.Extensions (>= 4.0) - framework: dnxcore50 + System.Threading (>= 4.0) - framework: dnxcore50 + System.Diagnostics.Contracts (4.0) - framework: dnxcore50 + System.Runtime (>= 4.0) - framework: dnxcore50 + System.Diagnostics.Debug (4.0.10) - framework: dnxcore50 + System.Runtime (>= 4.0) - framework: dnxcore50 + System.Globalization (4.0.10) - framework: dnxcore50 + System.Runtime (>= 4.0) - framework: dnxcore50 + System.IO (4.0.10) - framework: dnxcore50 + System.Globalization (>= 4.0) - framework: dnxcore50 + System.Runtime (>= 4.0.20) - framework: dnxcore50 + System.Text.Encoding (>= 4.0) - framework: dnxcore50 + System.Text.Encoding (>= 4.0.10) - framework: dnxcore50 + System.Text.Encoding.Extensions (>= 4.0) - framework: dnxcore50 + System.Threading (>= 4.0) - framework: dnxcore50 + System.Threading.Tasks (>= 4.0) - framework: dnxcore50 + System.Linq (4.0) - framework: dnxcore50 + System.Collections (>= 4.0.10) - framework: dnxcore50 + System.Diagnostics.Debug (>= 4.0.10) - framework: dnxcore50 + System.Resources.ResourceManager (>= 4.0) - framework: dnxcore50 + System.Runtime (>= 4.0.20) - framework: dnxcore50 + System.Runtime.Extensions (>= 4.0.10) - framework: dnxcore50 + System.Linq.Expressions (4.0.10) - framework: dnxcore50 + System.Collections (>= 4.0) - framework: dnxcore50 + System.Diagnostics.Debug (>= 4.0) - framework: dnxcore50 + System.Globalization (>= 4.0) - framework: dnxcore50 + System.IO (>= 4.0) - framework: dnxcore50 + System.Linq (>= 4.0) - framework: dnxcore50 + System.ObjectModel (>= 4.0) - framework: dnxcore50 + System.Reflection (>= 4.0) - framework: dnxcore50 + System.Reflection.Emit (>= 4.0) - framework: dnxcore50 + System.Reflection.Extensions (>= 4.0) - framework: dnxcore50 + System.Reflection.Primitives (>= 4.0) - framework: dnxcore50 + System.Reflection.TypeExtensions (>= 4.0) - framework: dnxcore50 + System.Resources.ResourceManager (>= 4.0) - framework: dnxcore50 + System.Runtime (>= 4.0) - framework: dnxcore50 + System.Runtime (>= 4.0.20) - framework: dnxcore50 + System.Runtime.Extensions (>= 4.0) - framework: dnxcore50 + System.Threading (>= 4.0) - framework: dnxcore50 + System.ObjectModel (4.0.10) - framework: dnxcore50 + System.Collections (>= 4.0.10) - framework: dnxcore50 + System.Diagnostics.Debug (>= 4.0.10) - framework: dnxcore50 + System.Resources.ResourceManager (>= 4.0) - framework: dnxcore50 + System.Runtime (>= 4.0.20) - framework: dnxcore50 + System.Threading (>= 4.0.10) - framework: dnxcore50 + System.Private.Uri (4.0) - framework: dnxcore50 + System.Reflection (4.0.10) - framework: dnxcore50 + System.IO (>= 4.0) - framework: dnxcore50 + System.Reflection.Primitives (>= 4.0) - framework: dnxcore50 + System.Runtime (>= 4.0.20) - framework: dnxcore50 + System.Reflection.Emit (4.0) - framework: dnxcore50 + System.IO (>= 4.0) - framework: dnxcore50 + System.Reflection (>= 4.0) - framework: dnxcore50 + System.Reflection.Emit.ILGeneration (>= 4.0) - framework: dnxcore50 + System.Reflection.Primitives (>= 4.0) - framework: dnxcore50 + System.Runtime (>= 4.0) - framework: dnxcore50 + System.Reflection.Emit.ILGeneration (4.0) - framework: dnxcore50 + System.Reflection (>= 4.0) - framework: dnxcore50 + System.Reflection.Primitives (>= 4.0) - framework: dnxcore50 + System.Runtime (>= 4.0) - framework: dnxcore50 + System.Reflection.Extensions (4.0) - framework: dnxcore50 + System.Diagnostics.Debug (>= 4.0.10) - framework: dnxcore50 + System.Reflection (>= 4.0) - framework: dnxcore50 + System.Reflection (>= 4.0.10) - framework: dnxcore50 + System.Reflection.Primitives (>= 4.0) - framework: dnxcore50 + System.Reflection.TypeExtensions (>= 4.0) - framework: dnxcore50 + System.Resources.ResourceManager (>= 4.0) - framework: dnxcore50 + System.Runtime (>= 4.0) - framework: dnxcore50 + System.Runtime (>= 4.0.20) - framework: dnxcore50 + System.Runtime.Extensions (>= 4.0.10) - framework: dnxcore50 + System.Reflection.Primitives (4.0) - framework: dnxcore50 + System.Runtime (>= 4.0) - framework: dnxcore50 + System.Threading (>= 4.0) - framework: dnxcore50 + System.Reflection.TypeExtensions (4.0) - framework: dnxcore50 + System.Diagnostics.Contracts (>= 4.0) - framework: dnxcore50 + System.Diagnostics.Debug (>= 4.0.10) - framework: dnxcore50 + System.Linq (>= 4.0) - framework: dnxcore50 + System.Reflection (>= 4.0) - framework: dnxcore50 + System.Reflection (>= 4.0.10) - framework: dnxcore50 + System.Reflection.Primitives (>= 4.0) - framework: dnxcore50 + System.Resources.ResourceManager (>= 4.0) - framework: dnxcore50 + System.Runtime (>= 4.0) - framework: dnxcore50 + System.Runtime (>= 4.0.20) - framework: dnxcore50 + System.Runtime.Extensions (>= 4.0.10) - framework: dnxcore50 + System.Resources.ResourceManager (4.0) - framework: dnxcore50 + System.Globalization (>= 4.0) - framework: dnxcore50 + System.Reflection (>= 4.0) - framework: dnxcore50 + System.Reflection (>= 4.0.10) - framework: dnxcore50 + System.Runtime (>= 4.0) - framework: dnxcore50 + System.Runtime (>= 4.0.20) - framework: dnxcore50 + System.Runtime (4.0.20) - framework: dnxcore50 + System.Private.Uri (>= 4.0) - framework: dnxcore50 + System.Runtime.Extensions (4.0.10) - framework: dnxcore50 + System.Runtime (>= 4.0.20) - framework: dnxcore50 + System.Text.Encoding (4.0.10) - framework: dnxcore50 + System.Runtime (>= 4.0) - framework: dnxcore50 + System.Text.Encoding.Extensions (4.0.10) - framework: dnxcore50 + System.Runtime (>= 4.0) - framework: dnxcore50 + System.Text.Encoding (>= 4.0.10) - framework: dnxcore50 + System.Text.RegularExpressions (4.0.10) - framework: dnxcore50 + System.Collections (>= 4.0.10) - framework: dnxcore50 + System.Globalization (>= 4.0.10) - framework: dnxcore50 + System.Resources.ResourceManager (>= 4.0) - framework: dnxcore50 + System.Runtime (>= 4.0.20) - framework: dnxcore50 + System.Runtime.Extensions (>= 4.0.10) - framework: dnxcore50 + System.Threading (>= 4.0.10) - framework: dnxcore50 + System.Threading (4.0.10) - framework: dnxcore50 + System.Runtime (>= 4.0) - framework: dnxcore50 + System.Threading.Tasks (>= 4.0) - framework: dnxcore50 + System.Threading.Tasks (4.0.10) - framework: dnxcore50 + System.Runtime (>= 4.0) - framework: dnxcore50 + xunit (2.1) + xunit.assert (2.1) + xunit.core (2.1) + xunit.abstractions (2.0) + xunit.assert (2.1) + System.Collections (>= 4.0) - framework: dnxcore50 + System.Diagnostics.Debug (>= 4.0) - framework: dnxcore50 + System.Globalization (>= 4.0) - framework: dnxcore50 + System.Linq (>= 4.0) - framework: dnxcore50 + System.ObjectModel (>= 4.0) - framework: dnxcore50 + System.Reflection (>= 4.0) - framework: dnxcore50 + System.Reflection.Extensions (>= 4.0) - framework: dnxcore50 + System.Runtime (>= 4.0) - framework: dnxcore50 + System.Runtime.Extensions (>= 4.0) - framework: dnxcore50 + System.Text.RegularExpressions (>= 4.0) - framework: dnxcore50 + System.Threading.Tasks (>= 4.0) - framework: dnxcore50 + xunit.core (2.1) + System.Collections (>= 4.0) - framework: dnxcore50 + System.Diagnostics.Debug (>= 4.0) - framework: dnxcore50 + System.Globalization (>= 4.0) - framework: dnxcore50 + System.Linq (>= 4.0) - framework: dnxcore50 + System.Reflection (>= 4.0) - framework: dnxcore50 + System.Reflection.Extensions (>= 4.0) - framework: dnxcore50 + System.Runtime (>= 4.0) - framework: dnxcore50 + System.Runtime.Extensions (>= 4.0) - framework: dnxcore50 + System.Threading.Tasks (>= 4.0) - framework: dnxcore50 + xunit.abstractions (>= 2.0) - framework: dnxcore50 + xunit.extensibility.core (2.1) - framework: >= net45, dnx451, dnxcore50, monoandroid, monotouch, portable-net45+win80+wp80+wpa81, xamarinios, winv4.5, wpv8.0, wpav8.1 + xunit.extensibility.execution (2.1) - framework: >= net45, dnx451, dnxcore50, monoandroid, monotouch, portable-net45+win80+wp80+wpa81, xamarinios, winv4.5, wpv8.0, wpav8.1 + xunit.extensibility.core (2.1) + xunit.abstractions (2.0) + xunit.extensibility.execution (2.1) - framework: >= net45, dnx451, dnxcore50, monoandroid, monotouch, portable-net45+win80+wp80+wpa81, xamarinios, winv4.5, wpv8.0, wpav8.1 + System.Collections (>= 4.0) - framework: dnxcore50 + System.Diagnostics.Debug (>= 4.0) - framework: dnxcore50 + System.Globalization (>= 4.0) - framework: dnxcore50 + System.IO (>= 4.0) - framework: dnxcore50 + System.Linq (>= 4.0) - framework: dnxcore50 + System.Linq.Expressions (>= 4.0) - framework: dnxcore50 + System.Reflection (>= 4.0) - framework: dnxcore50 + System.Reflection.Extensions (>= 4.0) - framework: dnxcore50 + System.Runtime (>= 4.0) - framework: dnxcore50 + System.Runtime.Extensions (>= 4.0) - framework: dnxcore50 + System.Text.Encoding (>= 4.0) - framework: dnxcore50 + System.Threading (>= 4.0) - framework: dnxcore50 + System.Threading.Tasks (>= 4.0) - framework: dnxcore50 + xunit.abstractions (>= 2.0) - framework: dnxcore50 + xunit.extensibility.core (2.1) - framework: >= net45, dnx451, dnxcore50, monoandroid, monotouch, xamarinios, winv4.5, wpv8.0, wpav8.1 + xunit.runner.console (2.1) + xunit.runner.visualstudio (2.1) + +GROUP History-1.3.6 +REDIRECTS: ON +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) + SimpleRESTServices (>= 1.3.0.1) + TaskParallelLibrary (>= 1.0.2856) + SimpleRESTServices (1.3.0.1) + Newtonsoft.Json (>= 5.0.6) + TaskParallelLibrary (1.0.2856) + +GROUP History-1.4 +REDIRECTS: ON +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) + Flurl.Signed (1.0.8) + Marvin.JsonPatch.Signed (0.7) + Newtonsoft.Json (>= 6.0.4) + Newtonsoft.Json (6.0.4) + openstack.net (1.4.0.2) + Flurl.Http.Signed (>= 0.6.2.2015062601) + Marvin.JsonPatch.Signed (>= 0.7) + Newtonsoft.Json (>= 6.0.4) + SimpleRESTServices (1.3.0.1) + SimpleRESTServices (1.3.0.1) + Newtonsoft.Json (>= 5.0.6) + +GROUP History-1.5 +REDIRECTS: ON +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) + Flurl.Signed (1.0.8) + Marvin.JsonPatch.Signed (0.7) + Newtonsoft.Json (>= 6.0.4) + Newtonsoft.Json (6.0.4) + openstack.net (1.5.0.2) + Flurl.Http.Signed (>= 0.6.2.2015062601 < 0.7) + Marvin.JsonPatch.Signed (0.7) + Newtonsoft.Json (>= 6.0.1 < 7.0) + SimpleRESTServices (1.3.0.2) + Newtonsoft.Json (>= 5.0.6) diff --git a/src/Documentation/History/1.3.6/Documentation.1.3.6.shfbproj b/src/Documentation/History/1.3.6/Documentation.1.3.6.shfbproj index 1ce0a8ca0..8868095c2 100644 --- a/src/Documentation/History/1.3.6/Documentation.1.3.6.shfbproj +++ b/src/Documentation/History/1.3.6/Documentation.1.3.6.shfbproj @@ -20,8 +20,8 @@ API Reference Documentation en-US - - + + OnlyWarningsAndErrors Website diff --git a/src/Samples/CPPCodeSamples/CPPCodeSamples.vcxproj b/src/Samples/CPPCodeSamples/CPPCodeSamples.vcxproj index 641d3239e..6fc77e3ad 100644 --- a/src/Samples/CPPCodeSamples/CPPCodeSamples.vcxproj +++ b/src/Samples/CPPCodeSamples/CPPCodeSamples.vcxproj @@ -40,7 +40,6 @@ - true diff --git a/src/Samples/FSharpCodeSamples/app.config b/src/Samples/FSharpCodeSamples/app.config index c5c407bdb..96e740bb1 100644 --- a/src/Samples/FSharpCodeSamples/app.config +++ b/src/Samples/FSharpCodeSamples/app.config @@ -1,4 +1,10 @@  - \ No newline at end of file + + + True + + + + \ No newline at end of file diff --git a/src/corelib/app.config b/src/corelib/app.config index 2ebde5a16..0cc7ca6fe 100644 --- a/src/corelib/app.config +++ b/src/corelib/app.config @@ -1,4 +1,10 @@  - + + + True + + + + diff --git a/src/testing/integration/App.config b/src/testing/integration/App.config index 76896fcd7..0d025b881 100644 --- a/src/testing/integration/App.config +++ b/src/testing/integration/App.config @@ -7,4 +7,10 @@ - \ No newline at end of file + + + True + + + + \ No newline at end of file diff --git a/src/testing/unit/app.config b/src/testing/unit/app.config index 2ebde5a16..0cc7ca6fe 100644 --- a/src/testing/unit/app.config +++ b/src/testing/unit/app.config @@ -1,4 +1,10 @@  - + + + True + + + + From 8a41e25629755a60f41192438ae706e6a338c3f8 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Wed, 8 Jun 2016 07:55:11 -0600 Subject: [PATCH 08/34] Pin SHFB to a custom build on myget --- paket.dependencies | 2 +- paket.lock | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/paket.dependencies b/paket.dependencies index 94ae4e4ba..c870510ea 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -2,7 +2,7 @@ source https://www.myget.org/F/openstacknetsdk/api/v2 source https://www.nuget.org/api/v2 redirects: on -nuget EWSoftware.SHFB = 2014.11.22 +nuget EWSoftware.SHFB = 2014.11.22-beta nuget Flurl.Http.Signed nuget Flurl.Signed nuget ILMerge diff --git a/paket.lock b/paket.lock index 41efbfea2..90e736dd6 100644 --- a/paket.lock +++ b/paket.lock @@ -1,8 +1,10 @@ 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: - EWSoftware.SHFB (2014.11.22) 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 From 66cf8d83c6ceed5ee8bf27ec22950a603130d849 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Wed, 8 Jun 2016 09:10:27 -0500 Subject: [PATCH 09/34] Download the paket bootstrapper if missing --- .gitignore | 1 + build/build.proj | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b363c8808..a4f6e5283 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,4 @@ docs/html/ packages paket.exe paket.lock +paket.bootstrapper.exe diff --git a/build/build.proj b/build/build.proj index b1bcb762a..97526fcf9 100644 --- a/build/build.proj +++ b/build/build.proj @@ -8,6 +8,7 @@ 0.0.0-dev $(MSBuildThisFileDirectory.Replace('build\','src'))\packages\ILMerge.2.14.1208\tools\ILMerge.exe + 2.66.9 $(MSBuildThisFileDirectory.Replace('build\','.paket'))\paket.bootstrapper.exe $(MSBuildThisFileDirectory.Replace('build\','.paket'))\paket.exe $(MSBuildThisFileDirectory.Replace('build\','packages')) @@ -42,7 +43,7 @@ - + @@ -52,6 +53,11 @@ + + + + + "$(VS140COMNTOOLS)..\IDE\MSTest.exe" From 46f72199daba758a7237a5b495929da24376f3cc Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Wed, 8 Jun 2016 09:54:14 -0500 Subject: [PATCH 10/34] Update reference paths in documentation projects --- ...alReferenceDocumentation.Portable.shfbproj | 11 ++++----- .../AdditionalReferenceDocumentation.shfbproj | 11 ++++----- src/Documentation/Documentation.v4.0.shfbproj | 24 +++++++++++++++---- .../1.3.6/Documentation.1.3.6.shfbproj | 15 +++++------- .../History/1.4/Documentation.1.4.shfbproj | 21 +++++++--------- .../History/1.5/Documentation.1.5.shfbproj | 19 +++++++-------- 6 files changed, 50 insertions(+), 51 deletions(-) diff --git a/src/Documentation/AdditionalReferenceDocumentation.Portable.shfbproj b/src/Documentation/AdditionalReferenceDocumentation.Portable.shfbproj index b4eb33022..110e478dd 100644 --- a/src/Documentation/AdditionalReferenceDocumentation.Portable.shfbproj +++ b/src/Documentation/AdditionalReferenceDocumentation.Portable.shfbproj @@ -27,10 +27,10 @@ - - - - + + + + OnlyWarningsAndErrors HtmlHelp1 @@ -58,9 +58,6 @@ - - - diff --git a/src/Documentation/AdditionalReferenceDocumentation.shfbproj b/src/Documentation/AdditionalReferenceDocumentation.shfbproj index 37200aa9f..1f9e56bbb 100644 --- a/src/Documentation/AdditionalReferenceDocumentation.shfbproj +++ b/src/Documentation/AdditionalReferenceDocumentation.shfbproj @@ -27,10 +27,10 @@ - - - - + + + + @@ -53,9 +53,6 @@ - - - \ No newline at end of file diff --git a/src/Documentation/Documentation.v4.0.shfbproj b/src/Documentation/Documentation.v4.0.shfbproj index 211b9721c..21cdb8ece 100644 --- a/src/Documentation/Documentation.v4.0.shfbproj +++ b/src/Documentation/Documentation.v4.0.shfbproj @@ -99,8 +99,25 @@ - - + + + + + + + + + + + + + + + + + + + @@ -180,9 +197,6 @@ - - - \ No newline at end of file diff --git a/src/Documentation/History/1.3.6/Documentation.1.3.6.shfbproj b/src/Documentation/History/1.3.6/Documentation.1.3.6.shfbproj index 8868095c2..8d5e63f57 100644 --- a/src/Documentation/History/1.3.6/Documentation.1.3.6.shfbproj +++ b/src/Documentation/History/1.3.6/Documentation.1.3.6.shfbproj @@ -20,8 +20,8 @@ API Reference Documentation en-US - - + + OnlyWarningsAndErrors Website @@ -84,20 +84,17 @@ None ..\..\ - - - - ..\..\..\packages\history-1.3.6\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll + ..\..\..\..\packages\history-1.3.6\Newtonsoft.Json\lib\net35\Newtonsoft.Json.dll True - ..\..\..\packages\history-1.3.6\SimpleRESTServices\lib\net35\SimpleRESTServices.dll + ..\..\..\..\packages\history-1.3.6\SimpleRESTServices\lib\net35\SimpleRESTServices.dll True - ..\..\..\packages\history-1.3.6\TaskParallelLibrary\lib\Net35\System.Threading.dll + ..\..\..\..\packages\history-1.3.6\TaskParallelLibrary\lib\Net35\System.Threading.dll True @@ -110,4 +107,4 @@ - + \ No newline at end of file diff --git a/src/Documentation/History/1.4/Documentation.1.4.shfbproj b/src/Documentation/History/1.4/Documentation.1.4.shfbproj index 933635f3c..898868109 100644 --- a/src/Documentation/History/1.4/Documentation.1.4.shfbproj +++ b/src/Documentation/History/1.4/Documentation.1.4.shfbproj @@ -20,8 +20,8 @@ API Reference Documentation en-US - - + + OnlyWarningsAndErrors Website @@ -84,32 +84,29 @@ None ..\..\ - - - - ..\..\..\packages\history-1.4\Flurl.Signed\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Flurl.dll + ..\..\..\..\packages\history-1.4\Flurl.Signed\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Flurl.dll True - ..\..\..\packages\history-1.4\Flurl.Http.Signed\lib\net45\Flurl.Http.dll + ..\..\..\..\packages\history-1.4\Flurl.Http.Signed\lib\net45\Flurl.Http.dll True - ..\..\..\packages\history-1.4\Marvin.JsonPatch.Signed\lib\portable-net40+win+wpa81\Marvin.JsonPatch.dll + ..\..\..\..\packages\history-1.4\Marvin.JsonPatch.Signed\lib\portable-net40+win+wpa81\Marvin.JsonPatch.dll True - ..\..\..\packages\history-1.4\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll + ..\..\..\..\packages\history-1.4\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll True - ..\..\..\packages\history-1.4\SimpleRESTServices\lib\net35\SimpleRESTServices.dll + ..\..\..\..\packages\history-1.4\SimpleRESTServices\lib\net35\SimpleRESTServices.dll True - ..\..\..\packages\history-1.4\TaskParallelLibrary\lib\Net35\System.Threading.dll + ..\..\..\..\packages\history-1.4\TaskParallelLibrary\lib\Net35\System.Threading.dll True @@ -122,4 +119,4 @@ - + \ No newline at end of file diff --git a/src/Documentation/History/1.5/Documentation.1.5.shfbproj b/src/Documentation/History/1.5/Documentation.1.5.shfbproj index 9a46036f3..910d0bbef 100644 --- a/src/Documentation/History/1.5/Documentation.1.5.shfbproj +++ b/src/Documentation/History/1.5/Documentation.1.5.shfbproj @@ -20,8 +20,8 @@ API Reference Documentation en-US - - + + OnlyWarningsAndErrors Website @@ -84,32 +84,29 @@ None ..\..\ - - - - ..\..\..\packages\history-1.5\Flurl.Signed\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Flurl.dll + ..\..\..\..\packages\history-1.5\Flurl.Signed\lib\portable-net40+sl50+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Flurl.dll True - ..\..\..\packages\history-1.5\Flurl.Http.Signed\lib\net45\Flurl.Http.dll + ..\..\..\..\packages\history-1.5\Flurl.Http.Signed\lib\net45\Flurl.Http.dll True - ..\..\..\packages\history-1.5\Marvin.JsonPatch.Signed\lib\portable-net40+win+wpa81\Marvin.JsonPatch.dll + ..\..\..\..\packages\history-1.5\Marvin.JsonPatch.Signed\lib\portable-net40+win+wpa81\Marvin.JsonPatch.dll True - ..\..\..\packages\history-1.5\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll + ..\..\..\..\packages\history-1.5\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll True - ..\..\..\packages\history-1.5\SimpleRESTServices\lib\net35\SimpleRESTServices.dll + ..\..\..\..\packages\history-1.5\SimpleRESTServices\lib\net35\SimpleRESTServices.dll True - ..\..\..\packages\history-1.5\TaskParallelLibrary\lib\Net35\System.Threading.dll + ..\..\..\..\packages\history-1.5\TaskParallelLibrary\lib\Net35\System.Threading.dll True From cabbc68f1ab73bab93c1e85bb7e401bc6668ce15 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Wed, 8 Jun 2016 10:44:29 -0500 Subject: [PATCH 11/34] Update ilmerge path --- build/build.proj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/build.proj b/build/build.proj index 97526fcf9..e27e91882 100644 --- a/build/build.proj +++ b/build/build.proj @@ -7,7 +7,6 @@ $(bamboo_GitVersion_NuGetVersion) 0.0.0-dev - $(MSBuildThisFileDirectory.Replace('build\','src'))\packages\ILMerge.2.14.1208\tools\ILMerge.exe 2.66.9 $(MSBuildThisFileDirectory.Replace('build\','.paket'))\paket.bootstrapper.exe $(MSBuildThisFileDirectory.Replace('build\','.paket'))\paket.exe @@ -16,6 +15,7 @@ "$(MSBuildToolsPath)\MSBuild.exe" $(PackagesFolder)\xunit.runner.console\tools\xunit.console.exe $(PackagesFolder)\xunit.runner.console\tools\NUnitXml.xslt + $(PackagesFolder)\ILMerge\tools\ILMerge.exe @@ -57,7 +57,7 @@ - + "$(VS140COMNTOOLS)..\IDE\MSTest.exe" From 30b5f4443c5b3177f4cd4703db7dad75f2352785 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Wed, 8 Jun 2016 10:50:08 -0500 Subject: [PATCH 12/34] Update build to use nuget from packages directory --- build/build.proj | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/build/build.proj b/build/build.proj index e27e91882..eed4d3c37 100644 --- a/build/build.proj +++ b/build/build.proj @@ -11,7 +11,7 @@ $(MSBuildThisFileDirectory.Replace('build\','.paket'))\paket.bootstrapper.exe $(MSBuildThisFileDirectory.Replace('build\','.paket'))\paket.exe $(MSBuildThisFileDirectory.Replace('build\','packages')) - $(PackagesFolder)\NuGet.CommandLine\tools$(LocalAppData)\NuGet.exe + $(PackagesFolder)\NuGet.CommandLine\tools\NuGet.exe "$(MSBuildToolsPath)\MSBuild.exe" $(PackagesFolder)\xunit.runner.console\tools\xunit.console.exe $(PackagesFolder)\xunit.runner.console\tools\NUnitXml.xslt @@ -48,11 +48,6 @@ - - - - - @@ -79,7 +74,7 @@ OutputPaths="..\artifacts\TestResults\integration-tests.nunit.xml" /> - + ..\src\testing\migration\migration.sln @@ -110,7 +105,7 @@ - + @@ -122,7 +117,7 @@ Condition=" '$(ShouldPublishToNuGet)' == 'True' " /> - + From 19788018b943ce98cf4201da76dfcc906bde3dac Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Fri, 1 Jul 2016 10:28:01 -0500 Subject: [PATCH 13/34] Build against the lowest supported NuGet version for dependencies Workaround problem where we are compiled against a higher version than NuGet installs and configures in the assembly binding redirects for consuming users. --- paket.dependencies | 8 ++++---- paket.lock | 4 ++-- src/Samples/FSharpCodeSamples/app.config | 2 +- src/corelib/app.config | 2 +- src/testing/integration/App.config | 2 +- src/testing/unit/app.config | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/paket.dependencies b/paket.dependencies index c870510ea..0af28ce0f 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -3,12 +3,12 @@ source https://www.nuget.org/api/v2 redirects: on nuget EWSoftware.SHFB = 2014.11.22-beta -nuget Flurl.Http.Signed -nuget Flurl.Signed +nuget Flurl.Http.Signed ~> 0.7.0 +nuget Flurl.Signed ~> 1.0 nuget ILMerge -nuget Marvin.JsonPatch.Signed +nuget Marvin.JsonPatch.Signed ~> 0.7.0 nuget Moq -nuget Newtonsoft.Json +nuget Newtonsoft.Json ~> 6.0 nuget NuGet.CommandLine nuget SharpZipLib nuget SimpleRESTServices = 1.3.0.1 diff --git a/paket.lock b/paket.lock index 90e736dd6..0e8f25383 100644 --- a/paket.lock +++ b/paket.lock @@ -13,7 +13,7 @@ NUGET PCLStorage (>= 0.9.6) - framework: portable-net45+sl50+win+wpa81+wp80 Flurl.Signed (1.0.10) ilmerge (2.14.1208) - Marvin.JsonPatch.Signed (0.9) + Marvin.JsonPatch.Signed (0.7) Newtonsoft.Json (>= 6.0.4) Microsoft.Bcl (1.1.10) - framework: portable-net45+sl50+win+wpa81+wp80 Microsoft.Bcl.Build (>= 1.0.14) @@ -24,7 +24,7 @@ NUGET Microsoft.Bcl (>= 1.1.10) Microsoft.Bcl.Build (>= 1.0.14) Moq (4.2.1510.2205) - Newtonsoft.Json (8.0.3) + Newtonsoft.Json (6.0.8) NuGet.CommandLine (3.4.3) PCLStorage (1.0.2) - framework: portable-net45+sl50+win+wpa81+wp80 Microsoft.Bcl (>= 1.1.6) - framework: net10, net11, net20, net30, net35, net40, net40-full diff --git a/src/Samples/FSharpCodeSamples/app.config b/src/Samples/FSharpCodeSamples/app.config index 96e740bb1..0ed82eae5 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/app.config b/src/corelib/app.config index 0cc7ca6fe..93e946be6 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 0d025b881..5c1fe4591 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/unit/app.config b/src/testing/unit/app.config index 0cc7ca6fe..93e946be6 100644 --- a/src/testing/unit/app.config +++ b/src/testing/unit/app.config @@ -5,6 +5,6 @@ True - + From 0ef45cdf6fb984e91493f1b7fe1fc197d926a189 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Fri, 1 Jul 2016 12:42:18 -0500 Subject: [PATCH 14/34] Fix reference to SimpleRESTServices Only 1.3.0.1 is good, 1.3.0.2 is bad. --- paket.dependencies | 10 +++++----- paket.lock | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/paket.dependencies b/paket.dependencies index 0af28ce0f..f3d2df6ac 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -26,8 +26,8 @@ group History-1.5 framework: net45 strategy: min - nuget openstack.net 1.5.0.2 - nuget SimpleRESTServices + nuget openstack.net = 1.5.0.2 + nuget SimpleRESTServices = 1.3.0.1 group History-1.4 redirects: on @@ -35,8 +35,8 @@ group History-1.4 framework: net45 strategy: min - nuget openstack.net 1.4.0.2 - nuget SimpleRESTServices + nuget openstack.net = 1.4.0.2 + nuget SimpleRESTServices = 1.3.0.1 group History-1.3.6 redirects: on @@ -45,4 +45,4 @@ group History-1.3.6 strategy: min nuget openstack.net = 1.3.6.1 - nuget SimpleRESTServices \ No newline at end of file + nuget SimpleRESTServices = 1.3.0.1 \ No newline at end of file diff --git a/paket.lock b/paket.lock index 0e8f25383..e191048bd 100644 --- a/paket.lock +++ b/paket.lock @@ -254,5 +254,5 @@ NUGET Flurl.Http.Signed (>= 0.6.2.2015062601 < 0.7) Marvin.JsonPatch.Signed (0.7) Newtonsoft.Json (>= 6.0.1 < 7.0) - SimpleRESTServices (1.3.0.2) + SimpleRESTServices (1.3.0.1) Newtonsoft.Json (>= 5.0.6) From 1cd362faf1b317a87366fda588ae0f81f1988374 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Fri, 1 Jul 2016 12:42:42 -0500 Subject: [PATCH 15/34] Bump paket to 3.4.0 .NET target names, they are a changing! Hurray for .NET Core 1.0 --- paket.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/paket.lock b/paket.lock index e191048bd..ee761675f 100644 --- a/paket.lock +++ b/paket.lock @@ -24,7 +24,7 @@ NUGET Microsoft.Bcl (>= 1.1.10) Microsoft.Bcl.Build (>= 1.0.14) Moq (4.2.1510.2205) - Newtonsoft.Json (6.0.8) + Newtonsoft.Json (6.0.8) NuGet.CommandLine (3.4.3) PCLStorage (1.0.2) - framework: portable-net45+sl50+win+wpa81+wp80 Microsoft.Bcl (>= 1.1.6) - framework: net10, net11, net20, net30, net35, net40, net40-full @@ -254,5 +254,5 @@ NUGET Flurl.Http.Signed (>= 0.6.2.2015062601 < 0.7) Marvin.JsonPatch.Signed (0.7) Newtonsoft.Json (>= 6.0.1 < 7.0) - SimpleRESTServices (1.3.0.1) + SimpleRESTServices (1.3.0.1) Newtonsoft.Json (>= 5.0.6) From 5e4d91156506b4e7e1521f787368a9d63a545a43 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Fri, 1 Jul 2016 14:47:17 -0500 Subject: [PATCH 16/34] Don't re-restore packages when publishing --- build/build.proj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/build.proj b/build/build.proj index eed4d3c37..42c5ad157 100644 --- a/build/build.proj +++ b/build/build.proj @@ -105,7 +105,7 @@ - + @@ -117,7 +117,7 @@ Condition=" '$(ShouldPublishToNuGet)' == 'True' " /> - + From 6781500a096b61314857afd0e71b0ad4914d5d45 Mon Sep 17 00:00:00 2001 From: Mikke Tanska Date: Tue, 2 Aug 2016 08:32:49 +0300 Subject: [PATCH 17/34] Allow version 9.x of Newtonsoft.Json in nuspec --- src/corelib/corelib.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/corelib.nuspec b/src/corelib/corelib.nuspec index 343c2ff71..ca0bf9fc5 100644 --- a/src/corelib/corelib.nuspec +++ b/src/corelib/corelib.nuspec @@ -15,7 +15,7 @@ openstack - + From e68e264c13e007645dc1afe78e758f5a0c269102 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Wed, 14 Sep 2016 08:25:19 -0500 Subject: [PATCH 18/34] Fix casing on the intermediateCertificate property --- .../Objects/LoadBalancers/LoadBalancerSslConfiguration.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/Providers/Rackspace/Objects/LoadBalancers/LoadBalancerSslConfiguration.cs b/src/corelib/Providers/Rackspace/Objects/LoadBalancers/LoadBalancerSslConfiguration.cs index 3c3184424..221d5834f 100644 --- a/src/corelib/Providers/Rackspace/Objects/LoadBalancers/LoadBalancerSslConfiguration.cs +++ b/src/corelib/Providers/Rackspace/Objects/LoadBalancers/LoadBalancerSslConfiguration.cs @@ -48,7 +48,7 @@ public class LoadBalancerSslConfiguration : ExtensibleJsonObject /// /// This is the backing field for the property. /// - [JsonProperty("intermediatecertificate", DefaultValueHandling = DefaultValueHandling.Ignore)] + [JsonProperty("intermediateCertificate", DefaultValueHandling = DefaultValueHandling.Ignore)] private string _intermediateCertificate; /// From a4ce3d997adcd71dcd59eca2d8c14b78ac8b7ff9 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Tue, 20 Sep 2016 10:30:54 -0500 Subject: [PATCH 19/34] Deserialize vanilla openstack token with preconfigured jsonserializer The default json.net serializer will helpfully reformat strings that appear to be date time strings for you, even when the destination property is a string. Use the preconfigured jsonserializer which has this disabled, to preserve the expires string as-is. --- .../Providers/OpenStackIdentityProvider.cs | 8 +++++--- src/corelib/OpenStackNet.cs | 20 +++++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/corelib/Core/Providers/OpenStackIdentityProvider.cs b/src/corelib/Core/Providers/OpenStackIdentityProvider.cs index d5f48a6c1..ee08b700d 100644 --- a/src/corelib/Core/Providers/OpenStackIdentityProvider.cs +++ b/src/corelib/Core/Providers/OpenStackIdentityProvider.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using Newtonsoft.Json; using OpenStack; using OpenStack.Authentication; @@ -109,11 +110,12 @@ public override UserAccess GetUserAccess(CloudIdentity identity, bool forceCache if (response == null || response.Data == null) return null; - JToken userAccessObject = response.Data["access"]; - if (userAccessObject == null) + // The defalut json serialization is helpfully formatting the expires date string. Use our custom serializer for this part to prevent chaos of timezone proportions. + var rawJson = response.Data["access"]?.ToString(Formatting.None); + if (rawJson == null) return null; - UserAccess access = userAccessObject.ToObject(); + UserAccess access = OpenStackNet.Deserialize(rawJson); if (access == null || access.Token == null) return null; diff --git a/src/corelib/OpenStackNet.cs b/src/corelib/OpenStackNet.cs index 5f2fb985d..a8eff122f 100644 --- a/src/corelib/OpenStackNet.cs +++ b/src/corelib/OpenStackNet.cs @@ -89,6 +89,26 @@ public static void ResetDefaults() } } + /// + /// Deserializes an object from a json string representation. + /// + /// The object type. + /// The json string. + public static T Deserialize(string json) + { + return Configuration.FlurlHttpSettings.JsonSerializer.Deserialize(json); + } + + /// + /// Serializes an object to a json string representation + /// + /// The object. + /// The json string representation of the object. + public static string Serialize(object obj) + { + return Configuration.FlurlHttpSettings.JsonSerializer.Serialize(obj); + } + /// /// Provides global point for programmatically configuraing tracing /// From f3fb8f10048ed25388daab2b6b054f903112cc76 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Tue, 20 Sep 2016 10:31:38 -0500 Subject: [PATCH 20/34] Make it easier to get at the good jsonserializer --- .../v1/ServiceOperationFailedException.cs | 4 ++-- src/corelib/Testing/HttpTest.cs | 2 +- src/testing/unit/Compute/v2_1/KeyPairTests.cs | 2 +- .../unit/Compute/v2_1/SecurityGroupTests.cs | 2 +- src/testing/unit/Compute/v2_1/ServerTests.cs | 4 ++-- src/testing/unit/Compute/v2_1/VolumeTests.cs | 2 +- .../v1/ServiceCacheTests.cs | 6 +++--- .../ContentDeliveryNetworks/v1/ServiceTests.cs | 8 ++++---- src/testing/unit/IdentifierTests.cs | 8 ++++---- .../Networking/v2/DHCPOptionConverterTests.cs | 8 ++++---- .../unit/Serialization/EmptyEnumerableTests.cs | 6 +++--- .../Serialization/RootWrapperConverterTests.cs | 16 ++++++++-------- .../Serialization/TolerantEnumConverterTests.cs | 10 +++++----- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/corelib/ContentDeliveryNetworks/v1/ServiceOperationFailedException.cs b/src/corelib/ContentDeliveryNetworks/v1/ServiceOperationFailedException.cs index 689de1c47..ba8f35596 100644 --- a/src/corelib/ContentDeliveryNetworks/v1/ServiceOperationFailedException.cs +++ b/src/corelib/ContentDeliveryNetworks/v1/ServiceOperationFailedException.cs @@ -27,7 +27,7 @@ public ServiceOperationFailedException(IEnumerable errors) /// The that contains contextual information about the source or destination. private ServiceOperationFailedException(SerializationInfo info, StreamingContext context) : base(info, context) { - Errors = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize>(info.GetString("service_errors")); + Errors = OpenStackNet.Deserialize>(info.GetString("service_errors")); } /// @@ -48,7 +48,7 @@ private ServiceOperationFailedException(SerializationInfo info, StreamingContext public override void GetObjectData(SerializationInfo info, StreamingContext context) { // ReSharper disable once ExceptionNotDocumented - info.AddValue("service_errors", OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(Errors)); + info.AddValue("service_errors", OpenStackNet.Serialize(Errors)); base.GetObjectData(info, context); } } diff --git a/src/corelib/Testing/HttpTest.cs b/src/corelib/Testing/HttpTest.cs index 7d3d058ac..f26328914 100644 --- a/src/corelib/Testing/HttpTest.cs +++ b/src/corelib/Testing/HttpTest.cs @@ -54,7 +54,7 @@ private void SetTestMode(OpenStackNetConfigurationOptions options) ResponseQueue.Enqueue(new HttpResponseMessage { StatusCode = (HttpStatusCode)status, - Content = new CapturedJsonContent(OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(data)) + Content = new CapturedJsonContent(OpenStackNet.Serialize(data)) }); return this; } diff --git a/src/testing/unit/Compute/v2_1/KeyPairTests.cs b/src/testing/unit/Compute/v2_1/KeyPairTests.cs index 6f880b3a3..69e391475 100644 --- a/src/testing/unit/Compute/v2_1/KeyPairTests.cs +++ b/src/testing/unit/Compute/v2_1/KeyPairTests.cs @@ -43,7 +43,7 @@ public void DeserializeKeyPairCollection() ] }").ToString(); - var results = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize(json); + var results = OpenStackNet.Deserialize(json); Assert.NotNull(results); Assert.Equal(2, results.Count()); var result = results.First(); diff --git a/src/testing/unit/Compute/v2_1/SecurityGroupTests.cs b/src/testing/unit/Compute/v2_1/SecurityGroupTests.cs index 77e4a123c..b67deee14 100644 --- a/src/testing/unit/Compute/v2_1/SecurityGroupTests.cs +++ b/src/testing/unit/Compute/v2_1/SecurityGroupTests.cs @@ -98,7 +98,7 @@ public void DeserializeSecurityGroupRule() }, 'id': '55d75417-37df-48e2-96aa-20ba53a82900' }}"; - var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize(JObject.Parse(json).ToString()); + var result = OpenStackNet.Deserialize(JObject.Parse(json).ToString()); Assert.Equal("0.0.0.0 / 24", result.CIDR); } diff --git a/src/testing/unit/Compute/v2_1/ServerTests.cs b/src/testing/unit/Compute/v2_1/ServerTests.cs index ab673c0c1..3b926a19b 100644 --- a/src/testing/unit/Compute/v2_1/ServerTests.cs +++ b/src/testing/unit/Compute/v2_1/ServerTests.cs @@ -29,7 +29,7 @@ public void SerializeServerWithSchedulerHints() server.SchedulerHints = new SchedulerHints(); server.SchedulerHints.Add("group", "groupId"); - var json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(server); + var json = OpenStackNet.Serialize(server); Assert.Equal(expectedJson, json); } @@ -40,7 +40,7 @@ public void SerializeServerWithoutSchedulerHints() .ToString(Formatting.None); var server = new ServerCreateDefinition("name", Guid.Empty, Guid.Empty); - var json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(server); + var json = OpenStackNet.Serialize(server); Assert.Equal(expectedJson, json); } diff --git a/src/testing/unit/Compute/v2_1/VolumeTests.cs b/src/testing/unit/Compute/v2_1/VolumeTests.cs index 7cda497b5..bcfca48fc 100644 --- a/src/testing/unit/Compute/v2_1/VolumeTests.cs +++ b/src/testing/unit/Compute/v2_1/VolumeTests.cs @@ -24,7 +24,7 @@ public VolumeTests() public void DeserializeVolumeWithEmptyAttachment() { var json = JObject.Parse(@"{'volume': {'attachments': [{}]}}").ToString(); - var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize(json); + var result = OpenStackNet.Deserialize(json); Assert.Empty(result.Attachments); } diff --git a/src/testing/unit/ContentDeliveryNetworks/v1/ServiceCacheTests.cs b/src/testing/unit/ContentDeliveryNetworks/v1/ServiceCacheTests.cs index f2cb8ce49..696b31ead 100644 --- a/src/testing/unit/ContentDeliveryNetworks/v1/ServiceCacheTests.cs +++ b/src/testing/unit/ContentDeliveryNetworks/v1/ServiceCacheTests.cs @@ -12,7 +12,7 @@ public void SerializeTimeToLiveToSeconds() { var cache = new ServiceCache("cache", TimeSpan.FromSeconds(60)); - var json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(cache); + var json = OpenStackNet.Serialize(cache); var result = JObject.Parse(json); Assert.Equal(60, result.Value("ttl")); @@ -22,9 +22,9 @@ public void SerializeTimeToLiveToSeconds() public void DeserializeTimeToLiveFromSeconds() { var cache = new ServiceCache("cache", TimeSpan.FromSeconds(60)); - var json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(cache); + var json = OpenStackNet.Serialize(cache); - var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize(json); + var result = OpenStackNet.Deserialize(json); Assert.Equal(60, result.TimeToLive.TotalSeconds); } diff --git a/src/testing/unit/ContentDeliveryNetworks/v1/ServiceTests.cs b/src/testing/unit/ContentDeliveryNetworks/v1/ServiceTests.cs index 8295f7255..f1c75a469 100644 --- a/src/testing/unit/ContentDeliveryNetworks/v1/ServiceTests.cs +++ b/src/testing/unit/ContentDeliveryNetworks/v1/ServiceTests.cs @@ -32,11 +32,11 @@ public void SerializeServiceCollection() Items = {new Service {Id = "service-id"}}, Links = {new PageLink("next", "http://api.com/next")} }; - string json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(services); + string json = OpenStackNet.Serialize(services); Assert.Contains("\"services\"", json); Assert.DoesNotContain("\"service\"", json); - var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize(json); + var result = OpenStackNet.Deserialize(json); Assert.NotNull(result); Assert.Equal(1, result.Count()); Assert.Equal(1, result.Items.Count()); @@ -48,9 +48,9 @@ public void SerializeServiceCollection() public void SerializePageLink() { var link = new PageLink("next", "http://api.com/next"); - string json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(link); + string json = OpenStackNet.Serialize(link); - var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize(json); + var result = OpenStackNet.Deserialize(json); Assert.NotNull(result); Assert.True(result.IsNextPage); } diff --git a/src/testing/unit/IdentifierTests.cs b/src/testing/unit/IdentifierTests.cs index d96b3d361..9503d28f9 100644 --- a/src/testing/unit/IdentifierTests.cs +++ b/src/testing/unit/IdentifierTests.cs @@ -17,7 +17,7 @@ public void Serialize() var rawId = Guid.NewGuid(); var id = (Identifier)rawId; - var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(id); + var result = OpenStackNet.Serialize(id); Assert.Equal(string.Format("\"{0}\"", rawId.ToString("D")), result); } @@ -27,7 +27,7 @@ public void Serialize_WithinAClass() { var thing = new Thing {Id = Guid.NewGuid()}; - var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(thing); + var result = OpenStackNet.Serialize(thing); Assert.Equal(string.Format("{{\"Id\":\"{0}\"}}", thing.Id), result); } @@ -37,8 +37,8 @@ public void Deserialize() { var id = new Identifier(Guid.NewGuid()); - var json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(id); - var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize(json); + var json = OpenStackNet.Serialize(id); + var result = OpenStackNet.Deserialize(json); Assert.Equal(id, result); } diff --git a/src/testing/unit/Networking/v2/DHCPOptionConverterTests.cs b/src/testing/unit/Networking/v2/DHCPOptionConverterTests.cs index c20ae1e32..a73f128e8 100644 --- a/src/testing/unit/Networking/v2/DHCPOptionConverterTests.cs +++ b/src/testing/unit/Networking/v2/DHCPOptionConverterTests.cs @@ -19,7 +19,7 @@ public void Serialize() } }; - string result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(input); + string result = OpenStackNet.Serialize(input); string expectedJson = JObject.Parse("{'port':{'extra_dhcp_opts':[{'opt_name':'a','opt_value':'stuff'},{'opt_name':'b','opt_value':'things'}]}}").ToString(Formatting.None); Assert.Equal(expectedJson, result); @@ -30,7 +30,7 @@ public void Deserialize() { string json = JObject.Parse("{'port':{'extra_dhcp_opts':[{'opt_name':'a','opt_value':'stuff'},{'opt_name':'b','opt_value':'things'}]}}").ToString(Formatting.None); - var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize(json).DHCPOptions; + var result = OpenStackNet.Deserialize(json).DHCPOptions; Assert.NotNull(result); Assert.Equal(2, result.Count); @@ -52,8 +52,8 @@ public void OpenStackNet_UsesDHCPOptionConverter() } }; - var json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(port); - var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize(json); + var json = OpenStackNet.Serialize(port); + var result = OpenStackNet.Deserialize(json); Assert.NotNull(result.DHCPOptions); Assert.Equal(1, result.DHCPOptions.Count); diff --git a/src/testing/unit/Serialization/EmptyEnumerableTests.cs b/src/testing/unit/Serialization/EmptyEnumerableTests.cs index 98aaca6af..86f10021c 100644 --- a/src/testing/unit/Serialization/EmptyEnumerableTests.cs +++ b/src/testing/unit/Serialization/EmptyEnumerableTests.cs @@ -21,10 +21,10 @@ public ExampleThing() public void WhenDeserializingNullCollection_ItShouldUseAnEmptyCollection() { var thing = new ExampleThing{Messages = null}; - string json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(thing); + string json = OpenStackNet.Serialize(thing); Assert.DoesNotContain("messages", json); - var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize(json); + var result = OpenStackNet.Deserialize(json); Assert.NotNull(result.Messages); Assert.Empty(result.Messages); @@ -35,7 +35,7 @@ public void WhenSerializingEmptyCollection_ItShouldBeIgnored() { var thing = new ExampleThing { Messages = new List() }; - string json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(thing); + string json = OpenStackNet.Serialize(thing); Assert.DoesNotContain("messages", json); } diff --git a/src/testing/unit/Serialization/RootWrapperConverterTests.cs b/src/testing/unit/Serialization/RootWrapperConverterTests.cs index a88a25c71..155a11e1c 100644 --- a/src/testing/unit/Serialization/RootWrapperConverterTests.cs +++ b/src/testing/unit/Serialization/RootWrapperConverterTests.cs @@ -23,7 +23,7 @@ class ThingCollection : List [Fact] public void Serialize() { - var json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(new Thing()); + var json = OpenStackNet.Serialize(new Thing()); var jsonObj = JObject.Parse(json); JProperty rootProperty = jsonObj.Properties().FirstOrDefault(); @@ -34,15 +34,15 @@ public void Serialize() [Fact] public void Deserialize() { - var json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(new Thing {Id = "thing-id"}); - var thing = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize(json); + var json = OpenStackNet.Serialize(new Thing {Id = "thing-id"}); + var thing = OpenStackNet.Deserialize(json); Assert.Equal("thing-id", thing.Id); } [Fact] public void SerializeWhenNotRoot() { - var json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(new List{ new Thing() }); + var json = OpenStackNet.Serialize(new List{ new Thing() }); Assert.DoesNotContain("\"thing\"", json); } @@ -50,7 +50,7 @@ public void SerializeWhenNotRoot() [Fact] public void SerializeWhenNested() { - var json = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Serialize(new ThingCollection { new Thing() }); + var json = OpenStackNet.Serialize(new ThingCollection { new Thing() }); Assert.DoesNotContain("\"thing\"", json); } @@ -59,7 +59,7 @@ public void SerializeWhenNested() public void DeserializeWhenNotRoot() { var json = JArray.Parse("[{'id':'thing-id'}]").ToString(); - var things = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize>(json); + var things = OpenStackNet.Deserialize>(json); Assert.Equal(1, things.Count); Assert.Equal("thing-id", things[0].Id); } @@ -68,7 +68,7 @@ public void DeserializeWhenNotRoot() public void DeserializeWhenNested() { var json = JObject.Parse("{'things':[{'id':'thing-id'}]}").ToString(); - var things = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize(json); + var things = OpenStackNet.Deserialize(json); Assert.NotNull(things); Assert.Equal(1, things.Count); Assert.Equal("thing-id", things[0].Id); @@ -78,7 +78,7 @@ public void DeserializeWhenNested() public void ShouldIgnoreUnexpectedRootProperties() { var json = JObject.Parse("{'links': [{'name': 'next', 'link': 'http://nextlink'}], 'thing': {'id': 'thing-id'}}").ToString(); - var thing = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize(json); + var thing = OpenStackNet.Deserialize(json); Assert.NotNull(thing); Assert.Equal("thing-id", thing.Id); } diff --git a/src/testing/unit/Serialization/TolerantEnumConverterTests.cs b/src/testing/unit/Serialization/TolerantEnumConverterTests.cs index 46ab46d0b..dc8967f2a 100644 --- a/src/testing/unit/Serialization/TolerantEnumConverterTests.cs +++ b/src/testing/unit/Serialization/TolerantEnumConverterTests.cs @@ -25,7 +25,7 @@ enum StuffStatus [Fact] public void WhenValueIsRecognized_MatchToValue() { - var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize("\"ACTIVE\""); + var result = OpenStackNet.Deserialize("\"ACTIVE\""); Assert.Equal(ThingStatus.Active, result); } @@ -33,7 +33,7 @@ public void WhenValueIsRecognized_MatchToValue() [Fact] public void WhenAttributedValueIsRecognized_MatchToValue() { - var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize("\"REMOVE_FAILED\""); + var result = OpenStackNet.Deserialize("\"REMOVE_FAILED\""); Assert.Equal(ThingStatus.RemoveFailed, result); } @@ -41,7 +41,7 @@ public void WhenAttributedValueIsRecognized_MatchToValue() [Fact] public void WhenValueIsUnrecognized_MatchToUnknownValue() { - var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize("\"bad-enum-value\""); + var result = OpenStackNet.Deserialize("\"bad-enum-value\""); Assert.Equal(ThingStatus.Unknown, result); } @@ -49,7 +49,7 @@ public void WhenValueIsUnrecognized_MatchToUnknownValue() [Fact] public void WhenValueIsUnrecognized_AndUnknownIsNotPresent_MatchToFirstValue() { - var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize("\"bad-enum-value\""); + var result = OpenStackNet.Deserialize("\"bad-enum-value\""); Assert.Equal(StuffStatus.Missing, result); } @@ -57,7 +57,7 @@ public void WhenValueIsUnrecognized_AndUnknownIsNotPresent_MatchToFirstValue() [Fact] public void WhenValueIsUnrecognized_AndDestinationIsNullable_UseNull() { - var result = OpenStackNet.Configuration.FlurlHttpSettings.JsonSerializer.Deserialize("\"bad-enum-value\""); + var result = OpenStackNet.Deserialize("\"bad-enum-value\""); Assert.Null(result); } From fe3ce3fcffc9f317d25a8f3c2a5a2d6c18588796 Mon Sep 17 00:00:00 2001 From: Carolyn Van Slyck Date: Tue, 3 Jan 2017 10:55:03 -0600 Subject: [PATCH 21/34] 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 22/34] 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 23/34] 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 24/34] 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 25/34] 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 26/34] 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 27/34] 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 28/34] 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 29/34] 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 30/34] 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 31/34] 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 32/34] 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 33/34] 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)" /> - +