[UX] Avalonia version update

BAndysc · BAndysc · commit 54ee23a5d2ac · 2025-04-01T22:34:14.000+01:00
diff --git a/.gitmodules b/.gitmodules
@@ -25,3 +25,6 @@
 [submodule "Libraries/Classic.Avalonia"]
 	path = Libraries/Classic.Avalonia
 	url = https://github.com/BAndysc/Classic.Avalonia
+[submodule "Libraries/Avalonia.Controls.DataGrid"]
+	path = Libraries/Avalonia.Controls.DataGrid
+	url = https://github.com/BAndysc/Avalonia.Controls.DataGrid
diff --git a/Avalonia.props b/Avalonia.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <AvaloniaVersion>11.1.3-cibuild0051668-beta</AvaloniaVersion>
+        <AvaloniaVersion>11.3.999-cibuild0055834-alpha</AvaloniaVersion>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
@@ -14,6 +14,7 @@
         <PackageReference Include="Projektanker.Icons.Avalonia" Version="9.1.1" />
         <PackageReference Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.1.1" />
         <ProjectReference Include="$(MSBuildThisFileDirectory)\Prism.Avalonia\src\Prism.Avalonia\Prism.Avalonia.csproj" />
+        <ProjectReference Include="$(MSBuildThisFileDirectory)\Libraries\Avalonia.Controls.DataGrid\src\Avalonia.Controls.DataGrid\Avalonia.Controls.DataGrid.csproj" />
     </ItemGroup>
     <ItemGroup>
         <Compile Update="**\*.xaml.cs">
diff --git a/AvaloniaEdit b/AvaloniaEdit
@@ -1 +1 @@
-Subproject commit afdbc5a4859a97bf292036d778a4a9f5b30d8e2a
+Subproject commit 874cacb1d62beb50d6fd995ee5fc2d56a5bdb12a
diff --git a/AvaloniaStyles/AvaloniaStyles.csproj b/AvaloniaStyles/AvaloniaStyles.csproj
@@ -16,7 +16,6 @@
     
     <Import Project="..\Avalonia.props" />
     <ItemGroup>
-        <PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
         <PackageReference Include="FuzzySharp" Version="2.0.2" />
     </ItemGroup>
diff --git a/Dock b/Dock
@@ -1 +1 @@
-Subproject commit 7a13143ed9378ee864567f19792bffe2c2cd8c16
+Subproject commit b536de42579794d246f2a64a41ae82e5b5302418
diff --git a/Libraries/Avalonia.Controls.DataGrid b/Libraries/Avalonia.Controls.DataGrid
@@ -0,0 +1 @@
+Subproject commit e1b31f4aa3cab94497fa19b120aec0cb21194626
diff --git a/Libraries/Avalonia.Labs.Gif/Avalonia.Labs.Gif.csproj b/Libraries/Avalonia.Labs.Gif/Avalonia.Labs.Gif.csproj
@@ -5,6 +5,9 @@
     <LangVersion>latest</LangVersion>
     <IsPackable>true</IsPackable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <RestoreAdditionalProjectSources>
+      https://nuget-feed-all.avaloniaui.net/v3/index.json;
+    </RestoreAdditionalProjectSources>
   </PropertyGroup>
 
   <Import Project="..\..\Avalonia.props" />
diff --git a/Libraries/Classic.Avalonia b/Libraries/Classic.Avalonia
@@ -1 +1 @@
-Subproject commit 002002de6e1ca7123a2c571180c6dbf2d950cfe5
+Subproject commit 423203f732aa13c0a6a694fb776bb917ba705ef1
diff --git a/LoaderAvalonia.Web/LoaderAvalonia.Web.csproj b/LoaderAvalonia.Web/LoaderAvalonia.Web.csproj
@@ -20,7 +20,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia.Browser" Version="11.1.3-cibuild0051668-beta"/>
+        <PackageReference Include="Avalonia.Browser" Version="11.3.999-cibuild0055834-alpha"/>
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Prism.Avalonia b/Prism.Avalonia
@@ -1 +1 @@
-Subproject commit b35860764ae1729cb13fc38cb05b4cc9c1ffc140
+Subproject commit 8779205e54d286aa8b8dc7a6a2528d3598c390d5
diff --git a/WDE.Common.Avalonia/WDE.Common.Avalonia.csproj b/WDE.Common.Avalonia/WDE.Common.Avalonia.csproj
@@ -9,7 +9,6 @@
     </PropertyGroup>
     <Import Project="..\Avalonia.props" />
     <ItemGroup>
-        <PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.9" />
     </ItemGroup>
     <ItemGroup>
diff --git a/WDE.CommonViews.Avalonia/WDE.CommonViews.Avalonia.csproj b/WDE.CommonViews.Avalonia/WDE.CommonViews.Avalonia.csproj
@@ -12,9 +12,6 @@
     </PropertyGroup>
     <Import Project="..\Module.props" />    
     <Import Project="..\Avalonia.props" />
-    <ItemGroup>
-        <PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" />
-    </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\AvaloniaEdit\src\AvaloniaEdit\AvaloniaEdit.csproj" />
         <ProjectReference Include="..\Modules\WDE.Sessions\WDE.Sessions.csproj" />
diff --git a/WoWDatabaseEditor.sln b/WoWDatabaseEditor.sln
@@ -279,6 +279,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Classic.Avalonia.Theme.Dock
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Labs.Gif", "Libraries\Avalonia.Labs.Gif\Avalonia.Labs.Gif.csproj", "{4A1CF91C-8076-492B-8C65-6D307E004959}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Controls.DataGrid", "Libraries\Avalonia.Controls.DataGrid\src\Avalonia.Controls.DataGrid\Avalonia.Controls.DataGrid.csproj", "{8708CD6F-DEB2-4A88-983D-ADABB49629DB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -769,6 +771,10 @@ Global
 		{4A1CF91C-8076-492B-8C65-6D307E004959}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4A1CF91C-8076-492B-8C65-6D307E004959}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4A1CF91C-8076-492B-8C65-6D307E004959}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8708CD6F-DEB2-4A88-983D-ADABB49629DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8708CD6F-DEB2-4A88-983D-ADABB49629DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8708CD6F-DEB2-4A88-983D-ADABB49629DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8708CD6F-DEB2-4A88-983D-ADABB49629DB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -882,6 +888,7 @@ Global
 		{BDC06DA9-2A62-4958-91AB-5D075B9AABCB} = {115B553F-4BA4-4635-AF48-18FECF3B7A57}
 		{06A33530-DE6A-4D24-A924-1AF63719D86F} = {115B553F-4BA4-4635-AF48-18FECF3B7A57}
 		{4A1CF91C-8076-492B-8C65-6D307E004959} = {47A1CB3E-73CD-4798-A089-169C2473204E}
+		{8708CD6F-DEB2-4A88-983D-ADABB49629DB} = {47A1CB3E-73CD-4798-A089-169C2473204E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3E63D4A5-8159-4344-B556-1E1D8D63DA99}
diff --git a/WoWDatabaseEditorCore.Avalonia/WoWDatabaseEditorCore.Avalonia.csproj b/WoWDatabaseEditorCore.Avalonia/WoWDatabaseEditorCore.Avalonia.csproj
@@ -32,7 +32,6 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Prism.Core" Version="7.2.0.1422" />
         <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.7" />
         <PackageReference Include="SmartFormat.NET" Version="2.7.3" />
