resolve conflicts

Author: Nickcandy

.azure-pipelines/live-test.yml

@@ -180,37 +180,37 @@ stages:
       psVersion: ${{ parameters.ps_latest }}
       dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
 
-  - template: util/live-test-steps.yml
-    parameters:
-      name: 'ps_7_2_x_macOS'
-      vmImage: ${{ parameters.os_macos }}
-      osType: 'MacOS'
-      psVersion: ${{ parameters.ps_7_2_x }}
-      dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
-
-  - template: util/live-test-steps.yml
-    parameters:
-      name: 'ps_7_3_x_macOS'
-      vmImage: ${{ parameters.os_macos }}
-      osType: 'MacOS'
-      psVersion: ${{ parameters.ps_7_3_x }}
-      dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
-
-  - template: util/live-test-steps.yml
-    parameters:
-      name: 'ps_7_4_x_macOS'
-      vmImage: ${{ parameters.os_macos }}
-      osType: 'MacOS'
-      psVersion: ${{ parameters.ps_7_4_x }}
-      dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
-
-  - template: util/live-test-steps.yml
-    parameters:
-      name: 'ps_latest_macOS'
-      vmImage: ${{ parameters.os_macos }}
-      osType: 'MacOS'
-      psVersion: ${{ parameters.ps_latest }}
-      dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
+  # - template: util/live-test-steps.yml
+  #   parameters:
+  #     name: 'ps_7_2_x_macOS'
+  #     vmImage: ${{ parameters.os_macos }}
+  #     osType: 'MacOS'
+  #     psVersion: ${{ parameters.ps_7_2_x }}
+  #     dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
+
+  # - template: util/live-test-steps.yml
+  #   parameters:
+  #     name: 'ps_7_3_x_macOS'
+  #     vmImage: ${{ parameters.os_macos }}
+  #     osType: 'MacOS'
+  #     psVersion: ${{ parameters.ps_7_3_x }}
+  #     dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
+
+  # - template: util/live-test-steps.yml
+  #   parameters:
+  #     name: 'ps_7_4_x_macOS'
+  #     vmImage: ${{ parameters.os_macos }}
+  #     osType: 'MacOS'
+  #     psVersion: ${{ parameters.ps_7_4_x }}
+  #     dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
+
+  # - template: util/live-test-steps.yml
+  #   parameters:
+  #     name: 'ps_latest_macOS'
+  #     vmImage: ${{ parameters.os_macos }}
+  #     osType: 'MacOS'
+  #     psVersion: ${{ parameters.ps_latest }}
+  #     dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
 
 - stage: Report
   displayName: Send Report

.azure-pipelines/release-test.yml

@@ -136,42 +136,42 @@ jobs:
     psVersion: ${{ parameters.preview_ps }}
     netCoreVersion: ${{ parameters.netCoreVersion_8 }}
 
-- template: util/smoke-test-steps.yml
-  parameters:
-    name: 'MacOS_PS7_2_X_SmokeTest'
-    agentPoolName: ${{ variables.macOsAgentPoolName }}
-    agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
-    psVersion: ${{ parameters.ps7_2 }}
-    netCoreVersion: ${{ parameters.netCoreVersion }}
-
-- template: util/smoke-test-steps.yml
-  parameters:
-    name: 'MacOS_PS7_3_X_SmokeTest'
-    agentPoolName: ${{ variables.macOsAgentPoolName }}
-    agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
-    psVersion: ${{ parameters.ps7_3 }}
-    netCoreVersion: ${{ parameters.netCoreVersion_7 }}
-
-- template: util/smoke-test-steps.yml
-  parameters:
-    name: 'MacOS_PS7_4_X_SmokeTest'
-    agentPoolName: ${{ variables.macOsAgentPoolName }}
-    agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
-    psVersion: ${{ parameters.ps7_4 }}
-    netCoreVersion: ${{ parameters.netCoreVersion_8 }}
-
-- template: util/smoke-test-steps.yml
-  parameters:
-    name: 'MacOS_Latest_PS_SmokeTest'
-    agentPoolName: ${{ variables.macOsAgentPoolName }}
-    agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
-    psVersion: ${{ parameters.latest_ps }}
-    netCoreVersion: ${{ parameters.netCoreVersion_8 }}
-
-- template: util/smoke-test-steps.yml
-  parameters:
-    name: 'MacOS_Preview_PS_SmokeTest'
-    agentPoolName: ${{ variables.macOsAgentPoolName }}
-    agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
-    psVersion: ${{ parameters.preview_ps }}
-    netCoreVersion: ${{ parameters.netCoreVersion_8 }}
+# - template: util/smoke-test-steps.yml
+#   parameters:
+#     name: 'MacOS_PS7_2_X_SmokeTest'
+#     agentPoolName: ${{ variables.macOsAgentPoolName }}
+#     agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
+#     psVersion: ${{ parameters.ps7_2 }}
+#     netCoreVersion: ${{ parameters.netCoreVersion }}
+
+# - template: util/smoke-test-steps.yml
+#   parameters:
+#     name: 'MacOS_PS7_3_X_SmokeTest'
+#     agentPoolName: ${{ variables.macOsAgentPoolName }}
+#     agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
+#     psVersion: ${{ parameters.ps7_3 }}
+#     netCoreVersion: ${{ parameters.netCoreVersion_7 }}
+
+# - template: util/smoke-test-steps.yml
+#   parameters:
+#     name: 'MacOS_PS7_4_X_SmokeTest'
+#     agentPoolName: ${{ variables.macOsAgentPoolName }}
+#     agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
+#     psVersion: ${{ parameters.ps7_4 }}
+#     netCoreVersion: ${{ parameters.netCoreVersion_8 }}
+
+# - template: util/smoke-test-steps.yml
+#   parameters:
+#     name: 'MacOS_Latest_PS_SmokeTest'
+#     agentPoolName: ${{ variables.macOsAgentPoolName }}
+#     agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
+#     psVersion: ${{ parameters.latest_ps }}
+#     netCoreVersion: ${{ parameters.netCoreVersion_8 }}
+
+# - template: util/smoke-test-steps.yml
+#   parameters:
+#     name: 'MacOS_Preview_PS_SmokeTest'
+#     agentPoolName: ${{ variables.macOsAgentPoolName }}
+#     agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
+#     psVersion: ${{ parameters.preview_ps }}
+#     netCoreVersion: ${{ parameters.netCoreVersion_8 }}

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,12 +6,12 @@
 
 ## Mandatory Checklist
 
