[Storage] Support Point in Time Restore

documentation/development-docs/help-generation.md

@@ -17,7 +17,7 @@ Install-Module -Name platyPS -Scope CurrentUser
 **Note:** this module will need to be installed from the [PowerShell Gallery](http://www.powershellgallery.com/). If, for some reason, this isn't a registered repository when running the `Get-PSRepository` cmdlet, then you will need to register it by running the following command:
 
 ```powershell
-Register-PSRepository -Name PSGallery -SourceLocation https://www.powershellgallery.com/api/v2/
+Register-PSRepository -Default -InstallationPolicy Trusted
 ```
 
 ## Using `platyPS`

src/Accounts/Accounts/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Added SubscriptionId, TenantId, and execution time into data of client side telemetry
 
 ## Version 1.7.1
 * Disable context auto saving when AzureRmContext.json not available

src/CognitiveServices/CognitiveServices.Test/CognitiveServices.Test.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>CognitiveServices</PsModuleName>
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="6.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="7.0.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.18.0-preview" />
   </ItemGroup>
 

src/CognitiveServices/CognitiveServices.Test/ScenarioTests/CognitiveServicesAccountTests.cs

@@ -84,6 +84,14 @@ public void TestGetAccounts()
         {
             TestController.NewInstance.RunPsTest(traceInterceptor, "Test-GetAzureCognitiveServiceAccount");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestAsyncAccountOperations()
+        {
+            TestController.NewInstance.RunPsTest(traceInterceptor, "Test-AsyncAccountOperations");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestSetAccount()

src/CognitiveServices/CognitiveServices.Test/ScenarioTests/CognitiveServicesAccountTests.ps1

@@ -114,6 +114,36 @@ function Test-NewAzureRmAllKindsOfCognitiveServicesAccounts
 	}
 }
 
+
+<#
+.SYNOPSIS
+Test AsyncAccountOperations
+#>
+function Test-AsyncAccountOperations
+{
+    # Setup
+    $rgname = Get-CognitiveServicesManagementTestResourceName;
+
+    try
+    {
+        # Test
+        $accountname = 'csa' + $rgname;
+        $skuname = 'S0';
+        $accounttype = 'Personalizer';
+        $loc = Get-Location -providerNamespace "Microsoft.CognitiveServices" -resourceType "accounts" -preferredLocation "West US 2";
+
+        New-AzResourceGroup -Name $rgname -Location $loc;
+
+        $createdAccount = New-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -Type $accounttype -SkuName $skuname -Location $loc -Force;
+        Remove-AzCognitiveServicesAccount -ResourceGroupName $rgname -Name $accountname -Force;
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}
+
 <#
 .SYNOPSIS
 Test Remove-AzCognitiveServicesAccount

src/CognitiveServices/CognitiveServices/ChangeLog.md

@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Update SDK to 7.0
+* Improve error message when server responses empty body
 
 ## Version 1.2.2
 * Update references in .psd1 to use relative path

src/CognitiveServices/CognitiveServices/CognitiveServices.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="6.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="7.0.0-preview" />
   </ItemGroup>
 
 </Project>

src/CognitiveServices/CognitiveServices/CognitiveServicesAccount/AddAzureCognitiveServicesAccountNetworkRule.cs

@@ -99,7 +99,7 @@ public override void ExecuteCmdlet()
                 var account = this.CognitiveServicesClient.Accounts.GetProperties(
                 this.ResourceGroupName,
                 this.Name);
-                NetworkRuleSet accountACL = account.NetworkAcls;
+                NetworkRuleSet accountACL = account.Properties.NetworkAcls;
 
                 if (accountACL == null)
                 {
@@ -156,21 +156,28 @@ public override void ExecuteCmdlet()
                         break;
                 }
 
-                var properties = new JObject();
-                properties["networkAcls"] = JToken.FromObject(accountACL);
-                this.CognitiveServicesClient.Accounts.Update(this.ResourceGroupName, this.Name, null, null, properties);
+                var properties = new CognitiveServicesAccountProperties();
+                properties.NetworkAcls = accountACL;
+                this.CognitiveServicesClient.Accounts.Update(
+                    this.ResourceGroupName,
+                    this.Name,
+                    new CognitiveServicesAccount()
+                    {
+                        Properties = properties
+                    }
+                    );
 
                 account = this.CognitiveServicesClient.Accounts.GetProperties(this.ResourceGroupName, this.Name);
 
                 switch (ParameterSetName)
                 {
                     case NetWorkRuleStringParameterSet:
                     case NetworkRuleObjectParameterSet:
-                        WriteObject(PSNetworkRuleSet.Create(account.NetworkAcls).VirtualNetworkRules);
+                        WriteObject(PSNetworkRuleSet.Create(account.Properties.NetworkAcls).VirtualNetworkRules);
                         break;
                     case IpRuleStringParameterSet:
                     case IpRuleObjectParameterSet:
-                        WriteObject(PSNetworkRuleSet.Create(account.NetworkAcls).IpRules);
+                        WriteObject(PSNetworkRuleSet.Create(account.Properties.NetworkAcls).IpRules);
                         break;
                 }
             }

src/CognitiveServices/CognitiveServices/CognitiveServicesAccount/CognitiveServicesAccountBaseCmdlet.cs

@@ -84,6 +84,11 @@ protected void RunCmdLet(Action action)
             }
             catch (ErrorException ex)
             {
+                if (ex.Body == null)
+                {
+                    throw new PSInvalidOperationException(ex.Message, ex);
+                }
+
                 throw new PSInvalidOperationException(ex.Body.ErrorProperty.Message, ex);
             }
         }

