From f067ea69034ccc310874ab9f99b23aeb364eb493 Mon Sep 17 00:00:00 2001 From: Mark Kromis <143529142+mkromis@users.noreply.github.com> Date: Sat, 15 Mar 2025 18:27:06 -0400 Subject: [PATCH 01/12] update to dotnet 8 --- Demos/MinoriDemo/MinoriDemo.Core/MinoriDemo.Core.csproj | 2 +- .../MinoriDemo/MinoriDemo.RibbonWPF/MinoriDemo.RibbonWPF.csproj | 2 +- .../MinoriDemo/MinoriDemo.RibbonWpf/MinoriDemo.RibbonWpf.csproj | 2 +- Demos/MinoriDemo/MinoriDemo.WPF/MinoriDemo.WPF.csproj | 2 +- Demos/MinoriDemo/MinoriDemo.Wpf/MinoriDemo.Wpf.csproj | 2 +- Demos/SimpleDemo/SimpleDemo.Core/SimpleDemo.Core.csproj | 2 +- .../SimpleDemo/SimpleDemo.RibbonWPF/SimpleDemo.RibbonWPF.csproj | 2 +- .../SimpleDemo/SimpleDemo.RibbonWpf/SimpleDemo.RibbonWpf.csproj | 2 +- Demos/SimpleDemo/SimpleDemo.WPF/SimpleDemo.WPF.csproj | 2 +- Demos/SimpleDemo/SimpleDemo.Wpf/SimpleDemo.Wpf.csproj | 2 +- .../MinoriEditorShell.Platforms.Wpf.csproj | 2 +- .../MinoriEditorShell.Ribbon/MinoriEditorShell.Ribbon.csproj | 2 +- .../MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj | 2 +- .../MinoriEditorShell.VirtualCanvas.csproj | 2 +- Modules/MinoriEditorShell/MinoriEditorShell.csproj | 2 +- .../MinoriEditorShell.Platforms.WpfTests.csproj | 2 +- .../MinoriEditorShell.RibbonTests.csproj | 2 +- Tests/MinoriEditorShellTests/MinoriEditorShellTests.csproj | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Demos/MinoriDemo/MinoriDemo.Core/MinoriDemo.Core.csproj b/Demos/MinoriDemo/MinoriDemo.Core/MinoriDemo.Core.csproj index ac44fc45..1cf0a978 100644 --- a/Demos/MinoriDemo/MinoriDemo.Core/MinoriDemo.Core.csproj +++ b/Demos/MinoriDemo/MinoriDemo.Core/MinoriDemo.Core.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 latest diff --git a/Demos/MinoriDemo/MinoriDemo.RibbonWPF/MinoriDemo.RibbonWPF.csproj b/Demos/MinoriDemo/MinoriDemo.RibbonWPF/MinoriDemo.RibbonWPF.csproj index 170cea1e..60f5dfcf 100644 --- a/Demos/MinoriDemo/MinoriDemo.RibbonWPF/MinoriDemo.RibbonWPF.csproj +++ b/Demos/MinoriDemo/MinoriDemo.RibbonWPF/MinoriDemo.RibbonWPF.csproj @@ -2,7 +2,7 @@ WinExe - net7.0-windows + net8.0-windows latest true diff --git a/Demos/MinoriDemo/MinoriDemo.RibbonWpf/MinoriDemo.RibbonWpf.csproj b/Demos/MinoriDemo/MinoriDemo.RibbonWpf/MinoriDemo.RibbonWpf.csproj index 170cea1e..60f5dfcf 100644 --- a/Demos/MinoriDemo/MinoriDemo.RibbonWpf/MinoriDemo.RibbonWpf.csproj +++ b/Demos/MinoriDemo/MinoriDemo.RibbonWpf/MinoriDemo.RibbonWpf.csproj @@ -2,7 +2,7 @@ WinExe - net7.0-windows + net8.0-windows latest true diff --git a/Demos/MinoriDemo/MinoriDemo.WPF/MinoriDemo.WPF.csproj b/Demos/MinoriDemo/MinoriDemo.WPF/MinoriDemo.WPF.csproj index 6ed11454..024f9964 100644 --- a/Demos/MinoriDemo/MinoriDemo.WPF/MinoriDemo.WPF.csproj +++ b/Demos/MinoriDemo/MinoriDemo.WPF/MinoriDemo.WPF.csproj @@ -2,7 +2,7 @@ WinExe - net7.0-windows + net8.0-windows latest true diff --git a/Demos/MinoriDemo/MinoriDemo.Wpf/MinoriDemo.Wpf.csproj b/Demos/MinoriDemo/MinoriDemo.Wpf/MinoriDemo.Wpf.csproj index 6ed11454..024f9964 100644 --- a/Demos/MinoriDemo/MinoriDemo.Wpf/MinoriDemo.Wpf.csproj +++ b/Demos/MinoriDemo/MinoriDemo.Wpf/MinoriDemo.Wpf.csproj @@ -2,7 +2,7 @@ WinExe - net7.0-windows + net8.0-windows latest true diff --git a/Demos/SimpleDemo/SimpleDemo.Core/SimpleDemo.Core.csproj b/Demos/SimpleDemo/SimpleDemo.Core/SimpleDemo.Core.csproj index 51039718..35572f10 100644 --- a/Demos/SimpleDemo/SimpleDemo.Core/SimpleDemo.Core.csproj +++ b/Demos/SimpleDemo/SimpleDemo.Core/SimpleDemo.Core.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 latest diff --git a/Demos/SimpleDemo/SimpleDemo.RibbonWPF/SimpleDemo.RibbonWPF.csproj b/Demos/SimpleDemo/SimpleDemo.RibbonWPF/SimpleDemo.RibbonWPF.csproj index 1c3b0a59..8193ab94 100644 --- a/Demos/SimpleDemo/SimpleDemo.RibbonWPF/SimpleDemo.RibbonWPF.csproj +++ b/Demos/SimpleDemo/SimpleDemo.RibbonWPF/SimpleDemo.RibbonWPF.csproj @@ -2,7 +2,7 @@ WinExe - net7.0-windows + net8.0-windows latest true diff --git a/Demos/SimpleDemo/SimpleDemo.RibbonWpf/SimpleDemo.RibbonWpf.csproj b/Demos/SimpleDemo/SimpleDemo.RibbonWpf/SimpleDemo.RibbonWpf.csproj index 1c3b0a59..8193ab94 100644 --- a/Demos/SimpleDemo/SimpleDemo.RibbonWpf/SimpleDemo.RibbonWpf.csproj +++ b/Demos/SimpleDemo/SimpleDemo.RibbonWpf/SimpleDemo.RibbonWpf.csproj @@ -2,7 +2,7 @@ WinExe - net7.0-windows + net8.0-windows latest true diff --git a/Demos/SimpleDemo/SimpleDemo.WPF/SimpleDemo.WPF.csproj b/Demos/SimpleDemo/SimpleDemo.WPF/SimpleDemo.WPF.csproj index b5abcb5c..c7abee4d 100644 --- a/Demos/SimpleDemo/SimpleDemo.WPF/SimpleDemo.WPF.csproj +++ b/Demos/SimpleDemo/SimpleDemo.WPF/SimpleDemo.WPF.csproj @@ -1,7 +1,7 @@  WinExe - net7.0-windows + net8.0-windows latest true diff --git a/Demos/SimpleDemo/SimpleDemo.Wpf/SimpleDemo.Wpf.csproj b/Demos/SimpleDemo/SimpleDemo.Wpf/SimpleDemo.Wpf.csproj index b5abcb5c..c7abee4d 100644 --- a/Demos/SimpleDemo/SimpleDemo.Wpf/SimpleDemo.Wpf.csproj +++ b/Demos/SimpleDemo/SimpleDemo.Wpf/SimpleDemo.Wpf.csproj @@ -1,7 +1,7 @@  WinExe - net7.0-windows + net8.0-windows latest true diff --git a/Modules/MinoriEditorShell.Platforms.Wpf/MinoriEditorShell.Platforms.Wpf.csproj b/Modules/MinoriEditorShell.Platforms.Wpf/MinoriEditorShell.Platforms.Wpf.csproj index 2f82b7b6..ac5eaf3d 100644 --- a/Modules/MinoriEditorShell.Platforms.Wpf/MinoriEditorShell.Platforms.Wpf.csproj +++ b/Modules/MinoriEditorShell.Platforms.Wpf/MinoriEditorShell.Platforms.Wpf.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows MinoriEditorStudio is an application shell similar in concept to the Visual Studio Shell. This uses AvalonDock and has an MVVM architecture based on MvvmCross. diff --git a/Modules/MinoriEditorShell.Ribbon/MinoriEditorShell.Ribbon.csproj b/Modules/MinoriEditorShell.Ribbon/MinoriEditorShell.Ribbon.csproj index de24c93f..717a2203 100644 --- a/Modules/MinoriEditorShell.Ribbon/MinoriEditorShell.Ribbon.csproj +++ b/Modules/MinoriEditorShell.Ribbon/MinoriEditorShell.Ribbon.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true Mark Kromis Mark Kromis diff --git a/Modules/MinoriEditorShell.VirtualCanvas.Platforms.Wpf/MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj b/Modules/MinoriEditorShell.VirtualCanvas.Platforms.Wpf/MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj index 5ee301bd..3a151434 100644 --- a/Modules/MinoriEditorShell.VirtualCanvas.Platforms.Wpf/MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj +++ b/Modules/MinoriEditorShell.VirtualCanvas.Platforms.Wpf/MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows true Mark Kromis Mark Kromis diff --git a/Modules/MinoriEditorShell.VirtualCanvas/MinoriEditorShell.VirtualCanvas.csproj b/Modules/MinoriEditorShell.VirtualCanvas/MinoriEditorShell.VirtualCanvas.csproj index 1b06a57c..e87e74ad 100644 --- a/Modules/MinoriEditorShell.VirtualCanvas/MinoriEditorShell.VirtualCanvas.csproj +++ b/Modules/MinoriEditorShell.VirtualCanvas/MinoriEditorShell.VirtualCanvas.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 true Mark Kromis Mark Kromis diff --git a/Modules/MinoriEditorShell/MinoriEditorShell.csproj b/Modules/MinoriEditorShell/MinoriEditorShell.csproj index b9cda4bd..5726f932 100644 --- a/Modules/MinoriEditorShell/MinoriEditorShell.csproj +++ b/Modules/MinoriEditorShell/MinoriEditorShell.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 MinoriEditorStudio is an application shell similar in concept to the Visual Studio Shell. This uses AvalonDock and has an MVVM architecture based on MvvmCross. diff --git a/Tests/MinoriEditorShell.Platforms.WpfTests/MinoriEditorShell.Platforms.WpfTests.csproj b/Tests/MinoriEditorShell.Platforms.WpfTests/MinoriEditorShell.Platforms.WpfTests.csproj index b7c5f578..2968ff06 100644 --- a/Tests/MinoriEditorShell.Platforms.WpfTests/MinoriEditorShell.Platforms.WpfTests.csproj +++ b/Tests/MinoriEditorShell.Platforms.WpfTests/MinoriEditorShell.Platforms.WpfTests.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows latest false diff --git a/Tests/MinoriEditorShell.RibbonTests/MinoriEditorShell.RibbonTests.csproj b/Tests/MinoriEditorShell.RibbonTests/MinoriEditorShell.RibbonTests.csproj index 780baca5..90083146 100644 --- a/Tests/MinoriEditorShell.RibbonTests/MinoriEditorShell.RibbonTests.csproj +++ b/Tests/MinoriEditorShell.RibbonTests/MinoriEditorShell.RibbonTests.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows latest false diff --git a/Tests/MinoriEditorShellTests/MinoriEditorShellTests.csproj b/Tests/MinoriEditorShellTests/MinoriEditorShellTests.csproj index 7bcf9a36..d97bb2b9 100644 --- a/Tests/MinoriEditorShellTests/MinoriEditorShellTests.csproj +++ b/Tests/MinoriEditorShellTests/MinoriEditorShellTests.csproj @@ -1,7 +1,7 @@  - net7.0-windows + net8.0-windows latest false MinoriEditorShell From a15c29343e34c6ad9a8d1f678c78cf2606456986 Mon Sep 17 00:00:00 2001 From: Mark Kromis <143529142+mkromis@users.noreply.github.com> Date: Sat, 15 Mar 2025 18:34:40 -0400 Subject: [PATCH 02/12] update nugets --- .../MinoriDemo.Core/MinoriDemo.Core.csproj | 6 +++--- .../MinoriDemo.RibbonWPF.csproj | 3 ++- .../MinoriDemo.RibbonWpf.csproj | 3 ++- .../MinoriDemo.WPF/MinoriDemo.WPF.csproj | 3 ++- .../MinoriDemo.Wpf/MinoriDemo.Wpf.csproj | 3 ++- .../SimpleDemo.Core/SimpleDemo.Core.csproj | 4 ++-- .../SimpleDemo.RibbonWPF.csproj | 3 ++- .../SimpleDemo.RibbonWpf.csproj | 3 ++- .../SimpleDemo.WPF/SimpleDemo.WPF.csproj | 5 +++-- .../SimpleDemo.Wpf/SimpleDemo.Wpf.csproj | 5 +++-- .../MinoriEditorShell.Platforms.Wpf.csproj | 15 ++++++++------- .../Presenters/MesWpfPresenter.cs | 9 ++++----- .../MinoriEditorShell.Ribbon.csproj | 7 ++++--- ...EditorShell.VirtualCanvas.Platforms.Wpf.csproj | 4 ++++ .../MinoriEditorShell/MinoriEditorShell.csproj | 12 ++++++------ .../MinoriEditorShell.Platforms.WpfTests.csproj | 15 ++++++++------- .../MinoriEditorShell.RibbonTests.csproj | 15 ++++++++------- .../MinoriEditorShellTests.csproj | 10 +++++----- 18 files changed, 70 insertions(+), 55 deletions(-) diff --git a/Demos/MinoriDemo/MinoriDemo.Core/MinoriDemo.Core.csproj b/Demos/MinoriDemo/MinoriDemo.Core/MinoriDemo.Core.csproj index 1cf0a978..397d648d 100644 --- a/Demos/MinoriDemo/MinoriDemo.Core/MinoriDemo.Core.csproj +++ b/Demos/MinoriDemo/MinoriDemo.Core/MinoriDemo.Core.csproj @@ -12,9 +12,9 @@ - - - + + + diff --git a/Demos/MinoriDemo/MinoriDemo.RibbonWPF/MinoriDemo.RibbonWPF.csproj b/Demos/MinoriDemo/MinoriDemo.RibbonWPF/MinoriDemo.RibbonWPF.csproj index 60f5dfcf..0a41d1e4 100644 --- a/Demos/MinoriDemo/MinoriDemo.RibbonWPF/MinoriDemo.RibbonWPF.csproj +++ b/Demos/MinoriDemo/MinoriDemo.RibbonWPF/MinoriDemo.RibbonWPF.csproj @@ -13,7 +13,8 @@ - + + diff --git a/Demos/MinoriDemo/MinoriDemo.RibbonWpf/MinoriDemo.RibbonWpf.csproj b/Demos/MinoriDemo/MinoriDemo.RibbonWpf/MinoriDemo.RibbonWpf.csproj index 60f5dfcf..0a41d1e4 100644 --- a/Demos/MinoriDemo/MinoriDemo.RibbonWpf/MinoriDemo.RibbonWpf.csproj +++ b/Demos/MinoriDemo/MinoriDemo.RibbonWpf/MinoriDemo.RibbonWpf.csproj @@ -13,7 +13,8 @@ - + + diff --git a/Demos/MinoriDemo/MinoriDemo.WPF/MinoriDemo.WPF.csproj b/Demos/MinoriDemo/MinoriDemo.WPF/MinoriDemo.WPF.csproj index 024f9964..d952fac1 100644 --- a/Demos/MinoriDemo/MinoriDemo.WPF/MinoriDemo.WPF.csproj +++ b/Demos/MinoriDemo/MinoriDemo.WPF/MinoriDemo.WPF.csproj @@ -8,7 +8,8 @@ - + + diff --git a/Demos/MinoriDemo/MinoriDemo.Wpf/MinoriDemo.Wpf.csproj b/Demos/MinoriDemo/MinoriDemo.Wpf/MinoriDemo.Wpf.csproj index 024f9964..d952fac1 100644 --- a/Demos/MinoriDemo/MinoriDemo.Wpf/MinoriDemo.Wpf.csproj +++ b/Demos/MinoriDemo/MinoriDemo.Wpf/MinoriDemo.Wpf.csproj @@ -8,7 +8,8 @@ - + + diff --git a/Demos/SimpleDemo/SimpleDemo.Core/SimpleDemo.Core.csproj b/Demos/SimpleDemo/SimpleDemo.Core/SimpleDemo.Core.csproj index 35572f10..66145586 100644 --- a/Demos/SimpleDemo/SimpleDemo.Core/SimpleDemo.Core.csproj +++ b/Demos/SimpleDemo/SimpleDemo.Core/SimpleDemo.Core.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/Demos/SimpleDemo/SimpleDemo.RibbonWPF/SimpleDemo.RibbonWPF.csproj b/Demos/SimpleDemo/SimpleDemo.RibbonWPF/SimpleDemo.RibbonWPF.csproj index 8193ab94..a35b4fe4 100644 --- a/Demos/SimpleDemo/SimpleDemo.RibbonWPF/SimpleDemo.RibbonWPF.csproj +++ b/Demos/SimpleDemo/SimpleDemo.RibbonWPF/SimpleDemo.RibbonWPF.csproj @@ -8,7 +8,8 @@ - + + diff --git a/Demos/SimpleDemo/SimpleDemo.RibbonWpf/SimpleDemo.RibbonWpf.csproj b/Demos/SimpleDemo/SimpleDemo.RibbonWpf/SimpleDemo.RibbonWpf.csproj index 8193ab94..a35b4fe4 100644 --- a/Demos/SimpleDemo/SimpleDemo.RibbonWpf/SimpleDemo.RibbonWpf.csproj +++ b/Demos/SimpleDemo/SimpleDemo.RibbonWpf/SimpleDemo.RibbonWpf.csproj @@ -8,7 +8,8 @@ - + + diff --git a/Demos/SimpleDemo/SimpleDemo.WPF/SimpleDemo.WPF.csproj b/Demos/SimpleDemo/SimpleDemo.WPF/SimpleDemo.WPF.csproj index c7abee4d..c5d78f10 100644 --- a/Demos/SimpleDemo/SimpleDemo.WPF/SimpleDemo.WPF.csproj +++ b/Demos/SimpleDemo/SimpleDemo.WPF/SimpleDemo.WPF.csproj @@ -7,8 +7,9 @@ - - + + + diff --git a/Demos/SimpleDemo/SimpleDemo.Wpf/SimpleDemo.Wpf.csproj b/Demos/SimpleDemo/SimpleDemo.Wpf/SimpleDemo.Wpf.csproj index c7abee4d..c5d78f10 100644 --- a/Demos/SimpleDemo/SimpleDemo.Wpf/SimpleDemo.Wpf.csproj +++ b/Demos/SimpleDemo/SimpleDemo.Wpf/SimpleDemo.Wpf.csproj @@ -7,8 +7,9 @@ - - + + + diff --git a/Modules/MinoriEditorShell.Platforms.Wpf/MinoriEditorShell.Platforms.Wpf.csproj b/Modules/MinoriEditorShell.Platforms.Wpf/MinoriEditorShell.Platforms.Wpf.csproj index ac5eaf3d..52b5aa3a 100644 --- a/Modules/MinoriEditorShell.Platforms.Wpf/MinoriEditorShell.Platforms.Wpf.csproj +++ b/Modules/MinoriEditorShell.Platforms.Wpf/MinoriEditorShell.Platforms.Wpf.csproj @@ -31,16 +31,17 @@ - - - - - - + + + + + + - + + \ No newline at end of file diff --git a/Modules/MinoriEditorShell.Platforms.Wpf/Presenters/MesWpfPresenter.cs b/Modules/MinoriEditorShell.Platforms.Wpf/Presenters/MesWpfPresenter.cs index acc2920d..4ef44ddc 100644 --- a/Modules/MinoriEditorShell.Platforms.Wpf/Presenters/MesWpfPresenter.cs +++ b/Modules/MinoriEditorShell.Platforms.Wpf/Presenters/MesWpfPresenter.cs @@ -1,7 +1,6 @@ using Microsoft.Extensions.Logging; using MinoriEditorShell.Services; using MvvmCross; -using MvvmCross.Exceptions; using MvvmCross.Logging; using MvvmCross.Platforms.Wpf.Presenters; using MvvmCross.Platforms.Wpf.Presenters.Attributes; @@ -67,7 +66,7 @@ protected override async Task ShowContentView(FrameworkElement element, // Add to manager model manager.Documents.Add(docViewModel); - _log?.LogTrace($"Add {document} to IMesDocumentManager.Documents"); + _log?.LogTrace("Add {document} to IMesDocumentManager.Documents", document); return true; case IMesTool tool: @@ -77,17 +76,17 @@ protected override async Task ShowContentView(FrameworkElement element, // Add to manager model manager.Tools.Add(toolViewModel); - _log?.LogTrace($"Add {tool} to IDocumentManager.Tools"); + _log?.LogTrace("Add {tool} to IDocumentManager.Tools", tool); return true; default: - _log?.LogTrace($"Passing to parent {view.ViewModel.ToString()}"); + _log?.LogTrace("Passing to parent {ViewModel}", view.ViewModel); return await base.ShowContentView(element, attribute, request); } } catch (Exception exception) { - _log?.LogError(exception, $"Error seen during navigation request to {request.ViewModelType.Name} - error {exception.ToLongString()}"); + _log?.LogError(exception, "Error seen during navigation request to {Name}", request.ViewModelType.Name); throw; } } diff --git a/Modules/MinoriEditorShell.Ribbon/MinoriEditorShell.Ribbon.csproj b/Modules/MinoriEditorShell.Ribbon/MinoriEditorShell.Ribbon.csproj index 717a2203..11a99732 100644 --- a/Modules/MinoriEditorShell.Ribbon/MinoriEditorShell.Ribbon.csproj +++ b/Modules/MinoriEditorShell.Ribbon/MinoriEditorShell.Ribbon.csproj @@ -19,8 +19,9 @@ - - - + + + + \ No newline at end of file diff --git a/Modules/MinoriEditorShell.VirtualCanvas.Platforms.Wpf/MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj b/Modules/MinoriEditorShell.VirtualCanvas.Platforms.Wpf/MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj index 3a151434..c342a180 100644 --- a/Modules/MinoriEditorShell.VirtualCanvas.Platforms.Wpf/MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj +++ b/Modules/MinoriEditorShell.VirtualCanvas.Platforms.Wpf/MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj @@ -17,6 +17,10 @@ true + + + + diff --git a/Modules/MinoriEditorShell/MinoriEditorShell.csproj b/Modules/MinoriEditorShell/MinoriEditorShell.csproj index 5726f932..4afca4c1 100644 --- a/Modules/MinoriEditorShell/MinoriEditorShell.csproj +++ b/Modules/MinoriEditorShell/MinoriEditorShell.csproj @@ -21,12 +21,12 @@ - - - - - - + + + + + + diff --git a/Tests/MinoriEditorShell.Platforms.WpfTests/MinoriEditorShell.Platforms.WpfTests.csproj b/Tests/MinoriEditorShell.Platforms.WpfTests/MinoriEditorShell.Platforms.WpfTests.csproj index 2968ff06..864db84a 100644 --- a/Tests/MinoriEditorShell.Platforms.WpfTests/MinoriEditorShell.Platforms.WpfTests.csproj +++ b/Tests/MinoriEditorShell.Platforms.WpfTests/MinoriEditorShell.Platforms.WpfTests.csproj @@ -7,16 +7,17 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + + diff --git a/Tests/MinoriEditorShell.RibbonTests/MinoriEditorShell.RibbonTests.csproj b/Tests/MinoriEditorShell.RibbonTests/MinoriEditorShell.RibbonTests.csproj index 90083146..ce1772d2 100644 --- a/Tests/MinoriEditorShell.RibbonTests/MinoriEditorShell.RibbonTests.csproj +++ b/Tests/MinoriEditorShell.RibbonTests/MinoriEditorShell.RibbonTests.csproj @@ -13,16 +13,17 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + + diff --git a/Tests/MinoriEditorShellTests/MinoriEditorShellTests.csproj b/Tests/MinoriEditorShellTests/MinoriEditorShellTests.csproj index d97bb2b9..788a3fe2 100644 --- a/Tests/MinoriEditorShellTests/MinoriEditorShellTests.csproj +++ b/Tests/MinoriEditorShellTests/MinoriEditorShellTests.csproj @@ -8,14 +8,14 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + From 4fe422de21894639ee985a9e305738e0dd74a702 Mon Sep 17 00:00:00 2001 From: Mark Kromis <143529142+mkromis@users.noreply.github.com> Date: Sat, 15 Mar 2025 18:59:02 -0400 Subject: [PATCH 03/12] nuget updates --- .../MinoriDemo/MinoriDemo.RibbonWPF/MinoriDemo.RibbonWPF.csproj | 2 +- .../MinoriDemo/MinoriDemo.RibbonWpf/MinoriDemo.RibbonWpf.csproj | 2 +- Demos/MinoriDemo/MinoriDemo.WPF/MinoriDemo.WPF.csproj | 2 +- Demos/MinoriDemo/MinoriDemo.Wpf/MinoriDemo.Wpf.csproj | 2 +- .../SimpleDemo/SimpleDemo.RibbonWPF/SimpleDemo.RibbonWPF.csproj | 2 +- .../SimpleDemo/SimpleDemo.RibbonWpf/SimpleDemo.RibbonWpf.csproj | 2 +- Demos/SimpleDemo/SimpleDemo.WPF/SimpleDemo.WPF.csproj | 2 +- Demos/SimpleDemo/SimpleDemo.Wpf/SimpleDemo.Wpf.csproj | 2 +- .../MinoriEditorShell.Platforms.Wpf.csproj | 2 +- .../MinoriEditorShell.Ribbon/MinoriEditorShell.Ribbon.csproj | 2 +- .../MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj | 2 +- .../MinoriEditorShell.Platforms.WpfTests.csproj | 2 +- .../MinoriEditorShell.RibbonTests.csproj | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Demos/MinoriDemo/MinoriDemo.RibbonWPF/MinoriDemo.RibbonWPF.csproj b/Demos/MinoriDemo/MinoriDemo.RibbonWPF/MinoriDemo.RibbonWPF.csproj index 0a41d1e4..c18de2de 100644 --- a/Demos/MinoriDemo/MinoriDemo.RibbonWPF/MinoriDemo.RibbonWPF.csproj +++ b/Demos/MinoriDemo/MinoriDemo.RibbonWPF/MinoriDemo.RibbonWPF.csproj @@ -14,7 +14,7 @@ - + diff --git a/Demos/MinoriDemo/MinoriDemo.RibbonWpf/MinoriDemo.RibbonWpf.csproj b/Demos/MinoriDemo/MinoriDemo.RibbonWpf/MinoriDemo.RibbonWpf.csproj index 0a41d1e4..c18de2de 100644 --- a/Demos/MinoriDemo/MinoriDemo.RibbonWpf/MinoriDemo.RibbonWpf.csproj +++ b/Demos/MinoriDemo/MinoriDemo.RibbonWpf/MinoriDemo.RibbonWpf.csproj @@ -14,7 +14,7 @@ - + diff --git a/Demos/MinoriDemo/MinoriDemo.WPF/MinoriDemo.WPF.csproj b/Demos/MinoriDemo/MinoriDemo.WPF/MinoriDemo.WPF.csproj index d952fac1..e4a79e68 100644 --- a/Demos/MinoriDemo/MinoriDemo.WPF/MinoriDemo.WPF.csproj +++ b/Demos/MinoriDemo/MinoriDemo.WPF/MinoriDemo.WPF.csproj @@ -9,7 +9,7 @@ - + diff --git a/Demos/MinoriDemo/MinoriDemo.Wpf/MinoriDemo.Wpf.csproj b/Demos/MinoriDemo/MinoriDemo.Wpf/MinoriDemo.Wpf.csproj index d952fac1..e4a79e68 100644 --- a/Demos/MinoriDemo/MinoriDemo.Wpf/MinoriDemo.Wpf.csproj +++ b/Demos/MinoriDemo/MinoriDemo.Wpf/MinoriDemo.Wpf.csproj @@ -9,7 +9,7 @@ - + diff --git a/Demos/SimpleDemo/SimpleDemo.RibbonWPF/SimpleDemo.RibbonWPF.csproj b/Demos/SimpleDemo/SimpleDemo.RibbonWPF/SimpleDemo.RibbonWPF.csproj index a35b4fe4..2b31c91c 100644 --- a/Demos/SimpleDemo/SimpleDemo.RibbonWPF/SimpleDemo.RibbonWPF.csproj +++ b/Demos/SimpleDemo/SimpleDemo.RibbonWPF/SimpleDemo.RibbonWPF.csproj @@ -9,7 +9,7 @@ - + diff --git a/Demos/SimpleDemo/SimpleDemo.RibbonWpf/SimpleDemo.RibbonWpf.csproj b/Demos/SimpleDemo/SimpleDemo.RibbonWpf/SimpleDemo.RibbonWpf.csproj index a35b4fe4..2b31c91c 100644 --- a/Demos/SimpleDemo/SimpleDemo.RibbonWpf/SimpleDemo.RibbonWpf.csproj +++ b/Demos/SimpleDemo/SimpleDemo.RibbonWpf/SimpleDemo.RibbonWpf.csproj @@ -9,7 +9,7 @@ - + diff --git a/Demos/SimpleDemo/SimpleDemo.WPF/SimpleDemo.WPF.csproj b/Demos/SimpleDemo/SimpleDemo.WPF/SimpleDemo.WPF.csproj index c5d78f10..8e98cfe2 100644 --- a/Demos/SimpleDemo/SimpleDemo.WPF/SimpleDemo.WPF.csproj +++ b/Demos/SimpleDemo/SimpleDemo.WPF/SimpleDemo.WPF.csproj @@ -9,7 +9,7 @@ - + diff --git a/Demos/SimpleDemo/SimpleDemo.Wpf/SimpleDemo.Wpf.csproj b/Demos/SimpleDemo/SimpleDemo.Wpf/SimpleDemo.Wpf.csproj index c5d78f10..8e98cfe2 100644 --- a/Demos/SimpleDemo/SimpleDemo.Wpf/SimpleDemo.Wpf.csproj +++ b/Demos/SimpleDemo/SimpleDemo.Wpf/SimpleDemo.Wpf.csproj @@ -9,7 +9,7 @@ - + diff --git a/Modules/MinoriEditorShell.Platforms.Wpf/MinoriEditorShell.Platforms.Wpf.csproj b/Modules/MinoriEditorShell.Platforms.Wpf/MinoriEditorShell.Platforms.Wpf.csproj index 52b5aa3a..4d6d0703 100644 --- a/Modules/MinoriEditorShell.Platforms.Wpf/MinoriEditorShell.Platforms.Wpf.csproj +++ b/Modules/MinoriEditorShell.Platforms.Wpf/MinoriEditorShell.Platforms.Wpf.csproj @@ -42,6 +42,6 @@ - + \ No newline at end of file diff --git a/Modules/MinoriEditorShell.Ribbon/MinoriEditorShell.Ribbon.csproj b/Modules/MinoriEditorShell.Ribbon/MinoriEditorShell.Ribbon.csproj index 11a99732..691d2746 100644 --- a/Modules/MinoriEditorShell.Ribbon/MinoriEditorShell.Ribbon.csproj +++ b/Modules/MinoriEditorShell.Ribbon/MinoriEditorShell.Ribbon.csproj @@ -22,6 +22,6 @@ - + \ No newline at end of file diff --git a/Modules/MinoriEditorShell.VirtualCanvas.Platforms.Wpf/MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj b/Modules/MinoriEditorShell.VirtualCanvas.Platforms.Wpf/MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj index c342a180..b8f50bed 100644 --- a/Modules/MinoriEditorShell.VirtualCanvas.Platforms.Wpf/MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj +++ b/Modules/MinoriEditorShell.VirtualCanvas.Platforms.Wpf/MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj @@ -18,7 +18,7 @@ - + diff --git a/Tests/MinoriEditorShell.Platforms.WpfTests/MinoriEditorShell.Platforms.WpfTests.csproj b/Tests/MinoriEditorShell.Platforms.WpfTests/MinoriEditorShell.Platforms.WpfTests.csproj index 864db84a..b7de8080 100644 --- a/Tests/MinoriEditorShell.Platforms.WpfTests/MinoriEditorShell.Platforms.WpfTests.csproj +++ b/Tests/MinoriEditorShell.Platforms.WpfTests/MinoriEditorShell.Platforms.WpfTests.csproj @@ -17,7 +17,7 @@ - + diff --git a/Tests/MinoriEditorShell.RibbonTests/MinoriEditorShell.RibbonTests.csproj b/Tests/MinoriEditorShell.RibbonTests/MinoriEditorShell.RibbonTests.csproj index ce1772d2..9e2f07f0 100644 --- a/Tests/MinoriEditorShell.RibbonTests/MinoriEditorShell.RibbonTests.csproj +++ b/Tests/MinoriEditorShell.RibbonTests/MinoriEditorShell.RibbonTests.csproj @@ -23,7 +23,7 @@ - + From 0bfced5d23dadf826d24cd2d1be7e6721258aa21 Mon Sep 17 00:00:00 2001 From: Mark Kromis <143529142+mkromis@users.noreply.github.com> Date: Sat, 15 Mar 2025 19:29:25 -0400 Subject: [PATCH 04/12] update readme --- README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 6ef793a9..38c012f3 100644 --- a/README.md +++ b/README.md @@ -5,19 +5,19 @@ [![Join the chat at https://gitter.im/MinoriEditorShell/community](https://badges.gitter.im/MinoriEditorShell/community.svg)](https://gitter.im/MinoriEditorShell/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) ## Status -[![Verification Build](https://github.com/TorisanKitsune/MinoriEditorShell/actions/workflows/build.yml/badge.svg)](https://github.com/TorisanKitsune/MinoriEditorShell/actions/workflows/build.yml) -[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=TorisanKitsune_MinoriEditorShell&metric=alert_status)](https://sonarcloud.io/dashboard?id=TorisanKitsune_MinoriEditorShell) -[![Build Coverage](https://img.shields.io/sonar/coverage/TorisanKitsune_MinoriEditorShell?server=https%3A%2F%2Fsonarcloud.io)](https://sonarcloud.io/dashboard?id=TorisanKitsune_MinoriEditorShell) +[![Verification Build](https://github.com/mkromis/MinoriEditorShell/actions/workflows/build.yml/badge.svg)](https://github.com/mkromis/MinoriEditorShell/actions/workflows/build.yml) +[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=mkromis_MinoriEditorShell&metric=alert_status)](https://sonarcloud.io/dashboard?id=mkromis_MinoriEditorShell) +[![Build Coverage](https://img.shields.io/sonar/coverage/mkromis_MinoriEditorShell?server=https%3A%2F%2Fsonarcloud.io)](https://sonarcloud.io/dashboard?id=mkromis_MinoriEditorShell) [![Downloads](https://img.shields.io/nuget/dt/MinoriEditorShell.svg)](https://www.nuget.org/packages/MinoriEditorShell/) -[![Open Issues](https://img.shields.io/github/issues-raw/TorisanKitsune/MinoriEditorShell.svg)](https://github.com/TorisanKitsune/MinoriEditorShell/issues) -[![Closed Issues](https://img.shields.io/github/issues-closed-raw/TorisanKitsune/MinoriEditorShell.svg)](https://github.com/TorisanKitsune/MinoriEditorShell/issues) -[![Open Pull Requests](https://img.shields.io/github/issues-pr-raw/TorisanKitsune/MinoriEditorShell.svg)](https://github.com/TorisanKitsune/MinoriEditorShell/issues) -[![Closed Pull Requests](https://img.shields.io/github/issues-pr-closed-raw/TorisanKitsune/MinoriEditorShell.svg)](https://github.com/TorisanKitsune/MinoriEditorShell/issues) +[![Open Issues](https://img.shields.io/github/issues-raw/mkromis/MinoriEditorShell.svg)](https://github.com/mkromis/MinoriEditorShell/issues) +[![Closed Issues](https://img.shields.io/github/issues-closed-raw/mkromis/MinoriEditorShell.svg)](https://github.com/mkromis/MinoriEditorShell/issues) +[![Open Pull Requests](https://img.shields.io/github/issues-pr-raw/mkromis/MinoriEditorShell.svg)](https://github.com/mkromis/MinoriEditorShell/issues) +[![Closed Pull Requests](https://img.shields.io/github/issues-pr-closed-raw/mkromis/MinoriEditorShell.svg)](https://github.com/mkromis/MinoriEditorShell/issues) Dual-Licensed with either -[![Apache](https://img.shields.io/badge/license-Apache-blue.svg)](https://github.com/TorisanKitsune/MinoriEditorShell/blob/master/LICENCE.txt) or -[![MS-PL](https://img.shields.io/badge/license-MsPL-blue.svg)](https://github.com/TorisanKitsune/MinoriEditorShell/blob/master/LICENCE.txt) +[![Apache](https://img.shields.io/badge/license-Apache-blue.svg)](https://github.com/mkromis/MinoriEditorShell/blob/master/LICENCE.txt) or +[![MS-PL](https://img.shields.io/badge/license-MsPL-blue.svg)](https://github.com/mkromis/MinoriEditorShell/blob/master/LICENCE.txt) ## MvvmCross 9 troubleshooting / Known Issues @@ -50,7 +50,7 @@ MinoriEditorShell is a IDE framework designed specifically for building multi do MinoriEditorShell ships with three themes: a Blue theme(Default), a Light theme, and a Dark theme. -![Screenshot - Blue theme](https://raw.github.com/TorisanKitsune/MinoriEditorShell/develop/Images/BlueDemoApp.png) +![Screenshot - Blue theme](https://raw.github.com/mkromis/MinoriEditorShell/develop/Images/BlueDemoApp.png) ## Modules used @@ -69,7 +69,7 @@ way of separating out the code for each part of your application. ## More Documentation -Documentation can be found on the github [wiki](https://github.com/TorisanKitsune/MinoriEditorShell/wiki/) +Documentation can be found on the github [wiki](https://github.com/mkromis/MinoriEditorShell/wiki/) ## Acknowledgements @@ -88,4 +88,4 @@ MinoriEditorShell is not the only WPF framework for building IDE-like applicatio ## License -[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2FTorisanKitsune%2FMinoriEditorShell.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2FTorisanKitsune%2FMinoriEditorShell?ref=badge_large) \ No newline at end of file +[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fmkromis%2FMinoriEditorShell.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fmkromis%2FMinoriEditorShell?ref=badge_large) \ No newline at end of file From 4b08aebf2eedb6ad85408eb62209d16a9db22ca3 Mon Sep 17 00:00:00 2001 From: Mark Kromis <143529142+mkromis@users.noreply.github.com> Date: Sat, 15 Mar 2025 19:37:11 -0400 Subject: [PATCH 05/12] fix build --- .github/workflows/build.yml | 8 ++++---- MinoriEditorShell.sln | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8852cb0e..7cd1848a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -118,10 +118,10 @@ jobs: # Copy Demo Folder #mkdir Artifacts\$basedir\Demos - cp Demos\SimpleDemo\SimpleDemo.WPF\bin\Release\net7.0-windows Artifacts\$basedir\Demos\SimpleDemo.WPF -Recurse - cp Demos\SimpleDemo\SimpleDemo.RibbonWPF\bin\Release\net7.0-windows Artifacts\$basedir\Demos\SimpleDemo.RibbonWPF -Recurse - cp Demos\MinoriDemo\MinoriDemo.WPF\bin\Release\net7.0-windows Artifacts\$basedir\Demos\MinoriDemo.WPF -Recurse - cp Demos\MinoriDemo\MinoriDemo.RibbonWPF\bin\Release\net7.0-windows Artifacts\$basedir\Demos\MinoriDemo.RibbonWPF -Recurse + cp Demos\SimpleDemo\SimpleDemo.WPF\bin\Release\net8.0-windows Artifacts\$basedir\Demos\SimpleDemo.WPF -Recurse + cp Demos\SimpleDemo\SimpleDemo.RibbonWPF\bin\Release\net8.0-windows Artifacts\$basedir\Demos\SimpleDemo.RibbonWPF -Recurse + cp Demos\MinoriDemo\MinoriDemo.WPF\bin\Release\net8.0-windows Artifacts\$basedir\Demos\MinoriDemo.WPF -Recurse + cp Demos\MinoriDemo\MinoriDemo.RibbonWPF\bin\Release\net8.0-windows Artifacts\$basedir\Demos\MinoriDemo.RibbonWPF -Recurse - name: Test run: dotnet test ${{env.solution}} --collect:"XPlat Code Coverage" --settings coverlet.runsettings diff --git a/MinoriEditorShell.sln b/MinoriEditorShell.sln index 46f2a563..c1211793 100644 --- a/MinoriEditorShell.sln +++ b/MinoriEditorShell.sln @@ -9,7 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "!Solution Items", "!Solutio .github\workflows\build.yml = .github\workflows\build.yml CHANGELOG.md = CHANGELOG.md coverlet.runsettings = coverlet.runsettings - .github\workflows\deploy.yml = .github\workflows\deploy.yml GitVersion.yml = GitVersion.yml LICENCE.txt = LICENCE.txt README.md = README.md From fef5aa83062c0ff627ba93c48059be8310de3a91 Mon Sep 17 00:00:00 2001 From: Mark Kromis <143529142+mkromis@users.noreply.github.com> Date: Sun, 16 Mar 2025 14:11:56 -0400 Subject: [PATCH 06/12] bump actions --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7cd1848a..70f23406 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,13 +38,13 @@ jobs: # Requires .NET Core 3.1 # https://github.com/marketplace/actions/gittools - name: 'Install GitVersion' - uses: gittools/actions/gitversion/setup@v0 + uses: gittools/actions/gitversion/setup@v3 with: - versionSpec: '5.x' + versionSpec: '6.x' - name: Determine Version id: gitversion - uses: gittools/actions/gitversion/execute@v0 + uses: gittools/actions/gitversion/execute@v3 with: useConfigFile: true @@ -55,7 +55,7 @@ jobs: run: dotnet restore ${{env.solution}} - name: Cache SonarCloud packages - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ~\sonar\cache key: ${{runner.os}}-sonar @@ -63,7 +63,7 @@ jobs: - name: Cache SonarCloud scanner id: cache-sonar-scanner - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: .\.sonar\scanner key: ${{runner.os}}-sonar-scanner From aa57bea77f8327954919bee80caf2c2b1bcc6e86 Mon Sep 17 00:00:00 2001 From: Mark Kromis <143529142+mkromis@users.noreply.github.com> Date: Sun, 16 Mar 2025 14:13:22 -0400 Subject: [PATCH 07/12] bump acton --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 70f23406..7ba58447 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -134,7 +134,7 @@ jobs: run: .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{secrets.SONAR_TOKEN}}" - name: Upload Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: MinoriEditorShell path: Artifacts/* From 424858c7c0b611cc6466b72a5ec9c70157c5f6cd Mon Sep 17 00:00:00 2001 From: Mark Kromis <143529142+mkromis@users.noreply.github.com> Date: Sun, 16 Mar 2025 14:14:50 -0400 Subject: [PATCH 08/12] gitversion --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7ba58447..74fed0fb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,7 @@ jobs: - name: 'Install GitVersion' uses: gittools/actions/gitversion/setup@v3 with: - versionSpec: '6.x' + versionSpec: '6.1.x' - name: Determine Version id: gitversion From 41b591c24f23143347e32d5d4bd87da9d823d4d0 Mon Sep 17 00:00:00 2001 From: Mark Kromis <143529142+mkromis@users.noreply.github.com> Date: Sun, 16 Mar 2025 14:16:35 -0400 Subject: [PATCH 09/12] gitversion --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 74fed0fb..da9112a8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,7 @@ jobs: - name: 'Install GitVersion' uses: gittools/actions/gitversion/setup@v3 with: - versionSpec: '6.1.x' + versionSpec: '6.0.x' - name: Determine Version id: gitversion From b007434947f3254561ef3fa7b0f2870c12f14c32 Mon Sep 17 00:00:00 2001 From: Mark Kromis <143529142+mkromis@users.noreply.github.com> Date: Sun, 16 Mar 2025 14:45:12 -0400 Subject: [PATCH 10/12] tweak build for dotnet --- .github/workflows/build.yml | 12 +++++++----- GitVersion.yml | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index da9112a8..3b595f2a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,8 +22,10 @@ jobs: with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - # if trying to build locally, make sure you have dotnet 3.1, 5.0 installed - # this container should have them pre-installed + - name: Setup .NET Core runtime + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 8.0.x # Needed for sonar analysis, even though java is installed # sonar will not pick up version 11, so state specifically @@ -31,8 +33,8 @@ jobs: - name: Set up JDK 18 uses: actions/setup-java@v2 with: - distribution: 'adopt-hotspot' # Cached java - java-version: '18' + distribution: 'adopt-hotspot' # Cached java + java-version: '18' # Install GitVersion # Requires .NET Core 3.1 @@ -46,7 +48,7 @@ jobs: id: gitversion uses: gittools/actions/gitversion/execute@v3 with: - useConfigFile: true + useConfigFile: true - name: Use NuGet > 5.0.0 uses: nuget/setup-nuget@v1 diff --git a/GitVersion.yml b/GitVersion.yml index 57f3137c..cf4472e0 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,4 +1,4 @@ -next-version: 0.9.0 +next-version: 1.0.0 assembly-versioning-scheme: MajorMinorPatch assembly-file-versioning-scheme: MajorMinorPatchTag mode: ContinuousDeployment From ed3e7428d659db9b618290b20387c254feb5ceae Mon Sep 17 00:00:00 2001 From: Mark Kromis <143529142+mkromis@users.noreply.github.com> Date: Sun, 16 Mar 2025 15:11:14 -0400 Subject: [PATCH 11/12] try rever gitversion --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3b595f2a..da04ba65 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,12 +37,11 @@ jobs: java-version: '18' # Install GitVersion - # Requires .NET Core 3.1 # https://github.com/marketplace/actions/gittools - name: 'Install GitVersion' uses: gittools/actions/gitversion/setup@v3 with: - versionSpec: '6.0.x' + versionSpec: '5.x' - name: Determine Version id: gitversion From 03d6d261b6cc576b19e33cba17d8ce0d95b1d4bd Mon Sep 17 00:00:00 2001 From: Mark Kromis <143529142+mkromis@users.noreply.github.com> Date: Sun, 16 Mar 2025 15:37:31 -0400 Subject: [PATCH 12/12] update copyrights --- .../MinoriEditorShell.Platforms.Wpf.csproj | 2 +- .../MinoriEditorShell.Ribbon/MinoriEditorShell.Ribbon.csproj | 2 +- .../MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj | 2 +- .../MinoriEditorShell.VirtualCanvas.csproj | 2 +- Modules/MinoriEditorShell/MinoriEditorShell.csproj | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Modules/MinoriEditorShell.Platforms.Wpf/MinoriEditorShell.Platforms.Wpf.csproj b/Modules/MinoriEditorShell.Platforms.Wpf/MinoriEditorShell.Platforms.Wpf.csproj index 4d6d0703..028d52c7 100644 --- a/Modules/MinoriEditorShell.Platforms.Wpf/MinoriEditorShell.Platforms.Wpf.csproj +++ b/Modules/MinoriEditorShell.Platforms.Wpf/MinoriEditorShell.Platforms.Wpf.csproj @@ -7,7 +7,7 @@ This uses AvalonDock and has an MVVM architecture based on MvvmCross. latest - Copyright 2019-2024 + Copyright© 2019-2025 https://github.com/TorisanKitsune/MinoriEditorShell https://github.com/TorisanKitsune/MinoriEditorShell diff --git a/Modules/MinoriEditorShell.Ribbon/MinoriEditorShell.Ribbon.csproj b/Modules/MinoriEditorShell.Ribbon/MinoriEditorShell.Ribbon.csproj index 691d2746..fbe9c68d 100644 --- a/Modules/MinoriEditorShell.Ribbon/MinoriEditorShell.Ribbon.csproj +++ b/Modules/MinoriEditorShell.Ribbon/MinoriEditorShell.Ribbon.csproj @@ -6,7 +6,7 @@ Mark Kromis Mark Kromis latest - Copyright 2019-2024 + Copyright© 2019-2025 Use a Mahapp.Metro window with Fluent.Ribbon easy https://github.com/TorisanKitsune/MinoriEditorShell https://github.com/TorisanKitsune/MinoriEditorShell diff --git a/Modules/MinoriEditorShell.VirtualCanvas.Platforms.Wpf/MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj b/Modules/MinoriEditorShell.VirtualCanvas.Platforms.Wpf/MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj index b8f50bed..7206608e 100644 --- a/Modules/MinoriEditorShell.VirtualCanvas.Platforms.Wpf/MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj +++ b/Modules/MinoriEditorShell.VirtualCanvas.Platforms.Wpf/MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj @@ -5,7 +5,7 @@ true Mark Kromis Mark Kromis - Copyright 2019-2024 + Copyright© 2019-2025 Easy Virtual Canvas with zoom https://github.com/TorisanKitsune/MinoriEditorShell https://github.com/TorisanKitsune/MinoriEditorShell diff --git a/Modules/MinoriEditorShell.VirtualCanvas/MinoriEditorShell.VirtualCanvas.csproj b/Modules/MinoriEditorShell.VirtualCanvas/MinoriEditorShell.VirtualCanvas.csproj index e87e74ad..d28970a5 100644 --- a/Modules/MinoriEditorShell.VirtualCanvas/MinoriEditorShell.VirtualCanvas.csproj +++ b/Modules/MinoriEditorShell.VirtualCanvas/MinoriEditorShell.VirtualCanvas.csproj @@ -6,7 +6,7 @@ Mark Kromis Mark Kromis latest - Copyright 2019-2024 + Copyright© 2019-2025 Easy Virtual Canvas with zoom https://github.com/TorisanKitsune/MinoriEditorShell https://github.com/TorisanKitsune/MinoriEditorShell diff --git a/Modules/MinoriEditorShell/MinoriEditorShell.csproj b/Modules/MinoriEditorShell/MinoriEditorShell.csproj index 4afca4c1..3cc88fc7 100644 --- a/Modules/MinoriEditorShell/MinoriEditorShell.csproj +++ b/Modules/MinoriEditorShell/MinoriEditorShell.csproj @@ -7,7 +7,7 @@ This uses AvalonDock and has an MVVM architecture based on MvvmCross. latest - Copyright 2019 - 2024 + Copyright© 2019-2025 https://github.com/TorisanKitsune/MinoriEditorShell https://github.com/TorisanKitsune/MinoriEditorShell