Merge e65a1f4 into 1b5c204

Author: stesee

.github/workflows/dotnet.yml

@@ -1,5 +1,6 @@
 name: .NET build and test
 env:
+  CURRENT_VERSION: 1.0.${{ github.run_number }}
   LAST_COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
 
 on:
@@ -27,10 +28,12 @@ jobs:
     - name: "Build & test"
       run: |
           echo "done!"
+          git tag ${{ env.CURRENT_VERSION }}
+          git push origin --tags
           pwd
 
-  deployMain:
-    if: github.ref == 'refs/heads/main'
+  deployPreRelease:
+    if: github.ref != 'refs/heads/main'
     runs-on: ubuntu-latest
     needs: build 
     steps:
@@ -49,22 +52,21 @@ jobs:
       run: |
           ls ./GithubActionsHelloWorld/bin/Release
           dotnet nuget push ./GithubActionsHelloWorld/bin/Release/*.nupkg --skip-duplicate --api-key ${{secrets.NUGET_TOKEN}} --source https://apiint.nugettest.org/v3/index.json
-          # dotnet nuget push ./GithubActionsHelloWorld/bin/Release/*.nupkg --skip-duplicate --api-key ${{secrets.NUGET_TOKEN}} --source https://api.nuget.org/v3/index.json
     - uses: papeloto/action-zip@v1
       with:
           files: ./GithubActionsHelloWorld/bin/Release/net6.0/publish/
           dest: GithubActionsHelloWorld.zip
     - uses: "marvinpinto/action-automatic-releases@latest"
       with:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        automatic_release_tag: "latest"
-        title: "Release Build"
+        automatic_release_tag: ${{ env.CURRENT_VERSION }}
+        prerelease: true
         files: |
           LICENSE
           GithubActionsHelloWorld.zip
 
-  deployTest:
-    if: github.ref != 'refs/heads/main'
+  deployRelease:
+    if: github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     needs: build 
     steps:
@@ -83,16 +85,17 @@ jobs:
       run: |
           ls ./GithubActionsHelloWorld/bin/Release
           dotnet nuget push ./GithubActionsHelloWorld/bin/Release/*.nupkg --skip-duplicate --api-key ${{secrets.NUGET_TOKEN}} --source https://apiint.nugettest.org/v3/index.json
+          # dotnet nuget push ./GithubActionsHelloWorld/bin/Release/*.nupkg --skip-duplicate --api-key ${{secrets.NUGET_TOKEN}} --source https://api.nuget.org/v3/index.json
     - uses: papeloto/action-zip@v1
       with:
           files: ./GithubActionsHelloWorld/bin/Release/net6.0/publish/
           dest: GithubActionsHelloWorld.zip
     - uses: "marvinpinto/action-automatic-releases@latest"
       with:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        automatic_release_tag: "latest-prerelease"
-        prerelease: true
-        title: "Prerelease Build"
+        automatic_release_tag: ${{ env.CURRENT_VERSION }}
         files: |
           LICENSE
           GithubActionsHelloWorld.zip
+
+

GithubActionsHelloWorld/GithubActionsHelloWorld.csproj

@@ -3,8 +3,8 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
-    <Version Condition="'$(GITHUB_RUN_NUMBER)' != ''">1.0.$(GITHUB_RUN_NUMBER)</Version>
-    <Version Condition="'$(GITHUB_RUN_NUMBER)' == ''">0.0.1</Version>
+    <Version Condition="'$(CURRENT_VERSION)' != ''">$(CURRENT_VERSION)</Version>
+    <Version Condition="'$(CURRENT_VERSION)' == ''">0.0.1</Version>
     <AssemblyVersion>$(Version)</AssemblyVersion>
     <FileVersion>$(Version)</FileVersion>
     <PackageVersion>$(Version)</PackageVersion>