Merge branch 'preview' into tentant-id-details

Author: MiYanni

.gitignore

@@ -242,4 +242,3 @@ launchSettings.json
 /SolutionMappings.json
 /TestMappings.json
 /tools/Modules/tmp
-/tools/Az/Az.psm1

build.proj

@@ -411,10 +411,21 @@
           Condition="'$(SkipHelp)' == 'false'"
           ContinueOnError="false"/>
 
-    <!-- Cleanup extraneous files. -->
-    <Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(LibraryToolsFolder)\CleanupBuild.ps1 -BuildConfig $(Configuration) &quot;" />
+    <!-- Copying modules to be signed -->
+    <Copy SourceFiles="$(LibraryToolsFolder)\Az\Az.psd1"
+          DestinationFolder="$(PackageDirectory)\$(Configuration)"
+          ContinueOnError="false" />
+    <Copy SourceFiles="$(LibraryToolsFolder)\Az\Az.psm1"
+          DestinationFolder="$(PackageDirectory)\$(Configuration)"
+          ContinueOnError="false" />
 
     <CallTarget Targets="CodeSignBinaries" Condition=" '$(CodeSign)' == 'true' " />
+
+    <Copy SourceFiles="$(PackageDirectory)\$(Configuration)\Az.psd1" DestinationFolder="$(LibraryToolsFolder)\Az" />
+    <Copy SourceFiles="$(PackageDirectory)\$(Configuration)\Az.psm1" DestinationFolder="$(LibraryToolsFolder)\Az" />
+
+    <!-- Cleanup extraneous files. -->
+    <Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(LibraryToolsFolder)\CleanupBuild.ps1 -BuildConfig $(Configuration) &quot;" />
   </Target>
 
 
@@ -438,9 +449,6 @@
       <Output TaskParameter="Path" PropertyName="WindowsSdkPath"/>
     </GetFrameworkSdkPath>
 
-    <Copy SourceFiles="$(LibraryRoot)tools\Az\Az.psd1"
-          DestinationFolder="$(PackageDirectory)\$(Configuration)" Condition= " '$(Scope)' == 'Netcore' "/>
-
     <!-- Azure -->
     <ItemGroup Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Latest' or '$(Scope)' == 'Netcore'">
       <DelaySignedAssembliesToSign Include="$(PackageDirectory)\$(Configuration)\**\Microsoft*Azure*Commands*.dll" Exclude="$(PackageDirectory)\$(Configuration)\**\Microsoft*Azure*Commands*Common*.dll" />
@@ -490,6 +498,8 @@
           Condition="'$(Scope)' != 'Netcore'"/>
 
     <!-- Copying shortcut to be signed -->
+    <Copy SourceFiles="$(LibraryRoot)tools\Az\Az.psm1"
+          DestinationFolder="$(PackageDirectory)\$(Configuration)" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Netcore'" />
     <Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psm1"
           DestinationFolder="$(PackageDirectory)\$(Configuration)" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Latest'" />
     <Copy SourceFiles="$(LibrarySourceFolder)\StackAdmin\AzureRM\AzureRM.psm1"
@@ -532,10 +542,6 @@
     <Exec Command="$(PowerShellCommandPrefix) &quot;. $(LibraryToolsFolder)\CheckSignature.ps1 -CustomPath $(StackPackageFolder)\$(Configuration) &quot;"
           Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'"
           ContinueOnError="ErrorAndContinue" />
-
-    <!-- Copying signed shortcut back -->
-    <Copy SourceFiles="$(PackageDirectory)\$(Configuration)\Az.psd1"
-          DestinationFolder="$(LibraryRoot)tools\Az" Condition= " '$(Scope)' == 'Latest' "/>
   </Target>
 
 

documentation/breaking-changes/breaking-changes-attribute-help.md

@@ -35,6 +35,7 @@ All of the attributes have the following common traits:
 
 The properties "deprecatedByVersion" and "changeInEfectByDate" are infotmation only (for the end user) as of now.
 
+#### Supress the breaking change messages at runtime
 - If the user desires to not see the warning messages generated by the attirbutes at runtime, they can set the env variable "SuppressAzurePowerShellBreakingChangeWarnings" to "true".
 
 NOTE :
@@ -485,4 +486,4 @@ Get-SomeObjectA -Param1=...
 ...
 Breaking changes in the cmdlet : Get-SomeObjectA
  - The parameter 'Param1' is becoming mandatory
