Skip to content

Commit c3e8346

Browse files
authored
Merge branch 'Azure:main' into regressiontests
2 parents 793f696 + ca81fc1 commit c3e8346

File tree

229 files changed

+16568
-1918
lines changed

Some content is hidden

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

229 files changed

+16568
-1918
lines changed

.ci-config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,5 +299,6 @@
299299
"Resources",
300300
"Storage",
301301
"Websites"
302-
]
302+
],
303+
"artifactPipelineInfoFolder": "artifacts/PipelineResult"
303304
}

build.proj

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -236,35 +236,34 @@
236236
<!-- Everything except Publish -->
237237
<Target Name="Full" DependsOnTargets="Clean;Build;OnPremChecks;CopyAboutTopics;GenerateHelp;StaticAnalysis;Test" />
238238

239-
<Target Name="StaticAnalysisBreakingChange" Condition="'$(RunStaticAnalysis)' == 'true'" DependsOnTargets="Build">
239+
<Target Name="StaticAnalysisBreakingChange" Condition="'$(RunStaticAnalysis)' == 'true'">
240240
<Message Importance="high" Text="Running static analysis for breaking change..." />
241241
<MakeDir Directories="$(StaticAnalysisOutputDirectory)" />
242242

243-
<Exec Command="dotnet $(RepoArtifacts)StaticAnalysis/StaticAnalysis.Netcore.dll -p $(RepoArtifacts)$(Configuration) -r $(StaticAnalysisOutputDirectory) --analyzers breaking-change -u -m '%(FilterTaskResult.breaking-change)'" />
243+
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;.\tools\ExecuteCIStep.ps1 -StaticAnalysisBreakingChange -RepoArtifacts $(RepoArtifacts) -Configuration $(Configuration) -StaticAnalysisOutputDirectory $(StaticAnalysisOutputDirectory)&quot;" />
244244
</Target>
245245

246-
<Target Name="StaticAnalysisDependency" Condition="'$(RunStaticAnalysis)' == 'true'" DependsOnTargets="Build">
246+
<Target Name="StaticAnalysisDependency" Condition="'$(RunStaticAnalysis)' == 'true'">
247247
<Message Importance="high" Text="Running static analysis for dependency..." />
248248
<MakeDir Directories="$(StaticAnalysisOutputDirectory)" />
249249

250-
<Exec Command="dotnet $(RepoArtifacts)StaticAnalysis/StaticAnalysis.Netcore.dll -p $(RepoArtifacts)$(Configuration) -r $(StaticAnalysisOutputDirectory) --analyzers dependency -u -m '%(FilterTaskResult.breaking-change)'" />
250+
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;.\tools\ExecuteCIStep.ps1 -StaticAnalysisDependency -RepoArtifacts $(RepoArtifacts) -Configuration $(Configuration) -StaticAnalysisOutputDirectory $(StaticAnalysisOutputDirectory)&quot;" />
251251
</Target>
252252

253-
<Target Name="StaticAnalysisSignature" Condition="'$(RunStaticAnalysis)' == 'true'" DependsOnTargets="Build">
253+
<Target Name="StaticAnalysisSignature" Condition="'$(RunStaticAnalysis)' == 'true'">
254254
<Message Importance="high" Text="Running static analysis for signature..." />
255255
<MakeDir Directories="$(StaticAnalysisOutputDirectory)" />
256-
257-
<Exec Command="dotnet $(RepoArtifacts)StaticAnalysis/StaticAnalysis.Netcore.dll -p $(RepoArtifacts)$(Configuration) -r $(StaticAnalysisOutputDirectory) --analyzers signature -u -m '%(FilterTaskResult.signature)'" />
256+
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;.\tools\ExecuteCIStep.ps1 -StaticAnalysisSignature -RepoArtifacts $(RepoArtifacts) -Configuration $(Configuration) -StaticAnalysisOutputDirectory $(StaticAnalysisOutputDirectory)&quot;" />
258257
</Target>
259258

260-
<Target Name="StaticAnalysisHelp" Condition="'$(RunStaticAnalysis)' == 'true'" DependsOnTargets="Build">
259+
<Target Name="StaticAnalysisHelp" Condition="'$(RunStaticAnalysis)' == 'true'">
261260
<Message Importance="high" Text="Running static analysis for help..." />
262261
<MakeDir Directories="$(StaticAnalysisOutputDirectory)" />
263262

264-
<Exec Command="dotnet $(RepoArtifacts)StaticAnalysis/StaticAnalysis.Netcore.dll -p $(RepoArtifacts)$(Configuration) -r $(StaticAnalysisOutputDirectory) --analyzers help -u -m '%(FilterTaskResult.help)'" />
263+
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;.\tools\ExecuteCIStep.ps1 -StaticAnalysisHelp -RepoArtifacts $(RepoArtifacts) -Configuration $(Configuration) -StaticAnalysisOutputDirectory $(StaticAnalysisOutputDirectory)&quot;" />
265264
</Target>
266265

