Skip to content

Commit

Permalink
Merge pull request #71 from AvaloniaCommunity/feature/Avalonia-v11.0.RC1
Browse files Browse the repository at this point in the history
Update to Support Avalonia v11.0.0-RC1.1
  • Loading branch information
DamianSuess authored Jun 1, 2023
2 parents 3a075e9 + d21866e commit b293865
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2017 Stratocast3r
Copyright (c) 2023 Suess Labs

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
6 changes: 3 additions & 3 deletions build/AvaloniaDependency.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<ItemGroup>
<PackageReference Include="Avalonia" Version="11.0.0-preview8" />
<PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.0.0-preview8" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview8" />
<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" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions build/Base.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<Project DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Version>8.1.97.11-preview.11.8.1</Version>
<Version>8.1.97.11000-rc1.1</Version>
<PackageProjectUrl>https://github.com/AvaloniaCommunity/Prism.Avalonia</PackageProjectUrl>
<Copyright>Copyright (c) 2023 Avalonia Community</Copyright>
<Copyright>Copyright (c) 2023 Avalonia Community, Suess Labs</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<RepositoryUrl>https://github.com/AvaloniaCommunity/Prism.Avalonia</RepositoryUrl>
</PropertyGroup>
Expand Down
12 changes: 6 additions & 6 deletions build/SampleApp.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<Import Project="AvaloniaDependency.props" />

<ItemGroup>
<PackageReference Include="Avalonia.Diagnostics" Version="11.0.0-preview8" />
<!--<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-preview5" />-->
<PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview8" />
<PackageReference Include="Avalonia.LinuxFramebuffer" Version="11.0.0-preview8" />
<PackageReference Include="Avalonia.Themes.Simple" Version="11.0.0-preview8" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview8" />
<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" />
<ProjectReference Include="$(MSBuildThisFileDirectory)..\src\Prism.DryIoc.Avalonia\Prism.DryIoc.Avalonia.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion samples/BootstrapperShellSample/Views/MainWindow.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Width="525"
x:Class="BootstrapperShellSample.Views.MainWindow">
<Grid>
<TextBlock Text="Hello, Prism on Avalonia!"
<TextBlock Text="Hello, from Prism.Avalonia!"
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="17"
Expand Down

0 comments on commit b293865

Please sign in to comment.