bump CI dotnet version

btcpayserver · Dec 7, 2023 · 3e25d22 · 3e25d22
1 parent 90c3615
commit 3e25d22
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 15 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -20,7 +20,7 @@ jobs:
     name: debian-x64
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - run: ./Build/CI/build.sh
         env:
           RID: debian-x64
@@ -30,7 +30,7 @@ jobs:
     name: linux-x64
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - run: ./Build/CI/build.sh
         env:
           RID: linux-x64
@@ -39,7 +39,7 @@ jobs:
     name: osx-x64
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - run: ./Build/CI/build.sh
         env:
           RID: osx-x64
@@ -48,7 +48,7 @@ jobs:
     name: win-x64
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - run: ./Build/CI/build.sh
         env:
           RID: win-x64
@@ -61,7 +61,7 @@ jobs:
     needs: [osx-x64]
     if: startsWith( github.ref, 'refs/tags/')
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - run: ./Build/CI/applesign.sh
         env:
           APPLE_ID: ${{ secrets.APPLE_ID }}
@@ -76,7 +76,7 @@ jobs:
     needs: [win-x64, osx-x64, linux-x64, debian-x64, applesign]
     if: ${{ always() }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - run: ./Build/CI/pgpsign.sh
         env:
           PGP_KEY: ${{ secrets.PGP_KEY }}
@@ -87,7 +87,7 @@ jobs:
     needs: [pgpsign, applesign]
     if: startsWith( github.ref, 'refs/tags/')
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - run: ./Build/CI/makerelease.sh
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/BTCPayServer.Vault/BTCPayServer.Vault.csproj b/BTCPayServer.Vault/BTCPayServer.Vault.csproj
@@ -61,4 +61,10 @@
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <SelfContained>true</SelfContained>
   </PropertyGroup>
+  <ItemGroup Condition="'$(GithubDistrib)' == 'true'">
+    <TrimmerRootAssembly Include="BTCPayServer.Vault"/>
+    <TrimmerRootAssembly Include="Avalonia.Themes.Simple"/>
+    <TrimmerRootAssembly Include="Avalonia.Base"/>
+    <TrimmerRootAssembly Include="Avalonia.FreeDesktop"/>
+  </ItemGroup>
 </Project>
diff --git a/BTCPayServer.Vault/MainWindow.xaml.cs b/BTCPayServer.Vault/MainWindow.xaml.cs
@@ -93,7 +93,7 @@ MainWindowViewModel MainViewModel
         public IServiceProvider ServiceProvider { get; private set; }
         public IRunningIndicator Indicator { get; private set; }
 
-        AvaloniaSynchronizationContext Context;
+        AvaloniaSynchronizationContext Context = new AvaloniaSynchronizationContext();
 
         internal async Task<bool> Authorize(OriginReason originReason)
         {

diff --git a/Build/common/export-variables.sh b/Build/common/export-variables.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
-BUILD_ARGS="--runtime $RUNTIME -p:Configuration=Release -p:GithubDistrib=true"
-FRAMEWORK="net6.0"
+DOTNET_RUNTIME=${DOTNET_RUNTIME:-$RUNTIME}
+BUILD_ARGS="--runtime $DOTNET_RUNTIME -p:Configuration=Release -p:GithubDistrib=true"
+FRAMEWORK="net8.0"
 DIST="/source/dist"
 RESOURCES="/source/Build/${RUNTIME}"
 RESOURCES_COMMON="/source/Build/common"
@@ -14,7 +15,7 @@ TITLE="$(cat $PROJECT_FILE | sed -n 's/.*<Title>\(.*\)<\/Title>.*/\1/p')"
 if [ -f "$VERSION_FILE" ]; then
     VERSION="$(cat $VERSION_FILE | sed -n 's/.*<Version>\(.*\)<\/Version>.*/\1/p')"
 fi
-PUBLISH_FOLDER="/source/BTCPayServer.Vault/bin/Release/$FRAMEWORK/$RUNTIME/publish"
+PUBLISH_FOLDER="/source/BTCPayServer.Vault/bin/Release/$FRAMEWORK/$DOTNET_RUNTIME/publish"
 EXECUTABLE="$(cat $PROJECT_FILE | sed -n 's/.*<TargetName>\(.*\)<\/TargetName>.*/\1/p')"
 
 mkdir -p "$DIST"

diff --git a/Build/debian-x64/Dockerfile b/Build/debian-x64/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS builder
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder
 
 # Optimize docker cache, do not make it one layer
 RUN apt-get update
@@ -15,6 +15,7 @@ ARG PGP_KEY=""
 RUN ! [[ "${PGP_KEY}" ]] || apt-get install -y debsigs
 
 WORKDIR /source
+ENV DOTNET_RUNTIME "linux-x64"
 ENV RUNTIME "debian-x64"
 COPY "Build/common" "Build/common"
 ENV EXPORT_VARIABLES "source Build/common/export-variables.sh"

diff --git a/Build/linux-x64/Dockerfile b/Build/linux-x64/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS builder
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder
 
 RUN wget -qO /tmp/hwi.tar.gz https://github.com/bitcoin-core/HWI/releases/download/2.1.1/hwi-2.1.1-linux-amd64.tar.gz && \
     tar -zxvf /tmp/hwi.tar.gz -C /tmp hwi && \

diff --git a/Build/osx-x64/Dockerfile b/Build/osx-x64/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS builder
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder
 
 # Optimize docker cache, do not make it one layer
 RUN apt-get update

diff --git a/Build/win-x64/Dockerfile b/Build/win-x64/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS builder
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder
 
 # Optimize docker cache, do not make it one layer
 RUN apt-get update