-- Please choose the target release of Azure PowerShell
+- Please choose the target release of Azure PowerShell. (⚠️**Target release** is a different concept from **API readiness**. Please click below links for details.)
   - [ ] [General release](../blob/main/CONTRIBUTING.md#target-release-types)
   - [ ] [Public preview](../blob/main/CONTRIBUTING.md#target-release-types)
   - [ ] [Private preview](../blob/main/CONTRIBUTING.md#target-release-types)
   - [ ] [Engineering build](../blob/main/CONTRIBUTING.md#target-release-types)
-  - [ ] N/A
+  - [ ] No need for a release
 
 - [ ] Check this box to confirm: **I have read the [_Submitting Changes_](../blob/main/CONTRIBUTING.md#submitting-changes) section of [`CONTRIBUTING.md`](../blob/main/CONTRIBUTING.md) and reviewed the following information:**
 

src/Blueprint/Blueprint.sln

@@ -31,8 +31,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.MSGraph", "..\Resources\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceManager", "..\Resources\ResourceManager\ResourceManager.csproj", "{12A89145-B44B-420B-8BF4-A0B0856D1110}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Resources.Sdk", "..\Resources\Resources.Sdk\Resources.Sdk.csproj", "{84352F21-CC21-46D9-B558-9B4A781772BA}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Resources", "..\Resources\Resources\Resources.csproj", "{79F05C6B-D6CB-4CE7-AC49-516D22822B86}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tags", "..\Resources\Tags\Tags.csproj", "{38A4D9FA-7D11-4014-ACED-5AC28C74CCF3}"
@@ -41,6 +39,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestFx", "..\..\tools\TestF
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authorization.Management.Sdk", "..\Resources\Authorization.Management.Sdk\Authorization.Management.Sdk.csproj", "{6C83208C-9E59-4EBA-86AB-E850FC13BD68}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Resources.Management.Sdk", "..\Resources\Resources.Management.Sdk\Resources.Management.Sdk.csproj", "{9A74916D-E00D-4CC5-ADA2-FA563F5F9505}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -94,10 +94,6 @@ Global
 		{12A89145-B44B-420B-8BF4-A0B0856D1110}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{12A89145-B44B-420B-8BF4-A0B0856D1110}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{12A89145-B44B-420B-8BF4-A0B0856D1110}.Release|Any CPU.Build.0 = Release|Any CPU
-		{84352F21-CC21-46D9-B558-9B4A781772BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{84352F21-CC21-46D9-B558-9B4A781772BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{84352F21-CC21-46D9-B558-9B4A781772BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{84352F21-CC21-46D9-B558-9B4A781772BA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{79F05C6B-D6CB-4CE7-AC49-516D22822B86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{79F05C6B-D6CB-4CE7-AC49-516D22822B86}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{79F05C6B-D6CB-4CE7-AC49-516D22822B86}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -114,6 +110,10 @@ Global
 		{6C83208C-9E59-4EBA-86AB-E850FC13BD68}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6C83208C-9E59-4EBA-86AB-E850FC13BD68}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6C83208C-9E59-4EBA-86AB-E850FC13BD68}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A74916D-E00D-4CC5-ADA2-FA563F5F9505}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A74916D-E00D-4CC5-ADA2-FA563F5F9505}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A74916D-E00D-4CC5-ADA2-FA563F5F9505}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A74916D-E00D-4CC5-ADA2-FA563F5F9505}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{3E40F9C5-9E33-423F-952A-605DC7990281} = {8E7C6C0C-BFD1-4E1A-B042-79FB992B3558}
@@ -127,10 +127,10 @@ Global
 		{29A8760B-A0DB-480C-8270-83038355969B} = {77D2C987-7CEB-4CFA-AA47-5171BD5B7C0A}
 		{44787BCE-CD80-4726-B9C5-8C7FBC2982B6} = {77D2C987-7CEB-4CFA-AA47-5171BD5B7C0A}
 		{12A89145-B44B-420B-8BF4-A0B0856D1110} = {77D2C987-7CEB-4CFA-AA47-5171BD5B7C0A}
-		{84352F21-CC21-46D9-B558-9B4A781772BA} = {77D2C987-7CEB-4CFA-AA47-5171BD5B7C0A}
 		{79F05C6B-D6CB-4CE7-AC49-516D22822B86} = {77D2C987-7CEB-4CFA-AA47-5171BD5B7C0A}
 		{38A4D9FA-7D11-4014-ACED-5AC28C74CCF3} = {77D2C987-7CEB-4CFA-AA47-5171BD5B7C0A}
 		{7E48CE83-9B77-4544-A4BF-9E850D6C2AD5} = {E09BB005-D744-4D6A-B74B-04DE90074A32}
 		{6C83208C-9E59-4EBA-86AB-E850FC13BD68} = {77D2C987-7CEB-4CFA-AA47-5171BD5B7C0A}
+		{9A74916D-E00D-4CC5-ADA2-FA563F5F9505} = {77D2C987-7CEB-4CFA-AA47-5171BD5B7C0A}
 	EndGlobalSection
 EndGlobal

src/CodeSigning/CodeSigning.sln

@@ -1,4 +1,4 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32901.215
 MinimumVisualStudioVersion = 10.0.40219.1
@@ -18,6 +18,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeSigning.Test", "CodeSig
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyLoading", "..\Accounts\AssemblyLoading\AssemblyLoading.csproj", "{1F6E85D8-6920-4F62-B378-F4948BF8DF2D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "..\Accounts\Accounts", "..\Accounts\Accounts", "{A0FF9ABD-FC90-4D57-8E97-1F14BB07BDBD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Accounts", "Accounts", "{D325ACB5-919A-4BD5-9811-ED3DC2237039}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthenticationAssemblyLoadContext", "..\Accounts\AuthenticationAssemblyLoadContext\AuthenticationAssemblyLoadContext.csproj", "{DACA957F-AAFE-4DDF-B325-36F995DC41BE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -56,11 +62,19 @@ Global
 		{1F6E85D8-6920-4F62-B378-F4948BF8DF2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1F6E85D8-6920-4F62-B378-F4948BF8DF2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1F6E85D8-6920-4F62-B378-F4948BF8DF2D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DACA957F-AAFE-4DDF-B325-36F995DC41BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DACA957F-AAFE-4DDF-B325-36F995DC41BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DACA957F-AAFE-4DDF-B325-36F995DC41BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DACA957F-AAFE-4DDF-B325-36F995DC41BE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5E85B4CC-D1A9-466B-98AC-E0AD0C5AE585}
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{142D7B0B-388A-4CEB-A228-7F6D423C5C2E} = {A0FF9ABD-FC90-4D57-8E97-1F14BB07BDBD}
+		{DACA957F-AAFE-4DDF-B325-36F995DC41BE} = {D325ACB5-919A-4BD5-9811-ED3DC2237039}
+	EndGlobalSection
 EndGlobal

src/Compute/Compute.Test/ScenarioTests/DiskRPTests.cs

@@ -192,5 +192,12 @@ public void TestSnapshotConfigTierOptionEnhancedSpeed()
             TestRunner.RunTestScript("Test-SnapshotConfigTierOptionEnhancedSpeed");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.LiveOnly)]
+        public void TestDiskGrantAccessGetSASWithTL()
+        {
+            TestRunner.RunTestScript("Test-DiskGrantAccessGetSASWithTL");
+        }
+
     }
 }

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

@@ -1825,4 +1825,42 @@ function Test-SnapshotConfigTierOptionEnhancedSpeed
         # Cleanup
         Clean-ResourceGroup $rgname
     }
