Skip to content

Commit d0860c5

Browse files
authored
Merge pull request #3347 from DamianSuess/dev/suess/Prism.Avalonia-v11.3.x
Prism.Avalonia Upgrade to v11.3.5 from v11.1.x
2 parents ea67f89 + 6afb8a0 commit d0860c5

File tree

3 files changed

+30
-9
lines changed

3 files changed

+30
-9
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ end_of_line = lf
4040
[*.{props,targets}]
4141
indent_size = 2
4242

43-
[*.xaml]
43+
[*.{xaml,axml}]
4444
indent_size = 2
4545
charset = utf-8-bom
4646

Directory.Packages.props

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@
5757
</ItemGroup>
5858
<!-- Avalonia -->
5959
<ItemGroup Condition=" $(IsAvaloniaProject) == 'true' ">
60-
<PackageVersion Include="Avalonia" Version="11.1.3" />
61-
<PackageVersion Include="Avalonia.Desktop" Version="11.1.3" />
62-
<PackageVersion Include="Avalonia.Diagnostics" Version="11.1.3" />
63-
<PackageVersion Include="Avalonia.LinuxFramebuffer" Version="11.1.3" />
64-
<PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.1.3" />
65-
<PackageVersion Include="Avalonia.Themes.Simple" Version="11.1.3" />
66-
<PackageVersion Include="Avalonia.Themes.Fluent" Version="11.1.3" />
67-
<PackageVersion Include="Avalonia.Fonts.Inter" Version="11.1.3" />
60+
<PackageVersion Include="Avalonia" Version="11.3.5" />
61+
<PackageVersion Include="Avalonia.Desktop" Version="11.3.5" />
62+
<PackageVersion Include="Avalonia.Diagnostics" Version="11.3.5" />
63+
<PackageVersion Include="Avalonia.LinuxFramebuffer" Version="11.3.5" />
64+
<PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.5" />
65+
<PackageVersion Include="Avalonia.Themes.Simple" Version="11.3.5" />
66+
<PackageVersion Include="Avalonia.Themes.Fluent" Version="11.3.5" />
67+
<PackageVersion Include="Avalonia.Fonts.Inter" Version="11.3.5" />
6868
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
6969
<PackageVersion Include="System.CodeDom" Version="8.0.0" />
7070
</ItemGroup>

README.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ These are the base packages for each platform, together with the Prism's Core as
5555
| Cross Platform | [Prism.Container.DryIoc][ContainerDryIocNuGet] | [![ContainerDryIocNuGetShield]][ContainerDryIocNuGet] | [![ContainerDryIocPrismNuGetShield]][CorePrismNuGet] |
5656
| Cross Platform | [Prism.Container.Unity][ContainerUnityNuGet] | [![ContainerUnityNuGetShield]][ContainerUnityNuGet] | [![ContainerUnityPrismNuGetShield]][CorePrismNuGet] |
5757
| WPF | [Prism.Wpf][WpfNuGet] | [![WpfNuGetShield]][WpfNuGet] | [![WpfPrismNuGetShield]][WpfPrismNuGet] |
58+
| Avalonia | [Prism.Avalonia][AvaloniaNuGet] | [![AvaloniaNuGetShield]][AvaloniaNuGet] | [![AvaloniaPrismNuGetShield]][AvaloniaPrismNuGet] |
5859
| Xamarin.Forms | [Prism.Forms][FormsNuGet] | [![FormsNuGetShield]][FormsNuGet] | [![FormsPrismNuGetShield]][FormsPrismNuGet] |
5960
| Uno Platform and WinUI | [Prism.Uno][UnoNuGet] | [![UnoNuGetShield]][UnoNuGet] | [![UnoPrismNuGetShield]][UnoPrismNuGet] |
6061

@@ -69,6 +70,12 @@ Each supported IoC container has its own package assisting in the setup and usag
6970
| [Prism.DryIoc][DryIocWpfNuGet] | [![DryIocWpfNuGetShield]][DryIocWpfNuGet] | [![DryIocWpfPrismNuGetShield]][DryIocWpfPrismNuGet] |
7071
| [Prism.Unity][UnityWpfNuGet] | [![UnityWpfNuGetShield]][UnityWpfNuGet] | [![UnityWpfPrismNuGetShield]][UnityWpfPrismNuGet] |
7172

73+
#### Avalonia
74+
75+
| Package | NuGet | Commercial Plus Feed |
76+
|---------|-------|-------|
77+
| [Prism.DryIoc.Avalonia][DryIocAvaloniaNuGet] | [![DryIocAvaloniaNuGetShield]][DryIocAvaloniaNuGet] | [![DryIocAvaloniaPrismNuGetShield]][DryIocAvaloniaPrismNuGet] |
78+
7279
#### Xamarin Forms
7380

