Skip to content

Update to 1.0 #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkromis merged 14 commits into from
Mar 16, 2025
Merged

Update to 1.0 #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1a95554
Merge pull request #95 from mkromis/stable
mkromis Apr 21, 2024
f067ea6
update to dotnet 8
mkromis Mar 15, 2025
a15c293
update nugets
mkromis Mar 15, 2025
4fe422d
nuget updates
mkromis Mar 15, 2025
0bfced5
update readme
mkromis Mar 15, 2025
4b08aeb
fix build
mkromis Mar 15, 2025
fef5aa8
bump actions
mkromis Mar 16, 2025
aa57bea
bump acton
mkromis Mar 16, 2025
424858c
gitversion
mkromis Mar 16, 2025
41b591c
gitversion
mkromis Mar 16, 2025
b007434
tweak build for dotnet
mkromis Mar 16, 2025
ed3e742
try rever gitversion
mkromis Mar 16, 2025
03d6d26
update copyrights
mkromis Mar 16, 2025
b743b04
Merge pull request #96 from mkromis/nuget-updates
mkromis Mar 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,32 @@ 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
# adopt is in tool cache so install should be quidker with it.
- 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
# 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'

- name: Determine Version
id: gitversion
uses: gittools/actions/gitversion/execute@v0
uses: gittools/actions/gitversion/execute@v3
with:
useConfigFile: true
useConfigFile: true

- name: Use NuGet > 5.0.0
uses: nuget/setup-nuget@v1
Expand All @@ -55,15 +56,15 @@ 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
restore-keys: ${{runner.os}}-sonar

