update flathub and windowsinstaller to net9.0

one-ware · Nov 14, 2024 · 6c6cb3e · 6c6cb3e
1 parent 03f9e20
commit 6c6cb3e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/publish-studio-linux-flathub.yml b/.github/workflows/publish-studio-linux-flathub.yml
@@ -22,8 +22,8 @@ jobs:
           sudo apt-get update
           sudo apt-get install flatpak -y
           sudo flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
-          sudo flatpak install flathub org.freedesktop.Sdk//23.08 -y --noninteractive 
-          sudo flatpak install flathub org.freedesktop.Sdk.Extension.dotnet8//23.08 -y --noninteractive 
+          sudo flatpak install flathub org.freedesktop.Sdk//24.08 -y --noninteractive 
+          sudo flatpak install flathub org.freedesktop.Sdk.Extension.dotnet8//24.08 -y --noninteractive 
       - name: Checkout the target repository
         uses: actions/checkout@v4
         with:
@@ -44,7 +44,7 @@ jobs:
         run: |
           curl -o flatpak-dotnet-generator.py https://raw.githubusercontent.com/flatpak/flatpak-builder-tools/master/dotnet/flatpak-dotnet-generator.py
           chmod +x flatpak-dotnet-generator.py
-          ./flatpak-dotnet-generator.py --dotnet 8 -f 23.08 -r linux-x64 oneware-nuget-sources.json ./source-repo/studio/OneWare.Studio.Desktop/OneWare.Studio.Desktop.csproj
+          ./flatpak-dotnet-generator.py --dotnet 9 -f 24.08 -r linux-x64 oneware-nuget-sources.json ./source-repo/studio/OneWare.Studio.Desktop/OneWare.Studio.Desktop.csproj
           rm -f flatpak-dotnet-generator.py      
       - name: Delete the source repository
         run: rm -rf source-repo 

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -24,7 +24,7 @@ parts:
       export TZ=Europe/Berlin
       ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
       cd studio/OneWare.Studio.Desktop
-      dotnet publish -f net8.0 -r linux-x64 -c Release -o $SNAPCRAFT_PART_INSTALL
+      dotnet publish -f net9.0 -r linux-x64 -c Release -o $SNAPCRAFT_PART_INSTALL
       chmod +x $SNAPCRAFT_PART_INSTALL/OneWareStudio
       chmod +x $SNAPCRAFT_PART_INSTALL/AsmichiChildProcessHelper
 

diff --git a/studio/OneWare.Studio.Desktop.MacOSInstaller/CreateAppBundle.sh b/studio/OneWare.Studio.Desktop.MacOSInstaller/CreateAppBundle.sh
@@ -11,7 +11,7 @@ rm -rf source
 mkdir -p "source/OneWare Studio.app/Contents"
 cp -r Contents "source/OneWare Studio.app"
 mkdir "OneWare Studio.app/Contents/MacOS"
-dotnet publish -c Release -f net8.0 -r osx-arm64 --self-contained ../OneWare.Studio.Desktop/OneWare.Studio.Desktop.csproj -o "source/OneWare Studio.app/Contents/MacOS"
+dotnet publish -c Release -f net9.0 -r osx-arm64 --self-contained ../OneWare.Studio.Desktop/OneWare.Studio.Desktop.csproj -o "source/OneWare Studio.app/Contents/MacOS"
 
 PACKAGENAME="publish/OneWareStudio-arm64.dmg"
 
@@ -31,7 +31,7 @@ rm -rf source
 mkdir -p "source/OneWare Studio.app/Contents"
 cp -r Contents "source/OneWare Studio.app"
 mkdir "OneWare Studio.app/Contents/MacOS"
-dotnet publish -c Release -f net8.0 -r osx-x64 --self-contained ../OneWare.Studio.Desktop/OneWare.Studio.Desktop.csproj -o "source/OneWare Studio.app/Contents/MacOS"
+dotnet publish -c Release -f net9.0 -r osx-x64 --self-contained ../OneWare.Studio.Desktop/OneWare.Studio.Desktop.csproj -o "source/OneWare Studio.app/Contents/MacOS"
 
 PACKAGENAME="publish/OneWareStudio-x64.dmg"
 

diff --git a/...o/OneWare.Studio.Desktop.WindowsInstaller/OneWare.Studio.Desktop.WindowsInstaller.wixproj b/...o/OneWare.Studio.Desktop.WindowsInstaller/OneWare.Studio.Desktop.WindowsInstaller.wixproj
@@ -6,7 +6,7 @@
     <OutputType>Package</OutputType>
     <StudioFolder>../OneWare.Studio.Desktop</StudioFolder>
     <StudioProj>../OneWare.Studio.Desktop/OneWare.Studio.Desktop.csproj</StudioProj>
-    <StudioPublish>$(StudioFolder)/bin/Release/net8.0/win-x64/publish</StudioPublish>
+    <StudioPublish>$(StudioFolder)/bin/Release/net9.0/win-x64/publish</StudioPublish>
   </PropertyGroup>
 
   <ItemGroup>
@@ -27,7 +27,7 @@
     <!-- Clean previous build folder -->
     <Exec Command="rd /s /q $(StudioPublish)" />
     <!-- Publish Oneware Studio -->
-    <Exec Command="dotnet publish $(StudioProj) -f net8.0 -c Release -r win-x64" />
+    <Exec Command="dotnet publish $(StudioProj) -f net9.0 -c Release -r win-x64" />
     <!-- Get assembly version -->
     <GetAssemblyIdentity AssemblyFiles="$(StudioPublish)/OneWareStudio.dll">
       <Output TaskParameter="Assemblies" ItemName="AssemblyVersion" />