Merge pull request #25773 from wastoresh/mergestorage

[Do not squash][Storage] merge main change to storage preview branch

Author: dolauli

.azure-pipelines/code-gen.yml

@@ -21,7 +21,8 @@ jobs:
   pool: pool-windows-2019
   steps:
   - checkout: self
-  - template: util/get-github-pat-steps.yml
+    persistCredentials: true
+  - template: util/get-github-token-steps.yml
   - task: NodeTool@0
     displayName: Use Node 14.15.5
     inputs:

.azure-pipelines/daily-build.yml

@@ -14,7 +14,7 @@ pr: none
 
 jobs:
 - job: DailyBuild
-  timeoutInMinutes: 180
+  timeoutInMinutes: 360
   pool: pool-windows-2019
   steps:
   - task: PowerShell@2

.azure-pipelines/security-tools.yml

@@ -47,7 +47,6 @@ jobs:
       OCTOKITPAT: $(GithubToken)
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@3
     displayName: Run CredScan
-    condition: in(variables['system.pullRequest.targetBranch'], 'generation', 'main')
     inputs:
       toolMajorVersion: V2
       outputFormat: sarif
@@ -61,8 +60,8 @@ jobs:
         New-Item $(Build.SourcesDirectory)/artifacts/FilesToScan.rsp -ItemType File -Force
         (Get-ChildItem -Path .\artifacts\Debug -Include *.dll,*.exe -Exclude msalruntime.dll,msalruntime_arm64.dll,msalruntime_x86.dll -Recurse).FullName > $(Build.SourcesDirectory)/artifacts/FilesToScan.rsp
       pwsh: true
-  
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-binskim.BinSkim@3
+
+  - task: securedevelopmentteam.vss-secure-development-tools.build-task-binskim.BinSkim@4
     displayName: Run BinSkim
     inputs:
       InputType: 'CommandLine'

.azure-pipelines/sync-tools-folder.yml

@@ -11,6 +11,7 @@ trigger:
   paths:
     include:
       - .azure-pipelines
+      - .devcontainer
       - tools
       - src/lib
       - .ci-config.json

.azure-pipelines/util/analyze-steps.yml

@@ -5,7 +5,6 @@ parameters:
   IsGenerateBased: ''
 
 steps:
-- template: get-github-pat-steps.yml
 - template: download-build-steps.yml
   parameters:
     artifactName: build-${{ parameters.testFramework }}
@@ -50,7 +49,6 @@ steps:
     custom: msbuild
     arguments: 'build.proj /t:GenerateHelp /p:Configuration=${{ parameters.configuration }};PullRequestNumber=$(System.PullRequest.PullRequestNumber)'
   env:
-      OCTOKITPAT: $(GithubToken)
       PowerShellPlatform: ${{ parameters.powerShellPlatform }}
 
 - task: DotNetCoreCLI@2
@@ -60,7 +58,6 @@ steps:
     custom: msbuild
     arguments: 'build.proj /t:StaticAnalysis /p:Configuration=${{ parameters.configuration }};PullRequestNumber=$(System.PullRequest.PullRequestNumber)'
   env:
-      OCTOKITPAT: $(GithubToken)
       IsGenerateBased: ${{ parameters.IsGenerateBased }}
 
 - template: publish-artifacts-steps.yml

.azure-pipelines/util/build-steps.yml

@@ -4,7 +4,9 @@ parameters:
   powerShellPlatform: ''
 
 steps:
-- template: get-github-pat-steps.yml
+- checkout: self
+  persistCredentials: true
+- template: get-github-token-steps.yml
 - task: NodeTool@0
   condition: eq(variables.IsGenerateBased, true)
   displayName: Install Autorest

.azure-pipelines/util/get-github-pat-steps.yml

@@ -1,6 +1,7 @@
 steps:
 - task: AzurePowerShell@5
   inputs:
+    pwsh: true
     azureSubscription: '$(AzureSubscription)'
     ScriptType: 'InlineScript'
     Inline: |

.azure-pipelines/util/get-github-token-steps.yml

@@ -0,0 +1,12 @@
+steps:
+- task: PowerShell@2
+  displayName: Get GitHub Token
+  inputs:
+    targetType: 'inline'
+    script: |
+      $httpConfigs = (git config --get-regexp "http" )
+      $authConfig = $httpConfigs | Where-Object {$_ -like "*AUTHORIZATION*"}
+      $token = ($authConfig -split ' ')[-1]
+      $ghToken = ([System.Text.Encoding]::ASCII.GetString([System.Convert]::FromBase64String($token)) -split ':')[1]
+      Write-Host "##vso[task.setvariable variable=GithubToken;issecret=true]$ghToken"
+

.azure-pipelines/util/test-steps.yml

@@ -6,7 +6,6 @@ parameters:
   powerShellPlatform: ''
 
 steps:
-- template: get-github-pat-steps.yml
 - template: download-build-steps.yml
   parameters:
     artifactName: build-${{ parameters.testFramework }}
@@ -31,7 +30,6 @@ steps:
     custom: msbuild
     arguments: 'build.proj /t:${{ parameters.testTarget }} /p:Configuration=${{ parameters.configuration }};TestFramework=${{ parameters.testFramework }};PullRequestNumber=$(System.PullRequest.PullRequestNumber)'
   env:
-    OCTOKITPAT: $(GithubToken)
     PowerShellPlatform: ${{ parameters.powerShellPlatform }}
   continueOnError: true
 

.devcontainer/devcontainer.json

@@ -13,13 +13,13 @@
 		}
 	},
 
-	// Set *default* container specific settings.json values on container create.
-	"settings": {},
-
-	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": [
-		"ms-dotnettools.csharp"
-	],
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"ms-dotnettools.csharp"
+			]
+		}
+	},
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [5000, 5001],