Updating signing configuration and version suffix (#267)

Author: fabiocav

azure-pipelines.yml

@@ -81,6 +81,38 @@ jobs:
           }
         ]
 
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+    displayName: 'Sdk: ESRP CodeSigning - Authenticode'
+    condition: eq(variables.isReleaseBuild, true)
+    inputs:
+      ConnectedServiceName: 'ESRP Service'
+      FolderPath: 'sdk\Sdk.Analyzers\bin\Release'
+      Pattern: Microsoft.Azure.Functions.Worker.Sdk.Analyzers.dll
+      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: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
     displayName: 'MetadataLoader: ESRP CodeSigning - Authenticode'
     condition: eq(variables.isReleaseBuild, true)
@@ -118,7 +150,7 @@ jobs:
     condition: eq(variables.isReleaseBuild, true)
     inputs:
       ConnectedServiceName: 'ESRP Service'
-      FolderPath: 'src\DotNetWorker\bin\Release'
+      FolderPath: 'src'
       Pattern: Microsoft.Azure.Functions.Worker*.dll
       signConfigType: inlineSignParams
       inlineOperation: |

build/Common.props

@@ -6,11 +6,12 @@
     <MinorProductVersion Condition="$(MinorProductVersion) == ''">0</MinorProductVersion>
     <PatchProductVersion Condition="$(PatchProductVersion) == ''">0</PatchProductVersion>
     <VersionPrefix Condition="$(VersionPrefix) == ''">$(MajorProductVersion).$(MinorProductVersion).$(PatchProductVersion)</VersionPrefix>
+    <!--If a preview release, this should have the label with the separator (e.g.: -preview1)-->
     <VersionSuffix Condition="$(VersionSuffix) == ''"></VersionSuffix>
     <IsLocalBuild Condition=" $(IsLocalBuild) == ''">True</IsLocalBuild>
     <BuildNumber Condition=" $(IsLocalBuild) == 'True'">local</BuildNumber>
-    <Version Condition=" '$(BuildNumber)' != '' And $(Version) == ''">$(VersionPrefix)-$(VersionSuffix)-$(BuildNumber)</Version>
-    <Version Condition=" '$(Version)' == '' ">$(VersionPrefix)-$(VersionSuffix)</Version>
+    <Version Condition=" '$(BuildNumber)' != '' And $(Version) == ''">$(VersionPrefix)$(VersionSuffix)-$(BuildNumber)</Version>
+    <Version Condition=" '$(Version)' == '' ">$(VersionPrefix)$(VersionSuffix)</Version>
     <AssemblyVersion Condition="$(AssemblyVersion) == ''">$(VersionPrefix).0</AssemblyVersion>
     <FileVersion  Condition="$(FileVersion) == ''">$(AssemblyVersion)</FileVersion>
     <CommitHash Condition="$(CommitHash) == ''">N/A</CommitHash>

extensions/Worker.Extensions.RabbitMQ/Worker.Extensions.RabbitMQ.csproj

@@ -7,7 +7,7 @@
 
     <!--Version information-->
     <MajorProductVersion>1</MajorProductVersion>
-    <VersionSuffix>beta</VersionSuffix>
+    <VersionSuffix>-beta</VersionSuffix>
   </PropertyGroup>
 
   <Import Project="..\..\build\Extensions.props" />