Merge pull request #85 from AvaloniaCommunity/feature/Avalonia-v11-ga

Upgraded code base to support Avalonia v11.0.0 GA release
AvaloniaCommunity · Jul 5, 2023 · 2a73147 · 2a73147
2 parents 49baf57 + 936942f
commit 2a73147
Show file tree

Hide file tree

Showing 17 changed files with 37 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -17,13 +17,14 @@ Choose the NuGet package version that matches your Avalonia version. Just like P
 
 | Avalonia Version | NuGet Package |
 |-|-|
-| **0.10.21**      | 8.1.97.1021 ([Core](https://www.nuget.org/packages/Prism.Avalonia/8.1.97.1021)) ([DryIoc](https://www.nuget.org/packages/Prism.DryIoc.Avalonia/8.1.97.1021))
-| 11.0 Preview 4  | 8.1.97.3-preview.11.4
-| 11.0 Preview 5  | 8.1.97.4-preview.11.5
-| 11.0 Preview 8  | 8.1.97.11-preview.11.8
+| **11.0**        | 8.1.97.11000 ([Core](https://www.nuget.org/packages/Prism.Avalonia/8.1.97.11000)) ([DryIoc](https://www.nuget.org/packages/Prism.DryIoc.Avalonia/8.1.97.11000))
+| **0.10.21**     | 8.1.97.1021 ([Core](https://www.nuget.org/packages/Prism.Avalonia/8.1.97.1021)) ([DryIoc](https://www.nuget.org/packages/Prism.DryIoc.Avalonia/8.1.97.1021))
 | **11.0 RC-1.1** | 8.1.97.11000-rc1.1 ([Core](https://www.nuget.org/packages/Prism.Avalonia/8.1.97.11000-rc1.1)) ([DryIoc](https://www.nuget.org/packages/Prism.DryIoc.Avalonia/8.1.97.11000-rc1.1))
+| 11.0 Preview 8  | 8.1.97.11-preview.11.8
+| 11.0 Preview 5  | 8.1.97.4-preview.11.5
+| 11.0 Preview 4  | 8.1.97.3-preview.11.4
 
-Be sure to check out the [ChangeLog.md](ChangeLog.md) and [Upgrading-to-Avalonia-11.md](Upgrading-to-Avalonia-11.md) when upgrading your NuGet packages
+Be sure to check out the [ChangeLog.md](ChangeLog.md) and [Upgrading-to-Avalonia-11.md](Upgrading-to-Avalonia-11.md) when upgrading your NuGet packages. Also, view the official [Avalonia Upgrading from v0.10](https://docs.avaloniaui.net/docs/next/stay-up-to-date/upgrade-from-0.10).
 
 ## Install
 
@@ -35,8 +36,8 @@ Install-Package Prism.Avalonia -Version 8.1.97.1021
 Install-Package Prism.DryIoc.Avalonia -Version 8.1.97.1021
 
 # Avalonia v11-preview8
-Install-Package Prism.Avalonia -Version 8.1.97.11000-rc1.1
-Install-Package Prism.DryIoc.Avalonia -Version 8.1.97.11000-rc1.1
+Install-Package Prism.Avalonia -Version 8.1.97.11000
+Install-Package Prism.DryIoc.Avalonia -Version 8.1.97.11000
 ```
 
 ## How to use
@@ -117,7 +118,7 @@ public static class Program
                 EnableMultiTouch = true,
                 UseDBusMenu = true
             })
-            .With(new Win32PlatformOptions { AllowEglInitialization = true })
+            .With(new Win32PlatformOptions())
             .UseSkia()
             .UseReactiveUI()
             .UseManagedSystemDialogs();
@@ -171,6 +172,7 @@ Below is a basic branching hierarchy and strategy.
 | `master`    | All releases are tagged published using the `master` branch
 | `develop`   | The **default** & active development branch. When a feature set is completed and ready for public release, the `develop` branch will be merged into `master` and a new NuGet package will be published.
 | `feature/*` | New feature branch. Once completed, it is merged into `develop` and the branch must be deleted.
+| `stable/*`  | Stable release base build which shares cherry-picked merges from `develop`. This branch **must not** be deleted.
 
 ## Contributing
 

diff --git a/build/AvaloniaDependency.props b/build/AvaloniaDependency.props
@@ -2,9 +2,9 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.0-rc1.1" />
-    <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.0.0-rc1.1" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-rc1.1" />
+    <PackageReference Include="Avalonia" Version="11.0.0" />
+    <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.0.0" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/build/Base.props b/build/Base.props
@@ -2,7 +2,7 @@
 <Project DefaultTargets="Build"
          xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <Version>8.1.97.11000-rc1.1</Version>
+    <Version>8.1.97.11000</Version>
     <PackageProjectUrl>https://github.com/AvaloniaCommunity/Prism.Avalonia</PackageProjectUrl>
     <Copyright>Copyright (c) 2023 Avalonia Community, Suess Labs</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/build/Nuget.props b/build/Nuget.props
@@ -5,7 +5,7 @@
   <PropertyGroup>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageReleaseNotes>* Upgraded to support Avalonia v11.0.0-rc1.1</PackageReleaseNotes>
+    <PackageReleaseNotes>* Upgraded to support Avalonia v11.0.0</PackageReleaseNotes>
   </PropertyGroup>
 
-</Project>
+</Project>
diff --git a/build/SampleApp.props b/build/SampleApp.props
@@ -6,12 +6,12 @@
   <Import Project="AvaloniaDependency.props" />
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.0-rc1.1" />
-    <!--<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-rc1.1" />-->
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.0-rc1.1" />
-    <PackageReference Include="Avalonia.LinuxFramebuffer" Version="11.0.0-rc1.1" />
-    <PackageReference Include="Avalonia.Themes.Simple" Version="11.0.0-rc1.1" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-rc1.1" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.0" />
+    <!--<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0" />-->
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.0" />
+    <PackageReference Include="Avalonia.LinuxFramebuffer" Version="11.0.0" />
+    <PackageReference Include="Avalonia.Themes.Simple" Version="11.0.0" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0" />
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\src\Prism.DryIoc.Avalonia\Prism.DryIoc.Avalonia.csproj" />
   </ItemGroup>
 </Project>
diff --git a/samples/BootstrapperShellSample/BootstrapperShellSample.csproj b/samples/BootstrapperShellSample/BootstrapperShellSample.csproj
@@ -6,4 +6,5 @@
   </PropertyGroup>
 
   <Import Project="../../build/SampleApp.props" />
+
 </Project>
diff --git a/samples/ModulesSample.Infrastructure/ModulesSample.Infrastructure.csproj b/samples/ModulesSample.Infrastructure/ModulesSample.Infrastructure.csproj
@@ -10,5 +10,5 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Prism.Avalonia\Prism.Avalonia.csproj" />
   </ItemGroup>
-
+  
 </Project>
diff --git a/samples/ModulesSample/App.axaml.cs b/samples/ModulesSample/App.axaml.cs
@@ -29,11 +29,7 @@ public static AppBuilder BuildAvaloniaApp()
                     EnableMultiTouch = true,
                     UseDBusMenu = true,
                 })
-                .With(new Win32PlatformOptions
-                {
-                    //// EnableMultitouch = true,  // Not supported in Avalonia v11.0.0-preview4
-                    AllowEglInitialization = true,
-                })
+                .With(new Win32PlatformOptions())
                 .UseSkia()
                 .UseManagedSystemDialogs();
 

diff --git a/samples/SampleDialogApp/Program.cs b/samples/SampleDialogApp/Program.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Avalonia;
 
 namespace SampleDialogApp
@@ -18,8 +18,8 @@ public static AppBuilder BuildAvaloniaApp() =>
                       .With(new X11PlatformOptions { EnableMultiTouch = true, UseDBusMenu = true, })
                       .With(new Win32PlatformOptions
                       {
-                          // EnableMultitouch = true,  // Not supported in Avalonia v11.0.0-preview4
-                          AllowEglInitialization = true,
+                          // EnableMultitouch = true,       // Not supported in Avalonia v11.0.0-preview4
+                          // AllowEglInitialization = true, // Removed in Avalonia v11.0.0
                       })
                       .UseSkia()
                       .LogToTrace();

diff --git a/samples/SampleDialogApp/SampleDialogApp.csproj b/samples/SampleDialogApp/SampleDialogApp.csproj
@@ -21,4 +21,5 @@
     <TrimmableAssembly Include="Avalonia.Themes.Fluent" />
     <TrimmableAssembly Include="Avalonia.Themes.Default" />
   </ItemGroup>
+
 </Project>
diff --git a/samples/SampleMvvmApp/Program.cs b/samples/SampleMvvmApp/Program.cs
@@ -14,8 +14,8 @@ public static AppBuilder BuildAvaloniaApp()
             .With(new X11PlatformOptions { EnableMultiTouch = true, UseDBusMenu = true, })
             .With(new Win32PlatformOptions
             {
-                //// EnableMultitouch = true, // In Avalonia v11 this is always enabled
-                AllowEglInitialization = true,
+                // EnableMultitouch = true,       // In Avalonia v11 this is always enabled
+                // AllowEglInitialization = true, // Removed in Avalonia v11.0.0
             })
             .UseSkia();
             // .UseReactiveUI();

diff --git a/samples/SampleMvvmApp/SampleMvvmApp.csproj b/samples/SampleMvvmApp/SampleMvvmApp.csproj
@@ -7,4 +7,5 @@
   </PropertyGroup>
 
   <Import Project="../../build/SampleApp.props" />
+
 </Project>
diff --git a/samples/ViewDiscovery/Program.cs b/samples/ViewDiscovery/Program.cs
@@ -15,7 +15,7 @@ public static AppBuilder BuildAvaloniaApp()
             .With(new Win32PlatformOptions
             {
                 //// EnableMultitouch = true, // In Avalonia v11 this is always enabled
-                AllowEglInitialization = true,
+                //// AllowEglInitialization = true, // Removed in Avalonia v11.0.0
             })
             .UseSkia();
 #if DEBUG

diff --git a/samples/ViewDiscovery/ViewDiscovery.csproj b/samples/ViewDiscovery/ViewDiscovery.csproj
@@ -6,4 +6,5 @@
   </PropertyGroup>
 
   <Import Project="../../build/SampleApp.props" />
+
 </Project>
diff --git a/src/Prism.Avalonia/Prism.Avalonia.csproj b/src/Prism.Avalonia/Prism.Avalonia.csproj
@@ -14,7 +14,7 @@
 Prism.Avalonia helps you more easily design and build rich, flexible, and easy to maintain cross-platform Avalonia desktop applications. This library provides user interface composition as well as modularity support.</Description>
     <PackageTags>prism;mvvm;xaml;avalonia;navigation;dialog;prismavalonia;</PackageTags>
     <Copyright>Copyright (c) 2023 Avalonia Community</Copyright>
-    <Authors>Damian Suess, Omid Mafakher, various contributors</Authors>
+    <Authors>Damian Suess, various contributors</Authors>
     <Title>Prism.Avalonia</Title>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageIcon>Prism.Avalonia.png</PackageIcon>

diff --git a/src/Prism.DryIoc.Avalonia/Prism.DryIoc.Avalonia.csproj b/src/Prism.DryIoc.Avalonia/Prism.DryIoc.Avalonia.csproj
@@ -9,7 +9,7 @@
     <RootNamespace>Prism.DryIoc</RootNamespace>
     <TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     <Description>This extension is used to build Prism.Avalonia applications based on DryIoc. Users must install the Prism.Avalonia NuGet package as well.</Description>
-    <Authors>Damian Suess, Omid Mafakher, various contributors</Authors>
+    <Authors>Damian Suess, various contributors</Authors>
     <Copyright>Copyright (c) 2023 Avalonia Community</Copyright>
     <Title>Prism.DryIoc.Avalonia</Title>
     <PackageReadmeFile>README.md</PackageReadmeFile>

diff --git a/tests/Avalonia/Prism.Avalonia.Tests/Prism.Avalonia.Tests.csproj b/tests/Avalonia/Prism.Avalonia.Tests/Prism.Avalonia.Tests.csproj
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="Moq" Version="4.18.1" />
+    <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="System.CodeDom" Version="6.0.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,5 @@
		</PropertyGroup>

		<Import Project="../../build/SampleApp.props" />

		</Project>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,5 @@
		</PropertyGroup>

		<Import Project="../../build/SampleApp.props" />

		</Project>