Merge branch 'main' into network-release

Author: Lei jin

.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
@@ -58,7 +58,7 @@ jobs:
       script: |
         $command = "`$PSVersionTable `
         Get-PSRepository `
-        ./tools/RunVersionController.ps1 -Release 'Daily Build $(today)' `
+        ./tools/RunVersionController.ps1 -Release 'Daily Build $(today)' -ReleaseType $(ReleaseType)`
         Exit"
         dotnet tool run pwsh -c $command
 
@@ -76,21 +76,21 @@ jobs:
       custom: msbuild
       arguments: 'build.proj /t:Build /p:Configuration=Release;TurnOnTestCoverage=true;ModifiedModuleBuild=true'
 
-  - task: EsrpCodeSigning@4
+  - task: EsrpCodeSigning@5
+    displayName: "Sign Dll [Authenticode + Strong Name]"
     inputs:
-      ConnectedServiceName: '$(signServiceConnection)'
+      ConnectedServiceName: '$(ESRPServiceConnectionName)' 
+      AppRegistrationClientId: '$(ESRPAppClientId)' 
+      AppRegistrationTenantId: '$(ESRPAppTenantId)' 
+      AuthAKVName: '$(ESRPKVName)' 
+      AuthCertName: '$(ESRPAuthCertName)' 
+      AuthSignCertName: '$(ESRPSignCertName)'
       FolderPath: 'artifacts'
       Pattern: |
-        Release/**/Microsoft*Azure*PowerShell*Cmdlets*.dll
-        Release/**/Microsoft.Azure.PowerShell.*.Sdk.dll
+        Release/**/Microsoft*Azure*PowerShell*.dll
         Release/**/Az.*.private.dll
-        Release/**/Microsoft.Azure.PowerShell.AssemblyLoading.dll
-        Release/**/Microsoft.Azure.PowerShell.Authentication.dll
-        Release/**/Microsoft.Azure.PowerShell.Authentication.ResourceManager.dll
-        Release/**/Microsoft.Azure.PowerShell.Authenticators.dll
-        Release/**/Microsoft.Azure.PowerShell.AuthenticationAssemblyLoadContext.dll
         Release/**/Microsoft.Azure.Commands.*.AlcWrapper.dll
-        !Release/**/Microsoft*Azure*PowerShell*Cmdlets*.Test.dll
+        InstallerChecks.dll
       UseMinimatch: true
       signConfigType: 'inlineSignParams'
       inlineOperation: |
@@ -133,11 +133,56 @@ jobs:
       SessionTimeout: '60'
       MaxConcurrency: '50'
       MaxRetryAttempts: '5'
-
-  - task: EsrpCodeSigning@4
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
+    displayName: "Sign Scripts [Authenticode]"
+    inputs:
+      ConnectedServiceName: '$(ESRPServiceConnectionName)' 
+      AppRegistrationClientId: '$(ESRPAppClientId)' 
+      AppRegistrationTenantId: '$(ESRPAppTenantId)' 
+      AuthAKVName: '$(ESRPKVName)' 
+      AuthCertName: '$(ESRPAuthCertName)' 
+      AuthSignCertName: '$(ESRPSignCertName)'
+      FolderPath: 'artifacts'
+      Pattern: |
+        Release/**/*.ps1
+        Release/**/*.psm1
+        Release/**/*.ps1xml
+        Release/**/*.js
+        InstallModule.ps1
+      UseMinimatch: true
+      signConfigType: inlineSignParams
+      inlineOperation: |
+        [
+          {
+            "KeyCode": "CP-230012",
+            "OperationCode": "SigntoolSign",
+            "Parameters": {
+              "OpusName": "Microsoft",
+              "OpusInfo": "http://www.microsoft.com",
+              "FileDigest": "/fd \"SHA256\"",
+              "PageHash": "/NPH",
+              "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+            },
+            "ToolName": "sign",
+            "ToolVersion": "1.0"
+          },
+          {
+            "KeyCode": "CP-230012",
+            "OperationCode": "SigntoolVerify",
+            "Parameters": {},
+            "ToolName": "sign",
+            "ToolVersion": "1.0"
+          }
+        ]
+  - task: EsrpCodeSigning@5
     displayName: 'Sign 3rd Party [Strong Name]'
     inputs:
-      ConnectedServiceName: '$(signServiceConnection)'
+      ConnectedServiceName: '$(ESRPServiceConnectionName)' 
+      AppRegistrationClientId: '$(ESRPAppClientId)' 
+      AppRegistrationTenantId: '$(ESRPAppTenantId)' 
+      AuthAKVName: '$(ESRPKVName)' 
+      AuthCertName: '$(ESRPAuthCertName)' 
+      AuthSignCertName: '$(ESRPSignCertName)'
       FolderPath: artifacts
       Pattern: 'Release/**/FuzzySharp.dll'
       UseMinimatch: true

.azure-pipelines/security-tools.yml

@@ -47,12 +47,28 @@ 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
       scanFolder: SecurityTmp
       suppressionsFile: tools/SecurityTools/CredScanSuppressions.json
+  - task: PowerShell@2
+    displayName: Run external CredScan
+    env:
+      GDN_CREDSCAN_OUTPUTTYPE: sarif
+      Scan_Folder: SecurityTmp
+      GDN_CREDSCAN_SUPPRESSIONSPATH: tools/SecurityTools/CredScanSuppressions.json
+      GDN_CREDSCAN_SUPPRESSASERROR: False
+    inputs:
+      targetType: inline
+      script: |
+        nuget.exe install Microsoft.Security.DevOps.Cli
+        $toolsPath = Join-Path ("Microsoft.Security.DevOps.Cli*" | Resolve-Path) tools
+        $env:Path = "$toolsPath;$env:Path"
+        $env:GDN_CREDSCAN_TARGETDIRECTORY = (Resolve-Path $env:Scan_Folder).Path
+        guardian init -f
+        guardian run -t CredScan
+
   - task: PowerShell@2
     displayName: Generate a response text file for BinSkim
     inputs:

.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/get-github-pat-steps.yml

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

.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],