267-
<Target Name="StaticAnalysisExample" Condition="'$(RunStaticAnalysis)' == 'true'" DependsOnTargets="Build" AfterTargets="StaticAnalysisHelp">
266+
<Target Name="StaticAnalysisExample" Condition="'$(RunStaticAnalysis)' == 'true'" AfterTargets="StaticAnalysisHelp">
268267
<Message Importance="high" Text="Running static analysis for PowerShell examples..." />
269268
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(RepoTools)/StaticAnalysis/ExampleAnalyzer/Measure-MarkdownOrScript.ps1 -MarkdownPaths $(RepoArtifacts)/FilesChanged.txt -RulePaths $(RepoTools)/StaticAnalysis/ExampleAnalyzer/AnalyzeRules/*.psm1 &quot;"/>
270269
</Target>
@@ -318,12 +317,12 @@
318317
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(DockerTools)/CleanArtifacts.ps1 -Docker $(DockerRoot) &quot;" />
319318
</Target>
320319

321-
<Target Name="Test" DependsOnTargets="FilterBuild" Condition="'$(IsGenerateBased)' == 'false'">
320+
<Target Name="Test" Condition="'$(IsGenerateBased)' == 'false'">
322321
<Message Importance="high" Text="Running check in tests..." />
323322
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
324323
<!-- https://github.com/Microsoft/msbuild/issues/3157#issuecomment-378002971 -->
325324
<!-- https://github.com/xunit/xunit/issues/1154#issuecomment-405366373 -->
326-
<Exec Command="dotnet test $(RepoArtifacts)Azure.PowerShell.sln --filter &quot;AcceptanceType=CheckIn%26RunType!=DesktopOnly&quot; --configuration $(Configuration) --framework $(TestFramework) --logger trx --results-directory &quot;$(TestOutputDirectory)&quot;" Condition="'$(TestCsprojList)' != ''" />
325+
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;.\tools\ExecuteCIStep.ps1 -Test -RepoArtifacts $(RepoArtifacts) -Configuration $(Configuration) -TestFramework $(TestFramework) -TestOutputDirectory $(TestOutputDirectory)&quot;" />
327326
<Message Importance="high" Text="Finish running tests..." />
328327
<OnError ExecuteTargets="TestFailureErrorMessage" />
329328
</Target>

src/Advisor/help/Get-AzAdvisorRecommendation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ Accept wildcard characters: False
123123
124124
### -Filter
125125
The filter to apply to the recommendations.
126-
Filter can be applied to properties ['ResourceId', 'ResourceGroup', 'RecommendationTypeGuid', '[Category](#category)'] with operators ['eq', 'and', 'or'].
126+
Filter can be applied to properties ['ResourceId', 'ResourceGroup', 'RecommendationTypeGuid', 'Category' with operators ['eq', 'and', 'or'].
127127
Example:
128128
- $filter=Category eq 'Cost' and ResourceGroup eq 'MyResourceGroup'
129129

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ $SASToken = New-AzStorageBlobSASToken -Context $ctx -Container $containerName -b
3333
$storAcc = Get-AzStorageAccount -ResourceGroupName $rgName -Name $storAccName
3434
$blob = Get-AzStorageBlob -Container $containerName -Blob $blobName -Context $storAcc.Context
3535
$SASToken = New-AzStorageBlobSASToken -Container $containerName -Blob $blobName -Permission rwd -Context $storAcc.Context
36-
$SASUri = $blob.ICloudBlob.Uri.AbsoluteUri + "?" +$SASToken
36+
$SASUri = $blob.ICloudBlob.Uri.AbsoluteUri + $SASToken
3737
New-AzGalleryApplicationVersion -ResourceGroupName $rgname -Location EastUS -GalleryName $galleryName -GalleryApplicationName $galleryApplicationName -name "0.1.0" -PackageFileLink $SASUri -Install "powershell -command 'Expand-Archive -Path package.zip -DestinationPath C:\\package\'" -Remove "del C:\\package"
3838
```
3939

src/DataProtection/Az.DataProtection.psd1

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

99
@{
@@ -145,8 +145,7 @@ PrivateData = @{
145145
# IconUri = ''
146146

147147
# ReleaseNotes of this module
148-
ReleaseNotes = '* Added support for automatic assignment of permissions for configure backup for DPP workloads - AzureDisk, AzureBlob, AzureDatabaseForPostgreSQL using Set-AzDataProtectionMSIPermission cmdlet
149-
* Added support for adding custom tags for new backup instance using New-AzDataProtectionBackupInstance cmdlet'
148+
# ReleaseNotes = ''
150149

151150
# Prerelease string of this module
152151
# Prerelease = ''

src/DataProtection/Changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
* Fixed list parameter set for `Get-AzDataProtectionBackupVault`
2122

2223
## Version 0.5.0
2324
* Added support for automatic assignment of permissions for configure backup for DPP workloads - AzureDisk, AzureBlob, AzureDatabaseForPostgreSQL using Set-AzDataProtectionMSIPermission cmdlet

0 commit comments

Comments
 (0)