+}
+
+<#
+.SYNOPSIS
+Using a TL disk, use the SecureVmGuestStateSas parameter to get the securityDataAccessSAS value.
+#>
+function Test-DiskGrantAccessGetSASWithTL
+{
+    $rgname = Get-ComputeTestResourceName;
+	$loc = Get-ComputeVMLocation;
+
+	try
+    {
+		New-AzResourceGroup -Name $rgname -Location $loc -Force;
+
+        $diskname = "d" + $rgname;
+
+        $image = Get-AzVMImage -Skus 2022-datacenter-azure-edition -Offer WindowsServer -PublisherName MicrosoftWindowsServer -Location $loc -Version latest;
+        $diskconfig = New-AzDiskConfig -DiskSizeGB 127 -AccountType Premium_LRS -OsType Windows -CreateOption FromImage -Location $loc;
+
+        $diskconfig = Set-AzDiskImageReference -Disk $diskconfig -Id $image.Id;
+
+        $disk = New-AzDisk -ResourceGroupName $rgname -DiskName $diskname -Disk $diskconfig;
+
+        $grantAccess = Grant-AzDiskAccess -ResourceGroupName $rgname -DiskName $diskname -Access 'Read' -DurationInSecond 60 -SecureVMGuestStateSAS;
+        Assert-NotNull $grantAccess.securityDataAccessSAS;
+        Assert-NotNull $grantAccess.AccessSAS;
+
+        $grantAccess = Grant-AzDiskAccess -ResourceGroupName $rgname -DiskName $diskname -Access 'Read' -DurationInSecond 60;
+        Assert-NotNull $grantAccess.AccessSAS;
+        Assert-Null $grantAccess.securityDataAccessSAS;
+
+	}
+    finally 
+    {
+		# Cleanup
+		Clean-ResourceGroup $rgname;
+	}
 }