src/CognitiveServices/CognitiveServices/CognitiveServicesAccount/GetAzureCognitiveServicesAccountNetworkRuleSet.cs

@@ -48,9 +48,9 @@ public override void ExecuteCmdlet()
                 this.ResourceGroupName,
                 this.Name);
 
-            if (account != null && account.NetworkAcls != null)
+            if (account != null && account.Properties.NetworkAcls != null)
             {
-                WriteObject(PSNetworkRuleSet.Create(account.NetworkAcls));
+                WriteObject(PSNetworkRuleSet.Create(account.Properties.NetworkAcls));
             }
         }
     }

src/CognitiveServices/CognitiveServices/CognitiveServicesAccount/NewAzureCognitiveServicesAccount.cs

@@ -110,21 +110,21 @@ public override void ExecuteCmdlet()
 
             RunCmdLet(() =>
             {
-                var properties = new JObject();
+                var properties = new CognitiveServicesAccountProperties();
                 if (!string.IsNullOrWhiteSpace(CustomSubdomainName))
                 {
-                    properties["customSubDomainName"] = CustomSubdomainName;
+                    properties.CustomSubDomainName = CustomSubdomainName;
                 }
                 if (NetworkRuleSet != null)
                 {
-                    properties["networkAcls"] = JToken.FromObject(NetworkRuleSet);
+                    properties.NetworkAcls = NetworkRuleSet.ToNetworkRuleSet();
                 }
 
-                CognitiveServicesAccountCreateParameters createParameters = new CognitiveServicesAccountCreateParameters()
+                CognitiveServicesAccount createParameters = new CognitiveServicesAccount()
                 {
                     Location = Location,
                     Kind = Type, // must have value, mandatory parameter
-                    Sku = new Sku(SkuName),
+                    Sku = new Sku(SkuName, null),
                     Tags = TagsConversionHelper.CreateTagDictionary(Tag),
                     Properties = properties
                 };

src/CognitiveServices/CognitiveServices/CognitiveServicesAccount/RemoveAzureCognitiveServicesAccountNetworkRule.cs

@@ -102,7 +102,7 @@ public override void ExecuteCmdlet()
                 var account = this.CognitiveServicesClient.Accounts.GetProperties(
                                         this.ResourceGroupName,
                                         this.Name);
-                NetworkRuleSet accountACL = account.NetworkAcls;
+                NetworkRuleSet accountACL = account.Properties.NetworkAcls;
 
                 if (accountACL == null)
                 {
@@ -152,21 +152,28 @@ public override void ExecuteCmdlet()
                 }
 
 
-                var properties = new JObject();
-                properties["networkAcls"] = JToken.FromObject(accountACL);
-                this.CognitiveServicesClient.Accounts.Update(this.ResourceGroupName, this.Name, null, null, properties);
+                var properties = new CognitiveServicesAccountProperties();
+                properties.NetworkAcls = accountACL;
+                this.CognitiveServicesClient.Accounts.Update(
+                    this.ResourceGroupName,
+                    this.Name,
+                    new CognitiveServicesAccount()
+                    {
+                        Properties = properties
+                    }
+                    );
 
                 account = this.CognitiveServicesClient.Accounts.GetProperties(this.ResourceGroupName, this.Name);
 
                 switch (ParameterSetName)
                 {
                     case NetWorkRuleStringParameterSet:
                     case NetworkRuleObjectParameterSet:
-                        WriteObject(PSNetworkRuleSet.Create(account.NetworkAcls).VirtualNetworkRules);
+                        WriteObject(PSNetworkRuleSet.Create(account.Properties.NetworkAcls).VirtualNetworkRules);
                         break;
                     case IpRuleStringParameterSet:
                     case IpRuleObjectParameterSet:
-                        WriteObject(PSNetworkRuleSet.Create(account.NetworkAcls).IpRules);
+                        WriteObject(PSNetworkRuleSet.Create(account.Properties.NetworkAcls).IpRules);
                         break;
                 }
             }

src/CognitiveServices/CognitiveServices/CognitiveServicesAccount/SetAzureCognitiveServicesAccount.cs

@@ -89,16 +89,16 @@ public override void ExecuteCmdlet()
             base.ExecuteCmdlet();
 
             bool hasPropertiesChange = false;
-            var properties = new JObject();
+            var properties = new CognitiveServicesAccountProperties();
             if (!string.IsNullOrWhiteSpace(CustomSubdomainName))
             {
                 hasPropertiesChange = true;
-                properties["customSubDomainName"] = CustomSubdomainName;
+                properties.CustomSubDomainName = CustomSubdomainName;
             }
             if (NetworkRuleSet != null)
             {
                 hasPropertiesChange = true;
-                properties["networkAcls"] = JToken.FromObject(NetworkRuleSet);
+                properties.NetworkAcls = NetworkRuleSet.ToNetworkRuleSet();
             }
 
             Sku sku = null;
@@ -152,9 +152,13 @@ public override void ExecuteCmdlet()
                     var updatedAccount = this.CognitiveServicesClient.Accounts.Update(
                         this.ResourceGroupName,
                         this.Name,
-                        sku,
-                        tags,
-                        properties);
+                        new CognitiveServicesAccount()
+                        {
+                            Sku = sku,
+                            Tags = tags,
+                            Properties = properties
+                        }
+                        );
 
                     WriteCognitiveServicesAccount(updatedAccount);
                 });

