Adjusted dependency tfms.

kekyo · Dec 9, 2024 · c62650b · c62650b
1 parent 197153e
commit c62650b
Show file tree

Hide file tree

Showing 33 changed files with 82 additions and 43 deletions.
diff --git a/build-nupkg.bat b/build-nupkg.bat
@@ -1,6 +1,8 @@
 @echo off
 
-git clean -xfd
+rem git clean -xfd
+rem dotnet workload restore
+
 mkdir artifacts
 
 echo.

diff --git a/...FSharp/EpoxyHello.Avalonia/EpoxyHello.Avalonia.Desktop/EpoxyHello.Avalonia.Desktop.fsproj b/...FSharp/EpoxyHello.Avalonia/EpoxyHello.Avalonia.Desktop/EpoxyHello.Avalonia.Desktop.fsproj
@@ -1,16 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net48;netcoreapp2.2;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+    <NoWarn>$(NoWarn);NETSDK1206</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Update="FSharp.Core" Version="8.0.200" />
     <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" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.21" />
+    <PackageReference Include="Avalonia" Version="0.10.22" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.22" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.22" />
     <PackageReference Include="Xamarin.Essentials" Version="1.8.1" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.11" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/playground.FSharp/EpoxyHello.Avalonia/EpoxyHello.Avalonia/EpoxyHello.Avalonia.fsproj b/playground.FSharp/EpoxyHello.Avalonia/EpoxyHello.Avalonia/EpoxyHello.Avalonia.fsproj
@@ -8,8 +8,8 @@
 
   <ItemGroup>
     <PackageReference Update="FSharp.Core" Version="8.0.200" />
-    <PackageReference Include="Avalonia" Version="0.10.21" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.21" />
+    <PackageReference Include="Avalonia" Version="0.10.22" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.22" />
     <PackageReference Include="FSharp.Control.FusionTasks" Version="2.6.0" />
     <PackageReference Include="Xamarin.Essentials" Version="1.8.1" />
   </ItemGroup>

diff --git a/playground.FSharp/EpoxyHello.Avalonia11/EpoxyHello.Avalonia11.fsproj b/playground.FSharp/EpoxyHello.Avalonia11/EpoxyHello.Avalonia11.fsproj
@@ -3,17 +3,17 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net48;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
     <IncludeAvaloniaGenerators>true</IncludeAvaloniaGenerators>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Update="FSharp.Core" Version="8.0.200" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
-    <PackageReference Include="Avalonia" Version="11.0.10" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.10" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.10" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.10" />
+    <PackageReference Include="Avalonia" Version="11.2.2" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.2.2" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.2.2" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.2" />
     <PackageReference Include="FSharp.Control.FusionTasks" Version="2.6.0" />
     <PackageReference Include="Xamarin.Essentials" Version="1.8.1" />
   </ItemGroup>

diff --git a/playground.FSharp/EpoxyHello.Wpf/EpoxyHello.Wpf.fsproj b/playground.FSharp/EpoxyHello.Wpf/EpoxyHello.Wpf.fsproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net48;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 

diff --git a/...ground/EpoxyHello.Avalonia/EpoxyHello.Avalonia.Desktop/EpoxyHello.Avalonia.Desktop.csproj b/...ground/EpoxyHello.Avalonia/EpoxyHello.Avalonia.Desktop/EpoxyHello.Avalonia.Desktop.csproj
@@ -1,13 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net48;netcoreapp2.2;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+    <NoWarn>$(NoWarn);NETSDK1206</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <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" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.21" />
+    <PackageReference Include="Avalonia" Version="0.10.22" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.22" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.22" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.11" />
    </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Epoxy.Core.Avalonia\Epoxy.Core.Avalonia.csproj" />

diff --git a/playground/EpoxyHello.Avalonia/EpoxyHello.Avalonia/EpoxyHello.Avalonia.csproj b/playground/EpoxyHello.Avalonia/EpoxyHello.Avalonia/EpoxyHello.Avalonia.csproj
@@ -6,8 +6,8 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.21" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.21" />
+    <PackageReference Include="Avalonia" Version="0.10.22" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.22" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
   </ItemGroup>
   <ItemGroup>

diff --git a/playground/EpoxyHello.Avalonia11/EpoxyHello.Avalonia11.csproj b/playground/EpoxyHello.Avalonia11/EpoxyHello.Avalonia11.csproj
@@ -3,16 +3,16 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net48;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
     <IncludeAvaloniaGenerators>true</IncludeAvaloniaGenerators>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
