Merge pull request #546 from erezvani1529/master

[8.5] Share Snapshot Release
Azure · Oct 5, 2017 · c64dd48 · c64dd48
2 parents 7be6a47 + 2e91dd0
commit c64dd48
Show file tree

Hide file tree

Showing 45 changed files with 143 additions and 137 deletions.
diff --git a/...ft.WindowsAzure.Storage.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.File.CloudFile.cs b/...ft.WindowsAzure.Storage.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.File.CloudFile.cs
@@ -88,15 +88,15 @@ public StorageUri StorageUri
         }
     }
 
-    internal Uri SnapshotQualifiedUri
+    public Uri SnapshotQualifiedUri
     {
         get
         {
             throw new System.NotImplementedException();
         }
     }
 
-    internal StorageUri SnapshotQualifiedStorageUri
+    public StorageUri SnapshotQualifiedStorageUri
     {
         get
         {

diff --git a/...dowsAzure.Storage.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.File.CloudFileClient.cs b/...dowsAzure.Storage.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.File.CloudFileClient.cs
@@ -136,7 +136,7 @@ public virtual CloudFileShare GetShareReference(string shareName)
     {
         throw new System.NotImplementedException();
     }
-    internal CloudFileShare GetShareReference(string shareName, DateTimeOffset? snapshotTime)
+    public CloudFileShare GetShareReference(string shareName, DateTimeOffset? snapshotTime)
     {
         throw new System.NotImplementedException();
     }

diff --git a/...sAzure.Storage.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.File.CloudFileDirectory.cs b/...sAzure.Storage.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.File.CloudFileDirectory.cs
@@ -34,15 +34,15 @@ public StorageUri StorageUri
         get; private set;
     }
 
-    internal Uri SnapshotQualifiedUri
+    public Uri SnapshotQualifiedUri
     {
         get
         {
             throw new System.NotImplementedException();
         }
     }
 
-    internal StorageUri SnapshotQualifiedStorageUri
+    public StorageUri SnapshotQualifiedStorageUri
     {
         get
         {

diff --git a/...ndowsAzure.Storage.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.File.CloudFileShare.cs b/...ndowsAzure.Storage.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.File.CloudFileShare.cs
@@ -35,28 +35,28 @@ public StorageUri StorageUri
         get; private set;
     }
 
-    internal DateTimeOffset? SnapshotTime
+    public DateTimeOffset? SnapshotTime
     {
-        get; set;
+        get; internal set;
     }
 
-    internal bool IsSnapshot
+    public bool IsSnapshot
     {
         get
         {
             throw new System.NotImplementedException();
         }
     }
 
-    internal Uri SnapshotQualifiedUri
+    public Uri SnapshotQualifiedUri
     {
         get
         {
             throw new System.NotImplementedException();
         }
     }
 
-    internal StorageUri SnapshotQualifiedStorageUri
+    public StorageUri SnapshotQualifiedStorageUri
     {
         get
         {
@@ -89,7 +89,7 @@ public CloudFileShare(Uri shareAddress, StorageCredentials credentials)
     {
         throw new System.NotImplementedException();
     }
-    internal CloudFileShare(Uri shareAddress, DateTimeOffset? snapshotTime, StorageCredentials credentials)
+    public CloudFileShare(Uri shareAddress, DateTimeOffset? snapshotTime, StorageCredentials credentials)
       : this(new StorageUri(shareAddress), snapshotTime, credentials)
     {
         throw new System.NotImplementedException();
@@ -99,7 +99,7 @@ public CloudFileShare(StorageUri shareAddress, StorageCredentials credentials)
     {
         throw new System.NotImplementedException();
     }
-    internal CloudFileShare(StorageUri shareAddress, DateTimeOffset? snapshotTime, StorageCredentials credentials)
+    public CloudFileShare(StorageUri shareAddress, DateTimeOffset? snapshotTime, StorageCredentials credentials)
     {
         throw new System.NotImplementedException();
     }
@@ -112,7 +112,6 @@ internal CloudFileShare(FileShareProperties properties, IDictionary<string, stri
     {
         throw new System.NotImplementedException();
     }
-    [DoesServiceRequest]
     public virtual Task CreateAsync()
     {
         throw new System.NotImplementedException();
@@ -154,7 +153,7 @@ public virtual Task DeleteAsync(AccessCondition accessCondition, FileRequestOpti
     {
         throw new System.NotImplementedException();
     }
-    internal virtual Task DeleteAsync(DeleteShareSnapshotsOption deleteSnapshotsOption, AccessCondition accessCondition, FileRequestOptions options, OperationContext operationContext, CancellationToken cancellationToken)
+    public virtual Task DeleteAsync(DeleteShareSnapshotsOption deleteSnapshotsOption, AccessCondition accessCondition, FileRequestOptions options, OperationContext operationContext, CancellationToken cancellationToken)
     {
         throw new System.NotImplementedException();
     }
@@ -170,7 +169,7 @@ public virtual Task<bool> DeleteIfExistsAsync(AccessCondition accessCondition, F
     {
         throw new System.NotImplementedException();
     }
-    internal virtual Task<bool> DeleteIfExistsAsync(DeleteShareSnapshotsOption deleteSnapshotsOption, AccessCondition accessCondition, FileRequestOptions options, OperationContext operationContext, CancellationToken cancellationToken)
+    public virtual Task<bool> DeleteIfExistsAsync(DeleteShareSnapshotsOption deleteSnapshotsOption, AccessCondition accessCondition, FileRequestOptions options, OperationContext operationContext, CancellationToken cancellationToken)
     {
         throw new System.NotImplementedException();
     }

diff --git a/...torage.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.File.DeleteShareSnapshotsOption.cs b/...torage.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.File.DeleteShareSnapshotsOption.cs
@@ -1,7 +1,7 @@
 
 namespace Microsoft.WindowsAzure.Storage.File
 {
-internal enum DeleteShareSnapshotsOption
+public enum DeleteShareSnapshotsOption
 {
     None,
     IncludeSnapshots,

diff --git a/...e.Storage.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.File.Protocol.FileShareEntry.cs b/...e.Storage.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.File.Protocol.FileShareEntry.cs
@@ -24,9 +24,9 @@ public Uri Uri
         get; internal set;
     }
 
-    internal DateTimeOffset? SnapshotTime
+    public DateTimeOffset? SnapshotTime
     {
-        get; set;
+        get; internal set;
     }
 
     internal FileShareEntry()

diff --git a/...Azure.Storage.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.File.ShareListingDetails.cs b/...Azure.Storage.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.File.ShareListingDetails.cs
@@ -6,7 +6,8 @@ public enum ShareListingDetails
 {
     None = 0,
     Metadata = 1,
-    All = Metadata,
+    Snapshots = 2,
+    All = Snapshots | Metadata,
 }
 
 }
diff --git a/...zure.Storage.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.Shared.Protocol.Constants.cs b/...zure.Storage.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.Shared.Protocol.Constants.cs
@@ -249,7 +249,7 @@ public static class EncryptionConstants
         public const string TableEncryptionKeyDetails = "_ClientEncryptionMetadata1";
         public const string TableEncryptionPropertyDetails = "_ClientEncryptionMetadata2";
         public const string AgentMetadataKey = "EncryptionLibrary";
-        public const string AgentMetadataValue = ".NET 8.4.0";
+        public const string AgentMetadataValue = ".NET 8.5.0";
     }
 }
 

diff --git a/...ge.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.Shared.Protocol.EncryptionConstants.cs b/...ge.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.Shared.Protocol.EncryptionConstants.cs
@@ -10,7 +10,7 @@ public static class EncryptionConstants
     public const string TableEncryptionKeyDetails = "_ClientEncryptionMetadata1";
     public const string TableEncryptionPropertyDetails = "_ClientEncryptionMetadata2";
     public const string AgentMetadataKey = "EncryptionLibrary";
-    public const string AgentMetadataValue = ".NET 8.4.0";
+    public const string AgentMetadataValue = ".NET 8.5.0";
 }
 
 }
diff --git a/...torage.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.Shared.Protocol.HeaderConstants.cs b/...torage.Facade/FacadeLib/Microsoft.WindowsAzure.Storage.Shared.Protocol.HeaderConstants.cs
@@ -4,9 +4,9 @@ namespace Microsoft.WindowsAzure.Storage.Shared.Protocol
 
 public static class HeaderConstants
 {
-    public static readonly string UserAgent = "Azure-Storage/8.4.0 ";
+    public static readonly string UserAgent = "Azure-Storage/8.5.0 ";
     public const string UserAgentProductName = "Azure-Storage";
-    public const string UserAgentProductVersion = "8.4.0";
+    public const string UserAgentProductVersion = "8.5.0";
     public const string PrefixForStorageHeader = "x-ms-";
     public const string TrueHeader = "true";
     public const string FalseHeader = "false";

diff --git a/Lib/AspNet/Microsoft.WindowsAzure.Storage.Facade/Properties/AssemblyInfo.cs b/Lib/AspNet/Microsoft.WindowsAzure.Storage.Facade/Properties/AssemblyInfo.cs
@@ -31,8 +31,8 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("8.4.0.0")]
-[assembly: AssemblyFileVersion("8.4.0.0")]
+[assembly: AssemblyVersion("8.5.0.0")]
+[assembly: AssemblyFileVersion("8.5.0.0")]
 
 [assembly: InternalsVisibleTo(
     "Microsoft.WindowsAzure.Storage.Facade.Portable, PublicKey=" +

diff --git a/Lib/AspNet/Microsoft.WindowsAzure.Storage.Facade/project.json b/Lib/AspNet/Microsoft.WindowsAzure.Storage.Facade/project.json
@@ -1,6 +1,6 @@
 {
     "title": "Microsoft.WindowsAzure.Storage",
-    "version": "8.4.0.0",
+    "version": "8.5.0.0",
 
     "authors": [ "Microsoft Corporation" ],
     "description": "Azure Storage SDK for NetCore",

diff --git a/Lib/AspNet/Microsoft.WindowsAzure.Storage/AssemblyInfo.cs b/Lib/AspNet/Microsoft.WindowsAzure.Storage/AssemblyInfo.cs
@@ -34,9 +34,9 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("8.4.0.0")]
-[assembly: AssemblyFileVersion("8.4.0.0")]
-[assembly: AssemblyInformationalVersion("8.4.0.0")]
+[assembly: AssemblyVersion("8.5.0.0")]
+[assembly: AssemblyFileVersion("8.5.0.0")]
+[assembly: AssemblyInformationalVersion("8.5.0.0")]
 
 
 [assembly: InternalsVisibleTo(

diff --git a/Lib/AspNet/Microsoft.WindowsAzure.Storage/WindowsAzure.StorageK.nuspec b/Lib/AspNet/Microsoft.WindowsAzure.Storage/WindowsAzure.StorageK.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>WindowsAzure.Storage</id>
-    <version>8.4.0</version>
+    <version>8.5.0</version>
     <title>Windows Azure Storage</title>
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>

diff --git a/Lib/AspNet/Microsoft.WindowsAzure.Storage/project.json b/Lib/AspNet/Microsoft.WindowsAzure.Storage/project.json
@@ -1,5 +1,5 @@
 {
-    "version": "8.4.0.0",
+    "version": "8.5.0.0",
 
     "authors": [ "Microsoft Corporation" ],
     "description": "Azure Storage SDK for NetCore",

diff --git a/Lib/ClassLibraryCommon/File/CloudFile.cs b/Lib/ClassLibraryCommon/File/CloudFile.cs
@@ -2506,7 +2506,7 @@ public virtual Task DeleteAsync(AccessCondition accessCondition, FileRequestOpti
         [DoesServiceRequest]
         public virtual bool DeleteIfExists(AccessCondition accessCondition = null, FileRequestOptions options = null, OperationContext operationContext = null)
         {
-            this.share.AssertNoSnapshot();
+            this.Share.AssertNoSnapshot();
             FileRequestOptions modifiedOptions = FileRequestOptions.ApplyDefaults(options, this.ServiceClient);
             operationContext = operationContext ?? new OperationContext();
 
@@ -3909,7 +3909,7 @@ public virtual Task<string> StartCopyAsync(CloudBlob source, AccessCondition sou
         [DoesServiceRequest]
         public virtual void AbortCopy(string copyId, AccessCondition accessCondition = null, FileRequestOptions options = null, OperationContext operationContext = null)
         {
-            this.share.AssertNoSnapshot();
+            this.Share.AssertNoSnapshot();
             FileRequestOptions modifiedOptions = FileRequestOptions.ApplyDefaults(options, this.ServiceClient);
             Executor.ExecuteSync(
                 this.AbortCopyImpl(copyId, accessCondition, modifiedOptions),