src/CognitiveServices/CognitiveServices/CognitiveServicesAccount/UpdateAzureCognitiveServicesAccountNetworkRuleSet.cs

@@ -114,7 +114,7 @@ public override void ExecuteCmdlet()
                 var account = this.CognitiveServicesClient.Accounts.GetProperties(
                     this.ResourceGroupName,
                     this.Name);
-                NetworkRuleSet accountACL = account.NetworkAcls;
+                NetworkRuleSet accountACL = account.Properties.NetworkAcls;
 
                 if (accountACL == null)
                 {
@@ -138,13 +138,20 @@ public override void ExecuteCmdlet()
                     psNetworkRule.DefaultAction = defaultAction.Value;
                 }
 
-                var properties = new JObject();
-                properties["networkAcls"] = JToken.FromObject(psNetworkRule.ToNetworkRuleSet());
-                this.CognitiveServicesClient.Accounts.Update(this.ResourceGroupName, this.Name, null, null, properties);
+                var properties = new CognitiveServicesAccountProperties();
+                properties.NetworkAcls = psNetworkRule.ToNetworkRuleSet();
+                this.CognitiveServicesClient.Accounts.Update(
+                    this.ResourceGroupName,
+                    this.Name,
+                    new CognitiveServicesAccount()
+                    {
+                        Properties = properties
+                    }
+                    );
 
                 account = this.CognitiveServicesClient.Accounts.GetProperties(this.ResourceGroupName, this.Name);
 
