Supported .NET 8.0 SDK.

kekyo · Nov 16, 2023 · 4ef8454 · 4ef8454
1 parent 25cdf94
commit 4ef8454
Show file tree

Hide file tree

Showing 18 changed files with 2,246 additions and 2,334 deletions.
diff --git a/README.ja.md b/README.ja.md
@@ -779,6 +779,8 @@ Apache-v2
 
 ## History
 
+* 1.12.0:
+  * .NET 8.0 SDKに対応しました。
 * 1.11.0:
   * .NET 8 RC2に対応しました。
   * UWP, WinUI3, MAUIをサポートから外しました (#39).

diff --git a/README.md b/README.md
@@ -780,6 +780,8 @@ Apache-v2
 
 ## History
 
+* 1.12.0:
+  * Supported .NET 8.0 SDK.
 * 1.11.0:
   * Supported .NET 8 RC2
   * Dropped UWP, WinUI3 and MAUI (See #39 ).

diff --git a/...FSharp/EpoxyHello.Avalonia/EpoxyHello.Avalonia.Desktop/EpoxyHello.Avalonia.Desktop.fsproj b/...FSharp/EpoxyHello.Avalonia/EpoxyHello.Avalonia.Desktop/EpoxyHello.Avalonia.Desktop.fsproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="7.0.300" />
+    <PackageReference Update="FSharp.Core" Version="8.0.100" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
     <PackageReference Include="Avalonia" Version="0.10.21" />
     <PackageReference Include="Avalonia.Desktop" Version="0.10.21" />

diff --git a/playground.FSharp/EpoxyHello.Avalonia/EpoxyHello.Avalonia/EpoxyHello.Avalonia.fsproj b/playground.FSharp/EpoxyHello.Avalonia/EpoxyHello.Avalonia/EpoxyHello.Avalonia.fsproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="7.0.300" />
+    <PackageReference Update="FSharp.Core" Version="8.0.100" />
     <PackageReference Include="Avalonia" Version="0.10.21" />
     <PackageReference Include="Avalonia.Diagnostics" Version="0.10.21" />
     <PackageReference Include="FSharp.Control.FusionTasks" Version="2.6.0" />

diff --git a/playground.FSharp/EpoxyHello.Avalonia11/EpoxyHello.Avalonia11.fsproj b/playground.FSharp/EpoxyHello.Avalonia11/EpoxyHello.Avalonia11.fsproj
@@ -8,12 +8,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="7.0.300" />
+    <PackageReference Update="FSharp.Core" Version="8.0.100" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
-    <PackageReference Include="Avalonia" Version="11.0.0" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.0" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.0" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0" />
+    <PackageReference Include="Avalonia" Version="11.0.5" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.5" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.5" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.5" />
     <PackageReference Include="FSharp.Control.FusionTasks" Version="2.6.0" />
   </ItemGroup>
 

diff --git a/playground.FSharp/EpoxyHello.Wpf/EpoxyHello.Wpf.fsproj b/playground.FSharp/EpoxyHello.Wpf/EpoxyHello.Wpf.fsproj
@@ -34,7 +34,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="7.0.300" />
+    <PackageReference Update="FSharp.Core" Version="8.0.100" />
   </ItemGroup>
 
   <Import Project="..\..\src\Epoxy.Build\build\Epoxy.Build.targets" />

diff --git a/playground/EpoxyHello.Avalonia11/EpoxyHello.Avalonia11.csproj b/playground/EpoxyHello.Avalonia11/EpoxyHello.Avalonia11.csproj
@@ -9,10 +9,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
-    <PackageReference Include="Avalonia" Version="11.0.0" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.0" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.0" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0" />
+    <PackageReference Include="Avalonia" Version="11.0.5" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.5" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.5" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...xyHello.OpenSilver/EpoxyHello.OpenSilver.Simulator/EpoxyHello.OpenSilver.Simulator.csproj b/...xyHello.OpenSilver/EpoxyHello.OpenSilver.Simulator/EpoxyHello.OpenSilver.Simulator.csproj
@@ -5,7 +5,7 @@
     <DefineSilverlight>true</DefineSilverlight>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="OpenSilver.Simulator" Version="1.1.0" />
+    <PackageReference Include="OpenSilver.Simulator" Version="1.2.3" />
    </ItemGroup>
   <ItemGroup>
       <ProjectReference Include="..\..\..\src\Epoxy.Core.OpenSilver\Epoxy.Core.OpenSilver.csproj" />

diff --git a/playground/EpoxyHello.OpenSilver/EpoxyHello.OpenSilver/EpoxyHello.OpenSilver.csproj b/playground/EpoxyHello.OpenSilver/EpoxyHello.OpenSilver/EpoxyHello.OpenSilver.csproj
@@ -7,7 +7,7 @@
     <DefineSilverlight>true</DefineSilverlight>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="OpenSilver" Version="1.1.0" />
+    <PackageReference Include="OpenSilver" Version="1.2.3" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
   </ItemGroup>
   <ItemGroup>

diff --git a/...lo.Xamarin.Forms/EpoxyHello.Xamarin.Forms.Android/EpoxyHello.Xamarin.Forms.Android.csproj b/...lo.Xamarin.Forms/EpoxyHello.Xamarin.Forms.Android/EpoxyHello.Xamarin.Forms.Android.csproj
@@ -17,7 +17,7 @@
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v13.0</TargetFrameworkVersion>
     <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
     <AndroidUseAapt2>true</AndroidUseAapt2>
     <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
@@ -51,11 +51,10 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2578" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.7.7" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2622" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.8.0" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />

diff --git a/.../EpoxyHello.Xamarin.Forms/EpoxyHello.Xamarin.Forms.Android/Properties/AndroidManifest.xml b/.../EpoxyHello.Xamarin.Forms/EpoxyHello.Xamarin.Forms.Android/Properties/AndroidManifest.xml
@@ -19,8 +19,10 @@
 //
 ////////////////////////////////////////////////////////////////////////////
 -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.epoxyhello.xamarin.forms">
-    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    android:versionCode="1" android:versionName="1.0"
+    package="com.companyname.epoxyhello.xamarin.forms">
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
     <application android:label="EpoxyHello.Xamarin.Forms.Android" android:theme="@style/MainTheme"></application>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 </manifest>