Merge pull request #33 from AvaloniaCommunity/feature/UpdateVersion-v…

…8.1.97.1 Version Bump 8.1.97.2
AvaloniaCommunity · Dec 9, 2022 · b5aa9ff · b5aa9ff
2 parents 7f2a287 + c795d50
commit b5aa9ff
Show file tree

Hide file tree

Showing 11 changed files with 81 additions and 33 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -0,0 +1,15 @@
+# Change Log
+
+Change log history for Prism.Avalonia
+
+## v8.1.97.1
+
+* Fixed: Automatically performs `AutoWireViewModel`
+  * No longer need to device `prism:ViewModelLocator.AutoWireViewModel="True"` in View
+* Updated DryIoc to v4.8.0
+* Updated to Avalonia v0.10.18
+
+## v8.1.97
+
+* Upgraded system to support Prism.Core v8.1.97
+* See [[Upgrade-Prism-7.2-to-8.1.md]] for more details
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Prism.Avalonia
 
-[Prism.Avalonia](https://github.com/AvaloniaCommunity/Prism.Avalonia) provides your Avalonia apps with [Prism framework](https://github.com/PrismLibrary/Prism) support so you can navigate and perform dependency injection easier than before.
+[Prism.Avalonia](https://github.com/AvaloniaCommunity/Prism.Avalonia) provides your [Avalonia](https://avaloniaui.net/) apps with [Prism framework](https://github.com/PrismLibrary/Prism) support so you can navigate and perform dependency injection easier than before.
 
 | Package | NuGet |
 |-|-|
@@ -14,7 +14,7 @@ Prism.Avalonia's logic and development approach is similar to that of [Prism for
 Add the DryIoc package to your project:
 
 ```powershell
-Install-Package Prism.DryIoc.Avalonia -Version 8.1.97
+Install-Package Prism.DryIoc.Avalonia -Version 8.1.97.2
 ```
 
 ## How to use
@@ -36,7 +36,21 @@ public class App : PrismApplication
     public override void Initialize()
     {
         AvaloniaXamlLoader.Load(this);
-        base.Initialize();
+        base.Initialize();              // <-- Required
+    }
+
+    protected override void RegisterTypes(IContainerRegistry containerRegistry)
+    {
+        // Register Services
+        containerRegistry.Register<IRestService, RestService>();
+
+        // Views - Generic
+        containerRegistry.Register<MainWindow>();
+
+        // Views - Region Navigation
+        containerRegistry.RegisterForNavigation<DashboardView, DashboardViewModel>();
+        containerRegistry.RegisterForNavigation<SettingsView, SettingsViewModel>();
+        containerRegistry.RegisterForNavigation<SidebarView, SidebarViewModel>();
     }
 
     protected override IAvaloniaObject CreateShell()
@@ -63,20 +77,6 @@ public class App : PrismApplication
       regionManager.RegisterViewWithRegion(RegionNames.ContentRegion, typeof(DashboardView));
       regionManager.RegisterViewWithRegion(RegionNames.SidebarRegion, typeof(SidebarView));
     }
-
-    protected override void RegisterTypes(IContainerRegistry containerRegistry)
-    {
-        // Register Services
-        containerRegistry.Register<IRestService, RestService>();
-
-        // Views - Generic
-        containerRegistry.Register<MainWindow>();
-
-        // Views - Region Navigation
-        containerRegistry.RegisterForNavigation<DashboardView, DashboardViewModel>();
-        containerRegistry.RegisterForNavigation<SettingsView, SettingsViewModel>();
-        containerRegistry.RegisterForNavigation<SidebarView, SidebarViewModel>();
-    }
 }
 ```
 
@@ -141,7 +141,3 @@ public static class Program
     }
 }
 ```
