Work CI-CD (#110)

***NO_CI***
2021-03-29 15:34:06 +01:00 · 2021-03-29 15:34:06 +01:00 · cdf496e960
--- a/LICENSE.md
+++ b/LICENSE.md
--- a/M2Mqtt/nanoFramework.M2Mqtt.nuspec
+++ b/M2Mqtt/nanoFramework.M2Mqtt.nuspec
@ -3,10 +3,9 @@
  <metadata>
    <id>nanoFramework.M2Mqtt</id>
    <version>$version$</version>
-    <title>M2Mqtt - MQTT Client Library for nanoFramework</title>
-    <authors>nanoFramework project contributors</authors>
-    <owners>nanoFramework project contributors</owners>
-    <licenseUrl>https://github.com/nanoframework/paho.mqtt.m2mqtt/blob/nanoframework/LICENSE</licenseUrl>
+    <title>M2Mqtt - MQTT Client Library for .NET nanoFramework</title>
+    <authors>nanoframework,dotnetfoundation</authors>
+    <license type="file">LICENSE.md</license>
    <projectUrl>https://github.com/nanoframework/paho.mqtt.m2mqtt</projectUrl>
    <iconUrl>https://secure.gravatar.com/avatar/97d0e092247f0716db6d4b47b7d1d1ad</iconUrl>
    <icon>images\nf-logo.png</icon>
@ -16,7 +15,7 @@
    <summary>M2Mqtt is a MQTT client available for .NET nanoFramework for M2M communication.</summary>
    <releaseNotes>
    </releaseNotes>
-    <copyright>Copyright (c) 2019 Paolo Patierno and the nanoFramework project contributors</copyright>
+    <copyright>Copyright (c) 2019 Paolo Patierno and the .NET nanoFramework project contributors</copyright>
    <tags>m2m mqtt queue messaging internetofthings iot cloud netmf embedded micro netduino micro-framework hardware gadgeteer</tags>
    <dependencies>
      <dependency id="nanoFramework.CoreLibrary" version="1.10.3-preview.7" />
@ -32,9 +31,9 @@
    <file src="bin\Release\nanoFramework.M2Mqtt.pdbx" target="lib\nanoFramework.M2Mqtt.pdbx" />
    <file src="bin\Release\nanoFramework.M2Mqtt.pe" target="lib\nanoFramework.M2Mqtt.pe" />
    <file src="bin\Release\nanoFramework.M2Mqtt.xml" target="lib\nanoFramework.M2Mqtt.xml" />
-    <!-- readme -->
-    <file src="readme.txt" target="readme.txt" />
-    <!-- logo -->
-    <file src="nf-logo.png" target="images\" />
+    
+    <file src="..\assets\readme.txt" target="" />
+    <file src="..\assets\nf-logo.png" target="images\" />
+    <file src="..\LICENSE.md" target="" />
  </files>
 </package>
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=nanoframework_paho.mqtt.m2mqtt&metric=alert_status)](https://sonarcloud.io/dashboard?id=nanoframework_paho.mqtt.m2mqtt) [![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=nanoframework_paho.mqtt.m2mqtt&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=nanoframework_paho.mqtt.m2mqtt) [![License](https://img.shields.io/badge/License-EPL-blue.svg)](https://github.com/nanoframework/paho.mqtt.m2mqtt/blob/master/LICENSE) [![NuGet](https://img.shields.io/nuget/dt/nanoFramework.M2Mqtt.svg)](https://www.nuget.org/packages/nanoFramework.M2Mqtt) [![#yourfirstpr](https://img.shields.io/badge/first--timers--only-friendly-blue.svg)](https://github.com/nanoframework/Home/blob/master/CONTRIBUTING.md) [![Discord](https://img.shields.io/discord/478725473862549535.svg)](https://discord.gg/gCyBu8T)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=nanoframework_paho.mqtt.m2mqtt&metric=alert_status)](https://sonarcloud.io/dashboard?id=nanoframework_paho.mqtt.m2mqtt) [![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=nanoframework_paho.mqtt.m2mqtt&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=nanoframework_paho.mqtt.m2mqtt) [![License](https://img.shields.io/badge/License-EPL-blue.svg)](https://github.com/nanoframework/paho.mqtt.m2mqtt/blob/main/LICENSE) [![NuGet](https://img.shields.io/nuget/dt/nanoFramework.M2Mqtt.svg)](https://www.nuget.org/packages/nanoFramework.M2Mqtt) [![#yourfirstpr](https://img.shields.io/badge/first--timers--only-friendly-blue.svg)](https://github.com/nanoframework/Home/blob/main/CONTRIBUTING.md) [![Discord](https://img.shields.io/discord/478725473862549535.svg)](https://discord.gg/gCyBu8T)

 # nanoFramework M2Mqtt

@ -13,8 +13,8 @@ The orignal project has an official website [here](https://m2mqtt.wordpress.com/

 | Component | Build Status | NuGet Package |
 |:-|---|---|
-| nanoFramework.M2Mqtt | [![Build Status](https://dev.azure.com/nanoframework/paho.mqtt.m2mqtt/_apis/build/status/nanoframework.paho.mqtt.m2mqtt?branchName=master)](https://dev.azure.com/nanoframework/paho.mqtt.m2mqtt/_build/latest?definitionId=56&branchName=master) | [![NuGet](https://img.shields.io/nuget/v/nanoFramework.M2Mqtt.svg?label=NuGet&style=flat&logo=nuget)](https://www.nuget.org/packages/nanoFramework.M2Mqtt/)  |
-| nanoFramework.M2Mqtt (preview) | [![Build Status](https://dev.azure.com/nanoframework/paho.mqtt.m2mqtt/_apis/build/status/nanoframework.paho.mqtt.m2mqtt?branchName=develop)](https://dev.azure.com/nanoframework/paho.mqtt.m2mqtt/_build/latest?definitionId=56&branchName=develop) | [![](https://badgen.net/badge/NuGet/preview/D7B023?icon=https://simpleicons.now.sh/azuredevops/fff)](https://dev.azure.com/nanoframework/feed/_packaging?_a=package&feed=sandbox&package=nanoFramework.M2Mqtt&protocolType=NuGet&view=overview) |
+| nanoFramework.M2Mqtt | [![Build Status](https://dev.azure.com/nanoframework/paho.mqtt.m2mqtt/_apis/build/status/nanoframework.paho.mqtt.m2mqtt?branchName=main)](https://dev.azure.com/nanoframework/paho.mqtt.m2mqtt/_build/latest?definitionId=56&branchName=main) | [![NuGet](https://img.shields.io/nuget/v/nanoFramework.M2Mqtt.svg?label=NuGet&style=flat&logo=nuget)](https://www.nuget.org/packages/nanoFramework.M2Mqtt/) |
+| nanoFramework.M2Mqtt (preview) | [![Build Status](https://dev.azure.com/nanoframework/paho.mqtt.m2mqtt/_apis/build/status/nanoframework.paho.mqtt.m2mqtt?branchName=develop)](https://dev.azure.com/nanoframework/paho.mqtt.m2mqtt/_build/latest?definitionId=56&branchName=develop) | [![NuGet](https://img.shields.io/nuget/vpre/nanoFramework.M2Mqtt.svg?label=NuGet&style=flat&logo=nuget)](https://www.nuget.org/packages/nanoFramework.M2Mqtt/) |

 ## Project Description

--- a/assets/nf-logo.png
+++ b/assets/nf-logo.png
--- a/assets/readme.txt
+++ b/assets/readme.txt
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@ -1,6 +1,6 @@
 trigger:
  branches:
-    include: [master, develop, "release-*" ]
+    include: [main, develop, "release-*" ]
  paths:
    exclude: ["*.md", .gitignore]
  tags:
@ -21,7 +21,7 @@ jobs:
 ##############################
 - job: Get_Build_Options
  pool:
-    vmImage: 'VS2017-Win2016'
+    vmImage: 'windows-2019'

  variables:
    DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
@ -63,7 +63,7 @@ jobs:
  - Get_Build_Options

  pool:
-    vmImage: 'VS2017-Win2016'
+    vmImage: 'windows-2019'

  variables:
    DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
@ -80,6 +80,8 @@ jobs:
      git config --global user.name "nfbot"
      git config --global core.autocrlf true
    displayName: Setup git identity
+  
+  - template: azure-pipelines-templates/install-nbgv-tool.yml@templates

  - task: SonarCloudPrepare@1
    inputs:
@ -91,7 +93,7 @@ jobs:

  - task: NuGetToolInstaller@0
    inputs:
-      versionSpec: '5.4.0'
+      versionSpec: '5.8.0'
    displayName: 'Install specifc version of NuGet'

  - task: NuGetCommand@2
@ -120,28 +122,6 @@ jobs:
      pollingTimeoutSec: '300'
    displayName: 'Publish Quality Gate Result'

-  - task: PowerShell@2
-    inputs:
-        targetType: 'inline'
-        script: |
-            $MyNuGetVersion = $env:NBGV_NuGetPackageVersion -replace "\-g$env:NBGV_GitCommitIdShort", ""
-
-            # replace preview with alpha if this is a PR build
-            if($env:Build_Reason -eq 'PullRequest')
-            {
-              $MyNuGetVersion = $MyNuGetVersion -replace "preview", "alpha"
-            }
-            if ($env:System_PullRequest_SourceBranch -like 'release*')
-            {
-              $MyNuGetVersion = $MyNuGetVersion + "-rc." + $env:NBGV_VersionHeight
-            }
-
-            Write-Host "NuGet build number is $MyNuGetVersion"
-
-            Write-Host "$("##vso[task.setvariable variable=MY_NUGET_VERSION]")$MyNuGetVersion"
-    condition: succeeded()
-    displayName: Get NuGet build number
-
  - powershell: |
      # get subject and commit message for commit
      $commitMessage = git log --format='%B' -1
@ -163,15 +143,6 @@ jobs:
      }
    name: SetReleaseDraftVar
    displayName: Set release draft var
-    
-  - task: PowerShell@2
-    inputs:
-      targetType: 'inline'
-      script: |
-        Write-Host "NuGet version is $("##vso[build.updatebuildnumber]")$env:MY_NUGET_VERSION"
-        Write-Host "Build version is $env:NBGV_AssemblyVersion"
-    condition: and( succeeded(), ne(variables['system.pullrequest.isfork'], true) )
-    displayName: Update cloud build number

  - task: NuGetCommand@2
    inputs:
@ -189,6 +160,29 @@ jobs:
    condition: succeeded()
    displayName: Collecting deployable artifacts

+  - task: DotNetCoreCLI@2
+    displayName: Install SignTool tool
+    condition: and( succeeded(), eq(variables['System.PullRequest.PullRequestId'], '') )
+    inputs:
+      command: custom
+      custom: tool
+      arguments: install --tool-path . SignClient
+
+  - pwsh: |
+      .\SignClient "Sign" `
+      --baseDirectory "$(Build.ArtifactStagingDirectory)" `
+      --input "**/*.nupkg" `
+      --config "$(Build.Repository.LocalPath)\config\SignClient.json" `
+      --filelist "$(Build.Repository.LocalPath)\config\filelist.txt" `
+      --user "$(SignClientUser)" `
+      --secret '$(SignClientSecret)' `
+      --name "nanoFramework.M2Mqtt" `
+      --description "nanoFramework.M2Mqtt" `
+      --descriptionUrl "https://github.com/$env:Build_Repository_Name"
+    displayName: Sign packages
+    continueOnError: true
+    condition: and( succeeded(), eq(variables['System.PullRequest.PullRequestId'], '') )
+
  # publish artifacts (only possible if this is not a PR originated on a fork)
  - task: PublishBuildArtifacts@1
    inputs:
@ -223,44 +217,36 @@ jobs:
    displayName: Push NuGet packages to Azure Artifacts

  # create or update GitHub release
-  - task: GitHubReleasePublish@1
+  - task: GithubRelease@1
+    condition: and( succeeded(), eq(variables['System.PullRequest.PullRequestId'], ''), not( startsWith(variables['Build.SourceBranch'], 'refs/tags/v') ), ne( variables['StartReleaseCandidate'], true ) )
+    displayName: Create/Update GitHub PREVIEW release
    inputs:
-      githubEndpoint: 'nanoframework'
-      githubOwner: 'nanoframework'
-      githubRepositoryName: 'paho.mqtt.m2mqtt'
-      githubTag: v$(MY_NUGET_VERSION)
-      githubReleaseTitle: 'nanoframework.M2Mqtt Library v$(MY_NUGET_VERSION)'
-      githubReleaseNotes: 'Check the [changelog]($(Build.Repository.Uri)/blob/$(Build.SourceBranchName)/CHANGELOG.md).<br><br><h4>Install from NuGet</h4><br>The following NuGet packages are available for download from this release:<br>:package: [.NET](https://www.nuget.org/packages/nanoframework.M2Mqtt/$(MY_NUGET_VERSION)) v$(MY_NUGET_VERSION).'
-      githubTargetCommitsh: $(Build.SourceVersion)
-      githubReleaseDraft: false
-      githubReleasePrerelease: true
-      githubReuseDraftOnly: false
-      githubReuseRelease: true
-      githubEditRelease: true
-      githubDeleteEmptyTag: true
-      githubReleaseAsset: '$(Build.ArtifactStagingDirectory)/*.nupkg'
-    condition: and( succeeded(), ne(variables['Build.Reason'], 'PullRequest'), not( startsWith(variables['Build.SourceBranch'], 'refs/tags/v') ) )
-    displayName: Create/Update GitHub PREVIEW release 
+      gitHubConnection: 'github.com_nano-$(System.TeamProject)'
+      tagSource: userSpecifiedTag
+      tag: v$(MY_NUGET_VERSION)
+      title: 'nanoframework.M2Mqtt Library v$(MY_NUGET_VERSION)'
+      releaseNotesSource: inline
+      releaseNotesInline: 'Check the [changelog]($(Build.Repository.Uri)/blob/$(Build.SourceBranchName)/CHANGELOG.md).<br><br><h4>Install from NuGet</h4><br>The following NuGet packages are available for download from this release:<br>:package: [.NET](https://www.nuget.org/packages/nanoframework.M2Mqtt/$(MY_NUGET_VERSION)) v$(MY_NUGET_VERSION).'
+      assets: '$(Build.ArtifactStagingDirectory)/*.nupkg'
+      assetUploadMode: replace
+      isPreRelease: true
+      addChangeLog: false

  # create or update GitHub release ON tags from release or master branches
-  - task: GitHubReleasePublish@1
-    inputs:
-      githubEndpoint: 'nanoframework'
-      githubOwner: 'nanoframework'
-      githubRepositoryName: 'paho.mqtt.m2mqtt'
-      githubTag: v$(MY_NUGET_VERSION)
-      githubReleaseTitle: 'nanoframework.M2Mqtt Library v$(MY_NUGET_VERSION)'
-      githubReleaseNotes: 'Check the [changelog]($(Build.Repository.Uri)/blob/$(Build.SourceBranchName)/CHANGELOG.md).<br><br><h4>Install from NuGet</h4><br>The following NuGet packages are available for download from this release:<br>:package: [.NET](https://www.nuget.org/packages/nanoframework.M2Mqtt/$(MY_NUGET_VERSION)) v$(MY_NUGET_VERSION).'
-      githubTargetCommitsh: $(Build.SourceVersion)
-      githubReleaseDraft: false
-      githubReleasePrerelease: false
-      githubReuseDraftOnly: false
-      githubReuseRelease: true
-      githubEditRelease: false
-      githubDeleteEmptyTag: true
-      githubReleaseAsset: '$(Build.ArtifactStagingDirectory)/*.nupkg'
+  - task: GithubRelease@1
    condition: and( succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/v'), not(contains(variables['Build.SourceBranch'], 'preview') ) )
    displayName: Create/Update GitHub stable release
+    inputs:
+      gitHubConnection: 'github.com_nano-$(System.TeamProject)'
+      tagSource: userSpecifiedTag
+      tag: v$(MY_NUGET_VERSION)
+      title: 'nanoframework.M2Mqtt Library v$(MY_NUGET_VERSION)'
+      releaseNotesSource: inline
+      releaseNotesInline: 'Check the [changelog]($(Build.Repository.Uri)/blob/$(Build.SourceBranchName)/CHANGELOG.md).<br><br><h4>Install from NuGet</h4><br>The following NuGet packages are available for download from this release:<br>:package: [.NET](https://www.nuget.org/packages/nanoframework.M2Mqtt/$(MY_NUGET_VERSION)) v$(MY_NUGET_VERSION).'
+      assets: '$(Build.ArtifactStagingDirectory)/*.nupkg'
+      assetUploadMode: replace
+      isPreRelease: false
+      addChangeLog: false

 ##################################
 # report build failure to Discord
@ -270,7 +256,7 @@ jobs:
  condition: failed('Build_M2Mqtt')

  pool:
-    vmImage: 'VS2017-Win2016'
+    vmImage: 'windows-2019'

  steps:

--- a/config/SignClient.json
+++ b/config/SignClient.json
@ -0,0 +1,14 @@
+{
+    "SignClient": {
+      "AzureAd": {
+        "AADInstance": "https://login.microsoftonline.com/",
+        "ClientId": "c248d68a-ba6f-4aa9-8a68-71fe872063f8",
+        "TenantId": "16076fdc-fcc1-4a15-b1ca-32c9a255900e"
+      },
+      "Service": {
+        "Url": "https://codesign.dotnetfoundation.org/",
+        "ResourceId": "https://SignService/3c30251f-36f3-490b-a955-520addb85001"
+      }
+    }
+  }
+  
--- a/config/filelist.txt
+++ b/config/filelist.txt
@ -0,0 +1 @@
+**/nanoFramework.M2Mqtt.*
--- a/version.json
+++ b/version.json
@ -9,7 +9,7 @@
    "semVer": 2.0
  },
  "publicReleaseRefSpec": [
-    "^refs/heads/master$",
+    "^refs/heads/main$",
    "^refs/heads/nanoframework$",
    "^refs/heads/v\\d+(?:\\.\\d+)?$"
  ],