Skip to content

Commit 2cc47e1

Browse files
authored
Merge pull request #27402 from kamboj-prjwl/kamboj-prjwl/release-network-2024-07-01
Merge branch release network 2024 07 01
2 parents 6c00e46 + 3e052d3 commit 2cc47e1

File tree

5,856 files changed

+899183
-443074
lines changed

Some content is hidden

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

5,856 files changed

+899183
-443074
lines changed

.azure-pipelines/PipelineSteps/build-steps.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ $buildProjPath = Join-Path $RepoRoot 'build.proj'
3030
if ($PowerShellPlatform) {
3131
$Env:PowerShellPlatform = $PowerShellPlatform
3232
}
33+
$CIPlanPath = Join-Path $RepoRoot 'artifacts' 'PipelineResult' 'CIPlan.json'
34+
New-Item -ItemType File -Path $CIPlanPath -Force
3335
dotnet msbuild $buildProjPath /t:FilterBuild "/p:FilesChangedOutputPath=$FilesChangedOutputPath;SubTasksFilePath=$SubTasksFilePath;IsSecurityCheck=$IsSecurityCheck"
3436
Write-Host -ForegroundColor DarkGreen "-------------------- End filtering changed files ... --------------------`n`n`n`n`n"
3537

.azure-pipelines/azure-powershell-ci.yml

Lines changed: 52 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,37 @@ variables:
3838
PowerShellPlatform: PowerShell Core
3939
AZURE_CLIENTS_SHOW_SECRETS_WARNING: true
4040

