diff --git a/sdk/storage/Azure.Storage.Blobs/src/Sas/BlobSasBuilder.cs b/sdk/storage/Azure.Storage.Blobs/src/Sas/BlobSasBuilder.cs index ad3570985303..3651b746a709 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/Sas/BlobSasBuilder.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/Sas/BlobSasBuilder.cs @@ -66,7 +66,7 @@ public struct BlobSasBuilder : IEquatable /// When specifying a range of IP addresses, note that the range is /// inclusive. /// - public IPRange IPRange { get; set; } + public SasIPRange IPRange { get; set; } /// /// An optional unique value up to 64 characters in length that diff --git a/sdk/storage/Azure.Storage.Blobs/src/Sas/BlobSasQueryParameters.cs b/sdk/storage/Azure.Storage.Blobs/src/Sas/BlobSasQueryParameters.cs index 36e543df8fa3..9c1b620bdd7e 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/Sas/BlobSasQueryParameters.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/Sas/BlobSasQueryParameters.cs @@ -68,7 +68,7 @@ internal BlobSasQueryParameters( SasProtocol protocol, DateTimeOffset startsOn, DateTimeOffset expiresOn, - IPRange ipRange, + SasIPRange ipRange, string identifier, string resource, string permissions, diff --git a/sdk/storage/Azure.Storage.Blobs/tests/BlobTestBase.cs b/sdk/storage/Azure.Storage.Blobs/tests/BlobTestBase.cs index b9b2e60111a5..5fa714339cc8 100644 --- a/sdk/storage/Azure.Storage.Blobs/tests/BlobTestBase.cs +++ b/sdk/storage/Azure.Storage.Blobs/tests/BlobTestBase.cs @@ -254,7 +254,7 @@ public SasQueryParameters GetNewAccountSasCredentials(StorageSharedKeyCredential StartsOn = Recording.UtcNow.AddHours(-1), ExpiresOn = Recording.UtcNow.AddHours(+1), Permissions = new BlobContainerSasPermissions { Read = true, Add = true, Create = true, Write = true, Delete = true, List = true }.ToString(), - IPRange = new IPRange(IPAddress.None, IPAddress.None) + IPRange = new SasIPRange(IPAddress.None, IPAddress.None) }.ToSasQueryParameters(sharedKeyCredentials); public BlobSasQueryParameters GetNewBlobServiceSasCredentialsContainer(string containerName, StorageSharedKeyCredential sharedKeyCredentials = default) @@ -265,7 +265,7 @@ public BlobSasQueryParameters GetNewBlobServiceSasCredentialsContainer(string co StartsOn = Recording.UtcNow.AddHours(-1), ExpiresOn = Recording.UtcNow.AddHours(+1), Permissions = new BlobContainerSasPermissions { Read = true, Add = true, Create = true, Write = true, Delete = true, List = true }.ToString(), - IPRange = new IPRange(IPAddress.None, IPAddress.None) + IPRange = new SasIPRange(IPAddress.None, IPAddress.None) }.ToSasQueryParameters(sharedKeyCredentials ?? GetNewSharedKeyCredentials()); public BlobSasQueryParameters GetNewBlobServiceIdentitySasCredentialsContainer(string containerName, UserDelegationKey userDelegationKey, string accountName) @@ -276,7 +276,7 @@ public BlobSasQueryParameters GetNewBlobServiceIdentitySasCredentialsContainer(s StartsOn = Recording.UtcNow.AddHours(-1), ExpiresOn = Recording.UtcNow.AddHours(+1), Permissions = new BlobContainerSasPermissions { Read = true, Add = true, Create = true, Write = true, Delete = true, List = true }.ToString(), - IPRange = new IPRange(IPAddress.None, IPAddress.None) + IPRange = new SasIPRange(IPAddress.None, IPAddress.None) }.ToSasQueryParameters(userDelegationKey, accountName); public BlobSasQueryParameters GetNewBlobServiceSasCredentialsBlob(string containerName, string blobName, StorageSharedKeyCredential sharedKeyCredentials = default) @@ -288,7 +288,7 @@ public BlobSasQueryParameters GetNewBlobServiceSasCredentialsBlob(string contain StartsOn = Recording.UtcNow.AddHours(-1), ExpiresOn = Recording.UtcNow.AddHours(+1), Permissions = new BlobSasPermissions { Read = true, Add = true, Create = true, Write = true, Delete = true }.ToString(), - IPRange = new IPRange(IPAddress.None, IPAddress.None) + IPRange = new SasIPRange(IPAddress.None, IPAddress.None) }.ToSasQueryParameters(sharedKeyCredentials ?? GetNewSharedKeyCredentials()); public BlobSasQueryParameters GetNewBlobServiceIdentitySasCredentialsBlob(string containerName, string blobName, UserDelegationKey userDelegationKey, string accountName) @@ -300,7 +300,7 @@ public BlobSasQueryParameters GetNewBlobServiceIdentitySasCredentialsBlob(string StartsOn = Recording.UtcNow.AddHours(-1), ExpiresOn = Recording.UtcNow.AddHours(+1), Permissions = new BlobSasPermissions { Read = true, Add = true, Create = true, Write = true, Delete = true }.ToString(), - IPRange = new IPRange(IPAddress.None, IPAddress.None) + IPRange = new SasIPRange(IPAddress.None, IPAddress.None) }.ToSasQueryParameters(userDelegationKey, accountName); public BlobSasQueryParameters GetNewBlobServiceSasCredentialsSnapshot(string containerName, string blobName, string snapshot, StorageSharedKeyCredential sharedKeyCredentials = default) @@ -313,7 +313,7 @@ public BlobSasQueryParameters GetNewBlobServiceSasCredentialsSnapshot(string con StartsOn = Recording.UtcNow.AddHours(-1), ExpiresOn = Recording.UtcNow.AddHours(+1), Permissions = new SnapshotSasPermissions { Read = true, Write = true, Delete = true }.ToString(), - IPRange = new IPRange(IPAddress.None, IPAddress.None) + IPRange = new SasIPRange(IPAddress.None, IPAddress.None) }.ToSasQueryParameters(sharedKeyCredentials ?? GetNewSharedKeyCredentials()); public async Task CreatePageBlobClientAsync(BlobContainerClient container, long size) diff --git a/sdk/storage/Azure.Storage.Blobs/tests/BlobUriBuilderTests.cs b/sdk/storage/Azure.Storage.Blobs/tests/BlobUriBuilderTests.cs index b574ac9f4bbd..7613a6efd86f 100644 --- a/sdk/storage/Azure.Storage.Blobs/tests/BlobUriBuilderTests.cs +++ b/sdk/storage/Azure.Storage.Blobs/tests/BlobUriBuilderTests.cs @@ -171,7 +171,7 @@ public void BlobUriBuilder_RegularUrl_SasTest() Assert.AreEqual(new DateTimeOffset(2015, 4, 30, 2, 23, 26, TimeSpan.Zero), blobUriBuilder.Sas.ExpiresOn); Assert.AreEqual("", blobUriBuilder.Sas.Identifier); - Assert.AreEqual(IPRange.Parse("168.1.5.60-168.1.5.70"), blobUriBuilder.Sas.IPRange); + Assert.AreEqual(SasIPRange.Parse("168.1.5.60-168.1.5.70"), blobUriBuilder.Sas.IPRange); Assert.AreEqual("rw", blobUriBuilder.Sas.Permissions); Assert.AreEqual(SasProtocol.Https, blobUriBuilder.Sas.Protocol); Assert.AreEqual("b", blobUriBuilder.Sas.Resource); @@ -332,7 +332,7 @@ public void BlobUriBuilder_IPStyleUrl_SasTest() Assert.AreEqual(new DateTimeOffset(2015, 4, 30, 2, 23, 26, TimeSpan.Zero), blobUriBuilder.Sas.ExpiresOn); Assert.AreEqual("", blobUriBuilder.Sas.Identifier); - Assert.AreEqual(IPRange.Parse("168.1.5.60-168.1.5.70"), blobUriBuilder.Sas.IPRange); + Assert.AreEqual(SasIPRange.Parse("168.1.5.60-168.1.5.70"), blobUriBuilder.Sas.IPRange); Assert.AreEqual("rw", blobUriBuilder.Sas.Permissions); Assert.AreEqual(SasProtocol.Https, blobUriBuilder.Sas.Protocol); Assert.AreEqual("b", blobUriBuilder.Sas.Resource); diff --git a/sdk/storage/Azure.Storage.Blobs/tests/SasQueryParametersTests.cs b/sdk/storage/Azure.Storage.Blobs/tests/SasQueryParametersTests.cs index e0cadb9a9397..dbbb7f39a8fd 100644 --- a/sdk/storage/Azure.Storage.Blobs/tests/SasQueryParametersTests.cs +++ b/sdk/storage/Azure.Storage.Blobs/tests/SasQueryParametersTests.cs @@ -25,7 +25,7 @@ public void SasQueryParameters_RoundTrip() SasProtocol protocol = SasProtocol.Https; DateTimeOffset startTime = DateTimeOffset.Now; DateTimeOffset expiryTime = startTime.AddDays(1); - var ipRange = new IPRange(); + var ipRange = new SasIPRange(); var identifier = "foo"; var resource = "bar"; var permissions = "rw"; diff --git a/sdk/storage/Azure.Storage.Common/src/Sas/AccountSasBuilder.cs b/sdk/storage/Azure.Storage.Common/src/Sas/AccountSasBuilder.cs index 7816e898de5d..fb98986e7008 100644 --- a/sdk/storage/Azure.Storage.Common/src/Sas/AccountSasBuilder.cs +++ b/sdk/storage/Azure.Storage.Common/src/Sas/AccountSasBuilder.cs @@ -61,7 +61,7 @@ public struct AccountSasBuilder : IEquatable /// When specifying a range of IP addresses, note that the range is /// inclusive. /// - public IPRange IPRange { get; set; } + public SasIPRange IPRange { get; set; } /// /// The services associated with the shared access signature. The diff --git a/sdk/storage/Azure.Storage.Common/src/Sas/IPRange.cs b/sdk/storage/Azure.Storage.Common/src/Sas/SasIPRange.cs similarity index 73% rename from sdk/storage/Azure.Storage.Common/src/Sas/IPRange.cs rename to sdk/storage/Azure.Storage.Common/src/Sas/SasIPRange.cs index 0a5bf78f3e89..28a25e2d9f3f 100644 --- a/sdk/storage/Azure.Storage.Common/src/Sas/IPRange.cs +++ b/sdk/storage/Azure.Storage.Common/src/Sas/SasIPRange.cs @@ -11,7 +11,7 @@ namespace Azure.Storage.Sas /// Represents a range of allowed IP addresses for constructing a Shared /// Access Signature. /// - public readonly struct IPRange : IEquatable + public readonly struct SasIPRange : IEquatable { /// /// Gets the start of the IP range. Not specified if equal to null or @@ -26,7 +26,7 @@ namespace Azure.Storage.Sas public IPAddress End { get; } /// - /// Creates a new . + /// Creates a new . /// /// /// The range's start . @@ -34,7 +34,7 @@ namespace Azure.Storage.Sas /// /// The range's optional end . /// - public IPRange(IPAddress start, IPAddress end = null) + public SasIPRange(IPAddress start, IPAddress end = null) { Start = start ?? IPAddress.None; End = end ?? IPAddress.None; @@ -49,10 +49,10 @@ private static bool IsEmpty(IPAddress address) => address == null || address == IPAddress.None; /// - /// Creates a string representation of an . + /// Creates a string representation of an . /// /// - /// A string representation of an . + /// A string representation of an . /// public override string ToString() => IsEmpty(Start) ? string.Empty : @@ -60,61 +60,61 @@ public override string ToString() => Start.ToString() + "-" + End.ToString(); /// - /// Parse an IP range string into a new . + /// Parse an IP range string into a new . /// /// IP range string to parse. - /// The parsed . - public static IPRange Parse(string s) + /// The parsed . + public static SasIPRange Parse(string s) { var dashIndex = s.IndexOf('-'); return dashIndex == -1 ? - new IPRange(IPAddress.Parse(s)) : - new IPRange( + new SasIPRange(IPAddress.Parse(s)) : + new SasIPRange( IPAddress.Parse(s.Substring(0, dashIndex)), IPAddress.Parse(s.Substring(dashIndex + 1))); } /// - /// Check if two instances are equal. + /// Check if two instances are equal. /// /// The instance to compare to. /// True if they're equal, false otherwise. [EditorBrowsable(EditorBrowsableState.Never)] public override bool Equals(object obj) => - obj is IPRange other && Equals(other); + obj is SasIPRange other && Equals(other); /// - /// Get a hash code for the . + /// Get a hash code for the . /// - /// Hash code for the . + /// Hash code for the . [EditorBrowsable(EditorBrowsableState.Never)] public override int GetHashCode() => (Start?.GetHashCode() ?? 0) ^ (End?.GetHashCode() ?? 0); /// - /// Check if two instances are equal. + /// Check if two instances are equal. /// /// The first instance to compare. /// The second instance to compare. /// True if they're equal, false otherwise. - public static bool operator ==(IPRange left, IPRange right) => + public static bool operator ==(SasIPRange left, SasIPRange right) => left.Equals(right); /// - /// Check if two instances are not equal. + /// Check if two instances are not equal. /// /// The first instance to compare. /// The second instance to compare. /// True if they're not equal, false otherwise. - public static bool operator !=(IPRange left, IPRange right) => + public static bool operator !=(SasIPRange left, SasIPRange right) => !(left == right); /// - /// Check if two instances are equal. + /// Check if two instances are equal. /// /// The instance to compare to. /// True if they're equal, false otherwise. - public bool Equals(IPRange other) => + public bool Equals(SasIPRange other) => ((IsEmpty(Start) && IsEmpty(other.Start)) || (Start != null && Start.Equals(other.Start))) && ((IsEmpty(End) && IsEmpty(other.End)) || diff --git a/sdk/storage/Azure.Storage.Common/src/Sas/SasQueryParameters.cs b/sdk/storage/Azure.Storage.Common/src/Sas/SasQueryParameters.cs index 600ed22ca6aa..87ba7c84d5ff 100644 --- a/sdk/storage/Azure.Storage.Common/src/Sas/SasQueryParameters.cs +++ b/sdk/storage/Azure.Storage.Common/src/Sas/SasQueryParameters.cs @@ -56,7 +56,7 @@ internal static string FormatTimesForSasSigning(DateTimeOffset time) => private readonly DateTimeOffset _expiryTime; // sip - private readonly IPRange _ipRange; + private readonly SasIPRange _ipRange; // si private readonly string _identifier; @@ -128,7 +128,7 @@ internal static string FormatTimesForSasSigning(DateTimeOffset time) => /// to accept requests. When specifying a range, note that the range /// is inclusive. /// - public IPRange IPRange => _ipRange; + public SasIPRange IPRange => _ipRange; /// /// Gets the optional unique value up to 64 characters in length that @@ -228,7 +228,7 @@ internal SasQueryParameters( SasProtocol protocol, DateTimeOffset startsOn, DateTimeOffset expiresOn, - IPRange ipRange, + SasIPRange ipRange, string identifier, string resource, string permissions, @@ -312,7 +312,7 @@ internal SasQueryParameters( _expiryTime = DateTimeOffset.ParseExact(kv.Value, Constants.SasTimeFormat, CultureInfo.InvariantCulture); break; case Constants.Sas.Parameters.IPRangeUpper: - _ipRange = IPRange.Parse(kv.Value); + _ipRange = SasIPRange.Parse(kv.Value); break; case Constants.Sas.Parameters.IdentifierUpper: _identifier = kv.Value; diff --git a/sdk/storage/Azure.Storage.Common/tests/Shared/Constants.cs b/sdk/storage/Azure.Storage.Common/tests/Shared/Constants.cs index 4d04721f7ee0..58ea0e6ffff2 100644 --- a/sdk/storage/Azure.Storage.Common/tests/Shared/Constants.cs +++ b/sdk/storage/Azure.Storage.Common/tests/Shared/Constants.cs @@ -49,7 +49,7 @@ internal class SasConstants public DateTimeOffset ExpiryTime { get; protected internal set; } public IPAddress StartAddress { get; protected internal set; } public IPAddress EndAddress { get; protected internal set; } - public IPRange IPRange { get; protected internal set; } + public SasIPRange IPRange { get; protected internal set; } public DateTimeOffset KeyStart { get; protected internal set; } public DateTimeOffset KeyExpiry { get; protected internal set; } public StorageSharedKeyCredential SharedKeyCredential { get; protected internal set; } @@ -82,7 +82,7 @@ public Constants(StorageTestBase test) KeyStart = test.GetUtcNow().AddHours(-1), KeyExpiry = test.GetUtcNow().AddHours(+1) }; - Sas.IPRange = new IPRange(Sas.StartAddress, Sas.EndAddress); + Sas.IPRange = new SasIPRange(Sas.StartAddress, Sas.EndAddress); Sas.SharedKeyCredential = new StorageSharedKeyCredential(Sas.Account, Sas.AccountKey); } } diff --git a/sdk/storage/Azure.Storage.Files/src/Sas/FileSasBuilder.cs b/sdk/storage/Azure.Storage.Files/src/Sas/FileSasBuilder.cs index 3af9e54e540e..9301e0d26eaa 100644 --- a/sdk/storage/Azure.Storage.Files/src/Sas/FileSasBuilder.cs +++ b/sdk/storage/Azure.Storage.Files/src/Sas/FileSasBuilder.cs @@ -61,7 +61,7 @@ public struct FileSasBuilder : IEquatable /// When specifying a range of IP addresses, note that the range is /// inclusive. /// - public IPRange IPRange { get; set; } + public SasIPRange IPRange { get; set; } /// /// An optional unique value up to 64 characters in length that diff --git a/sdk/storage/Azure.Storage.Files/tests/FileTestBase.cs b/sdk/storage/Azure.Storage.Files/tests/FileTestBase.cs index a7c98cbae322..f51812649b65 100644 --- a/sdk/storage/Azure.Storage.Files/tests/FileTestBase.cs +++ b/sdk/storage/Azure.Storage.Files/tests/FileTestBase.cs @@ -131,7 +131,7 @@ public SasQueryParameters GetNewAccountSasCredentials(StorageSharedKeyCredential StartsOn = Recording.UtcNow.AddHours(-1), ExpiresOn = Recording.UtcNow.AddHours(+1), Permissions = new FileAccountSasPermissions { Create = true, Delete = true }.ToString(), - IPRange = new IPRange(IPAddress.None, IPAddress.None) + IPRange = new SasIPRange(IPAddress.None, IPAddress.None) }.ToSasQueryParameters(sharedKeyCredentials); public SasQueryParameters GetNewFileServiceSasCredentialsShare(string shareName, StorageSharedKeyCredential sharedKeyCredentials = default) @@ -142,7 +142,7 @@ public SasQueryParameters GetNewFileServiceSasCredentialsShare(string shareName, StartsOn = Recording.UtcNow.AddHours(-1), ExpiresOn = Recording.UtcNow.AddHours(+1), Permissions = new ShareSasPermissions { Read = true, Write = true, List = true, Create = true, Delete = true }.ToString(), - IPRange = new IPRange(IPAddress.None, IPAddress.None) + IPRange = new SasIPRange(IPAddress.None, IPAddress.None) }.ToSasQueryParameters(sharedKeyCredentials ?? GetNewSharedKeyCredentials()); public SasQueryParameters GetNewFileServiceSasCredentialsFile(string shareName, string filePath, StorageSharedKeyCredential sharedKeyCredentials = default) @@ -154,7 +154,7 @@ public SasQueryParameters GetNewFileServiceSasCredentialsFile(string shareName, StartsOn = Recording.UtcNow.AddHours(-1), ExpiresOn = Recording.UtcNow.AddHours(+1), Permissions = new FileSasPermissions { Read = true, Write = true, Create = true, Delete = true }.ToString(), - IPRange = new IPRange(IPAddress.None, IPAddress.None) + IPRange = new SasIPRange(IPAddress.None, IPAddress.None) }.ToSasQueryParameters(sharedKeyCredentials ?? GetNewSharedKeyCredentials()); public SignedIdentifier[] BuildSignedIdentifiers() => diff --git a/sdk/storage/Azure.Storage.Files/tests/FileUriBuilderTests.cs b/sdk/storage/Azure.Storage.Files/tests/FileUriBuilderTests.cs index 7a2ae1036522..1aed7262983e 100644 --- a/sdk/storage/Azure.Storage.Files/tests/FileUriBuilderTests.cs +++ b/sdk/storage/Azure.Storage.Files/tests/FileUriBuilderTests.cs @@ -160,7 +160,7 @@ public void FileUriBuilder_SasTest() Assert.AreEqual(new DateTimeOffset(2015, 4, 30, 2, 23, 26, TimeSpan.Zero), fileUriBuilder.Sas.ExpiresOn); Assert.AreEqual("", fileUriBuilder.Sas.Identifier); - Assert.AreEqual(IPRange.Parse("168.1.5.60-168.1.5.70"), fileUriBuilder.Sas.IPRange); + Assert.AreEqual(SasIPRange.Parse("168.1.5.60-168.1.5.70"), fileUriBuilder.Sas.IPRange); Assert.AreEqual("rw", fileUriBuilder.Sas.Permissions); Assert.AreEqual(SasProtocol.Https, fileUriBuilder.Sas.Protocol); Assert.AreEqual("b", fileUriBuilder.Sas.Resource); diff --git a/sdk/storage/Azure.Storage.Queues/src/Sas/QueueSasBuilder.cs b/sdk/storage/Azure.Storage.Queues/src/Sas/QueueSasBuilder.cs index 896d5026637f..0e7c89fee29d 100644 --- a/sdk/storage/Azure.Storage.Queues/src/Sas/QueueSasBuilder.cs +++ b/sdk/storage/Azure.Storage.Queues/src/Sas/QueueSasBuilder.cs @@ -62,7 +62,7 @@ public struct QueueSasBuilder : IEquatable /// When specifying a range of IP addresses, note that the range is /// inclusive. /// - public IPRange IPRange { get; set; } + public SasIPRange IPRange { get; set; } /// /// An optional unique value up to 64 characters in length that diff --git a/sdk/storage/Azure.Storage.Queues/tests/QueueTestBase.cs b/sdk/storage/Azure.Storage.Queues/tests/QueueTestBase.cs index 53ee4819e3c7..d1b5b96bc351 100644 --- a/sdk/storage/Azure.Storage.Queues/tests/QueueTestBase.cs +++ b/sdk/storage/Azure.Storage.Queues/tests/QueueTestBase.cs @@ -144,7 +144,7 @@ public SasQueryParameters GetNewAccountSasCredentials(StorageSharedKeyCredential StartsOn = Recording.UtcNow.AddHours(-1), ExpiresOn = Recording.UtcNow.AddHours(+1), Permissions = new QueueAccountSasPermissions { Read = true, Write = true, Update = true, Process = true, Add = true, Delete = true, List = true }.ToString(), - IPRange = new IPRange(IPAddress.None, IPAddress.None) + IPRange = new SasIPRange(IPAddress.None, IPAddress.None) }.ToSasQueryParameters(sharedKeyCredentials); public SasQueryParameters GetNewQueueServiceSasCredentials(string queueName, StorageSharedKeyCredential sharedKeyCredentials = default) @@ -155,7 +155,7 @@ public SasQueryParameters GetNewQueueServiceSasCredentials(string queueName, Sto StartsOn = Recording.UtcNow.AddHours(-1), ExpiresOn = Recording.UtcNow.AddHours(+1), Permissions = new QueueAccountSasPermissions { Read = true, Update = true, Process = true, Add = true }.ToString(), - IPRange = new IPRange(IPAddress.None, IPAddress.None) + IPRange = new SasIPRange(IPAddress.None, IPAddress.None) }.ToSasQueryParameters(sharedKeyCredentials ?? GetNewSharedKeyCredentials()); private class DisposingQueue : IDisposable diff --git a/sdk/storage/Azure.Storage.Queues/tests/QueueUriBuilderTests.cs b/sdk/storage/Azure.Storage.Queues/tests/QueueUriBuilderTests.cs index deca4108471f..d96bdc8d2716 100644 --- a/sdk/storage/Azure.Storage.Queues/tests/QueueUriBuilderTests.cs +++ b/sdk/storage/Azure.Storage.Queues/tests/QueueUriBuilderTests.cs @@ -162,7 +162,7 @@ public void QueueUriBuilder_RegularUrl_SasTest() Assert.AreEqual(new DateTimeOffset(2015, 4, 30, 2, 23, 26, TimeSpan.Zero), queueUriBuilder.Sas.ExpiresOn); Assert.AreEqual("", queueUriBuilder.Sas.Identifier); - Assert.AreEqual(IPRange.Parse("168.1.5.60-168.1.5.70"), queueUriBuilder.Sas.IPRange); + Assert.AreEqual(SasIPRange.Parse("168.1.5.60-168.1.5.70"), queueUriBuilder.Sas.IPRange); Assert.AreEqual("rw", queueUriBuilder.Sas.Permissions); Assert.AreEqual(SasProtocol.Https, queueUriBuilder.Sas.Protocol); Assert.AreEqual("b", queueUriBuilder.Sas.Resource); @@ -349,7 +349,7 @@ public void QueueUriBuilder_IPStyleUrl_SasTest() Assert.AreEqual(new DateTimeOffset(2015, 4, 30, 2, 23, 26, TimeSpan.Zero), queueUriBuilder.Sas.ExpiresOn); Assert.AreEqual("", queueUriBuilder.Sas.Identifier); - Assert.AreEqual(IPRange.Parse("168.1.5.60-168.1.5.70"), queueUriBuilder.Sas.IPRange); + Assert.AreEqual(SasIPRange.Parse("168.1.5.60-168.1.5.70"), queueUriBuilder.Sas.IPRange); Assert.AreEqual("rw", queueUriBuilder.Sas.Permissions); Assert.AreEqual(SasProtocol.Https, queueUriBuilder.Sas.Protocol); Assert.AreEqual("b", queueUriBuilder.Sas.Resource);