Update ESRP signing

build/AzurePipelineTemplates/CsWinRT-LocalizeResources-Stage.yml

@@ -48,10 +48,15 @@ stages:
         cultureMappingType: 'None'
 
     # Sign TDBuild Output
-    - task: EsrpCodeSigning@1
+    - task: EsrpCodeSigning@5
       displayName: ESRP CodeSigning
       inputs:
-        ConnectedServiceName: 81cc6790-027c-4ef3-928d-65e8b96a691a
+        ConnectedServiceName: $(SigningServiceName)
+        AppRegistrationClientId: $(SigningAppId)
+        AppRegistrationTenantId: $(SigningTenantId)
+        AuthAKVName: $(SigningAKVName)
+        AuthCertName: $(SigningAuthCertName)
+        AuthSignCertName: $(SigningSignCertName)
         FolderPath: $(LocOutputDir)
         Pattern: |
           release_x64\de-DE\WinRT.Host.dll.mui

build/AzurePipelineTemplates/CsWinRT-PublishToNuget-Stage.yml

@@ -75,10 +75,15 @@ stages:
           copy release_x86\WinRT.Interop.winmd WinRT.Interop.winmd
 
 # ESRP Codesigning
-    - task: EsrpCodeSigning@1
+    - task: EsrpCodeSigning@5
       displayName: ESRP CodeSigning
       inputs:
-        ConnectedServiceName: 81cc6790-027c-4ef3-928d-65e8b96a691a
+        ConnectedServiceName: $(SigningServiceName)
+        AppRegistrationClientId: $(SigningAppId)
+        AppRegistrationTenantId: $(SigningTenantId)
+        AuthAKVName: $(SigningAKVName)
+        AuthCertName: $(SigningAuthCertName)
+        AuthSignCertName: $(SigningSignCertName)
         FolderPath: $(Build.SourcesDirectory)
         Pattern: |
           cswinrt.exe
@@ -133,11 +138,16 @@ stages:
           ]
 
 # ESRP CodeSigning 3rd Party
-    - task: EsrpCodeSigning@1
+    - task: EsrpCodeSigning@5
       displayName: ESRP CodeSigning 3rd party
       continueOnError: True
       inputs:
-        ConnectedServiceName: 81cc6790-027c-4ef3-928d-65e8b96a691a
+        ConnectedServiceName: $(SigningServiceName)
+        AppRegistrationClientId: $(SigningAppId)
+        AppRegistrationTenantId: $(SigningTenantId)
+        AuthAKVName: $(SigningAKVName)
+        AuthCertName: $(SigningAuthCertName)
+        AuthSignCertName: $(SigningSignCertName)
         FolderPath: $(Build.SourcesDirectory)
         Pattern: |
           net6.0\IIDOptimizer\Mono.Cecil.dll
@@ -223,10 +233,15 @@ stages:
         buildProperties: cswinmd_nuget_version=$(NugetVersion);cswinmd_outpath=$(Build.SourcesDirectory)\net6.0\CsWinMD;source_generator=$(Build.SourcesDirectory)\netstandard2.0\WinRT.SourceGenerator.dll
 
 # ESRP CodeSigning 
-    - task: EsrpCodeSigning@1
+    - task: EsrpCodeSigning@5
       displayName: ESRP CodeSigning
       inputs:
-        ConnectedServiceName: 81cc6790-027c-4ef3-928d-65e8b96a691a
+        ConnectedServiceName: $(SigningServiceName)
+        AppRegistrationClientId: $(SigningAppId)
+        AppRegistrationTenantId: $(SigningTenantId)
+        AuthAKVName: $(SigningAKVName)
+        AuthCertName: $(SigningAuthCertName)
+        AuthSignCertName: $(SigningSignCertName)
         FolderPath: $(Build.ArtifactStagingDirectory)
         Pattern: '*.nupkg'
         signConfigType: inlineSignParams

build/AzurePipelineTemplates/CsWinRT-Variables.yml

@@ -1,17 +1,30 @@
 variables:
-  MajorVersion: 2
-  MinorVersion: 0
-  PatchVersion: 8
-  WinRT.Runtime.AssemblyVersion: '2.0.0.0'
-  Net5.SDK.Feed: 'https://dotnetcli.blob.core.windows.net/dotnet'
-  Net6.SDK.Version: '6.0.415'
-  NoSamples: 'false'
+- group: XlangSigning
+- name: MajorVersion
+  value: 2
+- name: MinorVersion
+  value: 0
+- name: PatchVersion
+  value: 8
+- name: WinRT.Runtime.AssemblyVersion
+  value: '2.0.0.0'
+- name: Net5.SDK.Feed
+  value: 'https://dotnetcli.blob.core.windows.net/dotnet'
+- name: Net6.SDK.Version
+  value: '6.0.415'
+- name: NoSamples
+  value: 'false'
 
   # This 'coalesce' pattern allows the yml to define a default value for a variable but allows the value to be overridden at queue time.
   # E.g. '_IsRelease' defaults to empty string, but if 'IsRelease' is set at queue time that value will be used.
 
-  _IsRelease: $[coalesce(variables.IsRelease, '')]
-  _RunBenchmarks: $[coalesce(variables.RunBenchmarks, 'false')]
-  _DotNetRuntimeVersion: $[coalesce(variables.DotNetRuntimeVersion, '6.0.23')]  
-  _WindowsSdkVersionSuffix: $[coalesce(variables.WindowsSdkPackageVersionSuffix, '25')]  
-  _PublishCsWinMD: $[coalesce(variables.PublishCsWinMD, 'false')]
+- name: _IsRelease
+  value: $[coalesce(variables.IsRelease, '')]
+- name: _RunBenchmarks
+  value: $[coalesce(variables.RunBenchmarks, 'false')]
+- name: _DotNetRuntimeVersion
+  value: $[coalesce(variables.DotNetRuntimeVersion, '6.0.23')]  
+- name: _WindowsSdkVersionSuffix
+  value: $[coalesce(variables.WindowsSdkPackageVersionSuffix, '25')]  
+- name: _PublishCsWinMD
+  value: $[coalesce(variables.PublishCsWinMD, 'false')]