Work CI-CD

- Fix publish to Cloudsmith: need to adjust package name and versions to drop preview suffix.

Author: josesimoes

azure-pipelines-templates/publish-cloudsmith.yml

@@ -22,7 +22,7 @@ steps:
       rootFolderOrFile: '$(Build.ArtifactStagingDirectory)\$(TargetPublishName)' 
       includeRootFolder: false
       archiveType: 'zip'
-      archiveFile: '$(Agent.TempDirectory)\$(TargetPublishName)-$(NBGV_AssemblyVersion).zip'
+      archiveFile: '$(Agent.TempDirectory)\$(TargetPublishName)-$(NBGV_SimpleVersion).$(TARGET_BUILD_COUNTER).zip'
       replaceExistingArchive: true
 
   - task: CopyFiles@1
@@ -40,7 +40,7 @@ steps:
     inputs:
       sourceFolder: $(Agent.TempDirectory)
       Contents: |
-        $(TargetPublishName)-$(NBGV_AssemblyVersion).zip
+        $(TargetPublishName)-$(NBGV_SimpleVersion).$(TARGET_BUILD_COUNTER).zip
       TargetFolder: '$(Build.ArtifactStagingDirectory)\$(TargetPublishName)'
       flattenFolders: true
 
@@ -51,7 +51,6 @@ steps:
         eq(variables['System.PullRequest.PullRequestId'], ''),
         or(
           eq(variables['ForceUpload'], true),
-          startsWith(variables['Build.SourceBranchName'], 'main'),
           startsWith(variables['Build.SourceBranchName'], 'develop')
         )
       )
@@ -70,7 +69,6 @@ steps:
         eq(variables['System.PullRequest.PullRequestId'], ''),
         or(
           eq(variables['ForceUpload'], true),
-          startsWith(variables['Build.SourceBranchName'], 'main'),
           startsWith(variables['Build.SourceBranchName'], 'develop')
         )
       )
@@ -97,13 +95,7 @@ steps:
         eq(variables['ForceUpload'], true),
         and(
           succeeded(),
-          eq(variables['System.PullRequest.PullRequestId'], ''),
-          or(
-            eq(variables['Build.SourceBranchName'], 'develop'),
-            eq(variables['Build.SourceBranchName'], 'main'),
-            contains(variables['Build.SourceBranchName'], 'release'),
-            eq(variables['Build.Repository.Name'], 'nanoframework/nf-Community-Targets')
-          )
+          eq(variables['System.PullRequest.PullRequestId'], '')
         )
       )
     displayName: Set Cloudsmith repo path
@@ -122,9 +114,9 @@ steps:
             # this is a build for a community target
             Write-Host "$("##vso[task.setvariable variable=CLOUDSMITH_REPO]")nanoframework-images-community-targets"
             # set publishing package name
-            Write-Host "$("##vso[task.setvariable variable=PUBLISHING_PACKAGE_NAME]")$(TargetPublishName)-$(NBGV_AssemblyVersion)"
+            Write-Host "$("##vso[task.setvariable variable=PUBLISHING_PACKAGE_NAME]")$(TargetPublishName)-$(NBGV_SimpleVersion).$(TARGET_BUILD_COUNTER)"
             # set version
-            Write-Host "$("##vso[task.setvariable variable=PACKAGE_VERSION]")$(NBGV_AssemblyVersion)"
+            Write-Host "$("##vso[task.setvariable variable=PACKAGE_VERSION]")$(NBGV_SimpleVersion).$(TARGET_BUILD_COUNTER)"
           }
           else
           {
@@ -143,9 +135,9 @@ steps:
               # this main branch, publish to Cloudsmith stable repo
               Write-Host "$("##vso[task.setvariable variable=CLOUDSMITH_REPO]")nanoframework-images"
               # set publishing package name
-              Write-Host "$("##vso[task.setvariable variable=PUBLISHING_PACKAGE_NAME]")$(TargetPublishName)-$(NBGV_AssemblyVersion)"
+              Write-Host "$("##vso[task.setvariable variable=PUBLISHING_PACKAGE_NAME]")$(TargetPublishName)-$(NBGV_SimpleVersion).$(TARGET_BUILD_COUNTER)"
               # set version
-              Write-Host "$("##vso[task.setvariable variable=PACKAGE_VERSION]")$(NBGV_AssemblyVersion)"
+              Write-Host "$("##vso[task.setvariable variable=PACKAGE_VERSION]")$(NBGV_SimpleVersion).$(TARGET_BUILD_COUNTER)"
             }
           }
       errorActionPreference: 'stop'
@@ -157,13 +149,7 @@ steps:
         eq(variables['ForceUpload'], true),
         and(
           succeeded(),
-          eq(variables['System.PullRequest.PullRequestId'], ''),
-          or(
-            eq(variables['Build.SourceBranchName'], 'develop'),
-            eq(variables['Build.SourceBranchName'], 'main'),
-            contains(variables['Build.SourceBranchName'], 'release'),
-            eq(variables['Build.Repository.Name'], 'nanoframework/nf-Community-Targets')
-          )
+          eq(variables['System.PullRequest.PullRequestId'], '')
         )
       )
     displayName: Upload package to Cloudsmith
@@ -172,9 +158,9 @@ steps:
       script: |
 
           # install Cloudsmith CLI
-          python -m pip install --upgrade cloudsmith-cli
+          python -m pip install --upgrade cloudsmith-cli --quiet
 
-          Write-Host "Uploading $(PUBLISHING_PACKAGE_NAME) v$(PACKAGE_VERSION)"
+          Write-Host "Uploading $(PUBLISHING_PACKAGE_NAME) to v$(PACKAGE_VERSION)"
 
           cloudsmith push raw net-nanoframework/$(CLOUDSMITH_REPO) $(Agent.TempDirectory)\$(PUBLISHING_PACKAGE_NAME).zip --name $(TargetPublishName) --version $(PACKAGE_VERSION) --tags $(TargetPlatform),$(TargetSeries) --republish -k $(CLOUDSMITH_KEY)