-                WriteObject(PSNetworkRuleSet.Create(account.NetworkAcls));
+                WriteObject(PSNetworkRuleSet.Create(account.Properties.NetworkAcls));
             }
         }
     }

src/CognitiveServices/CognitiveServices/Models/PSCognitiveServicesAccount.cs

@@ -27,19 +27,19 @@ public PSCognitiveServicesAccount(CognitiveServicesModels.CognitiveServicesAccou
             this.ResourceGroupName = ParseResourceGroupFromId(cognitiveServicesAccount.Id);
             this.AccountName = cognitiveServicesAccount.Name;
             this.Id = cognitiveServicesAccount.Id;
-            this.Endpoint = cognitiveServicesAccount.Endpoint;
+            this.Endpoint = cognitiveServicesAccount.Properties.Endpoint;
             this.Location = cognitiveServicesAccount.Location;
             this.Sku = cognitiveServicesAccount.Sku;
             this.AccountType = cognitiveServicesAccount.Kind;
             this.Etag = cognitiveServicesAccount.Etag;
             this.ResourceType = cognitiveServicesAccount.Type;
-            this.ProvisioningState = cognitiveServicesAccount.ProvisioningState;
+            this.ProvisioningState = cognitiveServicesAccount.Properties.ProvisioningState;
             this.Tags = cognitiveServicesAccount.Tags;
-            this.CustomSubDomainName = cognitiveServicesAccount.CustomSubDomainName;
+            this.CustomSubDomainName = cognitiveServicesAccount.Properties.CustomSubDomainName;
 
-            if (cognitiveServicesAccount.NetworkAcls != null)
+            if (cognitiveServicesAccount.Properties.NetworkAcls != null)
             {
-                this.NetworkRuleSet = PSNetworkRuleSet.Create(cognitiveServicesAccount.NetworkAcls);
+                this.NetworkRuleSet = PSNetworkRuleSet.Create(cognitiveServicesAccount.Properties.NetworkAcls);
             }
         }
 

src/Compute/Compute/ChangeLog.md

@@ -19,7 +19,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
-* Allow empty value for ProximityPlacementGroupId during update
+* Allowed empty value for ProximityPlacementGroupId during update
 
 ## Version 3.4.0
 * Limit the number of VM status to 100 to avoid throttling when Get-AzVM -Status is performed without VM name.

src/DeviceProvisioningServices/DeviceProvisioningServices.Test/DeviceProvisioningServices.Test.csproj

@@ -11,6 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Azure.Devices" Version="1.18.2" />
     <PackageReference Include="Microsoft.Azure.Management.DeviceProvisioningServices" Version="0.10.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.IotHub" Version="2.10.0-preview" />
   </ItemGroup>

src/EventGrid/EventGrid.Test/EventGrid.Test.csproj

@@ -15,7 +15,7 @@
     <PackageReference Include="Microsoft.Azure.Management.EventHub" Version="2.5.0" />
     <PackageReference Include="Microsoft.Azure.Management.Relay" Version="2.0.2" />
     <PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="14.3.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="14.4.0" />
   </ItemGroup>
 
 </Project>

src/FrontDoor/FrontDoor.Test/ScenarioTests/WebApplicationFireWallPolicyTests.cs

@@ -41,5 +41,12 @@ public void TestPolicyCrudWithPiping()
         {
             TestController.NewInstance.RunPowerShellTest(_logger, "Test-PolicyCrudWithPiping");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestManagedRuleSetDefinitions()
+        {
+            TestController.NewInstance.RunPowerShellTest(_logger, "Test-ManagedRuleSetDefinition");
+        }
     }
 }