diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f4a98eee..6ffd8213 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,11 +27,11 @@ jobs: # 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 11 + - name: Set up JDK 18 uses: actions/setup-java@v2 with: distribution: 'adopt-hotspot' # Cached java - java-version: '11' + java-version: '18' # Install GitVersion # Requires .NET Core 3.1 @@ -84,9 +84,9 @@ jobs: SONAR_TOKEN: ${{secrets.SONAR_TOKEN}} shell: powershell run: > - .\.sonar\scanner\dotnet-sonarscanner - begin /k:"TorisanKitsune_MinoriEditorShell" /o:"torisankitsune" - /d:sonar.login="${{secrets.SONAR_TOKEN}}" /d:sonar.host.url="https://sonarcloud.io" + .\.sonar\scanner\dotnet-sonarscanner + begin /k:"mkromis_MinoriEditorShell" /o:"mkromis" + /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths=**/coverage.opencover.xml /v:${{steps.gitversion.outputs.semVer}} @@ -100,7 +100,35 @@ jobs: -p:InformationalVersion=${{steps.gitversion.outputs.InformationalVersion}} - name: Create Artifacts - run: pwsh -command ".\CreateArtifacts.ps1" + run: | + # Get list of all nupkgs + $nupkgs = Get-ChildItem -Path .\Modules -Filter *.nupkg -Recurse + + $basedir = 'MinoriEditorSystem-' + $env:GitVersion_NuGetVersion + + # Move each item into artifacts + # rm Artifacts -Recurse -Force + mkdir Artifacts\$basedir\Nugets + + # Copy nugets to nuget folder + foreach ($nupkg in $nupkgs) { + $leaf = Split-Path $nupkg -Leaf + $outFile = "Artifacts\$basedir\Nugets\$leaf" + echo $nupkg.FullName ' -> ' $outFile + Copy-Item $nupkg.FullName $outFile + } + + # Copy Demo Folder + #mkdir Artifacts\$basedir\Demos + cp Demos\SimpleDemo\SimpleDemo.WPF\bin\Release\net6.0-windows Artifacts\$basedir\Demos\SimpleDemo.WPF -Recurse + cp Demos\SimpleDemo\SimpleDemo.RibbonWPF\bin\Release\net6.0-windows Artifacts\$basedir\Demos\SimpleDemo.RibbonWPF -Recurse + cp Demos\MinoriDemo\MinoriDemo.WPF\bin\Release\net6.0-windows Artifacts\$basedir\Demos\MinoriDemo.WPF -Recurse + cp Demos\MinoriDemo\MinoriDemo.RibbonWPF\bin\Release\net6.0-windows Artifacts\$basedir\Demos\MinoriDemo.RibbonWPF -Recurse + + # Compress folder into 7z file + cd Artifacts + 7z a "$basedir.7z" $basedir + cd .. - name: Test run: dotnet test ${{env.solution}} --collect:"XPlat Code Coverage" --settings coverlet.runsettings @@ -115,6 +143,6 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v2 with: - name: MinoriEditorShell - path: Artifacts/*.7z - if-no-files-found: error + name: MinoriEditorShell + path: Artifacts/*.7z + if-no-files-found: error diff --git a/CreateArtifacts.ps1 b/CreateArtifacts.ps1 deleted file mode 100644 index 0c7b9f0b..00000000 --- a/CreateArtifacts.ps1 +++ /dev/null @@ -1,28 +0,0 @@ -# Get list of all nupkgs -$nupkgs = Get-ChildItem -Path .\Modules -Filter *.nupkg -Recurse - -$basedir = 'MinoriEditorSystem-' + $env:GitVersion_NuGetVersion - -# Move each item into artifacts -rm Artifacts -Recurse -Force -mkdir Artifacts\$basedir\Nugets - -# Copy nugets to nuget folder -foreach ($nupkg in $nupkgs) { - $leaf = Split-Path $nupkg -Leaf - $outFile = "Artifacts\$basedir\Nugets\$leaf" - echo $nupkg.FullName ' -> ' $outFile - Copy-Item $nupkg.FullName $outFile -} - -# Copy Demo Folder -#mkdir Artifacts\$basedir\Demos -cp Demos\SimpleDemo\SimpleDemo.WPF\bin\Release\net5.0-windows Artifacts\$basedir\Demos\SimpleDemo.WPF -Recurse -cp Demos\SimpleDemo\SimpleDemo.RibbonWPF\bin\Release\net5.0-windows Artifacts\$basedir\Demos\SimpleDemo.RibbonWPF -Recurse -cp Demos\MinoriDemo\MinoriDemo.WPF\bin\Release\net5.0-windows Artifacts\$basedir\Demos\MinoriDemo.WPF -Recurse -cp Demos\MinoriDemo\MinoriDemo.RibbonWPF\bin\Release\net5.0-windows Artifacts\$basedir\Demos\MinoriDemo.RibbonWPF -Recurse - -# Compress folder into 7z file -cd Artifacts -7z a "$basedir.7z" $basedir -cd .. \ No newline at end of file diff --git a/Demos/MinoriDemo/MinoriDemo.Core/MinoriDemo.Core.csproj b/Demos/MinoriDemo/MinoriDemo.Core/MinoriDemo.Core.csproj index b337457d..4d2df4d7 100644 --- a/Demos/MinoriDemo/MinoriDemo.Core/MinoriDemo.Core.csproj +++ b/Demos/MinoriDemo/MinoriDemo.Core/MinoriDemo.Core.csproj @@ -1,8 +1,9 @@  - netstandard2.0 + net6.0 MinoriDemo.Core.ruleset + latest @@ -16,9 +17,9 @@ - - - + + + diff --git a/Demos/MinoriDemo/MinoriDemo.RibbonWPF/MinoriDemo.RibbonWPF.csproj b/Demos/MinoriDemo/MinoriDemo.RibbonWPF/MinoriDemo.RibbonWPF.csproj index 5ae2f5f2..24d6f60e 100644 --- a/Demos/MinoriDemo/MinoriDemo.RibbonWPF/MinoriDemo.RibbonWPF.csproj +++ b/Demos/MinoriDemo/MinoriDemo.RibbonWPF/MinoriDemo.RibbonWPF.csproj @@ -2,7 +2,8 @@ WinExe - net5.0-windows + net6.0-windows + latest true MinoriDemo.RibbonWpf.ruleset @@ -17,7 +18,7 @@ - + diff --git a/Demos/MinoriDemo/MinoriDemo.RibbonWpf/MinoriDemo.RibbonWpf.csproj b/Demos/MinoriDemo/MinoriDemo.RibbonWpf/MinoriDemo.RibbonWpf.csproj index 5ae2f5f2..24d6f60e 100644 --- a/Demos/MinoriDemo/MinoriDemo.RibbonWpf/MinoriDemo.RibbonWpf.csproj +++ b/Demos/MinoriDemo/MinoriDemo.RibbonWpf/MinoriDemo.RibbonWpf.csproj @@ -2,7 +2,8 @@ WinExe - net5.0-windows + net6.0-windows + latest true MinoriDemo.RibbonWpf.ruleset @@ -17,7 +18,7 @@ - + diff --git a/Demos/MinoriDemo/MinoriDemo.WPF/MinoriDemo.WPF.csproj b/Demos/MinoriDemo/MinoriDemo.WPF/MinoriDemo.WPF.csproj index 273a6136..8c72c05b 100644 --- a/Demos/MinoriDemo/MinoriDemo.WPF/MinoriDemo.WPF.csproj +++ b/Demos/MinoriDemo/MinoriDemo.WPF/MinoriDemo.WPF.csproj @@ -2,7 +2,8 @@ WinExe - net5.0-windows + net6.0-windows + latest true MinoriDemo.Wpf.ruleset @@ -12,7 +13,7 @@ - + diff --git a/Demos/MinoriDemo/MinoriDemo.Wpf/MinoriDemo.Wpf.csproj b/Demos/MinoriDemo/MinoriDemo.Wpf/MinoriDemo.Wpf.csproj index 273a6136..8c72c05b 100644 --- a/Demos/MinoriDemo/MinoriDemo.Wpf/MinoriDemo.Wpf.csproj +++ b/Demos/MinoriDemo/MinoriDemo.Wpf/MinoriDemo.Wpf.csproj @@ -2,7 +2,8 @@ WinExe - net5.0-windows + net6.0-windows + latest true MinoriDemo.Wpf.ruleset @@ -12,7 +13,7 @@ - + diff --git a/Demos/SimpleDemo/SimpleDemo.Core/SimpleDemo.Core.csproj b/Demos/SimpleDemo/SimpleDemo.Core/SimpleDemo.Core.csproj index 88af4579..2f344bdd 100644 --- a/Demos/SimpleDemo/SimpleDemo.Core/SimpleDemo.Core.csproj +++ b/Demos/SimpleDemo/SimpleDemo.Core/SimpleDemo.Core.csproj @@ -1,8 +1,9 @@  - netstandard2.0 + net6.0 SimpleDemo.Core.ruleset + latest @@ -10,8 +11,8 @@ - - + + diff --git a/Demos/SimpleDemo/SimpleDemo.RibbonWPF/SimpleDemo.RibbonWPF.csproj b/Demos/SimpleDemo/SimpleDemo.RibbonWPF/SimpleDemo.RibbonWPF.csproj index 3c674dc4..45a3d36b 100644 --- a/Demos/SimpleDemo/SimpleDemo.RibbonWPF/SimpleDemo.RibbonWPF.csproj +++ b/Demos/SimpleDemo/SimpleDemo.RibbonWPF/SimpleDemo.RibbonWPF.csproj @@ -2,7 +2,8 @@ WinExe - net5.0-windows + net6.0-windows + latest true SimpleDemo.RibbonWpf.ruleset @@ -12,7 +13,7 @@ - + diff --git a/Demos/SimpleDemo/SimpleDemo.RibbonWpf/SimpleDemo.RibbonWpf.csproj b/Demos/SimpleDemo/SimpleDemo.RibbonWpf/SimpleDemo.RibbonWpf.csproj index 3c674dc4..45a3d36b 100644 --- a/Demos/SimpleDemo/SimpleDemo.RibbonWpf/SimpleDemo.RibbonWpf.csproj +++ b/Demos/SimpleDemo/SimpleDemo.RibbonWpf/SimpleDemo.RibbonWpf.csproj @@ -2,7 +2,8 @@ WinExe - net5.0-windows + net6.0-windows + latest true SimpleDemo.RibbonWpf.ruleset @@ -12,7 +13,7 @@ - + diff --git a/Demos/SimpleDemo/SimpleDemo.WPF/SimpleDemo.WPF.csproj b/Demos/SimpleDemo/SimpleDemo.WPF/SimpleDemo.WPF.csproj index 12521816..bb43d4b6 100644 --- a/Demos/SimpleDemo/SimpleDemo.WPF/SimpleDemo.WPF.csproj +++ b/Demos/SimpleDemo/SimpleDemo.WPF/SimpleDemo.WPF.csproj @@ -1,7 +1,8 @@  WinExe - net5.0-windows + net6.0-windows + latest true ..\..\..\.sonarlint\torisankitsune_minorieditorshellcsharp.ruleset @@ -11,8 +12,8 @@ - - + + diff --git a/Demos/SimpleDemo/SimpleDemo.Wpf/SimpleDemo.Wpf.csproj b/Demos/SimpleDemo/SimpleDemo.Wpf/SimpleDemo.Wpf.csproj index 12521816..bb43d4b6 100644 --- a/Demos/SimpleDemo/SimpleDemo.Wpf/SimpleDemo.Wpf.csproj +++ b/Demos/SimpleDemo/SimpleDemo.Wpf/SimpleDemo.Wpf.csproj @@ -1,7 +1,8 @@  WinExe - net5.0-windows + net6.0-windows + latest true ..\..\..\.sonarlint\torisankitsune_minorieditorshellcsharp.ruleset @@ -11,8 +12,8 @@ - - + + diff --git a/GitVersion.yml b/GitVersion.yml index 4bea6a3f..cf4472e0 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,4 +1,4 @@ -next-version: 0.4.1 +next-version: 1.0.0 assembly-versioning-scheme: MajorMinorPatch assembly-file-versioning-scheme: MajorMinorPatchTag mode: ContinuousDeployment diff --git a/MinoriEditorShell.sln b/MinoriEditorShell.sln index 04b186a3..46f2a563 100644 --- a/MinoriEditorShell.sln +++ b/MinoriEditorShell.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28803.202 +# Visual Studio Version 17 +VisualStudioVersion = 17.8.34511.84 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "!Solution Items", "!Solution Items", "{748FD7C1-877B-451D-809A-68E032C39B34}" ProjectSection(SolutionItems) = preProject @@ -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 - CreateArtifacts.ps1 = CreateArtifacts.ps1 .github\workflows\deploy.yml = .github\workflows\deploy.yml GitVersion.yml = GitVersion.yml LICENCE.txt = LICENCE.txt diff --git a/Modules/MinoriEditorShell.Platforms.Wpf/MinoriEditorShell.Platforms.Wpf.csproj b/Modules/MinoriEditorShell.Platforms.Wpf/MinoriEditorShell.Platforms.Wpf.csproj index d2e099b1..52167986 100644 --- a/Modules/MinoriEditorShell.Platforms.Wpf/MinoriEditorShell.Platforms.Wpf.csproj +++ b/Modules/MinoriEditorShell.Platforms.Wpf/MinoriEditorShell.Platforms.Wpf.csproj @@ -1,12 +1,13 @@  - netcoreapp3.1;net461;net5.0-windows + net6.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. - Copyright 2019 + latest + Copyright 2019-2024 https://github.com/TorisanKitsune/MinoriEditorShell https://github.com/TorisanKitsune/MinoriEditorShell @@ -35,16 +36,16 @@ - - - - - - + + + + + + - - - - + + + + \ No newline at end of file diff --git a/Modules/MinoriEditorShell.Ribbon/MinoriEditorShell.Ribbon.csproj b/Modules/MinoriEditorShell.Ribbon/MinoriEditorShell.Ribbon.csproj index 3696194d..d63b5750 100644 --- a/Modules/MinoriEditorShell.Ribbon/MinoriEditorShell.Ribbon.csproj +++ b/Modules/MinoriEditorShell.Ribbon/MinoriEditorShell.Ribbon.csproj @@ -1,11 +1,13 @@  - netcoreapp3.1;net461;net5.0-windows + net6.0-windows true Mark Kromis Mark Kromis - Use a Mahapp.Metro window with Fluent.Ribbon easy + latest + Copyright 2019-2024 + Use a Mahapp.Metro window with Fluent.Ribbon easy https://github.com/TorisanKitsune/MinoriEditorShell https://github.com/TorisanKitsune/MinoriEditorShell Git @@ -22,8 +24,8 @@ - - - + + + \ 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 22286299..13521a67 100644 --- a/Modules/MinoriEditorShell.VirtualCanvas.Platforms.Wpf/MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj +++ b/Modules/MinoriEditorShell.VirtualCanvas.Platforms.Wpf/MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj @@ -1,17 +1,19 @@  - netcoreapp3.1;net461;net5.0-windows + net6.0-windows true Mark Kromis Mark Kromis - Easy Virtual Canvas with zoom + Copyright 2019-2024 + Easy Virtual Canvas with zoom https://github.com/TorisanKitsune/MinoriEditorShell https://github.com/TorisanKitsune/MinoriEditorShell Git IDE VirtualCanvas Module true bin\MinoriEditorStudio.VirtualCanvas.xml + latest true MinoriEditorShell.VirtualCanvas.Platforms.Wpf.ruleset diff --git a/Modules/MinoriEditorShell.VirtualCanvas/MinoriEditorShell.VirtualCanvas.csproj b/Modules/MinoriEditorShell.VirtualCanvas/MinoriEditorShell.VirtualCanvas.csproj index f031219b..72d22c4d 100644 --- a/Modules/MinoriEditorShell.VirtualCanvas/MinoriEditorShell.VirtualCanvas.csproj +++ b/Modules/MinoriEditorShell.VirtualCanvas/MinoriEditorShell.VirtualCanvas.csproj @@ -1,11 +1,13 @@  - netstandard2.0 + net6.0 true Mark Kromis Mark Kromis - Easy Virtual Canvas with zoom + latest + Copyright 2019-2024 + Easy Virtual Canvas with zoom https://github.com/TorisanKitsune/MinoriEditorShell https://github.com/TorisanKitsune/MinoriEditorShell Git diff --git a/Modules/MinoriEditorShell/MinoriEditorShell.csproj b/Modules/MinoriEditorShell/MinoriEditorShell.csproj index 3e211f48..c61cf1bd 100644 --- a/Modules/MinoriEditorShell/MinoriEditorShell.csproj +++ b/Modules/MinoriEditorShell/MinoriEditorShell.csproj @@ -1,12 +1,13 @@  - netstandard2.0 + net6.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. - Copyright 2019 + latest + Copyright 2019 - 2024 https://github.com/TorisanKitsune/MinoriEditorShell https://github.com/TorisanKitsune/MinoriEditorShell @@ -25,12 +26,12 @@ - - - - - - + + + + + + diff --git a/README.md b/README.md index 4408c7cc..6ef793a9 100644 --- a/README.md +++ b/README.md @@ -19,8 +19,9 @@ 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) -## MvvmCross 8 troubleshooting / Known Issues +## MvvmCross 9 troubleshooting / Known Issues +* dot net v6 or greater to be compatable with dependencies. * If view does not showing add `[MvxContentPresentation]` for MesDocuments or Main Content view .i.e. MainView. * Add`[MvxWindowPresentation]` for windows. * If using logging you only need `ILoggerFactory`, otherwise return null. diff --git a/Tests/MinoriEditorShell.Platforms.WpfTests/MinoriEditorShell.Platforms.WpfTests.csproj b/Tests/MinoriEditorShell.Platforms.WpfTests/MinoriEditorShell.Platforms.WpfTests.csproj index 5452871a..4e08880b 100644 --- a/Tests/MinoriEditorShell.Platforms.WpfTests/MinoriEditorShell.Platforms.WpfTests.csproj +++ b/Tests/MinoriEditorShell.Platforms.WpfTests/MinoriEditorShell.Platforms.WpfTests.csproj @@ -1,22 +1,22 @@  - net461;net5.0-windows - 9.0 + net6.0-windows + latest false - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/Tests/MinoriEditorShell.RibbonTests/MinoriEditorShell.RibbonTests.csproj b/Tests/MinoriEditorShell.RibbonTests/MinoriEditorShell.RibbonTests.csproj index 6b5268b4..a453c3cc 100644 --- a/Tests/MinoriEditorShell.RibbonTests/MinoriEditorShell.RibbonTests.csproj +++ b/Tests/MinoriEditorShell.RibbonTests/MinoriEditorShell.RibbonTests.csproj @@ -1,22 +1,22 @@  - net461;net5.0-windows - 9.0 + net6.0-windows + latest false - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/Tests/MinoriEditorShellTests/MinoriEditorShellTests.csproj b/Tests/MinoriEditorShellTests/MinoriEditorShellTests.csproj index b4f27642..f414073d 100644 --- a/Tests/MinoriEditorShellTests/MinoriEditorShellTests.csproj +++ b/Tests/MinoriEditorShellTests/MinoriEditorShellTests.csproj @@ -1,21 +1,21 @@  - net461;net5.0-windows - 9.0 + net6.0-windows + latest false MinoriEditorShell - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - +