Skip to content

Commit 887f438

Browse files
yifanz7yifanz7
committed
merge main
2 parents e93b9f7 + 821f11b commit 887f438

File tree

471 files changed

+30300
-8464
lines changed

Some content is hidden

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

471 files changed

+30300
-8464
lines changed

‎.ci-config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@
113113
"help:module",
114114
"signature:module",
115115
"test:dependence-module",
116-
"file-change:module"
116+
"file-change:module",
117+
"ux:module"
117118
]
118119
},
119120
{

‎build.proj

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -239,33 +239,6 @@
239239
<!-- Everything except Publish -->
240240
<Target Name="Full" DependsOnTargets="Clean;Build;OnPremChecks;CopyAboutTopics;GenerateHelp;StaticAnalysis;Test" />
241241

242-
<Target Name="StaticAnalysisBreakingChange" Condition="'$(RunStaticAnalysis)' == 'true'">
243-
<Message Importance="high" Text="Running static analysis for breaking change..." />
244-
<MakeDir Directories="$(StaticAnalysisOutputDirectory)" />
245-
246-
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;.\tools\ExecuteCIStep.ps1 -StaticAnalysisBreakingChange -RepoArtifacts $(RepoArtifacts) -Configuration $(Configuration) -StaticAnalysisOutputDirectory $(StaticAnalysisOutputDirectory)&quot;" />
247-
</Target>
248-
249-
<Target Name="StaticAnalysisDependency" Condition="'$(RunStaticAnalysis)' == 'true'">
250-
<Message Importance="high" Text="Running static analysis for dependency..." />
251-
<MakeDir Directories="$(StaticAnalysisOutputDirectory)" />
252-
253-
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;.\tools\ExecuteCIStep.ps1 -StaticAnalysisDependency -RepoArtifacts $(RepoArtifacts) -Configuration $(Configuration) -StaticAnalysisOutputDirectory $(StaticAnalysisOutputDirectory)&quot;" />
254-
</Target>
255-
256-
<Target Name="StaticAnalysisSignature" Condition="'$(RunStaticAnalysis)' == 'true'">
257-
<Message Importance="high" Text="Running static analysis for signature..." />
258-
<MakeDir Directories="$(StaticAnalysisOutputDirectory)" />
259-
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;.\tools\ExecuteCIStep.ps1 -StaticAnalysisSignature -RepoArtifacts $(RepoArtifacts) -Configuration $(Configuration) -StaticAnalysisOutputDirectory $(StaticAnalysisOutputDirectory)&quot;" />
260-
</Target>
261-
262-
<Target Name="StaticAnalysisHelp" Condition="'$(RunStaticAnalysis)' == 'true'">
263-
<Message Importance="high" Text="Running static analysis for help..." />
264-
<MakeDir Directories="$(StaticAnalysisOutputDirectory)" />
265-
266-
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;.\tools\ExecuteCIStep.ps1 -StaticAnalysisHelp -RepoArtifacts $(RepoArtifacts) -Configuration $(Configuration) -StaticAnalysisOutputDirectory $(StaticAnalysisOutputDirectory)&quot;" />
267-
</Target>
268-
269242
<Target Name="StaticAnalysisExample" Condition="'$(RunStaticAnalysis)' == 'true'" AfterTargets="StaticAnalysisHelp">
270243
<Message Importance="high" Text="Running static analysis for PowerShell examples..." />
271244
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(RepoTools)/StaticAnalysis/ExampleAnalyzer/Measure-MarkdownOrScript.ps1 -MarkdownPaths $(RepoArtifacts)/FilesChanged.txt -RulePaths $(RepoTools)/StaticAnalysis/ExampleAnalyzer/AnalyzeRules/*.psm1 &quot;"/>
@@ -276,9 +249,11 @@
276249
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;.\tools\StaticAnalysis\FileChangeAnalyzer\Test-FileChange.ps1 &quot;" />
277250
</Target>
278251

279-
<Target Name="StaticAnalysis" DependsOnTargets="StaticAnalysisBreakingChange;StaticAnalysisDependency;StaticAnalysisSignature;StaticAnalysisHelp;StaticAnalysisExample;StaticAnalysisFileChange">
252+
<Target Name="StaticAnalysis" DependsOnTargets="StaticAnalysisExample;StaticAnalysisFileChange">
280253
<Message Importance="high" Text="Running static analysis..." />
281254

255+
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;.\tools\ExecuteCIStep.ps1 -StaticAnalysis -RepoArtifacts $(RepoArtifacts) -Configuration $(Configuration) -StaticAnalysisOutputDirectory $(StaticAnalysisOutputDirectory)&quot;" />
256+
282257
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(RepoTools)/StaticAnalysis/CollectStaticAnalysisPipelineResult.ps1 -StaticAnalysisOutputDirectory $(StaticAnalysisOutputDirectory) &quot;"/>
283258
<Exec Command="dotnet $(RepoArtifacts)StaticAnalysis/StaticAnalysis.Netcore.dll -p $(RepoArtifacts)$(Configuration) -r $(StaticAnalysisOutputDirectory) --analyzers check-error" />
284259
<OnError ExecuteTargets="StaticAnalysisErrorMessage" />

‎src/Accounts/Accounts/Utilities/CommandMappings.json

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3191,16 +3191,25 @@
31913191
"Suspend-AzMigrateServerReplication": {}
31923192
},
31933193
"Az.MixedReality": {
3194-
"Get-AzSpatialAnchorsAccount": {},
3195-
"Get-AzSpatialAnchorsAccountKey": {},
3196-
"New-AzSpatialAnchorsAccount": {},
3197-
"New-AzSpatialAnchorsAccountKey": {},
3198-
"Remove-AzSpatialAnchorsAccount": {},
3199-
"Get-AzRemoteRenderingAccount": {},
3200-
"Get-AzRemoteRenderingAccountKey": {},
3201-
"New-AzRemoteRenderingAccount": {},
3202-
"New-AzRemoteRenderingAccountKey": {},
3203-
"Remove-AzRemoteRenderingAccount": {}
3194+
"Get-AzMixedRealityObjectAnchorsAccount": {},
3195+
"Get-AzMixedRealityObjectAnchorsAccountKey": {},
3196+
"Get-AzMixedRealityRemoteRenderingAccount": {},
3197+
"Get-AzMixedRealityRemoteRenderingAccountKey": {},
3198+
"Get-AzMixedRealitySpatialAnchorsAccount": {},
3199+
"Get-AzMixedRealitySpatialAnchorsAccountKey": {},
3200+
"New-AzMixedRealityObjectAnchorsAccount": {},
3201+
"New-AzMixedRealityObjectAnchorsAccountKey": {},
3202+
"New-AzMixedRealityRemoteRenderingAccount": {},
3203+
"New-AzMixedRealityRemoteRenderingAccountKey": {},
3204+
"New-AzMixedRealitySpatialAnchorsAccount": {},
3205+
"New-AzMixedRealitySpatialAnchorsAccountKey": {},
3206+
"Remove-AzMixedRealityObjectAnchorsAccount": {},
3207+
"Remove-AzMixedRealityRemoteRenderingAccount": {},
3208+
"Remove-AzMixedRealitySpatialAnchorsAccount": {},
3209+
"Test-AzMixedRealityNameAvailability": {},
3210+
"Update-AzMixedRealityObjectAnchorsAccount": {},
3211+
"Update-AzMixedRealityRemoteRenderingAccount": {},
3212+
"Update-AzMixedRealitySpatialAnchorsAccount": {}
32043213
},
32053214
"Az.Monitor": {
32063215
"Get-AzMetricDefinition": {},

‎src/Aks/Aks.Test/ScenarioTests/KubernetesTests.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,13 @@ public void TestManagedIdentity()
7979
{
8080
TestRunner.RunTestScript("Test-ManagedIdentity");
8181
}
82+
83+
84+
[Fact]
85+
[Trait(Category.AcceptanceType, Category.CheckIn)]
86+
public void TestOsSku()
87+
{
88+
TestRunner.RunTestScript("Test-OSSku");
89+
}
8290
}
8391
}

‎src/Aks/Aks.Test/ScenarioTests/KubernetesTests.ps1

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,4 +346,45 @@ function Test-ManagedIdentity
346346
{
347347
Remove-AzResourceGroup -Name $resourceGroupName -Force
348348
}
349+
}
350+
351+
function Test-OSSku
352+
{
353+
# Setup
354+
$resourceGroupName = Get-RandomResourceGroupName
355+
$kubeClusterName = Get-RandomClusterName
356+
$location = 'eastus'
357+
$nodeVmSize = "Standard_D2_v2"
358+
359+
try
360+
{
361+
New-AzResourceGroup -Name $resourceGroupName -Location $location
362+
363+
New-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName -NodeVmSize $nodeVmSize -NodeCount 1 -NodeOsSKU "CBLMariner"
364+
$cluster = Get-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName
365+
Assert-AreEqual 'default' $cluster.AgentPoolProfiles.Name
366+
Assert-AreEqual 'Linux' $cluster.AgentPoolProfiles.OsType
367+
Assert-AreEqual 'CBLMariner' $cluster.AgentPoolProfiles.OsSKU
368+
369+
New-AzAksNodePool -ResourceGroupName $resourceGroupName -ClusterName $kubeClusterName -Name "pool2" -OsType "Windows" -OsSKU "Windows2022" -Count 1 -VmSetType VirtualMachineScaleSets
370+
$pools = Get-AzAksNodePool -ResourceGroupName $resourceGroupName -ClusterName $kubeClusterName
371+
Assert-AreEqual 2 $pools.Count
372+
Assert-AreEqualArray "Linux" ($pools | where {$_.Name -eq "default"}).OsType
373+
Assert-AreEqualArray "CBLMariner" ($pools | where {$_.Name -eq "default"}).OsSKU
374+
Assert-AreEqualArray "Windows" ($pools | where {$_.Name -eq "pool2"}).OsType
375+
Assert-AreEqualArray "Windows2022" ($pools | where {$_.Name -eq "pool2"}).OsSKU
376+
377+
$cluster = Get-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName
378+
Assert-AreEqual 2 $cluster.AgentPoolProfiles.Count
379+
Assert-AreEqualArray "Linux" ($cluster.AgentPoolProfiles | where {$_.Name -eq "default"}).OsType
380+
Assert-AreEqualArray "CBLMariner" ($cluster.AgentPoolProfiles | where {$_.Name -eq "default"}).OsSKU
381+
Assert-AreEqualArray "Windows" ($cluster.AgentPoolProfiles | where {$_.Name -eq "pool2"}).OsType
382+
Assert-AreEqualArray "Windows2022" ($cluster.AgentPoolProfiles | where {$_.Name -eq "pool2"}).OsSKU
383+
384+
$cluster | Remove-AzAksCluster -Force
385+
}
386+
finally
387+
{
388+
Remove-AzResourceGroup -Name $resourceGroupName -Force
389+
}
349390
}

0 commit comments

Comments
 (0)