Skip to content

Commit 48554fc

Browse files
VeryEarlyVeryEarly
authored
Merge branch 'main' into feature/cplat-nap
2 parents 785dcc2 + 3bce5b6 commit 48554fc

File tree

91 files changed

+10244
-33820
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+10244
-33820
lines changed

‎.azure-pipelines/security-tools.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
script: dotnet msbuild build.proj /t:"Build;GenerateHelp" /p:"PullRequestNumber=$(System.PullRequest.PullRequestNumber);IsSecurityCheck=true"
4646
env:
4747
OCTOKITPAT: $(OCTOKITPAT)
48-
- task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
48+
- task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@3
4949
displayName: Run CredScan
5050
condition: in(variables['system.pullRequest.targetBranch'], 'generation', 'main')
5151
inputs:
@@ -76,7 +76,7 @@ jobs:
7676
script: ./tools/CleanupBuild.ps1
7777
pwsh: true
7878

79-
- task: PoliCheck@1
79+
- task: PoliCheck@2
8080
displayName: Run PoliCheck
8181
inputs:
8282
targetArgument: $(Build.SourcesDirectory)/artifacts/Debug

‎.github/fabricbot.json

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1531,10 +1531,14 @@
15311531
"Compute"
15321532
],
15331533
"mentionees": [
1534-
"amjads1",
1535-
"avirishuv",
1536-
"vaibhav-agar",
1537-
"Drewm3"
1534+
"Drewm3",
1535+
"TravisCragg-MSFT",
1536+
"nikhilpatel909",
1537+
"sandeepraichura",
1538+
"hilaryw29",
1539+
"GabstaMSFT",
1540+
"ramankumarlive",
1541+
"ushnaarshadkhan"
15381542
]
15391543
},
15401544
{
@@ -1543,8 +1547,8 @@
15431547
"Compute - Extensions"
15441548
],
15451549
"mentionees": [
1546-
"amjads1",
1547-
"Drewm3"
1550+
"TravisCragg-MSFT",
1551+
"GabstaMSFT"
15481552
]
15491553
},
15501554
{
@@ -1553,8 +1557,8 @@
15531557
"Compute - Images"
15541558
],
15551559
"mentionees": [
1556-
"Drewm3",
1557-
"vaibhav-agar"
1560+
"TravisCragg-MSFT",
1561+
"sandeepraichura"
15581562
]
15591563
},
15601564
{
@@ -1563,8 +1567,9 @@
15631567
"Compute - Managed Disks"
15641568
],
15651569
"mentionees": [
1566-
"Drewm3",
1567-
"vaibhav-agar"
1570+
"TravisCragg-MSFT",
1571+
"ramankumarlive",
1572+
"ushnaarshadkhan"
15681573
]
15691574
},
15701575
{
@@ -1574,7 +1579,7 @@
15741579
],
15751580
"mentionees": [
15761581
"Drewm3",
1577-
"avirishuv"
1582+
"TravisCragg-MSFT"
15781583
]
15791584
},
15801585
{
@@ -1584,7 +1589,11 @@
15841589
],
15851590
"mentionees": [
15861591
"Drewm3",
1587-
"avirishuv"
1592+
"TravisCragg-MSFT",
1593+
"nikhilpatel909",
1594+
"sandeepraichura",
1595+
"hilaryw29",
1596+
"GabstaMSFT"
15881597
]
15891598
},
15901599
{
@@ -1593,8 +1602,8 @@
15931602
"Compute - VMSS"
15941603
],
15951604
"mentionees": [
1596-
"Drewm3",
1597-
"avirishuv"
1605+
"TravisCragg-MSFT",
1606+
"hilaryw29"
15981607
]
15991608
},
16001609
{

‎src/Accounts/Accounts/Az.Accounts.psd1

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 3/6/2023
6+
# Generated on: 3/10/2023
77
#
88

99
@{
@@ -12,7 +12,7 @@
1212
# RootModule = ''
1313

1414
# Version number of this module.
15-
ModuleVersion = '2.12.0'
15+
ModuleVersion = '2.12.1'
1616

1717
# Supported PSEditions
1818
CompatiblePSEditions = 'Core', 'Desktop'
@@ -147,11 +147,7 @@ PrivateData = @{
147147
# IconUri = ''
148148

149149
# ReleaseNotes of this module
150-
ReleaseNotes = '* Fixed the issue that errors related to WAM are thrown when it is not enabled. [#20871] [#20824]
151-
* Updated Azure.Core library to 1.28.0.
152-
* Fixed an issue that the helper message about missing modules shows up at the wrong time. [#19228]
153-
* Added a hint message for some resource creation cmdlets when there is another region which may reduce the costs.
154-
* Supported environment initialization and auto-discovery with ArmMetadata of API version 2022-09-01.'
150+
ReleaseNotes = '* Fixed an issue that broke some cmdlets in Az.Synapse module.'
155151

156152
# Prerelease string of this module
157153
# Prerelease = ''

‎src/Accounts/Accounts/ChangeLog.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020

2121
## Upcoming Release
2222

23+
## Version 2.12.1
24+
* Fixed an issue that broke some cmdlets in Az.Synapse module.
25+
2326
## Version 2.12.0
2427
* Fixed the issue that errors related to WAM are thrown when it is not enabled. [#20871] [#20824]
2528
* Updated Azure.Core library to 1.28.0.

‎src/Accounts/Accounts/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
// You can specify all the values or you can default the Build and Revision Numbers
4444
// by using the '*' as shown below:
4545

46-
[assembly: AssemblyVersion("2.12.0")]
47-
[assembly: AssemblyFileVersion("2.12.0")]
46+
[assembly: AssemblyVersion("2.12.1")]
47+
[assembly: AssemblyFileVersion("2.12.1")]
4848
#if !SIGN
4949
[assembly: InternalsVisibleTo("Microsoft.Azure.PowerShell.Cmdlets.Accounts.Test")]
5050
#endif

‎src/Accounts/AssemblyLoading/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@
4242
// You can specify all the values or you can default the Build and Revision Numbers
4343
// by using the '*' as shown below:
4444
// [assembly: AssemblyVersion("1.0.*")]
45-
[assembly: AssemblyVersion("2.11.2")]
46-
[assembly: AssemblyFileVersion("2.11.2")]
45+
[assembly: AssemblyVersion("2.12.1")]
46+
[assembly: AssemblyFileVersion("2.12.1")]

‎src/Accounts/Authentication/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
// You can specify all the values or you can default the Build and Revision Numbers
4444
// by using the '*' as shown below:
4545
// [assembly: AssemblyVersion("1.0.*")]
46-
[assembly: AssemblyVersion("2.12.0")]
47-
[assembly: AssemblyFileVersion("2.12.0")]
46+
[assembly: AssemblyVersion("2.12.1")]
47+
[assembly: AssemblyFileVersion("2.12.1")]
4848
#if !SIGN
4949
[assembly: InternalsVisibleTo("Microsoft.Azure.PowerShell.Authentication.Test")]
5050
#endif

‎src/Accounts/AuthenticationAssemblyLoadContext/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@
4242
// You can specify all the values or you can default the Build and Revision Numbers
4343
// by using the '*' as shown below:
4444
// [assembly: AssemblyVersion("1.0.*")]
45-
[assembly: AssemblyVersion("2.11.2")]
46-
[assembly: AssemblyFileVersion("2.11.2")]
45+
[assembly: AssemblyVersion("2.12.1")]
46+
[assembly: AssemblyFileVersion("2.12.1")]

‎src/Accounts/Authenticators/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,5 @@
4848
// You can specify all the values or you can default the Build and Revision Numbers
4949
// by using the '*' as shown below:
5050
// [assembly: AssemblyVersion("1.0.*")]
51-
[assembly: AssemblyVersion("2.12.0")]
52-
[assembly: AssemblyFileVersion("2.12.0")]
51+
[assembly: AssemblyVersion("2.12.1")]
52+
[assembly: AssemblyFileVersion("2.12.1")]

‎src/Batch/Batch.Test/Batch.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PackageReference Include="Microsoft.Azure.Batch" Version="15.4.0" />
1717
<PackageReference Include="Microsoft.Azure.Management.Batch" Version="15.0.0" />
1818
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
19-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="25.0.0" />
19+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="26.0.0" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="25.0.0" />
14+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="26.0.0" />
1515
<PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="8.4.0" />
1616
</ItemGroup>
1717

‎src/Compute/Compute.Test/Compute.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
1515
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="60.0.0" />
1616
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="4.0.0-preview.1" />
17-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="25.0.0" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="26.0.0" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src/Compute/Compute/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
-->
2222
## Upcoming Release
2323
* Added `-NetworkAccessPolicy` parameter to `New-AzSnapshotUpdateConfig`.
24+
* Added `-SharedGalleryImageId` parameter to `New-AzVM`, `New-AzVmConfig`, `New-AzVmss`, `New-AzVmssConfig`, `Update-AzVmss`, and `Set-AzVmssStorageProfile`.
2425

2526
## Version 5.5.0
2627
* Added breaking change message for `New-AzVmss`.

‎src/Compute/Compute/Generated/VirtualMachineScaleSet/Config/NewAzureRmVmssConfigCommand.cs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,11 @@ public partial class NewAzureRmVmssConfigCommand : Microsoft.Azure.Commands.Reso
310310
[ResourceIdCompleter("Microsoft.Compute galleries/images/versions")]
311311
public string ImageReferenceId { get; set; }
312312

313+
[Parameter(
314+
Mandatory = false,
315+
HelpMessage = "Specified the shared gallery image unique id for vm deployment. This can be fetched from shared gallery image GET call.")]
316+
public string SharedGalleryImageId { get; set; }
317+
313318
protected override void ProcessRecord()
314319
{
315320
if (ShouldProcess("VirtualMachineScaleSet", "New"))
@@ -769,6 +774,25 @@ private void Run()
769774
vVirtualMachineProfile.StorageProfile.ImageReference.Id = this.ImageReferenceId;
770775
}
771776

777+
if (this.IsParameterBound(c => c.SharedGalleryImageId))
778+
{
779+
if (vVirtualMachineProfile == null)
780+
{
781+
vVirtualMachineProfile = new PSVirtualMachineScaleSetVMProfile();
782+
}
783+
784+
if (vVirtualMachineProfile.StorageProfile == null)
785+
{
786+
vVirtualMachineProfile.StorageProfile = new VirtualMachineScaleSetStorageProfile();
787+
}
788+
789+
if (vVirtualMachineProfile.StorageProfile.ImageReference == null)
790+
{
791+
vVirtualMachineProfile.StorageProfile.ImageReference = new ImageReference();
792+
}
793+
vVirtualMachineProfile.StorageProfile.ImageReference.SharedGalleryImageId = this.SharedGalleryImageId;
794+
}
795+
772796
var vVirtualMachineScaleSet = new PSVirtualMachineScaleSet
773797
{
774798
Overprovision = this.IsParameterBound(c => c.Overprovision) ? this.Overprovision : (bool?)null,

‎src/Compute/Compute/Generated/VirtualMachineScaleSet/Config/SetAzureRmVmssStorageProfileCommand.cs

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,11 @@ public partial class SetAzureRmVmssStorageProfileCommand : Microsoft.Azure.Comma
175175
HelpMessage = "ResourceId of the disk encryption set to use for enabling encryption at rest.")]
176176
public string SecureVMDiskEncryptionSet { get; set; }
177177

178+
[Parameter(
179+
Mandatory = false,
180+
HelpMessage = "Specified the shared gallery image unique id for vm deployment. This can be fetched from shared gallery image GET call.")]
181+
public string SharedGalleryImageId { get; set; }
182+
178183
protected override void ProcessRecord()
179184
{
180185
if (ShouldProcess("VirtualMachineScaleSet", "Set"))
@@ -285,6 +290,26 @@ private void Run()
285290
this.VirtualMachineScaleSet.VirtualMachineProfile.StorageProfile.ImageReference.Id = this.ImageReferenceId;
286291
}
287292

293+
if (this.IsParameterBound(c => c.SharedGalleryImageId))
294+
{
295+
// VirtualMachineProfile
296+
if (this.VirtualMachineScaleSet.VirtualMachineProfile == null)
297+
{
298+
this.VirtualMachineScaleSet.VirtualMachineProfile = new PSVirtualMachineScaleSetVMProfile();
299+
}
300+
// StorageProfile
301+
if (this.VirtualMachineScaleSet.VirtualMachineProfile.StorageProfile == null)
302+
{
303+
this.VirtualMachineScaleSet.VirtualMachineProfile.StorageProfile = new VirtualMachineScaleSetStorageProfile();
304+
}
305+
// ImageReference
306+
if (this.VirtualMachineScaleSet.VirtualMachineProfile.StorageProfile.ImageReference == null)
307+
{
308+
this.VirtualMachineScaleSet.VirtualMachineProfile.StorageProfile.ImageReference = new ImageReference();
309+
}
310+
this.VirtualMachineScaleSet.VirtualMachineProfile.StorageProfile.ImageReference.SharedGalleryImageId = this.SharedGalleryImageId;
311+
}
312+
288313
if (this.IsParameterBound(c => c.OsDiskName))
289314
{
290315
// VirtualMachineProfile

‎src/Compute/Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetUpdateMethod.cs

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,11 @@ public override void ExecuteCmdlet()
371371
ValueFromPipelineByPropertyName = true)]
372372
public int RegularPriorityPercentage { get; set; }
373373

374+
[Parameter(
375+
Mandatory = false,
376+
HelpMessage = "Specified the shared gallery image unique id for vm deployment. This can be fetched from shared gallery image GET call.")]
377+
public string SharedGalleryImageId { get; set; }
378+
374379
private void BuildPatchObject()
375380
{
376381
if (this.IsParameterBound(c => c.AutomaticOSUpgrade))
@@ -590,6 +595,28 @@ private void BuildPatchObject()
590595
this.VirtualMachineScaleSetUpdate.VirtualMachineProfile.StorageProfile.ImageReference.Id = this.ImageReferenceId;
591596
}
592597

598+
if (this.IsParameterBound(c => c.SharedGalleryImageId))
599+
{
600+
if (this.VirtualMachineScaleSetUpdate == null)
601+
{
602+
this.VirtualMachineScaleSetUpdate = new VirtualMachineScaleSetUpdate();
603+
}
604+
if (this.VirtualMachineScaleSetUpdate.VirtualMachineProfile == null)
605+
{
606+
this.VirtualMachineScaleSetUpdate.VirtualMachineProfile = new VirtualMachineScaleSetUpdateVMProfile();
607+
}
608+
if (this.VirtualMachineScaleSetUpdate.VirtualMachineProfile.StorageProfile == null)
609+
{
610+
this.VirtualMachineScaleSetUpdate.VirtualMachineProfile.StorageProfile = new VirtualMachineScaleSetUpdateStorageProfile();
611+
}
612+
if (this.VirtualMachineScaleSetUpdate.VirtualMachineProfile.StorageProfile.ImageReference == null)
613+
{
614+
this.VirtualMachineScaleSetUpdate.VirtualMachineProfile.StorageProfile.ImageReference = new ImageReference();
615+
}
616+
this.VirtualMachineScaleSetUpdate.VirtualMachineProfile.StorageProfile.ImageReference.SharedGalleryImageId = this.SharedGalleryImageId;
617+
}
618+
619+
593620
if (this.IsParameterBound(c => c.ImageReferenceOffer))
594621
{
595622
if (this.VirtualMachineScaleSetUpdate == null)
@@ -1412,6 +1439,27 @@ private void BuildPutObject()
14121439
this.VirtualMachineScaleSet.VirtualMachineProfile.StorageProfile.ImageReference.Id = this.ImageReferenceId;
14131440
}
14141441

1442+
if (this.IsParameterBound(c => c.SharedGalleryImageId))
1443+
{
1444+
if (this.VirtualMachineScaleSetUpdate == null)
1445+
{
1446+
this.VirtualMachineScaleSetUpdate = new VirtualMachineScaleSetUpdate();
1447+
}
1448+
if (this.VirtualMachineScaleSetUpdate.VirtualMachineProfile == null)
1449+
{
1450+
this.VirtualMachineScaleSetUpdate.VirtualMachineProfile = new VirtualMachineScaleSetUpdateVMProfile();
1451+
}
1452+
if (this.VirtualMachineScaleSetUpdate.VirtualMachineProfile.StorageProfile == null)
1453+
{
1454+
this.VirtualMachineScaleSetUpdate.VirtualMachineProfile.StorageProfile = new VirtualMachineScaleSetUpdateStorageProfile();
1455+
}
1456+
if (this.VirtualMachineScaleSetUpdate.VirtualMachineProfile.StorageProfile.ImageReference == null)
1457+
{
1458+
this.VirtualMachineScaleSetUpdate.VirtualMachineProfile.StorageProfile.ImageReference = new ImageReference();
1459+
}
1460+
this.VirtualMachineScaleSetUpdate.VirtualMachineProfile.StorageProfile.ImageReference.SharedGalleryImageId = this.SharedGalleryImageId;
1461+
}
1462+
14151463
if (this.IsParameterBound(c => c.ImageReferenceOffer))
14161464
{
14171465
if (this.VirtualMachineScaleSet.VirtualMachineProfile == null)

‎src/Compute/Compute/Manual/VirtualMachineScaleSetCreateOrUpdateMethod.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,12 @@ public partial class NewAzureRmVmss : ComputeAutomationBaseCmdlet
221221
[PSArgumentCompleter("SCSI", "NVMe")]
222222
public string DiskControllerType { get; set; }
223223

224+
[Parameter(
225+
Mandatory = false,
226+
ParameterSetName = SimpleParameterSet,
227+
HelpMessage = "Specified the shared gallery image unique id for vm deployment. This can be fetched from shared gallery image GET call.")]
228+
public string SharedGalleryImageId { get; set; }
229+
224230
const int FirstPortRangeStart = 50000;
225231

226232
sealed class Parameters : IParameters<VirtualMachineScaleSet>
@@ -414,7 +420,8 @@ private async Task<ResourceConfig<VirtualMachineScaleSet>> SimpleParameterSetNor
414420
userData: _cmdlet.IsParameterBound(c => c.UserData) ? _cmdlet.UserData : null,
415421
imageReferenceId: _cmdlet.IsParameterBound(c => c.ImageReferenceId) ? _cmdlet.ImageReferenceId : null,
416422
auxAuthHeader: auxAuthHeader,
417-
diskControllerType: _cmdlet.DiskControllerType
423+
diskControllerType: _cmdlet.DiskControllerType,
424+
sharedImageGalleryId: _cmdlet.IsParameterBound(c => c.SharedGalleryImageId) ? _cmdlet.SharedGalleryImageId : null
418425
);
419426
}
420427

0 commit comments

Comments
 (0)