net8 + 0.3.7.789

rbfx · Apr 7, 2024 · 2435aa4 · 2435aa4
1 parent 8afa999
commit 2435aa4
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 17 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -9,7 +9,7 @@
       ]
     },
     "unofficial.Urho3DNet.Editor": {
-      "version": "0.3.7.785",
+      "version": "0.3.7.789",
       "commands": [
         "rbfx"
       ]

diff --git a/.github/workflows/build-master.yml b/.github/workflows/build-master.yml
@@ -83,18 +83,18 @@ jobs:
 
     - name: Dotnet Publish
       working-directory: ./RbfxTemplate.Desktop
-      run: dotnet publish -f net7.0 -c Release --runtime ${{ env.RUNTIME_ID }} --self-contained true -p:Version=${{ needs.set_version.outputs.BUILD_VERSION }}
+      run: dotnet publish -f net8.0 -c Release --runtime ${{ env.RUNTIME_ID }} --self-contained true -p:Version=${{ needs.set_version.outputs.BUILD_VERSION }}
 
     - name: Copy runtime dlls
       if: ${{ env.RUNTIME_ID == 'win-x64' }}
       run: |
-        copy "C:/Windows/System32/MSVCP140.dll" "RbfxTemplate.Desktop/bin/Release/net7.0/${{ env.RUNTIME_ID }}/publish/"
-        copy "C:/Windows/System32/VCRUNTIME140.dll" "RbfxTemplate.Desktop/bin/Release/net7.0/${{ env.RUNTIME_ID }}/publish/"
-        copy "C:/Windows/System32/VCRUNTIME140_1.dll" "RbfxTemplate.Desktop/bin/Release/net7.0/${{ env.RUNTIME_ID }}/publish/"
-        copy "C:/Windows/System32/D3DCOMPILER_47.dll" "RbfxTemplate.Desktop/bin/Release/net7.0/${{ env.RUNTIME_ID }}/publish/"
+        copy "C:/Windows/System32/MSVCP140.dll" "RbfxTemplate.Desktop/bin/Release/net8.0/${{ env.RUNTIME_ID }}/publish/"
+        copy "C:/Windows/System32/VCRUNTIME140.dll" "RbfxTemplate.Desktop/bin/Release/net8.0/${{ env.RUNTIME_ID }}/publish/"
+        copy "C:/Windows/System32/VCRUNTIME140_1.dll" "RbfxTemplate.Desktop/bin/Release/net8.0/${{ env.RUNTIME_ID }}/publish/"
+        copy "C:/Windows/System32/D3DCOMPILER_47.dll" "RbfxTemplate.Desktop/bin/Release/net8.0/${{ env.RUNTIME_ID }}/publish/"
 
     - name: Zip Package
-      run: dotnet tool run ezpipeline -- zip -i RbfxTemplate.Desktop/bin/Release/net7.0/${{ env.RUNTIME_ID }}/publish/ -o RbfxTemplate.${{ env.RUNTIME_ID }}.zip
+      run: dotnet tool run ezpipeline -- zip -i RbfxTemplate.Desktop/bin/Release/net8.0/${{ env.RUNTIME_ID }}/publish/ -o RbfxTemplate.${{ env.RUNTIME_ID }}.zip
 
     - name: Release
       uses: softprops/action-gh-release@v1
@@ -111,7 +111,7 @@ jobs:
       if: ${{ env.BUTLER_API_KEY != '' && vars.ITCH_PROJECT != '' }}
       run: |
         dotnet tool run ezpipeline -- fetch-tool --name Butler -o tools/itch
-        tools/itch/butler push RbfxTemplate.Desktop/bin/Release/net7.0/${{ env.RUNTIME_ID }}/publish/ ${{ vars.ITCH_PROJECT }}:${{ env.RUNTIME_ID }}
+        tools/itch/butler push RbfxTemplate.Desktop/bin/Release/net8.0/${{ env.RUNTIME_ID }}/publish/ ${{ vars.ITCH_PROJECT }}:${{ env.RUNTIME_ID }}
       shell: bash
   # ---------------------------------------------------------------------------------------
   build_android:
@@ -159,7 +159,7 @@ jobs:
 
     - name: Dotnet Publish
       working-directory: ./RbfxTemplate.Android
-      run: dotnet publish -f net7.0-android -c Release --no-restore -p:AndroidVersionCode=${{ needs.set_version.outputs.ANDROID_VERSION }} -p:AndroidSdkDirectory=$ANDROID_HOME -p:Version=${{ needs.set_version.outputs.BUILD_VERSION }}
+      run: dotnet publish -f net8.0-android -c Release --no-restore -p:AndroidVersionCode=${{ needs.set_version.outputs.ANDROID_VERSION }} -p:AndroidSdkDirectory=$ANDROID_HOME -p:Version=${{ needs.set_version.outputs.BUILD_VERSION }}
 
     - name: Find APK
       run: |

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <Urho3DNetVersion>0.3.7.785</Urho3DNetVersion>
+    <Urho3DNetVersion>0.3.7.789</Urho3DNetVersion>
   </PropertyGroup>
 </Project>
diff --git a/RbfxTemplate.Android/MainActivity.cs b/RbfxTemplate.Android/MainActivity.cs
@@ -15,7 +15,7 @@ protected override void OnResume()
             base.OnResume();
         }
 
-        protected override void OnCreate(Bundle savedInstanceState)
+        protected override void OnCreate(Bundle? savedInstanceState)
         {
             //Launcher.SdlTrapBackButton = true;
             Launcher.Run(_ => new UrhoApplication(_));

diff --git a/RbfxTemplate.Android/RbfxTemplate.Android.csproj b/RbfxTemplate.Android/RbfxTemplate.Android.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0-android</TargetFramework>
+    <TargetFramework>net8.0-android</TargetFramework>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>

diff --git a/RbfxTemplate.Desktop/RbfxTemplate.Desktop.csproj b/RbfxTemplate.Desktop/RbfxTemplate.Desktop.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>RbfxTemplate</RootNamespace>
     <ApplicationIcon>icon.ico</ApplicationIcon>
     <!-- FastUpToDateCheck disabled as a workaround. Without this flag the build system going to miss changes in content files. -->

diff --git a/RbfxTemplate.IOS/RbfxTemplate.IOS.csproj b/RbfxTemplate.IOS/RbfxTemplate.IOS.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net7.0-ios</TargetFramework>
+		<TargetFramework>net8.0-ios</TargetFramework>
 		<OutputType>Exe</OutputType>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>true</ImplicitUsings>

diff --git a/RbfxTemplate.Tests/RbfxTemplate.Tests.csproj b/RbfxTemplate.Tests/RbfxTemplate.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 

diff --git a/RbfxTemplate.csproj b/RbfxTemplate.csproj
@@ -12,7 +12,7 @@
     <Authors>rbfx</Authors>
     <Description>Templates to use when creating a casual game using Rebel Framework.</Description>
     <PackageTags>dotnet-new;templates;rbfx</PackageTags>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IncludeContentInPack>true</IncludeContentInPack>
     <IncludeBuildOutput>false</IncludeBuildOutput>

diff --git a/Tools/IconUpdater/IconUpdater.csproj b/Tools/IconUpdater/IconUpdater.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>