From d4dc3c3af70c4948fdd31d3ba7bdd6c1389d5d84 Mon Sep 17 00:00:00 2001
From: Evgeniy Antonyuk <antonyuk.evgenyiy@onlyoffice.com>
Date: Fri, 29 Nov 2024 14:13:35 +0300
Subject: [PATCH] Build packages with updated donet-sdk

---
 .github/workflows/build_packages.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml
index f3aa6ac892..20eee48944 100644
--- a/.github/workflows/build_packages.yml
+++ b/.github/workflows/build_packages.yml
@@ -6,7 +6,9 @@ on:
       - 'release/**'
       - 'hotfix/**'
       - 'develop'
+      - 'feature/packages-dotnet'
     paths:
+      - '.github/workflows/build_packages.yml'
       - 'install/common/**'
       - 'install/deb/**'
       - 'install/rpm/**'
@@ -35,8 +37,8 @@ env:
   BUILD_NUMBER: ${{ github.run_number }}
   PACKAGE_DIRECTORY: "/home/runner/work/${{ github.event.repository.name }}/${{ github.event.repository.name }}"
   BRANCH_BUILDTOOLS: ${{ github.event.inputs.branch-buildtools != '' && github.event.inputs.branch-buildtools || github.ref_name || 'develop' }}
-  BRANCH_CLIENT: ${{ github.event.inputs.branch-client != '' && github.event.inputs.branch-client || github.ref_name || 'develop' }}
-  BRANCH_SERVER: ${{ github.event.inputs.branch-server != '' && github.event.inputs.branch-server || github.ref_name || 'develop' }}
+  BRANCH_CLIENT: ${{ github.event.inputs.branch-client != '' && github.event.inputs.branch-client || 'develop' }}
+  BRANCH_SERVER: ${{ github.event.inputs.branch-server != '' && github.event.inputs.branch-server || 'develop' }}
 
 jobs:
   build:
@@ -52,9 +54,8 @@ jobs:
     steps:
       - name: Set product version
         run: |
-          PRODUCT_VERSION=$(grep -oP '\d+\.\d+\.\d+' <<< "${BRANCH_BUILDTOOLS//\//} ${BRANCH_CLIENT//\//} \
-          ${BRANCH_SERVER//\//}" | head -n1 || echo "3.0.1")
-          echo "PRODUCT_VERSION=$PRODUCT_VERSION" >> $GITHUB_ENV
+          PRODUCT_VERSION=$(grep -oP '\d+\.\d+\.\d+' <<< "${BRANCH_BUILDTOOLS//\//} ${BRANCH_CLIENT//\//} ${BRANCH_SERVER//\//}" | head -n1)
+          echo "PRODUCT_VERSION=${PRODUCT_VERSION:-3.0.1}" >> $GITHUB_ENV
 
       - name: Free Disk Space
         run: |
@@ -81,10 +82,9 @@ jobs:
           sudo chmod 644 /usr/share/keyrings/yarnkey.gpg
           echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian/ stable main" | \
           sudo tee /etc/apt/sources.list.d/yarn.list
-          wget https://packages.microsoft.com/config/$(lsb_release -is | \
-          tr [:upper:] [:lower:])/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
-          sudo dpkg -i packages-microsoft-prod.deb
+          sudo add-apt-repository -y ppa:dotnet/backports
           curl -fsSL https://deb.nodesource.com/setup_20.x | sudo bash -
+          sudo apt remove -y netstandard-targeting-pack-2.1 # Conflict with netstandard-targeting-package-2.1-9.0 
           sudo apt install -y dotnet-sdk-9.0 yarn nodejs rename unzip maven openjdk-21-jdk-headless
           JAVA_PATH=$(find /usr/lib/jvm/ -name "java" -path "*java-${JAVA_VERSION}*" | head -1)
           sudo update-alternatives --install /usr/bin/java java "$JAVA_PATH" 100 && sudo update-alternatives --set java "$JAVA_PATH"