Merge branch 'main' into auth13

Author: sneivandt

.azure-pipelines/daily-build.yml

@@ -97,6 +97,8 @@ jobs:
         Release/**/Microsoft.Azure.PowerShell.Authentication.dll
         Release/**/Microsoft.Azure.PowerShell.Authentication.ResourceManager.dll
         Release/**/Microsoft.Azure.PowerShell.Authenticators.dll
+        Release/**/Microsoft.Azure.PowerShell.AuthenticationAssemblyLoadContext.dll
+        Release/**/Microsoft.Azure.Commands.*.AlcWrapper.dll
         !Release/**/Microsoft*Azure*PowerShell*Cmdlets*.Test.dll
       UseMinimatch: true
       signConfigType: 'inlineSignParams'

src/Accounts/Accounts/ChangeLog.md

@@ -19,6 +19,7 @@
 -->
 
 ## Upcoming Release
+* Updated Azure.Core from 1.16.0 to 1.19.0.
 
 ## Version 2.5.3
 * Corrected the URLs to Azure Portal in the results of `Get-AzEnvironment` and `Get-AzContext`. [#15429]

src/Accounts/AuthenticationAssemblyLoadContext/AzAssemblyLoadContextInitializer.cs

@@ -31,7 +31,7 @@ static AzAssemblyLoadContextInitializer()
             //TODO: Generate assembly version info into AzSharedAssemblies.json during build
             var azSharedAssemblies = new Dictionary<string, Version>()
             {
-                {"Azure.Core", new Version("1.16.0.0")},
+                {"Azure.Core", new Version("1.19.0.0")},
                 {"Azure.Identity", new Version("1.4.0.0")},
                 {"Microsoft.Bcl.AsyncInterfaces", new Version("1.0.0.0")},
                 {"Microsoft.Identity.Client", new Version("4.30.1.0") },

src/Attestation/Attestation/ChangeLog.md

@@ -20,6 +20,7 @@
 
 
 ## Upcoming Release
+* General availability of `Az.Attestation` module
 
 ## Version 0.1.8
 * Added default provider support to `Az.Attestation` module

src/Compute/Compute/Compute.csproj

@@ -37,7 +37,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Compute.AlcWrapper\Compute.AlcWrapper.csproj" />
+    <ProjectReference Include="..\Compute.AlcWrapper\Compute.AlcWrapper.csproj">
+      <!-- AlcWrapper DLL (and its dependencies) won't be copied to the output folder -->
+      <!-- Because we are going to put them under ModuleAlcAssemblies/ -->
+      <!-- See https://docs.microsoft.com/en-us/dotnet/core/tutorials/creating-app-with-plugin-support -->
+      <Private>false</Private>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </ProjectReference>
   </ItemGroup>
 
 </Project>

src/Compute/Compute/help/New-AzGalleryImageVersion.md

@@ -162,7 +162,7 @@ $region_westus = @{Name = 'West US'}
 $region_ukwest = @{Name = 'UK West';ReplicaCount = 2}
 $region_southcentralus = @{Name = 'South Central US';StorageAccountType = Standard_LRS}
 $targetRegions = @($region_eastus, $region_westus, $region_ukwest, $region_southcentralus)
-New-AzGalleryImageVersion -ResourceGroupName $rgName -GalleryName $galleryName -GalleryImageDefinitionName $galleryImageDefinitionName -Name $galleryImageVersionName -Location $location -SourceImageId $sourceImageId -ReplicaCount 1 -StorageAccountType $storageAccountType
+New-AzGalleryImageVersion -ResourceGroupName $rgName -GalleryName $galleryName -GalleryImageDefinitionName $galleryImageDefinitionName -Name $galleryImageVersionName -Location $location -SourceImageId $sourceImageId -ReplicaCount 1 -StorageAccountType $storageAccountType -TargetRegion $targetRegions
 ```
 
 Create an image version in four regions. In this example, the global replica count is 1 and the global storage account type is Standard_ZRS. East US will have 3 replicas, each stored on Standard_LRS account storage. West US will inherit from global settings and have 1 replica stored on Standard_ZRS. UK West will have a replica count of 2 stored on Standard_ZRS. South Central US will have one replica stored on Standard_LRS.
@@ -197,7 +197,7 @@ $region_westus = @{Name = 'West US'; Encryption = $westus_encryption}}
 
 # Create images
 $targetRegions = @($region_eastus, $region_westus)
-New-AzGalleryImageVersion -ResourceGroupName $rgName -GalleryName $galleryName -GalleryImageDefinitionName $galleryImageDefinitionName -Name $galleryImageVersionName -Location $location -SourceImageId $sourceImageId
+New-AzGalleryImageVersion -ResourceGroupName $rgName -GalleryName $galleryName -GalleryImageDefinitionName $galleryImageDefinitionName -Name $galleryImageVersionName -Location $location -SourceImageId $sourceImageId -TargetRegion $targetRegions
 ```
 
 Create an image version with encryption in two regions. Disk encryption sets are regional resources and a different disk encryption set must be used in each region.

src/DataFactory/DataFactoryV2.Test/ScenarioTests/IntegrationRuntimeTests.cs

@@ -64,6 +64,13 @@ public void TestSsisAzureIntegrationRuntimeWithSubnetId()
             RunPowerShellTest(_logger, "Test-Azure-IntegrationRuntime-SubnetId");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestExpressSsisAzureIntegrationRuntime()
+        {
+            RunPowerShellTest(_logger, "Test-Azure-Express-IntegrationRuntime");
+        }
+
         [Fact(Skip = "New-AzureRMRoleAssignmentWithId and Remove-AzureRmRoleAssignment rely on Resources module. Needs fixed in AzureRM.Resources.ps1.")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestSharedIntegrationRuntime()

src/DataFactory/DataFactoryV2.Test/ScenarioTests/IntegrationRuntimeTests.ps1

@@ -360,6 +360,74 @@ function Test-Azure-IntegrationRuntime-SubnetId
     }
 }
 
+<#
+.SYNOPSIS
+Creates a express azure integration runtime with subnetId.
+Deletes the created integration runtime at the end.
+
+To record this test, please prepare a subnet, to which the Azure SSIS IR could join.
+#>
+function Test-Azure-Express-IntegrationRuntime
+{
+    $dfname = Get-DataFactoryName
+    $rgname = Get-ResourceGroupName
+    $rglocation = Get-ProviderLocation ResourceManagement
+    $dflocation = Get-ProviderLocation DataFactoryManagement
+
+    New-AzResourceGroup -Name $rgname -Location $rglocation -Force
+
+    try
+    {
+        
+        Set-AzDataFactoryV2 -ResourceGroupName $rgname `
+            -Name $dfname `
+            -Location $dflocation `
+            -Force
+
+        $irname = "test-Azure-Express-SSIS-IR"
+        $description = "Managed SSIS IR"
+        $VNetInjectionMethod = "Express"
+
+        # Get SubnetId from environment variable.
+        $IsSubnetIdSet = Test-Path env:SSIS_IR_SUBNETID
+        if ($IsSubnetIdSet) {
+            $subnetId = $Env:SSIS_IR_SUBNETID
+        } else {
+            $subnetId = "fakeId"
+        }
+
+        $actual = Set-AzDataFactoryV2IntegrationRuntime -ResourceGroupName $rgname `
+            -DataFactoryName $dfname `
+            -Name $irname `
+            -Type Managed `
+            -Description $description `
+            -Location $dflocation `
+            -NodeSize Standard_A4_v2 `
+            -NodeCount 1 `
+            -MaxParallelExecutionsPerNode 1 `
+            -Edition standard `
+            -subnetId $subnetId `
+            -VNetInjectionMethod $VNetInjectionMethod `
+            -Force
+
+        $expected = Get-AzDataFactoryV2IntegrationRuntime -ResourceGroupName $rgname `
+            -DataFactoryName $dfname `
+            -Name $irname
+        Assert-AreEqual $actual.Name $expected.Name
+        if ($IsSubnetIdSet) {
+            Assert-AreEqual $subnetId $expected.SubnetId
+        }
+
+        Assert-AreEqual $expected.VNetInjectionMethod $VNetInjectionMethod
+
+        Remove-AzDataFactoryV2IntegrationRuntime -ResourceGroupName $rgname -DataFactoryName $dfname -Name $irname -Force
+    }
+    finally
+    {
+        CleanUp $rgname $dfname
+    }
+}
+
 <#
 .SYNOPSIS
 Creates a self-hosted integration runtime and then does piping operations.