-    <PackageReference Include="Avalonia" Version="11.0.10" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.10" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.10" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.10" />
+    <PackageReference Include="Avalonia" Version="11.2.2" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.2.2" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.2.2" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/playground/EpoxyHello.Wpf/EpoxyHello.Wpf.csproj b/playground/EpoxyHello.Wpf/EpoxyHello.Wpf.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net461;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 

diff --git a/src/Epoxy.Avalonia/Epoxy.Avalonia.csproj b/src/Epoxy.Avalonia/Epoxy.Avalonia.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyName>Epoxy</AssemblyName>
-    <TargetFrameworks>net461;net48;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net461;net48;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
 
     <AssemblyTitle>Epoxy.Avalonia</AssemblyTitle>
 

diff --git a/src/Epoxy.Avalonia/Epoxy.Avalonia.nuspec b/src/Epoxy.Avalonia/Epoxy.Avalonia.nuspec
@@ -59,6 +59,10 @@
         <dependency id="Epoxy.Build" version="$PackageVersion$" />
         <dependency id="Epoxy.Core.Avalonia" version="$PackageVersion$" exclude="Build,Analyzers" />
       </group>
+      <group targetFramework="net9.0">
+        <dependency id="Epoxy.Build" version="$PackageVersion$" />
+        <dependency id="Epoxy.Core.Avalonia" version="$PackageVersion$" exclude="Build,Analyzers" />
+      </group>
       <group targetFramework=".NETStandard2.0">
         <dependency id="Epoxy.Build" version="$PackageVersion$" />
         <dependency id="Epoxy.Core.Avalonia" version="$PackageVersion$" exclude="Build,Analyzers" />

diff --git a/src/Epoxy.Avalonia11/Epoxy.Avalonia11.csproj b/src/Epoxy.Avalonia11/Epoxy.Avalonia11.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyName>Epoxy</AssemblyName>
-    <TargetFrameworks>net461;net48;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net461;net48;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
 
     <AssemblyTitle>Epoxy.Avalonia11</AssemblyTitle>
 

diff --git a/src/Epoxy.Avalonia11/Epoxy.Avalonia11.nuspec b/src/Epoxy.Avalonia11/Epoxy.Avalonia11.nuspec
@@ -59,6 +59,10 @@
         <dependency id="Epoxy.Build" version="$PackageVersion$" />
         <dependency id="Epoxy.Core.Avalonia11" version="$PackageVersion$" exclude="Build,Analyzers" />
       </group>
+      <group targetFramework="net9.0">
+        <dependency id="Epoxy.Build" version="$PackageVersion$" />
+        <dependency id="Epoxy.Core.Avalonia11" version="$PackageVersion$" exclude="Build,Analyzers" />
+      </group>
       <group targetFramework=".NETStandard2.0">
         <dependency id="Epoxy.Build" version="$PackageVersion$" />
         <dependency id="Epoxy.Core.Avalonia11" version="$PackageVersion$" exclude="Build,Analyzers" />

diff --git a/src/Epoxy.Build/Epoxy.Build.csproj b/src/Epoxy.Build/Epoxy.Build.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AssemblyName>eb</AssemblyName>
-    <TargetFrameworks>net461;netcoreapp2.0;netcoreapp2.2;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp2.0;netcoreapp2.2;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
     <AssemblyTitle>Epoxy.Build</AssemblyTitle>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
 

diff --git a/src/Epoxy.Build/Epoxy.Build.nuspec b/src/Epoxy.Build/Epoxy.Build.nuspec
@@ -27,5 +27,6 @@
     <file src="bin\$Configuration$\net6.0\*.*" target="tools/net6.0" />
     <file src="bin\$Configuration$\net7.0\*.*" target="tools/net7.0" />
     <file src="bin\$Configuration$\net8.0\*.*" target="tools/net8.0" />
+    <file src="bin\$Configuration$\net9.0\*.*" target="tools/net9.0" />
   </files>
 </package>
diff --git a/src/Epoxy.Build/build/Epoxy.Build.targets b/src/Epoxy.Build/build/Epoxy.Build.targets
@@ -50,7 +50,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <_EB_ToolingBaseDir>$([System.IO.Path]::Combine('$(_EB_ScriptBaseDir)','..','tools','$(_EB_PlatformName)'))</_EB_ToolingBaseDir>
+    <EpoxyBuildToolingDir>$([System.IO.Path]::Combine('$(_EB_ScriptBaseDir)','..','tools','$(_EB_PlatformName)'))</EpoxyBuildToolingDir>
   </PropertyGroup>
 
   <!-- ======================== -->