-
-## Upgrade to Prism v8.1 Roadmap
-
-Check out [Upgrade-Prism-7.2-to-8.1.md](https://github.com/AvaloniaCommunity/Prism.Avalonia/blob/feature-Prism8197/Upgrade-Prism-7.2-to-8.1.md) for the latest progress.
diff --git a/build/AvaloniaDependency.props b/build/AvaloniaDependency.props
@@ -3,14 +3,14 @@
          xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.16" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.16" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.16" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.16" />
-    <!--<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.16" />-->
-    <PackageReference Include="Avalonia.LinuxFramebuffer" Version="0.10.16" />
-    <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="0.10.16" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.16" />
+    <PackageReference Include="Avalonia" Version="0.10.18" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.18" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.18" />
+    <!--<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.18" />-->
+    <PackageReference Include="Avalonia.LinuxFramebuffer" Version="0.10.18" />
+    <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="0.10.18" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.18" />
   </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</Version>
+    <Version>8.1.97.2</Version>
     <PackageProjectUrl>https://github.com/AvaloniaCommunity/Prism.Avalonia</PackageProjectUrl>
     <Copyright>Copyright (c) 2022 Avalonia Community</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/logo/Avalonia.png b/logo/Avalonia.png
diff --git a/logo/Prism.Avalonia.png b/logo/Prism.Avalonia.png
diff --git a/logo/Prism.Avalonia.xcf b/logo/Prism.Avalonia.xcf
diff --git a/logo/Prism.png b/logo/Prism.png
diff --git a/samples/SampleMvvmApp/Views/DashboardView.xaml b/samples/SampleMvvmApp/Views/DashboardView.xaml
@@ -6,7 +6,6 @@
              x:Class="SampleMvvmApp.Views.DashboardView"
              d:DesignHeight="350"
              d:DesignWidth="500"
-             prism:ViewModelLocator.AutoWireViewModel="True"
              mc:Ignorable="d">
 
   <UserControl.Styles>

diff --git a/src/Prism.Avalonia/Prism.Avalonia.csproj b/src/Prism.Avalonia/Prism.Avalonia.csproj
@@ -11,10 +11,18 @@
     <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <Description>Prism is a fully open source version of the Prism guidance originally produced by Microsoft Patterns &amp; Practices. Prism provides an implementation of a collection of design patterns that are helpful in writing well structured, maintainable, and testable XAML applications, including MVVM, dependency injection, commanding, event aggregation, and more. Prism's core functionality is a shared library targeting the .NET Framework and .NET Standard. Features that need to be platform specific are implemented in the respective libraries for the target platform (Avalonia, WPF, Uno Platform, and Xamarin Forms).
 
-Prism.Wpf helps you more easily design and build rich, flexible, and easy to maintain Windows Presentation Foundation (WPF) desktop applications. This library provides user interface composition as well as modularity support.</Description>
-    <PackageTags>prism;mvvm;xaml;avalonia</PackageTags>
+Prism.Avalonia helps you more easily design and build rich, flexible, and easy to maintain Avalonia desktop applications. This library provides user interface composition as well as modularity support.</Description>
+    <PackageTags>prism;mvvm;xaml;avalonia;</PackageTags>
     <Copyright>Copyright (c) 2022 Avalonia Community</Copyright>
     <Authors>Omid Mafakher, Damian Suess, various contributors</Authors>
+    <Title>Prism.Avalonia</Title>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PackageReleaseNotes>* Fixed: Automatically performs `AutoWireViewModel`
+  * No longer need to device `prism:ViewModelLocator.AutoWireViewModel="True"` in View
+* Updated DryIoc to v4.8.0
+* Updated to Avalonia v0.10.18
+</PackageReleaseNotes>
+    <PackageIcon>Prism.Avalonia.png</PackageIcon>
   </PropertyGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
@@ -28,6 +36,17 @@ Prism.Wpf helps you more easily design and build rich, flexible, and easy to mai
     <None Include="**\*.net45.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\..\logo\Prism.Avalonia.png">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+    <None Include="..\..\README.md">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="CommonServiceLocator" Version="2.0.5" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />

diff --git a/src/Prism.DryIoc.Avalonia/Prism.DryIoc.Avalonia.csproj b/src/Prism.DryIoc.Avalonia/Prism.DryIoc.Avalonia.csproj
@@ -11,8 +11,27 @@
     <Description>Use these extensions to build Prism applications based on DryIoc.</Description>
     <Authors>Omid Mafakher, Damian Suess, various contributors</Authors>
     <Copyright>Copyright (c) 2022 Avalonia Community</Copyright>
+    <Title>Prism.DryIoc.Avalonia</Title>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PackageReleaseNotes>* Fixed: Automatically performs `AutoWireViewModel`
+    * No longer need to device `prism:ViewModelLocator.AutoWireViewModel="True"` in View
+* Updated DryIoc to v4.8.0
+* Updated to Avalonia v0.10.18</PackageReleaseNotes>
+    <PackageTags>prism;mvvm;xaml;avalonia;dryioc;dependencyinjection;navigation;</PackageTags>
+    <PackageIcon>Prism.Avalonia.png</PackageIcon>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="..\..\logo\Prism.Avalonia.png">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+    <None Include="..\..\README.md">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="DryIoc.dll" Version="4.8.0" />
   </ItemGroup>