41+
schedules:
42+
- cron: 0 4 * * 0,1,2,3,4,5,6
43+
displayName: Daily Archive
44+
branches:
45+
include:
46+
- main
47+
4148
trigger:
4249
batch: true
4350
branches:
4451
include:
4552
- main
46-
53+
- release-*
54+
- Az.*
55+
- LTS
56+
- generation-LTS
57+
- stack-dev
58+
- preview
59+
- AzureRM
60+
- AzureRM6.13
61+
- AzureRM.*
62+
- DeploymentRollouts
63+
- Compute-*
64+
- test-filtering-branch
65+
- azvmremotingpreview
66+
- test-build-filter
67+
- generation
68+
- Azure
69+
exclude:
70+
- release-network-*
71+
4772
jobs:
4873
- job: Build
4974
displayName: Build
@@ -57,24 +82,24 @@ jobs:
5782
workspaceRepo: true
5883
- checkout: azure-powershell-devops
5984
path: "azure-powershell-devops"
60-
- task: PowerShell@2
61-
displayName: 'Get Github Access Token'
62-
inputs:
63-
targetType: inline
64-
pwsh: true
65-
script: |
66-
$ghToken = (& "$(Agent.BuildDirectory)/azure-powershell-devops/pipeline/scripts/Get-GithubToken.ps1")
67-
Write-Host "##vso[task.setvariable variable=GithubToken;issecret=true]$ghToken"
68-
# - template: util/get-github-pat-steps.yml
85+
# - task: PowerShell@2
86+
# displayName: 'Get Github Access Token'
87+
# inputs:
88+
# targetType: inline
89+
# pwsh: true
90+
# script: |
91+
# $ghToken = (& "$(Agent.BuildDirectory)/azure-powershell-devops/pipeline/scripts/Get-GithubToken.ps1")
92+
# Write-Host "##vso[task.setvariable variable=GithubToken;issecret=true]$ghToken"
93+
- template: util/get-github-pat-steps.yml
6994
- task: UseDotNet@2
70-
displayName: 'Use .NET Core sdk 6.0.x'
95+
displayName: 'Use .NET SDK for Build'
7196
inputs:
7297
packageType: sdk
73-
version: 6.0.x
98+
version: 8.x
7499
- task: NodeTool@0
75100
displayName: Install Autorest
76101
inputs:
77-
versionSpec: '14.17.1'
102+
versionSpec: '18.20.7'
78103
command: custom
79104
verbose: false
80105
customCommand: install autorest@latest
@@ -84,7 +109,11 @@ jobs:
84109
targetType: inline
85110
script: "$env:NODE_OPTIONS=\"--max-old-space-size=65536\""
86111
pwsh: true
87-
112+
- task: Npm@1
113+
displayName: Install tsp client
114+
inputs:
115+
command: custom
116+
customCommand: install -g @azure-tools/[email protected]
88117
- task: PowerShell@2
89118
displayName: 'Build'
90119
inputs:
@@ -110,15 +139,15 @@ jobs:
110139
Get-FilesChangedFromCommit -CommitId $_ | Foreach-Object { $filesChanged += $_ }
111140
}
112141
} elseif ("$(Build.reason)" -eq 'Manual') {
113-
$filesChanged += Get-OutdatedModuleFromTargetModule -RepoRoot "$(Working_Directory)" -TargetModule "${{ parameters.TargetModule }}" -ForceRegenerate $forceRegenerate
142+
$filesChanged += Get-OutdatedModuleFromTargetModule -RepoRoot "$(Working_Directory)" -TargetModule "${{ parameters.TargetModule }}" -ForceRegenerate $forceRegenerate | ForEach-Object { 'src/' + $_ }
114143
} elseif ("$(Build.reason)" -eq 'Schedule') {
115-
$filesChanged += Get-OutdatedModuleFromTargetModule -RepoRoot "$(Working_Directory)" -TargetModule "${{ parameters.TargetModule }}" -ForceRegenerate $forceRegenerate
144+
$filesChanged += Get-OutdatedModuleFromTargetModule -RepoRoot "$(Working_Directory)" -TargetModule "${{ parameters.TargetModule }}" -ForceRegenerate $forceRegenerate | ForEach-Object { 'src/' + $_ }
116145
} else {
117146
Write-Host "##vso[task.logissue type=error]Invalid trigger: $(Build.reason)."
118147
exit 1
119148
}
120149
$filesChanged | Select-Object -Unique | Out-File $filesChangedOutputPath
121-
150+
122151
$sourceBranchName = "$(Build.SourceBranch)".Replace("refs/heads/","")
123152
$baseBranchName = "origin/$sourceBranchName"
124153
$tmpBranchName = "archive/$sourceBranchName/$(Build.Reason)"
@@ -161,7 +190,7 @@ jobs:
161190
git add $generatedPath
162191
git commit -m $prTitle
163192
git push origin $tmpBranchName --force
164-
193+
165194
& $prScriptPath -Title $prTitle -HeadBranch $tmpBranchName -BaseBranch $sourceBranchName -BotAccessToken '$(GithubToken)' -Description $prDescription
166195
167196
<#
@@ -196,10 +225,10 @@ jobs:
196225
script: "$env:NODE_OPTIONS=\"--max-old-space-size=65536\""
197226
pwsh: true
198227
- task: UseDotNet@2
199-
displayName: 'Use .NET Core sdk 6.0.x'
228+
displayName: 'Use .NET SDK for Static Analysis'
200229
inputs:
201230
packageType: sdk
202-
version: 6.0.x
231+
version: 8.x
203232
- task: PowerShell@2
204233
displayName: 'Analyze'
205234
inputs:
@@ -238,10 +267,10 @@ jobs:
238267
parameters:
239268
artifactName: build-${{ variables.TestFramework }}
240269
- task: UseDotNet@2
241-
displayName: 'Use .NET SDK 6 for tests'
270+
displayName: 'Use .NET SDK for Test'
242271
inputs:
243272
packageType: sdk
244-
version: 6.0.x
273+
version: 8.x
245274
- task: PowerShell@2
246275
displayName: 'Test'
247276
inputs:
@@ -255,4 +284,4 @@ jobs:
255284
testResultsFiles: '**/*.trx'
256285
- template: util/publish-artifacts-steps.yml
257286
parameters:
258-
artifactName: test-${{ variables.testFramework }}-$(OSName)-$(System.JobAttempt)
287+
artifactName: test-${{ variables.testFramework }}-$(OSName)-$(System.JobAttempt)