@@ -59,7 +59,7 @@
   <Target Name="EpoxyBuild" AfterTargets="AfterCompile"
     Condition="'$(EpoxyBuildEnable)' == 'True'">
 
-    <_EB_CandidateToolingDir ToolingDir="$(_EB_ToolingBaseDir)">
+    <_EB_CandidateToolingDir ToolingDir="$(EpoxyBuildToolingDir)">
       <Output TaskParameter="CandidateDir" PropertyName="_EB_ToolingCandidateDir" />
     </_EB_CandidateToolingDir>
 

diff --git a/src/Epoxy.Core.Avalonia/Epoxy.Core.Avalonia.csproj b/src/Epoxy.Core.Avalonia/Epoxy.Core.Avalonia.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyName>Epoxy.Core</AssemblyName>
-    <TargetFrameworks>net461;net48;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net461;net48;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
     <AssemblyTitle>Epoxy.Core.Avalonia</AssemblyTitle>
     <PackageId>Epoxy.Core.Avalonia</PackageId>
     <PackageTags>$(PackageTags);avalonia</PackageTags>

diff --git a/src/Epoxy.Core.Avalonia11/Epoxy.Core.Avalonia11.csproj b/src/Epoxy.Core.Avalonia11/Epoxy.Core.Avalonia11.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyName>Epoxy.Core</AssemblyName>
-    <TargetFrameworks>net461;net48;netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net461;net48;netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
     <AssemblyTitle>Epoxy.Core.Avalonia11</AssemblyTitle>
     <PackageId>Epoxy.Core.Avalonia11</PackageId>
     <PackageTags>$(PackageTags);avalonia</PackageTags>

diff --git a/src/Epoxy.Core.Maui/Epoxy.Core.Maui.csproj b/src/Epoxy.Core.Maui/Epoxy.Core.Maui.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyName>Epoxy.Core</AssemblyName>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0</TargetFrameworks>
     <AssemblyTitle>Epoxy.Core.Maui</AssemblyTitle>
     <PackageId>Epoxy.Core.Maui</PackageId>
     <PackageTags>$(PackageTags);maui</PackageTags>
@@ -17,7 +17,7 @@
     <DefineConstants>TRACE;MAUI</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' != 'net8.0'">
+  <PropertyGroup Condition="('$(TargetFramework)' != 'net8.0') AND ('$(TargetFramework)' != 'net9.0')">
     <UseMaui>true</UseMaui>
   </PropertyGroup>
 

diff --git a/src/Epoxy.Core.OpenSilver/Epoxy.Core.OpenSilver.csproj b/src/Epoxy.Core.OpenSilver/Epoxy.Core.OpenSilver.csproj
@@ -7,6 +7,7 @@
     <PackageId>Epoxy.Core.OpenSilver</PackageId>
     <PackageTags>$(PackageTags);opensilver</PackageTags>
     <DefineSilverlight>true</DefineSilverlight>
+    <NoWarn>$(NoWarn);NU1904</NoWarn>   <!-- Yes, you need to update dependent packages on final application project. -->
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">

diff --git a/src/Epoxy.Core.Wpf/Epoxy.Core.Wpf.csproj b/src/Epoxy.Core.Wpf/Epoxy.Core.Wpf.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyName>Epoxy.Core</AssemblyName>
-    <TargetFrameworks>net45;net461;net48;netcoreapp3.0;netcoreapp3.1;net5.0-windows7.0;net6.0-windows7.0;net7.0-windows7.0;net8.0-windows7.0</TargetFrameworks>
+    <TargetFrameworks>net45;net461;net48;netcoreapp3.0;netcoreapp3.1;net5.0-windows7.0;net6.0-windows7.0;net7.0-windows7.0;net8.0-windows7.0;net9.0-windows7.0</TargetFrameworks>
     <UseWpf>true</UseWpf>
     <AssemblyTitle>Epoxy.Core.Wpf</AssemblyTitle>
     <PackageId>Epoxy.Core.Wpf</PackageId>

diff --git a/src/Epoxy.Maui/Epoxy.Maui.csproj b/src/Epoxy.Maui/Epoxy.Maui.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyName>Epoxy</AssemblyName>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0</TargetFrameworks>
     <AssemblyTitle>Epoxy.Maui</AssemblyTitle>
 
     <NuspecFile>Epoxy.Maui.nuspec</NuspecFile>