- 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
Expand Down Expand Up @@ -118,10 +119,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
Expand All @@ -134,7 +135,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/*
Expand Down
8 changes: 4 additions & 4 deletions Demos/MinoriDemo/MinoriDemo.Core/MinoriDemo.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>latest</LangVersion>
</PropertyGroup>

Expand All @@ -12,9 +12,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MvvmCross" Version="9.2.0" />
<PackageReference Include="MvvmCross.Plugin.Messenger" Version="9.2.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.4" />
<PackageReference Include="MvvmCross" Version="9.3.1" />
<PackageReference Include="MvvmCross.Plugin.Messenger" Version="9.3.1" />
<PackageReference Include="System.Drawing.Common" Version="9.0.3" />
<PackageReference Include="System.Drawing.Primitives" Version="4.3.0" />
</ItemGroup>

Expand Down
5 changes: 3 additions & 2 deletions Demos/MinoriDemo/MinoriDemo.RibbonWPF/MinoriDemo.RibbonWPF.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<LangVersion>latest</LangVersion>
<UseWPF>true</UseWPF>
</PropertyGroup>
Expand All @@ -13,7 +13,8 @@

<ItemGroup>
<PackageReference Include="Dirkster.ColorPickerLib" Version="1.6.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.3" />
<PackageReference Include="System.Text.Json" Version="9.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 3 additions & 2 deletions Demos/MinoriDemo/MinoriDemo.RibbonWpf/MinoriDemo.RibbonWpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<LangVersion>latest</LangVersion>
<UseWPF>true</UseWPF>
</PropertyGroup>
Expand All @@ -13,7 +13,8 @@

<ItemGroup>
<PackageReference Include="Dirkster.ColorPickerLib" Version="1.6.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.3" />
<PackageReference Include="System.Text.Json" Version="9.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 3 additions & 2 deletions Demos/MinoriDemo/MinoriDemo.WPF/MinoriDemo.WPF.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<LangVersion>latest</LangVersion>
<UseWPF>true</UseWPF>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.3" />
<PackageReference Include="System.Text.Json" Version="9.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 3 additions & 2 deletions Demos/MinoriDemo/MinoriDemo.Wpf/MinoriDemo.Wpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<LangVersion>latest</LangVersion>
<UseWPF>true</UseWPF>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.3" />
<PackageReference Include="System.Text.Json" Version="9.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Demos/SimpleDemo/SimpleDemo.Core/SimpleDemo.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>latest</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MvvmCross" Version="9.2.0" />
<PackageReference Include="MvvmCross.Plugin.Messenger" Version="9.2.0" />
<PackageReference Include="MvvmCross" Version="9.3.1" />
<PackageReference Include="MvvmCross.Plugin.Messenger" Version="9.3.1" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 3 additions & 2 deletions Demos/SimpleDemo/SimpleDemo.RibbonWPF/SimpleDemo.RibbonWPF.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<LangVersion>latest</LangVersion>
<UseWPF>true</UseWPF>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.3" />
<PackageReference Include="System.Text.Json" Version="9.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 3 additions & 2 deletions Demos/SimpleDemo/SimpleDemo.RibbonWpf/SimpleDemo.RibbonWpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<LangVersion>latest</LangVersion>
<UseWPF>true</UseWPF>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.3" />
<PackageReference Include="System.Text.Json" Version="9.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
7 changes: 4 additions & 3 deletions Demos/SimpleDemo/SimpleDemo.WPF/SimpleDemo.WPF.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<LangVersion>latest</LangVersion>
<UseWPF>true</UseWPF>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
<PackageReference Include="MvvmCross.Platforms.Wpf" Version="9.2.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.3" />
<PackageReference Include="MvvmCross.Platforms.Wpf" Version="9.3.1" />
<PackageReference Include="System.Text.Json" Version="9.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
7 changes: 4 additions & 3 deletions Demos/SimpleDemo/SimpleDemo.Wpf/SimpleDemo.Wpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<LangVersion>latest</LangVersion>
<UseWPF>true</UseWPF>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
<PackageReference Include="MvvmCross.Platforms.Wpf" Version="9.2.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.3" />
<PackageReference Include="MvvmCross.Platforms.Wpf" Version="9.3.1" />
<PackageReference Include="System.Text.Json" Version="9.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion GitVersion.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion MinoriEditorShell.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 10 additions & 9 deletions Modules/MinoriEditorShell.Platforms.Wpf/MinoriEditorShell.Platforms.Wpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<Description>
MinoriEditorStudio is an application shell similar in concept to the Visual Studio Shell.
This uses AvalonDock and has an MVVM architecture based on MvvmCross.
</Description>
<LangVersion>latest</LangVersion>
<Copyright>Copyright 2019-2024</Copyright>
<Copyright>Copyright© 2019-2025</Copyright>
<PackageProjectUrl>https://github.com/TorisanKitsune/MinoriEditorShell</PackageProjectUrl>
<RepositoryUrl>https://github.com/TorisanKitsune/MinoriEditorShell</RepositoryUrl>
<PackageIconUrl></PackageIconUrl>
Expand All @@ -31,16 +31,17 @@
<ItemGroup>
<ProjectReference Include="..\MinoriEditorShell\MinoriEditorShell.csproj" />

<PackageReference Include="MvvmCross" Version="9.2.0" />
<PackageReference Include="MvvmCross.Plugin.Messenger" Version="9.2.0" />
<PackageReference Include="MvvmCross.Plugin.ResxLocalization" Version="9.2.0" />
<PackageReference Include="System.ComponentModel.Composition" Version="8.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.4" />
<PackageReference Include="MvvmCross" Version="9.3.1" />
<PackageReference Include="MvvmCross.Plugin.Messenger" Version="9.3.1" />
<PackageReference Include="MvvmCross.Plugin.ResxLocalization" Version="9.3.1" />
<PackageReference Include="System.ComponentModel.Composition" Version="9.0.3" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.3" />
<PackageReference Include="System.Drawing.Common" Version="9.0.3" />

<PackageReference Include="Dirkster.AvalonDock" Version="4.72.1" />
<PackageReference Include="Dirkster.AvalonDock.Themes.VS2013" Version="4.72.1" />
<PackageReference Include="MahApps.Metro" Version="3.0.0-alpha0476" />
<PackageReference Include="MvvmCross.Platforms.Wpf" Version="9.2.0" />
<PackageReference Include="MvvmCross.Platforms.Wpf" Version="9.3.1" />
<PackageReference Include="System.Text.Json" Version="9.0.3" />
</ItemGroup>
</Project>
9 changes: 4 additions & 5 deletions Modules/MinoriEditorShell.Platforms.Wpf/Presenters/MesWpfPresenter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -67,7 +66,7 @@ protected override async Task<Boolean> 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:
Expand All @@ -77,17 +76,17 @@ protected override async Task<Boolean> 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;
}
}
Expand Down
11 changes: 6 additions & 5 deletions Modules/MinoriEditorShell.Ribbon/MinoriEditorShell.Ribbon.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>Mark Kromis</Authors>
<Company>Mark Kromis</Company>
<LangVersion>latest</LangVersion>
<Copyright>Copyright 2019-2024</Copyright>
<Copyright>Copyright© 2019-2025</Copyright>
<Description>Use a Mahapp.Metro window with Fluent.Ribbon easy</Description>
<PackageProjectUrl>https://github.com/TorisanKitsune/MinoriEditorShell</PackageProjectUrl>
<RepositoryUrl>https://github.com/TorisanKitsune/MinoriEditorShell</RepositoryUrl>
Expand All @@ -19,8 +19,9 @@
<ProjectReference Include="..\MinoriEditorShell.Platforms.Wpf\MinoriEditorShell.Platforms.Wpf.csproj" />
<ProjectReference Include="..\MinoriEditorShell\MinoriEditorShell.csproj" />

<PackageReference Include="Fluent.Ribbon" Version="10.1.0" />
<PackageReference Include="MvvmCross" Version="9.2.0" />
<PackageReference Include="MvvmCross.Platforms.Wpf" Version="9.2.0" />
<PackageReference Include="Fluent.Ribbon" Version="11.0.0" />
<PackageReference Include="MvvmCross" Version="9.3.1" />
<PackageReference Include="MvvmCross.Platforms.Wpf" Version="9.3.1" />
<PackageReference Include="System.Text.Json" Version="9.0.3" />
</ItemGroup>
</Project>
Loading
Loading