Skip to content

Commit 088946d

Browse files
authored
Revert "[DO NOT SQUASH] [Az.RecoveryServices.Backup] syncing Az.RecoveryServices-preview branch with master (#14462)"
This reverts commit 63bec00.
1 parent 63bec00 commit 088946d

File tree

8,130 files changed

+268133
-647782
lines changed

Some content is hidden

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

8,130 files changed

+268133
-647782
lines changed

.azure-pipelines/sign-tool-predictor.yml

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ pool:
55

66
steps:
77
- task: PowerShell@2
8-
displayName: Install PS 7.2
8+
displayName: Install PS 7.1.0-preview.7
99
inputs:
1010
targetType: 'inline'
1111
script: |
12-
$url = "https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.3/PowerShell-7.2.0-preview.3-win-x64.zip"
13-
$output = Join-Path -Path $(Pipeline.Workspace) -ChildPath "./PowerShell-7.2.0-preview.3-win-x64.zip"
12+
$url = "https://github.com/PowerShell/PowerShell/releases/download/v7.1.0-preview.7/PowerShell-7.1.0-preview.7-win-x64.zip"
13+
$output = Join-Path -Path $(Pipeline.Workspace) -ChildPath "./PowerShell-7.1.0-preview.7-win-x64.zip"
1414
(New-Object System.Net.WebClient).DownloadFile($url, $output)
15-
$pwshPath= Join-Path -Path $(Pipeline.Workspace) -ChildPath "./PowerShell-7.2.0-preview.3/"
15+
$pwshPath= Join-Path -Path $(Pipeline.Workspace) -ChildPath "./PowerShell-7.1.0-preview.7/"
1616
Expand-Archive -Path $output -DestinationPath $pwshPath
1717
$pwshFullPath = Convert-Path $pwshPath
1818
Write-Host $pwshFullPath
@@ -22,32 +22,25 @@ steps:
2222
inputs:
2323
targetType: inline
2424
script: |
25-
$pwshPath= Join-Path -Path $(Pipeline.Workspace) -ChildPath "./PowerShell-7.2.0-preview.3/pwsh.exe"
25+
$pwshPath= Join-Path -Path $(Pipeline.Workspace) -ChildPath "./PowerShell-7.1.0-preview.7/pwsh.exe"
2626
$command = "`$PSVersionTable `
2727
Install-Module platyPS -Force -Confirm:`$false -Scope CurrentUser `
2828
Install-Module PowerShellGet -Force -Confirm:`$false -Scope CurrentUser -SkipPublisherCheck `
2929
Install-Module Az -Repository PSGallery -RequiredVersion 3.0.0 -Confirm:`$false -Scope CurrentUser -AllowClobber -Force"
3030
Invoke-Command -ScriptBlock { param ($pwshPath, $command) & $pwshPath -Command $command } -ArgumentList $pwshPath, $command
3131
3232
- task: UseDotNet@2
33-
displayName: 'Install DotNet 6.0 SDK'
33+
displayName: 'Use .NET Core sdk'
3434
inputs:
35-
packageType: 'sdk'
36-
version: '6.0.x'
37-
includePreviewVersions: true
35+
packageType: sdk
36+
version: 5.0.100-rc.1.20452.10
3837

3938
- task: DotNetCoreCLI@2
4039
displayName: 'Build'
4140
inputs:
4241
command: custom
4342
custom: msbuild
44-
arguments: 'tools\Az.Tools.Predictor\build.proj /target:"Clean;Build;GenerateHelp" /p:Configuration=Release /p:PowerShellCoreCommandPrefix="$(Pipeline.Workspace)\\PowerShell-7.2.0-preview.3\\pwsh.exe -NonInteractive -NoLogo -NoProfile -Command"'
45-
46-
- task: UseDotNet@2
47-
displayName: 'Install DotNet 2.1 Runtime for Signing'
48-
inputs:
49-
packageType: 'runtime'
50-
version: '2.1.x'
43+
arguments: 'tools\Az.Tools.Predictor\build.proj /target:"Clean;Build" /p:Configuration=Release'
5144

5245
- task: EsrpCodeSigning@1
5346
displayName: 'Signing'
@@ -90,7 +83,7 @@ steps:
9083
inputs:
9184
command: custom
9285
custom: msbuild
93-
arguments: 'tools\Az.Tools.Predictor\build.proj /target:"Package" /p:Configuration=Release /p:PowerShellCoreCommandPrefix="$(Pipeline.Workspace)\\PowerShell-7.2.0-preview.3\\pwsh.exe -NonInteractive -NoLogo -NoProfile -Command" '
86+
arguments: 'tools\Az.Tools.Predictor\build.proj /target:"Package" /p:Configuration=Release /p:PowerShellCoreCommandPrefix="$(Pipeline.Workspace)\\PowerShell-7.1.0-preview.7\\pwsh.exe -NonInteractive -NoLogo -NoProfile -Command" '
9487

9588
- task: PublishPipelineArtifact@0
9689
displayName: 'Save artifacts'

.ci-config.json

Lines changed: 0 additions & 269 deletions
This file was deleted.

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
# To make sure Network PRs go to the right branch, e.g. network-april
22
/src/Network/ @MikhailTryakhov
33
/src/Compute/ @bilaakpan-ms @sandido @dkulkarni-ms @haagha @madewithsmiles @MS-syh2qs @grizzlytheodore
4-
/src/PolicyInsights/ @pilor

0 commit comments

Comments
 (0)