Update buildAndPublish.yml to include 'forRelease' input

.github/workflows/buildAndPublish.yml

@@ -5,6 +5,10 @@ on:
         description: 'NuGet feed URL'
         required: true
         type: string
+      forRelease:
+        description: 'Run for release?'
+        required: true
+        type: boolean
     secrets:
       feedAPIKey:
         description: 'NuGet feed API key'
@@ -26,12 +30,12 @@ jobs:
       uses: PaulHatch/[email protected]
       with:
         tag_prefix: ''
-        version_format: '${major}.${minor}.${patch}-preview${increment}'
+        version_format: "${major}.${minor}.${patch}${{ !inputs.forRelease && '-preview${increment}' || '' }}"
         search_commit_body: true
         debug: true
 
     - name: Output version
-      run: echo "Version is ${{ steps.version.outputs.debug_output }}"
+      run: echo "Version is ${{ toJSON(steps.version.outputs.debug_output) }}"
 
     - name: Setup dotnet ${{ env.DOTNET_VERSION }}
       uses: actions/setup-dotnet@v3
@@ -46,7 +50,7 @@ jobs:
 
     - name: Upload dotnet test results
       uses: dorny/[email protected]
-      if: always()
+      if: ${{ !cancelled() }}
       with:
         name: .NET Tests
         path: '**/MGR.Guard.UnitTests.trx'

.github/workflows/ci.yml

@@ -24,5 +24,6 @@ jobs:
     uses: ./.github/workflows/buildAndPublish.yml
     with:
       feedUrl: https://www.myget.org/F/mgrosperrin/api/v3/index.json
+      forRelease: false
     secrets:
       feedAPIKey: ${{ secrets.MYGET_CI_API_KEY }}

.github/workflows/release.yml

@@ -21,6 +21,7 @@ jobs:
     uses: ./.github/workflows/buildAndPublish.yml
     with:
       feedUrl: https://api.nuget.org/v3/index.json
+      forRelease: true
     secrets:
       feedAPIKey: ${{ secrets.NUGET_API_KEY }}