Skip to content

Commit 1cb2288

Browse files
vb2aevb2ae
committed
get latest
2 parents f0ff704 + d308202 commit 1cb2288

File tree

137 files changed

+2997
-350
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+2997
-350
lines changed

‎.github/workflows/dotnet.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ jobs:
7474
run: msbuild ${{env.caliburn_features}} -t:restore
7575

7676
- name: Build feature features
77-
run: msbuild ${{env.caliburn_features}} /t:Build /p:Configuration=${{env.build_configuration}}
77+
run: msbuild ${{env.caliburn_features}} /t:Build /p:Configuration=Debug
7878

7979
- name: Pack Nuget
8080
run: msbuild ${{env.caliburn_sln}} /t:package /p:Configuration=${{env.build_configuration}}
8181

8282
- name: publish Nuget Packages to GitHub
8383
run: dotnet nuget push ${{env.nuget_upload}} --source ${{env.package_feed}} --api-key ${{secrets.PUBLISH_NUGET_PACKAGE}} --skip-duplicate
84-
if: github.event_name != 'pull_request'
84+
if: github.event_name != 'pull_request'

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ MyGet | [![MyGet Package](https://img.shields.io/myget/caliburn-micro-builds/v/c
88
NuGet | [![NuGet Package](https://img.shields.io/nuget/v/Caliburn.Micro.svg?logo=nuget&logoColor=white&&style=for-the-badge&colorB=green)](https://www.nuget.org/packages/Caliburn.Micro)
99
GitHub Action | ![example workflow](https://github.com/Caliburn-Micro/Caliburn.Micro/actions/workflows/dotnet.yml/badge.svg)
1010

11-
Caliburn.Micro is a small, yet powerful framework, designed for building applications across all XAML platforms. With strong support for MVVM and other proven UI patterns, Caliburn.Micro will enable you to build your solution quickly, without the need to sacrifice code quality or testability.
11+
Caliburn.Micro is a small, yet powerful framework, designed for building applications across all XAML platforms. With strong support for MVVM and other proven UI patterns, Caliburn.Micro enables you to build your solution quickly without sacrificing code quality or testability.
1212

1313
## Packages are available on Nuget
14-
- [Caliburn.Micro.Core](https://www.nuget.org/packages/Caliburn.Micro.Core/) - The Portable Class Library (PCL) portion of Caliburn.Micro.
14+
- [Caliburn.Micro.Core](https://www.nuget.org/packages/Caliburn.Micro.Core/) - The Standard Class Library portion of Caliburn.Micro.
1515
- [Caliburn.Micro](https://www.nuget.org/packages/Caliburn.Micro/) - The platform-specific adapters for Caliburn.Micro.
1616
- [Caliburn.Micro.Xamarin.Forms](https://www.nuget.org/packages/Caliburn.Micro.Xamarin.Forms/) - Support to Caliburn.Micro in Xamarin.Forms.
1717

1818
## Packages are available on Github
19-
- [Caliburn.Micro.Core](https://github.com/Caliburn-Micro/Caliburn.Micro/pkgs/nuget/Caliburn.Micro.Core) - The Portable Class Library (PCL) portion of Caliburn.Micro.
19+
- [Caliburn.Micro.Core](https://github.com/Caliburn-Micro/Caliburn.Micro/pkgs/nuget/Caliburn.Micro.Core) - The Standard Class Library portion of Caliburn.Micro.
2020
- [Caliburn.Micro](https://github.com/Caliburn-Micro/Caliburn.Micro/pkgs/nuget/Caliburn.Micro) - The platform-specific adapters for Caliburn.Micro.
2121
- [Caliburn.Micro.Xamarin.Forms](https://github.com/Caliburn-Micro/Caliburn.Micro/pkgs/nuget/Caliburn.Micro.Xamarin.Forms) - Support to Caliburn.Micro for Xamarin.Forms.
2222
- [Caliburn.Micro.Maui](https://github.com/Caliburn-Micro/Caliburn.Micro/pkgs/nuget/Caliburn.Micro.Maui) - Support to Caliburn.Micro for dotnet Maui
2323
- [Caliburn.Micro.Avalonia](https://github.com/Caliburn-Micro/Caliburn.Micro/pkgs/nuget/Caliburn.Micro.Avalonia) - Support To Caliburn.Micro for Avalonia UI
24-
- [Caliburn.Micro.WinUI]() - Support to Caliburn.Micro for WinUI (WinApp Sdk) Coming Soon
24+
- [Caliburn.Micro.WinUI]() - Support to Caliburn.Micro for WinUI (WinApp Sdk)
2525

2626
## Questions
2727
- For non bug related questions see [Stack Overflow](https://stackoverflow.com/questions/tagged/caliburn.micro)

‎samples/features/Features.Avalonia/Features.Avalonia.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717
<None Remove=".gitignore" />
1818
</ItemGroup>
1919
<ItemGroup>
20-
<PackageReference Include="Avalonia" Version="11.2.2" />
21-
<PackageReference Include="Avalonia.Desktop" Version="11.2.2" />
22-
<PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.2.2" />
20+
<PackageReference Include="Avalonia" Version="11.2.3" />
21+
<PackageReference Include="Avalonia.Desktop" Version="11.2.3" />
22+
<PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.2.3" />
2323

24-
<PackageReference Include="Avalonia.Themes.FLuent" Version="11.2.2" />
25-
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.2.0.1" />
26-
<PackageReference Include="Avalonia.Xaml.Interactivity" Version="11.2.0.1" />
24+
<PackageReference Include="Avalonia.Themes.FLuent" Version="11.2.3" />
25+
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.2.0.7" />
26+
<PackageReference Include="Avalonia.Xaml.Interactivity" Version="11.2.0.7" />
2727
<PackageReference Include="MessageBox.Avalonia" Version="3.2.0" />
2828
<PackageReference Include="System.Reactive" Version="6.0.1" />
2929
<PackageReference Include="XamlNameReferenceGenerator" Version="1.6.1" />
3030
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
31-
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.2" />
31+
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.3" />
3232
</ItemGroup>
3333
<ItemGroup>
3434
<Reference Include="Caliburn.Micro.Avalonia">

‎samples/features/Features.Avalonia/ViewModels/ShellViewModel.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@ public void GoHome()
4242
}
4343
}
4444

45+
public void GoBack()
46+
{
47+
if (_navigationService != null)
48+
{
49+
_navigationService.GoBackAsync();
50+
}
51+
}
52+
4553
public async void NavReady(NavigationFrame frame)
4654
{
4755
_navigationService = frame as INavigationService;

‎samples/features/Features.Avalonia/Views/NavigationSourceView.axaml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,11 @@
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
66
x:Class="Features.CrossPlatform.Views.NavigationSourceView">
7-
Welcome to Avalonia!
7+
<Grid>
8+
<StackPanel Margin="20">
9+
<TextBox x:Name="Text" />
10+
<CheckBox x:Name="IsNavigationEnabled" Content="Is Enabled" Margin="0,10" />
11+
<Button x:Name="Navigate" Content="Navigate" />
12+
</StackPanel>
13+
</Grid>
814
</UserControl>

‎samples/features/Features.Avalonia/Views/NavigationTargetView.axaml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,10 @@
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
66
x:Class="Features.CrossPlatform.Views.NavigationTargetView">
7-
Welcome to Avalonia!
7+
<Grid>
8+
<StackPanel Margin="20">
9+
<TextBlock x:Name="Text" />
10+
<TextBlock x:Name="IsNavigationEnabled" />
11+
</StackPanel>
12+
</Grid>
813
</UserControl>

‎samples/features/Features.Avalonia/Views/ShellView.axaml‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,29 @@
88
Height="450"
99
x:Class="Features.CrossPlatform.Views.ShellView"
1010
Title="ShellView">
11+
<Window.Resources>
12+
<StreamGeometry x:Key="arrow_left_regular">M12.7347,4.20949 C13.0332,3.92233 13.508,3.93153 13.7952,4.23005 C14.0823,4.52857 14.0731,5.00335 13.7746,5.29051 L5.50039,13.25 L24.2532,13.25 C24.6674,13.25 25.0032,13.5858 25.0032,13.9999982 C25.0032,14.4142 24.6674,14.75 24.2532,14.75 L5.50137,14.75 L13.7746,22.7085 C14.0731,22.9957 14.0823,23.4705 13.7952,23.769 C13.508,24.0675 13.0332,24.0767 12.7347,23.7896 L3.30673,14.7202 C2.89776,14.3268 2.89776,13.6723 3.30673,13.2788 L12.7347,4.20949 Z</StreamGeometry>
13+
<StreamGeometry x:Key="home_regular">M21.6062 5.85517C23.0048 4.71494 24.9952 4.71494 26.3938 5.85517L39.5688 16.5966C40.4736 17.3342 41 18.4492 41 19.628V39.1134C41 41.2599 39.2875 43 37.175 43H32.075C29.9625 43 28.25 41.2599 28.25 39.1134V29.7492C28.25 29.0337 27.6792 28.4536 26.975 28.4536H21.025C20.3208 28.4536 19.75 29.0337 19.75 29.7492V39.1134C19.75 41.2599 18.0375 43 15.925 43H10.825C8.71251 43 7 41.2599 7 39.1134V19.628C7 18.4493 7.52645 17.3342 8.43124 16.5966L21.6062 5.85517ZM24.7979 7.87612C24.3317 7.49604 23.6683 7.49604 23.2021 7.87612L10.0271 18.6175C9.72548 18.8634 9.55 19.2351 9.55 19.628V39.1134C9.55 39.8289 10.1208 40.4089 10.825 40.4089H15.925C16.6292 40.4089 17.2 39.8289 17.2 39.1134V29.7492C17.2 27.6027 18.9125 25.8626 21.025 25.8626H26.975C29.0875 25.8626 30.8 27.6027 30.8 29.7492V39.1134C30.8 39.8289 31.3708 40.4089 32.075 40.4089H37.175C37.8792 40.4089 38.45 39.8289 38.45 39.1134V19.628C38.45 19.2351 38.2745 18.8634 37.9729 18.6175L24.7979 7.87612Z</StreamGeometry> </Window.Resources>
1114
<Grid>
1215
<Grid.RowDefinitions>
1316
<RowDefinition Height="50"></RowDefinition>
1417
<RowDefinition Height="*"></RowDefinition>
1518
</Grid.RowDefinitions>
1619
<StackPanel Grid.Row="0" Orientation="Horizontal">
17-
<Button cal:Message.Attach="GoHome">Home</Button>
20+
<StackPanel.Background>
21+
<LinearGradientBrush StartPoint="50%,0%" EndPoint="50%,100%">
22+
<GradientStop Color="#A8E6CF" Offset="0.0"/>
23+
<GradientStop Color="#3D84A8" Offset="1.0"/>
24+
</LinearGradientBrush>
25+
</StackPanel.Background>
26+
<Button cal:Message.Attach="GoBack" >
27+
<PathIcon Height="25" Width="25" Foreground="Blue"
28+
Data="{StaticResource arrow_left_regular}"/>
29+
</Button>
30+
<Button cal:Message.Attach="GoHome" >
31+
<PathIcon Height="25" Width="25" Foreground="Blue"
32+
Data="{StaticResource home_regular}"/>
33+
</Button>
1834
</StackPanel>
1935
<DockPanel Grid.Row="1">
2036
<Border>

‎samples/features/Features.CrossPlatform.Shared/Results/MessageDialogResult.cs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Runtime.InteropServices;
23
using Caliburn.Micro;
34
#if XAMARINFORMS
45
using Xamarin.Forms;
@@ -51,6 +52,22 @@ public override async void Execute(CoroutineExecutionContext context)
5152
await dialog.ShowAsync();
5253
OnCompleted();
5354
}
55+
#elif WinUI3
56+
public override async void Execute(CoroutineExecutionContext context)
57+
{
58+
var dialog = new MessageDialog(_content, _title);
59+
60+
var hWnd = GetActiveWindow();
61+
62+
WinRT.Interop.InitializeWithWindow.Initialize(dialog, hWnd);
63+
64+
await dialog.ShowAsync();
65+
66+
OnCompleted();
67+
}
68+
69+
[DllImport("user32.dll")]
70+
private static extern IntPtr GetActiveWindow();
5471
#else
5572
public override async void Execute(CoroutineExecutionContext context)
5673
{

‎samples/features/Features.CrossPlatform.Shared/Results/VisualStateResult.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
#if SILVERLIGHT || WPF
66
using System.Windows;
77
using System.Windows.Controls;
8+
#elif WinUI3
9+
using Microsoft.UI.Xaml;
10+
using Microsoft.UI.Xaml.Controls;
811
#elif AVALONIA
912
using Avalonia.Controls;
1013
#else

‎samples/features/Features.UWP/Features.UWP.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyName>Features.CrossPlatform</AssemblyName>
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14-
<TargetPlatformVersion>10.0.20348.0</TargetPlatformVersion>
14+
<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
1515
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>
@@ -272,4 +272,4 @@
272272
<Target Name="AfterBuild">
273273
</Target>
274274
-->
275-
</Project>
275+
</Project>

0 commit comments

Comments
 (0)