Update

wieslawsoltes · Jan 6, 2024 · caaa030 · caaa030
1 parent 6c815ff
commit caaa030
Show file tree

Hide file tree

Showing 19 changed files with 20 additions and 22 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -13,7 +13,7 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <AvaloniaVersion>11.0.0</AvaloniaVersion>
+    <AvaloniaVersion>11.0.6</AvaloniaVersion>
     <DockVersion>11.0.0</DockVersion>
     <NodeEditorVersion>11.0.0</NodeEditorVersion>
     <CommunityToolkitMvvmVersion>8.1.0</CommunityToolkitMvvmVersion>

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -11,7 +11,7 @@ resources:
 variables:
   BuildConfiguration: 'Release'
   BuildPlatform: 'Any CPU'
-  PublishFramework: 'net7.0'
+  PublishFramework: 'net8.0'
   PublishProject: 'ChatGPT.UI.Desktop'
   PublishRuntime: ''
   Workloads: 'wasm-tools wasm-experimental android'
@@ -138,6 +138,6 @@ jobs:
         vmImage: 'macOS-13'
         BuildConfiguration: ${{ variables.BuildConfiguration }}
         Workloads: ${{ variables.Workloads }} ios
-        PublishFramework: 'net7.0-android'
+        PublishFramework: 'net8.0-android'
         PublishProject: 'ChatGPT.UI.Android'
         PublishRuntime: ''
diff --git a/build/build/_build.csproj b/build/build/_build.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <IsPackable>False</IsPackable>
     <NoWarn>CS0649;CS0169</NoWarn>

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.100",
+    "version": "8.0.100",
     "rollForward": "latestMinor",
     "allowPrerelease": true
   }

diff --git a/samples/ChatGPT.CLI.Chaining/ChatGPT.CLI.Chaining.csproj b/samples/ChatGPT.CLI.Chaining/ChatGPT.CLI.Chaining.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifiers>win-x64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>

diff --git a/samples/ChatGPT.CLI.FunctionCalling/ChatGPT.CLI.FunctionCalling.csproj b/samples/ChatGPT.CLI.FunctionCalling/ChatGPT.CLI.FunctionCalling.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifiers>win-x64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>

diff --git a/samples/ChatGPT.CLI.Repl/ChatGPT.CLI.Repl.csproj b/samples/ChatGPT.CLI.Repl/ChatGPT.CLI.Repl.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifiers>win-x64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>

diff --git a/samples/ChatGPT.UI.Designer/ChatGPT.UI.Designer.csproj b/samples/ChatGPT.UI.Designer/ChatGPT.UI.Designer.csproj
@@ -6,7 +6,7 @@
     <OutputType>WinExe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <TrimMode>full</TrimMode>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>

diff --git a/samples/ChatGPT.UI.Game/ChatGPT.UI.Game.csproj b/samples/ChatGPT.UI.Game/ChatGPT.UI.Game.csproj
@@ -6,7 +6,7 @@
     <OutputType>WinExe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <TrimMode>full</TrimMode>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>

diff --git a/src/ChatGPT.CLI/ChatGPT.CLI.csproj b/src/ChatGPT.CLI/ChatGPT.CLI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifiers>win-x64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>

diff --git a/src/ChatGPT.Core/ChatGPT.Core.csproj b/src/ChatGPT.Core/ChatGPT.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>net7.0;net462</TargetFrameworks>
+    <TargetFrameworks>net8.0;net462</TargetFrameworks>
     <Nullable>enable</Nullable>
     <IsPackable>True</IsPackable>
     <RootNamespace>ChatGPT</RootNamespace>

diff --git a/src/ChatGPT.UI.Android/ChatGPT.UI.Android.csproj b/src/ChatGPT.UI.Android/ChatGPT.UI.Android.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0-android</TargetFramework>
+    <TargetFramework>net8.0-android</TargetFramework>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <Nullable>enable</Nullable>
     <ApplicationId>com.chatgpt.android</ApplicationId>
@@ -21,8 +21,6 @@
     <!--<AndroidEnableProfiledAot>True</AndroidEnableProfiledAot>-->
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.3.1.3" />
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModel" Version="2.3.1.3" />
     <PackageReference Include="Avalonia.Android" Version="$(AvaloniaVersion)" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/ChatGPT.UI.Browser/AppBundle/main.js b/src/ChatGPT.UI.Browser/AppBundle/main.js
@@ -21,4 +21,4 @@ window.addEventListener(terminationEvent, (event) => {
     exports.ChatGPT.UI.Browser.Services.Interop.SaveSettings();
 });
 
-await dotnetRuntime.runMainAndExit(config.mainAssemblyName, [window.location.search]);
+await dotnetRuntime.runMain(config.mainAssemblyName, [window.location.search]);
diff --git a/src/ChatGPT.UI.Browser/ChatGPT.UI.Browser.csproj b/src/ChatGPT.UI.Browser/ChatGPT.UI.Browser.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
     <WasmMainJSPath>AppBundle\main.js</WasmMainJSPath>
     <OutputType>Exe</OutputType>

diff --git a/src/ChatGPT.UI.Desktop/ChatGPT.UI.Desktop.csproj b/src/ChatGPT.UI.Desktop/ChatGPT.UI.Desktop.csproj
@@ -6,7 +6,7 @@
     <OutputType>WinExe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifiers>win-x64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
     <Nullable>enable</Nullable>
     <TrimMode>full</TrimMode>

diff --git a/src/ChatGPT.UI.iOS/ChatGPT.UI.iOS.csproj b/src/ChatGPT.UI.iOS/ChatGPT.UI.iOS.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0-ios</TargetFramework>
+    <TargetFramework>net8.0-ios</TargetFramework>
     <SupportedOSPlatformVersion>15.0</SupportedOSPlatformVersion>
     <ProvisioningType>manual</ProvisioningType>
     <Nullable>enable</Nullable>

diff --git a/src/ChatGPT.UI/ChatGPT.UI.csproj b/src/ChatGPT.UI/ChatGPT.UI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <RootNamespace>ChatGPT</RootNamespace>

diff --git a/src/ChatGPT/ChatGPT.csproj b/src/ChatGPT/ChatGPT.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>net7.0;net462</TargetFrameworks>
+    <TargetFrameworks>net8.0;net462</TargetFrameworks>
     <Nullable>enable</Nullable>
     <IsPackable>True</IsPackable>
     <RootNamespace>AI</RootNamespace>

diff --git a/tests/ChatGPT.UnitTests/ChatGPT.UnitTests.csproj b/tests/ChatGPT.UnitTests/ChatGPT.UnitTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
     <GenerateRuntimeConfigurationFiles>True</GenerateRuntimeConfigurationFiles>