From 899771cdeb0f22695a50dbce03df2648c074f7ad Mon Sep 17 00:00:00 2001
From: Mark McDowall <mark@mcdowall.ca>
Date: Sun, 24 Dec 2023 14:47:38 -0800
Subject: [PATCH] Update build.yml

---
 .github/actions/package/action.yml | 19 -------------------
 .github/workflows/build.yml        |  9 ++++++++-
 build.sh                           |  6 ++----
 3 files changed, 10 insertions(+), 24 deletions(-)
 delete mode 100644 .github/actions/package/action.yml

diff --git a/.github/actions/package/action.yml b/.github/actions/package/action.yml
deleted file mode 100644
index 5b8ebe520..000000000
--- a/.github/actions/package/action.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# https://docs.github.com/en/actions/creating-actions/creating-a-composite-action
-
-name: Set up environment
-description: Runs setup actions and installs packages
-
-inputs:
-  framework:
-    description: '.net framework'
-    required: true
-  runtime:
-    description: '.net runtime'
-    required: true
-
-runs:
-  using: 'composite'
-  steps:
-    - run: |
-        echo "Packaging ${{inputs.framework}} ${{inputs.runtime}}"
-      shell: bash
\ No newline at end of file
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6b194f0ea..a7ce7ca76 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,23 +14,30 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  SOLUTION_FILE: src/Sonarr.sln
+  SONARR_MAJOR_VERSION: 4
+  VERSION: 4.0.0
 
 jobs:
   build_backend:
     runs-on: windows-latest
     steps:
+    - name: Check out
     - uses: actions/checkout@v3
+
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
+
     - name: Setup Environment Variables
       shell: bash
       run: |
         DOTNET_VERSION=$(jq -r '.sdk.version' global.json)
         echo "SDK_PATH=${{ env.DOTNET_ROOT }}/sdk/${DOTNET_VERSION}" >> "$GITHUB_ENV"
+        echo "SONARR_VERSION=${{ env.VERSION }}.${{ env.GITHUB_RUN_NUMBER }}" >> "$GITHUB_ENV"
+
     - name: Enable Extra Platforms In SDK
       shell: bash
       run: ./build.sh --enable-extra-platforms-in-sdk
+
     - name: Build Backend
       shell: bash
       run: ./build.sh --backend --enable-extra-platforms --packages
diff --git a/build.sh b/build.sh
index 337e08b99..52049aa06 100755
--- a/build.sh
+++ b/build.sh
@@ -7,16 +7,14 @@ artifactsFolder="_artifacts";
 
 ProgressStart()
 {
-    echo "##teamcity[blockOpened name='$1']"
-    echo "##teamcity[progressStart '$1']"
+    echo "::group::$1"
     echo "Start '$1'"
 }
 
 ProgressEnd()
 {
     echo "Finish '$1'"
-    echo "##teamcity[progressFinish '$1']"
-    echo "##teamcity[blockClosed name='$1']"
+    echo "::endgroup::"
 }
 
 UpdateVersionNumber()