.azure-pipelines/daily-build.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
# Wipe any changes from a previous branch
2929
git clean -xdf
3030
- task: UseDotNet@2
31-
displayName: 'Use .NET Core sdk 6.0.x for build'
31+
displayName: 'Use .NET SDK'
3232
inputs:
3333
packageType: sdk
34-
version: 6.0.x
34+
version: 8.x
3535
- task: PowerShell@2
3636
displayName: Prepare Powershell $(PSVersion)
3737
inputs:
@@ -85,11 +85,11 @@ jobs:
8585
- task: EsrpCodeSigning@5
8686
displayName: "Sign Dll [Authenticode + Strong Name]"
8787
inputs:
88-
ConnectedServiceName: '$(ESRPServiceConnectionName)'
89-
AppRegistrationClientId: '$(ESRPAppClientId)'
90-
AppRegistrationTenantId: '$(ESRPAppTenantId)'
91-
AuthAKVName: '$(ESRPKVName)'
92-
AuthCertName: '$(ESRPAuthCertName)'
88+
ConnectedServiceName: '$(ESRPServiceConnectionName)'
89+
AppRegistrationClientId: '$(ESRPAppClientId)'
90+
AppRegistrationTenantId: '$(ESRPAppTenantId)'
91+
AuthAKVName: '$(ESRPKVName)'
92+
AuthCertName: '$(ESRPAuthCertName)'
9393
AuthSignCertName: '$(ESRPSignCertName)'
9494
FolderPath: 'artifacts'
9595
Pattern: |
@@ -142,11 +142,11 @@ jobs:
142142
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
143143
displayName: "Sign Scripts [Authenticode]"
144144
inputs:
145-
ConnectedServiceName: '$(ESRPServiceConnectionName)'
146-
AppRegistrationClientId: '$(ESRPAppClientId)'
147-
AppRegistrationTenantId: '$(ESRPAppTenantId)'
148-
AuthAKVName: '$(ESRPKVName)'
149-
AuthCertName: '$(ESRPAuthCertName)'
145+
ConnectedServiceName: '$(ESRPServiceConnectionName)'
146+
AppRegistrationClientId: '$(ESRPAppClientId)'
147+
AppRegistrationTenantId: '$(ESRPAppTenantId)'
148+
AuthAKVName: '$(ESRPKVName)'
149+
AuthCertName: '$(ESRPAuthCertName)'
150150
AuthSignCertName: '$(ESRPSignCertName)'
151151
FolderPath: 'artifacts'
152152
Pattern: |
@@ -183,11 +183,11 @@ jobs:
183183
- task: EsrpCodeSigning@5
184184
displayName: 'Sign 3rd Party [Strong Name]'
185185
inputs:
186-
ConnectedServiceName: '$(ESRPServiceConnectionName)'
187-
AppRegistrationClientId: '$(ESRPAppClientId)'
188-
AppRegistrationTenantId: '$(ESRPAppTenantId)'
189-
AuthAKVName: '$(ESRPKVName)'
190-
AuthCertName: '$(ESRPAuthCertName)'
186+
ConnectedServiceName: '$(ESRPServiceConnectionName)'
187+
AppRegistrationClientId: '$(ESRPAppClientId)'
188+
AppRegistrationTenantId: '$(ESRPAppTenantId)'
189+
AuthAKVName: '$(ESRPKVName)'
190+
AuthCertName: '$(ESRPAuthCertName)'
191191
AuthSignCertName: '$(ESRPSignCertName)'
192192
FolderPath: artifacts
193193
Pattern: 'Release/**/FuzzySharp.dll'

0 commit comments

Comments
 (0)