Update from master

AzureSDKAutomation · Jun 2, 2020 · 9a8bf78 · 9a8bf78
1 parent a6d58cf
commit 9a8bf78
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 3,789 deletions.
diff --git a/...mpute/Microsoft.Azure.Management.Compute/src/Generated/SdkInfo_ComputeManagementClient.cs b/...mpute/Microsoft.Azure.Management.Compute/src/Generated/SdkInfo_ComputeManagementClient.cs
diff --git a/sdk/compute/Microsoft.Azure.Management.Compute/src/Microsoft.Azure.Management.Compute.csproj b/sdk/compute/Microsoft.Azure.Management.Compute/src/Microsoft.Azure.Management.Compute.csproj
@@ -6,12 +6,12 @@
   <PropertyGroup>
     <PackageId>Microsoft.Azure.Management.Compute</PackageId>
     <Description>Provides developers with libraries for the updated compute platform under Azure Resource manager to deploy virtual machine, virtual machine extensions and availability set management capabilities. Launch, restart, scale, capture and manage VMs, VM Extensions and more. Note: This client library is for Virtual Machines under Azure Resource Manager.</Description>
-    <Version>36.1.0.0</Version>
+    <Version>36.0.0.0</Version>
     <AssemblyName>Microsoft.Azure.Management.Compute</AssemblyName>
     <PackageTags>management;virtual machine;compute;</PackageTags>
     <PackageReleaseNotes>
       <![CDATA[
-        This is a public release of the Azure Compute SDK. Included with this release are the fixes for Gallery Image Version Update and VM Scale Set ConvertToSinglePlacementGroup API.
+        This is a public release of the Azure Compute SDK. Included with this release are SimulateEviction API for Spot Virtual Machines and Spot VMScaleSet VMs
       ]]>
     </PackageReleaseNotes>
   </PropertyGroup>

diff --git a/sdk/compute/Microsoft.Azure.Management.Compute/src/Properties/AssemblyInfo.cs b/sdk/compute/Microsoft.Azure.Management.Compute/src/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@
 [assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Compute Resources.")]
 
 [assembly: AssemblyVersion("36.0.0.0")]
-[assembly: AssemblyFileVersion("36.1.0.0")]
+[assembly: AssemblyFileVersion("36.0.0.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft")]
 [assembly: AssemblyProduct("Microsoft Azure .NET SDK")]

diff --git a/sdk/compute/Microsoft.Azure.Management.Compute/tests/ScenarioTests/VMIdentityTests.cs b/sdk/compute/Microsoft.Azure.Management.Compute/tests/ScenarioTests/VMIdentityTests.cs
@@ -36,7 +36,7 @@ public void TestVMIdentitySystemAssignedUserAssigned()
 
                 try
                 {
-                    var storageAccountOutput = CreateStorageAccount(rgName, storageAccountName);
+                    var storageAccountOutput = CreateStorageAccount( rgName, storageAccountName );
 
                     Action<VirtualMachine> addUserIdentity = vm =>
                     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,7 +36,7 @@ public void TestVMIdentitySystemAssignedUserAssigned() @@
                     try
                     {
-                        var storageAccountOutput = CreateStorageAccount(rgName, storageAccountName);
+                        var storageAccountOutput = CreateStorageAccount( rgName, storageAccountName );
                         Action<VirtualMachine> addUserIdentity = vm =>
                         {
@@ Expand Down @@