@@ -17,7 +17,7 @@
     <DefineConstants>TRACE;MAUI</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' != 'net8.0'">
+  <PropertyGroup Condition="('$(TargetFramework)' != 'net8.0') AND ('$(TargetFramework)' != 'net9.0')">
     <UseMaui>true</UseMaui>
   </PropertyGroup>
 

diff --git a/src/Epoxy.Maui/Epoxy.Maui.nuspec b/src/Epoxy.Maui/Epoxy.Maui.nuspec
@@ -31,6 +31,10 @@
         <dependency id="Epoxy.Build" version="$PackageVersion$" />
         <dependency id="Epoxy.Core.Maui" version="$PackageVersion$" exclude="Build,Analyzers" />
       </group>
+      <group targetFramework=".NETCoreApp9.0">
+        <dependency id="Epoxy.Build" version="$PackageVersion$" />
+        <dependency id="Epoxy.Core.Maui" version="$PackageVersion$" exclude="Build,Analyzers" />
+      </group>
     </dependencies>
   </metadata>
   <files>

diff --git a/src/Epoxy.Wpf/Epoxy.Wpf.csproj b/src/Epoxy.Wpf/Epoxy.Wpf.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyName>Epoxy</AssemblyName>
-    <TargetFrameworks>net45;net461;net48;netcoreapp3.0;netcoreapp3.1;net5.0-windows7.0;net6.0-windows7.0;net7.0-windows7.0;net8.0-windows7.0</TargetFrameworks>
+    <TargetFrameworks>net45;net461;net48;netcoreapp3.0;netcoreapp3.1;net5.0-windows7.0;net6.0-windows7.0;net7.0-windows7.0;net8.0-windows7.0;net9.0-windows7.0</TargetFrameworks>
     <UseWpf>true</UseWpf>
     <AssemblyTitle>Epoxy.Wpf</AssemblyTitle>
 

diff --git a/src/Epoxy.Wpf/Epoxy.Wpf.nuspec b/src/Epoxy.Wpf/Epoxy.Wpf.nuspec
@@ -51,6 +51,10 @@
         <dependency id="Epoxy.Build" version="$PackageVersion$" />
         <dependency id="Epoxy.Core.Wpf" version="$PackageVersion$" exclude="Build,Analyzers" />
       </group>
+      <group targetFramework="net9.0-windows7.0">
+        <dependency id="Epoxy.Build" version="$PackageVersion$" />
+        <dependency id="Epoxy.Core.Wpf" version="$PackageVersion$" exclude="Build,Analyzers" />
+      </group>
     </dependencies>
   </metadata>
   <files>

diff --git a/src/FSharp.Epoxy.Avalonia/FSharp.Epoxy.Avalonia.fsproj b/src/FSharp.Epoxy.Avalonia/FSharp.Epoxy.Avalonia.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyName>FSharp.Epoxy</AssemblyName>
-    <TargetFrameworks>net461;net48;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net461;net48;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
     <AssemblyTitle>FSharp.Epoxy.Avalonia</AssemblyTitle>
 
     <NuspecFile>FSharp.Epoxy.Avalonia.nuspec</NuspecFile>

diff --git a/src/FSharp.Epoxy.Avalonia/FSharp.Epoxy.Avalonia.nuspec b/src/FSharp.Epoxy.Avalonia/FSharp.Epoxy.Avalonia.nuspec
@@ -70,6 +70,11 @@
         <dependency id="Epoxy.Core.Avalonia" version="$PackageVersion$" exclude="Build,Analyzers" />
         <dependency id="FSharp.Core" version="5.0.0" exclude="Build,Analyzers" />
       </group>
+      <group targetFramework="net9.0">
+        <dependency id="Epoxy.Build" version="$PackageVersion$" />
+        <dependency id="Epoxy.Core.Avalonia" version="$PackageVersion$" exclude="Build,Analyzers" />
+        <dependency id="FSharp.Core" version="5.0.0" exclude="Build,Analyzers" />
+      </group>
       <group targetFramework=".NETStandard2.0">
         <dependency id="Epoxy.Build" version="$PackageVersion$" />
         <dependency id="Epoxy.Core.Avalonia" version="$PackageVersion$" exclude="Build,Analyzers" />