src/Compute/Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.DiskRPTests/TestDiskGrantAccessGetSASWithTL.json

@@ -24,6 +24,7 @@
 ## Version 7.3.0
 * Added cmdlet `Invoke-AzSpotPlacementRecommender`.
 * Fixed `Update-AzCapacityReservationGroup` to remove Subscriptions from SharingProfile.
+* Added new optional parameter `SecureVMGuestStateSAS` to cmdlet `Grant-AzDiskAccess`.
 
 ## Version 7.2.0
 * Added parameters `-scriptUriManagedIdentity`, `-outputBlobManagedIdentity`, `-errorBlobMangedIdentity`, and `-TreatFailureAsDeploymentFailure` to cmdlets `Set-AzVmRunCommand` and `Set-AzVmssRunCommand`. 

src/Compute/Compute/ChangeLog.md

@@ -48,6 +48,7 @@ public override void ExecuteCmdlet()
                     var grantAccessData = new GrantAccessData();
                     grantAccessData.Access = this.Access;
                     grantAccessData.DurationInSeconds = this.DurationInSecond;
+                    grantAccessData.GetSecureVMGuestStateSAS = this.SecureVMGuestStateSAS;
 
                     var result = DisksClient.GrantAccess(resourceGroupName, diskName, grantAccessData);
                     var psObject = new PSAccessUri();
@@ -88,5 +89,12 @@ public override void ExecuteCmdlet()
 
         [Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
         public SwitchParameter AsJob { get; set; }
+
+        [Parameter(
+            ParameterSetName = "DefaultParameter",
+            HelpMessage = "Set this flag to true to get additional SAS for VM guest state.",
+            Mandatory = false,
+            ValueFromPipelineByPropertyName = true)]
+        public SwitchParameter SecureVMGuestStateSAS { get; set; }
     }
 }

src/Compute/Compute/Generated/Disk/DiskGrantAccessMethod.cs

@@ -29,5 +29,7 @@ public partial class PSAccessUri
     {
         public string AccessSAS { get; set; }
 
+        public string SecurityDataAccessSAS { get; set; }
+
     }
 }

src/Compute/Compute/Generated/Models/PSAccessUri.cs

@@ -14,7 +14,7 @@ Grants an access to a disk.
 
 ```
 Grant-AzDiskAccess [-ResourceGroupName] <String> [-DiskName] <String> [-Access] <String>
- [[-DurationInSecond] <Int32>] [-AsJob] [-DefaultProfile <IAzureContextContainer>]
+ [[-DurationInSecond] <Int32>] [-AsJob] [-SecureVMGuestStateSAS] [-DefaultProfile <IAzureContextContainer>]
  [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
@@ -122,6 +122,21 @@ Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
+### -SecureVMGuestStateSAS
+Set this flag to true to get additional SAS for VM guest state.
+
+```yaml
+Type: System.Management.Automation.SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+Accept wildcard characters: False
+```
+
 ### -Confirm
 Prompts you for confirmation before running the cmdlet.