7481
| Package | NuGet | Commercial Plus Feed |
@@ -95,6 +102,7 @@ For stable samples be sure to check out the samples repo for the platform you ar
95102
- [Prism for Xamarim.Forms](https://github.com/PrismLibrary/Prism-Samples-Forms)
96103
- [Prism for Uno Platform](#) (Coming soon)
97104
- [Prism for .NET MAUI](#) (Coming soon)
105+
- [Prism for Avalonia](https://github.com/AvaloniaCommunity/Prism.Avalonia/tree/develop/e2e)
98106

99107
## Contributing
100108

@@ -109,6 +117,8 @@ We strongly encourage you to get involved and help us evolve the code base.
109117
[ContainerUnityNuGet]: https://www.nuget.org/packages/Prism.Container.Unity/
110118
[WpfNuGet]: https://www.nuget.org/packages/Prism.Wpf/
111119
[UnoNuGet]: https://www.nuget.org/packages/Prism.Uno.WinUI/
120+
[AvaloniaNuGet]: https://www.nuget.org/packages/Prism.Avalonia/
121+
[FormsNuget]: https://www.nuget.org/packages/Prism.Forms/
112122

113123
[PrismFormsRegionsNuGet]: https://www.nuget.org/packages/Prism.Forms.Regions/
114124
[PrismFormsRegionsPrismNuGet]: #
@@ -119,6 +129,7 @@ We strongly encourage you to get involved and help us evolve the code base.
119129
[UnityWpfNuGet]: https://www.nuget.org/packages/Prism.Unity/
120130

121131
[DryIocUnoPlatformNuGet]: https://www.nuget.org/packages/Prism.DryIoc.Uno.WinUI/
132+
[DryIocAvaloniaNuGet]: https://www.nuget.org/packages/Prism.DryIoc.Avalonia/
122133

123134
[CoreNuGetShield]: https://img.shields.io/nuget/vpre/Prism.Core.svg
124135
[EventsNuGetShield]: https://img.shields.io/nuget/vpre/Prism.Events.svg
@@ -132,6 +143,9 @@ We strongly encourage you to get involved and help us evolve the code base.
132143
[DryIocWpfNuGetShield]: https://img.shields.io/nuget/vpre/Prism.DryIoc.svg
133144
[UnityWpfNuGetShield]: https://img.shields.io/nuget/vpre/Prism.Unity.svg
134145

146+
[AvaloniaNuGetShield]: https://img.shields.io/nuget/vpre/Prism.Avalonia.svg
147+
[DryIocAvaloniaNuGetShield]: https://img.shields.io/nuget/vpre/Prism.DryIoc.Avalonia.svg
148+
135149
[DryIocFormsNuGetShield]: https://img.shields.io/nuget/vpre/Prism.DryIoc.Forms.svg
136150
[UnityFormsNuGetShield]: https://img.shields.io/nuget/vpre/Prism.Unity.Forms.svg
137151

@@ -141,13 +155,16 @@ We strongly encourage you to get involved and help us evolve the code base.
141155
[WpfPrismNuGet]: #
142156
[FormsPrismNuGet]: #
143157
[UnoPrismNuGet]: #
158+
[AvaloniaPrismNuGet]: #
144159

145160
[DryIocWpfPrismNuGet]: #
146161
[UnityWpfPrismNuGet]: #
147162

148163
[UnityFormsPrismNuGet]: #
149164
[DryIocFormsPrismNuGet]: #
150165

166+
[DryIocAvaloniaPrismNuGet]: #
167+
151168
[DryIocUnoPlatformPrismNuGet]: #
152169

153170
[CorePrismNuGetShield]: https://nuget.prismlibrary.com/shield/Prism.Core/vpre
@@ -156,11 +173,15 @@ We strongly encourage you to get involved and help us evolve the code base.
156173
[ContainerDryIocPrismNuGetShield]: https://nuget.prismlibrary.com/shield/Prism.Container.DryIoc/vpre
157174
[ContainerUnityPrismNuGetShield]: https://nuget.prismlibrary.com/shield/Prism.Container.Unity/vpre
158175
[WpfPrismNuGetShield]: https://nuget.prismlibrary.com/shield/Prism.Wpf/vpre
176+
[AvaloniaPrismNuGetShield]: https://nuget.prismlibrary.com/shield/Prism.Avalonia/vpre
159177
[UnoPrismNuGetShield]: https://nuget.prismlibrary.com/shield/Prism.Uno.WinUI/vpre
178+
[FormsPrismNuGetShield]: https://nuget.prismlibrary.com/shield/Prism.Forms/vpre
160179

161180
[DryIocWpfPrismNuGetShield]: https://nuget.prismlibrary.com/shield/Prism.DryIoc/vpre
162181
[UnityWpfPrismNuGetShield]: https://nuget.prismlibrary.com/shield/Prism.Unity/vpre
163182

183+
[DryIocAvaloniaPrismNuGetShield]: https://nuget.prismlibrary.com/shield/Prism.DryIoc.Avalonia/vpre
184+
164185
[DryIocUnoPlatformPrismNuGetShield]: https://nuget.prismlibrary.com/shield/Prism.DryIoc.Uno.WinUI/vpre
165186

166187
[TwitterLogo]: https://dansiegelgithubsponsors.blob.core.windows.net/images/twitter.png

0 commit comments

Comments
 (0)