-```
+```

src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.Netcore.csproj

@@ -25,7 +25,7 @@
 
   <ItemGroup Condition="'$(TargetFramework)' != 'net472'">
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="22.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Compute" Version="23.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.1" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.5.0-preview" />
  	<PackageReference Include="Microsoft.Azure.Management.Storage" Version="8.1.0-preview" />

src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj

@@ -44,7 +44,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Azure.Management.Compute">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.22.0.0\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.23.0.0\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Network, Version=19.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.5.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
@@ -69,6 +69,7 @@
     <Compile Include="ScenarioTests\ContainerServiceTests.cs" />
     <Compile Include="ScenarioTests\DiagnosticsExtensionTests.cs" />
     <Compile Include="ScenarioTests\DiskRPTests.cs" />
+    <Compile Include="ScenarioTests\GalleryTests.cs" />
     <Compile Include="ScenarioTests\ImageTests.cs" />
     <Compile Include="ScenarioTests\LogAnalyticTests.cs" />
     <Compile Include="ScenarioTests\NewVhdVMTests.cs" />
@@ -177,6 +178,9 @@
     <None Include="ScenarioTests\DummyConfig.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="ScenarioTests\GalleryTests.ps1">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="ScenarioTests\ImageTests.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/DiskRPTests.ps1

@@ -33,6 +33,11 @@ function Test-Disk
         $access = 'Read';
 
         # Config create test
+        $diskconfig = New-AzureRmDiskConfig -Location $loc -DiskSizeGB 500 -SkuName UltraSSD_LRS -OsType Windows -CreateOption Empty -DiskMBpsReadWrite 8 -DiskIOPSReadWrite 500;
+        Assert-AreEqual "UltraSSD_LRS" $diskconfig.Sku.Name;
+        Assert-AreEqual 500 $diskconfig.DiskIOPSReadWrite;
+        Assert-AreEqual 8 $diskconfig.DiskMBpsReadWrite
+
         $diskconfig = New-AzureRmDiskConfig -Location $loc -Zone "1" -DiskSizeGB 5 -AccountType Standard_LRS -OsType Windows -CreateOption Empty -EncryptionSettingsEnabled $true;
         # Encryption test
         $diskconfig = Set-AzureRmDiskDiskEncryptionKey -Disk $diskconfig -SecretUrl $mockkey -SourceVaultId $mocksourcevault;
@@ -83,6 +88,11 @@ function Test-Disk
         Verify-PSOperationStatusResponse $st;
 
         # Config update test
+        $updateconfig = New-AzureRmDiskUpdateConfig -DiskSizeGB 10 -AccountType UltraSSD_LRS -OsType Windows -DiskMBpsReadWrite 8 -DiskIOPSReadWrite 500;
+        Assert-AreEqual "UltraSSD_LRS" $updateconfig.Sku.Name;
+        Assert-AreEqual 500 $updateconfig.DiskIOPSReadWrite;
+        Assert-AreEqual 8 $updateconfig.DiskMBpsReadWrite
+
         $updateconfig = New-AzureRmDiskUpdateConfig -DiskSizeGB 10 -AccountType Premium_LRS -OsType Windows;
         $job = Update-AzureRmDisk -ResourceGroupName $rgname -DiskName $diskname -DiskUpdate $updateconfig -AsJob;
         $result = $job | Wait-Job;

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/GalleryTests.cs

@@ -0,0 +1,43 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using Microsoft.Azure.ServiceManagemenet.Common.Models;
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
+using Xunit;
+
+namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests
+{
+    public class GalleryTests
+    {
+        XunitTracingInterceptor _logger;
+
+        public GalleryTests(Xunit.Abstractions.ITestOutputHelper output)
+        {
+            _logger = new XunitTracingInterceptor(output);
+            XunitTracingInterceptor.AddToContext(_logger);
+        }
+
+#if NETSTANDARD
+        [Fact(Skip = "Resources -> ResourceManager, needs re-recorded")]
+        [Trait(Category.RunType, Category.DesktopOnly)]
+#else
+        [Fact]
+#endif
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestGallery()
+        {
+            ComputeTestController.NewInstance.RunPsTest(_logger, "Test-Gallery");
+        }
+    }
+}