diff --git a/src/FSharp.Epoxy.Avalonia11/FSharp.Epoxy.Avalonia11.fsproj b/src/FSharp.Epoxy.Avalonia11/FSharp.Epoxy.Avalonia11.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyName>FSharp.Epoxy</AssemblyName>
-    <TargetFrameworks>net461;net48;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net461;net48;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
     <AssemblyTitle>FSharp.Epoxy.Avalonia11</AssemblyTitle>
 
     <NuspecFile>FSharp.Epoxy.Avalonia11.nuspec</NuspecFile>

diff --git a/src/FSharp.Epoxy.Avalonia11/FSharp.Epoxy.Avalonia11.nuspec b/src/FSharp.Epoxy.Avalonia11/FSharp.Epoxy.Avalonia11.nuspec
@@ -70,6 +70,11 @@
         <dependency id="Epoxy.Core.Avalonia11" version="$PackageVersion$" exclude="Build,Analyzers" />
         <dependency id="FSharp.Core" version="5.0.0" exclude="Build,Analyzers" />
       </group>
+      <group targetFramework="net9.0">
+        <dependency id="Epoxy.Build" version="$PackageVersion$" />
+        <dependency id="Epoxy.Core.Avalonia11" version="$PackageVersion$" exclude="Build,Analyzers" />
+        <dependency id="FSharp.Core" version="5.0.0" exclude="Build,Analyzers" />
+      </group>
       <group targetFramework=".NETStandard2.0">
         <dependency id="Epoxy.Build" version="$PackageVersion$" />
         <dependency id="Epoxy.Core.Avalonia11" version="$PackageVersion$" exclude="Build,Analyzers" />

diff --git a/src/FSharp.Epoxy.Wpf/FSharp.Epoxy.Wpf.fsproj b/src/FSharp.Epoxy.Wpf/FSharp.Epoxy.Wpf.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyName>FSharp.Epoxy</AssemblyName>
-    <TargetFrameworks>net461;net48;netcoreapp3.0;netcoreapp3.1;net5.0-windows7.0;net6.0-windows7.0;net7.0-windows7.0;net8.0-windows7.0</TargetFrameworks>
+    <TargetFrameworks>net461;net48;netcoreapp3.0;netcoreapp3.1;net5.0-windows7.0;net6.0-windows7.0;net7.0-windows7.0;net8.0-windows7.0;net9.0-windows7.0</TargetFrameworks>
     <UseWpf>true</UseWpf>
     <AssemblyTitle>FSharp.Epoxy.Wpf</AssemblyTitle>
 

diff --git a/src/FSharp.Epoxy.Wpf/FSharp.Epoxy.Wpf.nuspec b/src/FSharp.Epoxy.Wpf/FSharp.Epoxy.Wpf.nuspec
@@ -55,6 +55,11 @@
         <dependency id="Epoxy.Core.Wpf" version="$PackageVersion$" exclude="Build,Analyzers" />
         <dependency id="FSharp.Core" version="5.0.0" exclude="Build,Analyzers" />
       </group>
+      <group targetFramework="net9.0-windows7.0">
+        <dependency id="Epoxy.Build" version="$PackageVersion$" />
+        <dependency id="Epoxy.Core.Wpf" version="$PackageVersion$" exclude="Build,Analyzers" />
+        <dependency id="FSharp.Core" version="5.0.0" exclude="Build,Analyzers" />
+      </group>
     </dependencies>
   </metadata>
   <files>

diff --git a/tests/Epoxy.Build.TestTargets/Epoxy.Build.TestTargets.csproj b/tests/Epoxy.Build.TestTargets/Epoxy.Build.TestTargets.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyName>Epoxy.Build.TestTargets</AssemblyName>
-    <TargetFrameworks>net461;net48;netstandard2.0;netstandard2.1;netcoreapp2.2;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net461;net48;netstandard2.0;netstandard2.1;netcoreapp2.2;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
     <AssemblyTitle>Epoxy.Build.TestTargets</AssemblyTitle>
 
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

diff --git a/tests/FSharp.Epoxy.Build.TestTargets/FSharp.Epoxy.Build.TestTargets.fsproj b/tests/FSharp.Epoxy.Build.TestTargets/FSharp.Epoxy.Build.TestTargets.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AssemblyName>FSharp.Epoxy.Build.TestTargets</AssemblyName>
-    <TargetFrameworks>net461;net48;netstandard2.0;netstandard2.1;netcoreapp2.2;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net461;net48;netstandard2.0;netstandard2.1;netcoreapp2.2;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
     <AssemblyTitle>FSharp.Epoxy.Build.TestTargets</AssemblyTitle>
 
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>