diff --git a/build/ReactiveUI.props b/build/ReactiveUI.props
index f74ab07e31..c3b136d41d 100644
--- a/build/ReactiveUI.props
+++ b/build/ReactiveUI.props
@@ -1,5 +1,5 @@
-
+
diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm
index b46655c7df..d7afbdaa3a 100644
--- a/native/Avalonia.Native/src/OSX/window.mm
+++ b/native/Avalonia.Native/src/OSX/window.mm
@@ -1936,6 +1936,10 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
[NSApp setMenu:_menu];
}
+ else
+ {
+ [self showAppMenuOnly];
+ }
}
-(void) showAppMenuOnly
diff --git a/nukebuild/Build.cs b/nukebuild/Build.cs
index d627a2bf19..eec21d4423 100644
--- a/nukebuild/Build.cs
+++ b/nukebuild/Build.cs
@@ -301,14 +301,19 @@ partial class Build : NukeBuild
.Executes(() =>
{
var data = Parameters;
+ var pathToProjectSource = RootDirectory / "samples" / "ControlCatalog.NetCore";
+ var pathToPublish = pathToProjectSource / "bin" / data.Configuration / "publish";
+
+ DotNetPublish(c => c
+ .SetProject(pathToProjectSource / "ControlCatalog.NetCore.csproj")
+ .EnableNoBuild()
+ .SetConfiguration(data.Configuration)
+ .AddProperty("PackageVersion", data.Version)
+ .AddProperty("PublishDir", pathToPublish));
+
Zip(data.ZipCoreArtifacts, data.BinRoot);
Zip(data.ZipNuGetArtifacts, data.NugetRoot);
- Zip(data.ZipTargetControlCatalogDesktopDir,
- GlobFiles(data.ZipSourceControlCatalogDesktopDir, "*.dll").Concat(
- GlobFiles(data.ZipSourceControlCatalogDesktopDir, "*.config")).Concat(
- GlobFiles(data.ZipSourceControlCatalogDesktopDir, "*.so")).Concat(
- GlobFiles(data.ZipSourceControlCatalogDesktopDir, "*.dylib")).Concat(
- GlobFiles(data.ZipSourceControlCatalogDesktopDir, "*.exe")));
+ Zip(data.ZipTargetControlCatalogNetCoreDir, pathToPublish);
});
Target CreateIntermediateNugetPackages => _ => _
diff --git a/nukebuild/BuildParameters.cs b/nukebuild/BuildParameters.cs
index c76019d9eb..a92c988fbd 100644
--- a/nukebuild/BuildParameters.cs
+++ b/nukebuild/BuildParameters.cs
@@ -58,8 +58,7 @@ public partial class Build
public string FileZipSuffix { get; }
public AbsolutePath ZipCoreArtifacts { get; }
public AbsolutePath ZipNuGetArtifacts { get; }
- public AbsolutePath ZipSourceControlCatalogDesktopDir { get; }
- public AbsolutePath ZipTargetControlCatalogDesktopDir { get; }
+ public AbsolutePath ZipTargetControlCatalogNetCoreDir { get; }
public BuildParameters(Build b)
@@ -129,9 +128,7 @@ public partial class Build
FileZipSuffix = Version + ".zip";
ZipCoreArtifacts = ZipRoot / ("Avalonia-" + FileZipSuffix);
ZipNuGetArtifacts = ZipRoot / ("Avalonia-NuGet-" + FileZipSuffix);
- ZipSourceControlCatalogDesktopDir =
- RootDirectory / ("samples/ControlCatalog.Desktop/bin/" + DirSuffix + "/net461");
- ZipTargetControlCatalogDesktopDir = ZipRoot / ("ControlCatalog.Desktop-" + FileZipSuffix);
+ ZipTargetControlCatalogNetCoreDir = ZipRoot / ("ControlCatalog.NetCore-" + FileZipSuffix);
}
string GetVersion()
diff --git a/readme.md b/readme.md
index f73bdffaeb..67b706f428 100644
--- a/readme.md
+++ b/readme.md
@@ -2,8 +2,6 @@
[](https://www.nuget.org/packages/Avalonia) [](https://www.nuget.org/packages/Avalonia) [](https://www.myget.org/gallery/avalonia-ci) 
-
-
## 📖 About AvaloniaUI
Avalonia is a cross-platform XAML-based UI framework providing a flexible styling system and supporting a wide range of Operating Systems such as Windows via .NET Framework and .NET Core, Linux via Xorg, macOS. Avalonia is ready for **General-Purpose Desktop App Development**. However, there may be some bugs and breaking changes as we continue along into this project's development.
diff --git a/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj b/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj
index d5aedf7783..3c2d2ee359 100644
--- a/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj
+++ b/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj
@@ -1,7 +1,7 @@
- Exe
+ WinExe
netcoreapp3.1
true
@@ -15,6 +15,10 @@
+
+
+ en
+
diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index 1aa926a2a6..53ad213d92 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -27,6 +27,6 @@
-
+
diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index 142c532d75..6537c470d5 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -21,6 +21,9 @@
+
+
+
@@ -38,6 +41,9 @@
+
+
+
diff --git a/samples/ControlCatalog/Pages/ContextFlyoutPage.axaml b/samples/ControlCatalog/Pages/ContextFlyoutPage.axaml
new file mode 100644
index 0000000000..e15637aa0f
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ContextFlyoutPage.axaml
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+ Context Flyout
+ A right click Flyout that can be applied to any control.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/ControlCatalog/Pages/ContextFlyoutPage.axaml.cs b/samples/ControlCatalog/Pages/ContextFlyoutPage.axaml.cs
new file mode 100644
index 0000000000..e64d4a2cdd
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ContextFlyoutPage.axaml.cs
@@ -0,0 +1,45 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using ControlCatalog.ViewModels;
+using Avalonia.Interactivity;
+namespace ControlCatalog.Pages
+{
+ public class ContextFlyoutPage : UserControl
+ {
+ private TextBox _textBox;
+
+ public ContextFlyoutPage()
+ {
+ InitializeComponent();
+
+ var vm = new ContextFlyoutPageViewModel();
+ vm.View = this;
+ DataContext = vm;
+
+ _textBox = this.FindControl("TextBox");
+
+ var cutButton = this.FindControl