Skip to content

Commit c81a066

Browse files
mkromismkromis
authored
Fix versioning for sonar build (#85)
* add gitversion.msbuild * remove erros via supression * try pass version to sonar * add comment * tweak build * fix spacing
1 parent 8a5c1d6 commit c81a066

File tree

19 files changed

+476
-334
lines changed

19 files changed

+476
-334
lines changed

‎.github/workflows/build.yml‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,39 @@ jobs:
2121
with:
2222
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
2323

24+
# Needed for sonar analysis
2425
- name: Set up JDK 11
2526
uses: actions/setup-java@v1
2627
with:
2728
java-version: 1.11
2829

30+
# Needed for gitversion tools
31+
- name: 'Setup .NET Core SDK 3.1'
32+
uses: actions/setup-dotnet@v1
33+
with:
34+
dotnet-version: '3.1.x'
35+
36+
# Install GitVersion
37+
# Requires .NET Core 3.1
38+
# https://github.com/marketplace/actions/gittools
39+
- name: 'Install GitVersion'
40+
uses: gittools/actions/gitversion/setup@v0
41+
with:
42+
versionSpec: '5.x'
43+
44+
- name: Determine Version
45+
id: gitversion
46+
uses: gittools/actions/gitversion/execute@v0
47+
with:
48+
useConfigFile: true
49+
2950
- name: Setup .NET
3051
uses: actions/setup-dotnet@v1
3152
with:
3253
dotnet-version: 5.0.x
3354

3455
- name: Setup MSBuild
35-
uses: microsoft/setup-msbuild@v1.0.2
56+
uses: microsoft/setup-msbuild@v1
3657

3758
- name: Use NuGet > 5.0.0
3859
uses: nuget/setup-nuget@v1
@@ -72,7 +93,9 @@ jobs:
7293
begin /k:"TorisanKitsune_MinoriEditorShell" /o:"torisankitsune"
7394
/d:sonar.login="${{secrets.SONAR_TOKEN}}" /d:sonar.host.url="https://sonarcloud.io"
7495
/d:sonar.cs.opencover.reportsPaths=**/coverage.opencover.xml
96+
/v:${{steps.gitversion.outputs.semVer}}
7597
98+
# projects uses GitVersion.MsBuild, so don't neeed to pass version
7699
- name: Build
77100
run: dotnet build ${{env.solution}} --configuration ${{env.buildConfiguration}} --no-restore
78101

‎Demos/MinoriDemo/MinoriDemo.Core/MinoriDemo.Core.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19+
<PackageReference Include="GitVersion.MsBuild" Version="5.6.11">
20+
<PrivateAssets>all</PrivateAssets>
21+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
22+
</PackageReference>
1923
<PackageReference Include="MvvmCross" Version="8.0.2" />
2024
<PackageReference Include="MvvmCross.Plugin.Messenger" Version="8.0.2" />
2125
<PackageReference Include="System.Drawing.Common" Version="5.0.2" />

‎Demos/MinoriDemo/MinoriDemo.RibbonWPF/MinoriDemo.RibbonWPF.csproj‎

Lines changed: 36 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,44 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net5.0-windows</TargetFramework>
6-
<UseWPF>true</UseWPF>
7-
<CodeAnalysisRuleSet>MinoriDemo.RibbonWpf.ruleset</CodeAnalysisRuleSet>
8-
</PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>WinExe</OutputType>
5+
<TargetFramework>net5.0-windows</TargetFramework>
6+
<UseWPF>true</UseWPF>
7+
<CodeAnalysisRuleSet>MinoriDemo.RibbonWpf.ruleset</CodeAnalysisRuleSet>
8+
9+
<!-- https://github.com/dotnet/sdk/issues/1450 -->
10+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
11+
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
12+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
13+
</PropertyGroup>
914

10-
<ItemGroup>
11-
<None Remove="Resources\Splash.png" />
12-
</ItemGroup>
15+
<ItemGroup>
16+
<None Remove="Resources\Splash.png" />
17+
</ItemGroup>
1318

14-
<ItemGroup>
15-
<AdditionalFiles Include="..\..\..\.sonarlint\torisankitsune_minorieditorshell\CSharp\SonarLint.xml" Link="SonarLint.xml" />
16-
</ItemGroup>
19+
<ItemGroup>
20+
<AdditionalFiles Include="..\..\..\.sonarlint\torisankitsune_minorieditorshell\CSharp\SonarLint.xml" Link="SonarLint.xml" />
21+
</ItemGroup>
1722

18-
<ItemGroup>
19-
<PackageReference Include="Dirkster.ColorPickerLib" Version="1.6.2" />
20-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
21-
</ItemGroup>
23+
<ItemGroup>
24+
<PackageReference Include="Dirkster.ColorPickerLib" Version="1.6.2" />
25+
<PackageReference Include="GitVersion.MsBuild" Version="5.6.11">
26+
<PrivateAssets>all</PrivateAssets>
27+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
28+
</PackageReference>
29+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
30+
</ItemGroup>
2231

23-
<ItemGroup>
24-
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.Platforms.Wpf\MinoriEditorShell.Platforms.Wpf.csproj" />
25-
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.Ribbon\MinoriEditorShell.Ribbon.csproj" />
26-
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.VirtualCanvas.Platforms.Wpf\MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj" />
27-
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.VirtualCanvas\MinoriEditorShell.VirtualCanvas.csproj" />
28-
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell\MinoriEditorShell.csproj" />
29-
<ProjectReference Include="..\MinoriDemo.Core\MinoriDemo.Core.csproj" />
30-
</ItemGroup>
32+
<ItemGroup>
33+
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.Platforms.Wpf\MinoriEditorShell.Platforms.Wpf.csproj" />
34+
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.Ribbon\MinoriEditorShell.Ribbon.csproj" />
35+
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.VirtualCanvas.Platforms.Wpf\MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj" />
36+
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.VirtualCanvas\MinoriEditorShell.VirtualCanvas.csproj" />
37+
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell\MinoriEditorShell.csproj" />
38+
<ProjectReference Include="..\MinoriDemo.Core\MinoriDemo.Core.csproj" />
39+
</ItemGroup>
3140

32-
<ItemGroup>
33-
<SplashScreen Include="Resources\Splash.png" />
34-
</ItemGroup>
41+
<ItemGroup>
42+
<SplashScreen Include="Resources\Splash.png" />
43+
</ItemGroup>
3544
</Project>

‎Demos/MinoriDemo/MinoriDemo.RibbonWpf/MinoriDemo.RibbonWpf.csproj‎

Lines changed: 36 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,44 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net5.0-windows</TargetFramework>
6-
<UseWPF>true</UseWPF>
7-
<CodeAnalysisRuleSet>MinoriDemo.RibbonWpf.ruleset</CodeAnalysisRuleSet>
8-
</PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>WinExe</OutputType>
5+
<TargetFramework>net5.0-windows</TargetFramework>
6+
<UseWPF>true</UseWPF>
7+
<CodeAnalysisRuleSet>MinoriDemo.RibbonWpf.ruleset</CodeAnalysisRuleSet>
8+
9+
<!-- https://github.com/dotnet/sdk/issues/1450 -->
10+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
11+
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
12+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
13+
</PropertyGroup>
914

10-
<ItemGroup>
11-
<None Remove="Resources\Splash.png" />
12-
</ItemGroup>
15+
<ItemGroup>
16+
<None Remove="Resources\Splash.png" />
17+
</ItemGroup>
1318

14-
<ItemGroup>
15-
<AdditionalFiles Include="..\..\..\.sonarlint\torisankitsune_minorieditorshell\CSharp\SonarLint.xml" Link="SonarLint.xml" />
16-
</ItemGroup>
19+
<ItemGroup>
20+
<AdditionalFiles Include="..\..\..\.sonarlint\torisankitsune_minorieditorshell\CSharp\SonarLint.xml" Link="SonarLint.xml" />
21+
</ItemGroup>
1722

18-
<ItemGroup>
19-
<PackageReference Include="Dirkster.ColorPickerLib" Version="1.6.2" />
20-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
21-
</ItemGroup>
23+
<ItemGroup>
24+
<PackageReference Include="Dirkster.ColorPickerLib" Version="1.6.2" />
25+
<PackageReference Include="GitVersion.MsBuild" Version="5.6.11">
26+
<PrivateAssets>all</PrivateAssets>
27+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
28+
</PackageReference>
29+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
30+
</ItemGroup>
2231

23-
<ItemGroup>
24-
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.Platforms.Wpf\MinoriEditorShell.Platforms.Wpf.csproj" />
25-
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.Ribbon\MinoriEditorShell.Ribbon.csproj" />
26-
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.VirtualCanvas.Platforms.Wpf\MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj" />
27-
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.VirtualCanvas\MinoriEditorShell.VirtualCanvas.csproj" />
28-
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell\MinoriEditorShell.csproj" />
29-
<ProjectReference Include="..\MinoriDemo.Core\MinoriDemo.Core.csproj" />
30-
</ItemGroup>
32+
<ItemGroup>
33+
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.Platforms.Wpf\MinoriEditorShell.Platforms.Wpf.csproj" />
34+
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.Ribbon\MinoriEditorShell.Ribbon.csproj" />
35+
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.VirtualCanvas.Platforms.Wpf\MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj" />
36+
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.VirtualCanvas\MinoriEditorShell.VirtualCanvas.csproj" />
37+
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell\MinoriEditorShell.csproj" />
38+
<ProjectReference Include="..\MinoriDemo.Core\MinoriDemo.Core.csproj" />
39+
</ItemGroup>
3140

32-
<ItemGroup>
33-
<SplashScreen Include="Resources\Splash.png" />
34-
</ItemGroup>
41+
<ItemGroup>
42+
<SplashScreen Include="Resources\Splash.png" />
43+
</ItemGroup>
3544
</Project>

‎Demos/MinoriDemo/MinoriDemo.WPF/MinoriDemo.WPF.csproj‎

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,33 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net5.0-windows</TargetFramework>
6-
<UseWPF>true</UseWPF>
7-
<CodeAnalysisRuleSet>MinoriDemo.Wpf.ruleset</CodeAnalysisRuleSet>
8-
</PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>WinExe</OutputType>
5+
<TargetFramework>net5.0-windows</TargetFramework>
6+
<UseWPF>true</UseWPF>
7+
<CodeAnalysisRuleSet>MinoriDemo.Wpf.ruleset</CodeAnalysisRuleSet>
98

10-
<ItemGroup>
11-
<AdditionalFiles Include="..\..\..\.sonarlint\torisankitsune_minorieditorshell\CSharp\SonarLint.xml" Link="SonarLint.xml" />
12-
</ItemGroup>
9+
<!-- https://github.com/dotnet/sdk/issues/1450 -->
10+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
11+
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
12+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
13+
</PropertyGroup>
1314

14-
<ItemGroup>
15-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
16-
</ItemGroup>
15+
<ItemGroup>
16+
<AdditionalFiles Include="..\..\..\.sonarlint\torisankitsune_minorieditorshell\CSharp\SonarLint.xml" Link="SonarLint.xml" />
17+
</ItemGroup>
1718

18-
<ItemGroup>
19-
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.Platforms.Wpf\MinoriEditorShell.Platforms.Wpf.csproj" />
20-
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.VirtualCanvas.Platforms.Wpf\MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj" />
21-
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.VirtualCanvas\MinoriEditorShell.VirtualCanvas.csproj" />
22-
<ProjectReference Include="..\MinoriDemo.Core\MinoriDemo.Core.csproj" />
23-
</ItemGroup>
19+
<ItemGroup>
20+
<PackageReference Include="GitVersion.MsBuild" Version="5.6.11">
21+
<PrivateAssets>all</PrivateAssets>
22+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
23+
</PackageReference>
24+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
25+
</ItemGroup>
26+
27+
<ItemGroup>
28+
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.Platforms.Wpf\MinoriEditorShell.Platforms.Wpf.csproj" />
29+
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.VirtualCanvas.Platforms.Wpf\MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj" />
30+
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.VirtualCanvas\MinoriEditorShell.VirtualCanvas.csproj" />
31+
<ProjectReference Include="..\MinoriDemo.Core\MinoriDemo.Core.csproj" />
32+
</ItemGroup>
2433
</Project>

‎Demos/MinoriDemo/MinoriDemo.Wpf/MinoriDemo.Wpf.csproj‎

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,33 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net5.0-windows</TargetFramework>
6-
<UseWPF>true</UseWPF>
7-
<CodeAnalysisRuleSet>MinoriDemo.Wpf.ruleset</CodeAnalysisRuleSet>
8-
</PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>WinExe</OutputType>
5+
<TargetFramework>net5.0-windows</TargetFramework>
6+
<UseWPF>true</UseWPF>
7+
<CodeAnalysisRuleSet>MinoriDemo.Wpf.ruleset</CodeAnalysisRuleSet>
98

10-
<ItemGroup>
11-
<AdditionalFiles Include="..\..\..\.sonarlint\torisankitsune_minorieditorshell\CSharp\SonarLint.xml" Link="SonarLint.xml" />
12-
</ItemGroup>
9+
<!-- https://github.com/dotnet/sdk/issues/1450 -->
10+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
11+
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
12+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
13+
</PropertyGroup>
1314

14-
<ItemGroup>
15-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
16-
</ItemGroup>
15+
<ItemGroup>
16+
<AdditionalFiles Include="..\..\..\.sonarlint\torisankitsune_minorieditorshell\CSharp\SonarLint.xml" Link="SonarLint.xml" />
17+
</ItemGroup>
1718

18-
<ItemGroup>
19-
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.Platforms.Wpf\MinoriEditorShell.Platforms.Wpf.csproj" />
20-
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.VirtualCanvas.Platforms.Wpf\MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj" />
21-
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.VirtualCanvas\MinoriEditorShell.VirtualCanvas.csproj" />
22-
<ProjectReference Include="..\MinoriDemo.Core\MinoriDemo.Core.csproj" />
23-
</ItemGroup>
19+
<ItemGroup>
20+
<PackageReference Include="GitVersion.MsBuild" Version="5.6.11">
21+
<PrivateAssets>all</PrivateAssets>
22+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
23+
</PackageReference>
24+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
25+
</ItemGroup>
26+
27+
<ItemGroup>
28+
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.Platforms.Wpf\MinoriEditorShell.Platforms.Wpf.csproj" />
29+
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.VirtualCanvas.Platforms.Wpf\MinoriEditorShell.VirtualCanvas.Platforms.Wpf.csproj" />
30+
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.VirtualCanvas\MinoriEditorShell.VirtualCanvas.csproj" />
31+
<ProjectReference Include="..\MinoriDemo.Core\MinoriDemo.Core.csproj" />
32+
</ItemGroup>
2433
</Project>

‎Demos/SimpleDemo/SimpleDemo.Core/SimpleDemo.Core.csproj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,20 @@
33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<CodeAnalysisRuleSet>SimpleDemo.Core.ruleset</CodeAnalysisRuleSet>
6+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
7+
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
8+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
69
</PropertyGroup>
710

811
<ItemGroup>
912
<AdditionalFiles Include="..\..\..\.sonarlint\torisankitsune_minorieditorshell\CSharp\SonarLint.xml" Link="SonarLint.xml" />
1013
</ItemGroup>
1114

1215
<ItemGroup>
16+
<PackageReference Include="GitVersion.MsBuild" Version="5.6.11">
17+
<PrivateAssets>all</PrivateAssets>
18+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19+
</PackageReference>
1320
<PackageReference Include="MvvmCross" Version="8.0.2" />
1421
<PackageReference Include="MvvmCross.Plugin.Messenger" Version="8.0.2" />
1522
</ItemGroup>

‎Demos/SimpleDemo/SimpleDemo.RibbonWPF/SimpleDemo.RibbonWPF.csproj‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net5.0-windows</TargetFramework>
6-
<UseWPF>true</UseWPF>
7-
<CodeAnalysisRuleSet>SimpleDemo.RibbonWpf.ruleset</CodeAnalysisRuleSet>
8-
</PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>WinExe</OutputType>
5+
<TargetFramework>net5.0-windows</TargetFramework>
6+
<UseWPF>true</UseWPF>
7+
<CodeAnalysisRuleSet>SimpleDemo.RibbonWpf.ruleset</CodeAnalysisRuleSet>
8+
</PropertyGroup>
99

10-
<ItemGroup>
11-
<AdditionalFiles Include="..\..\..\.sonarlint\torisankitsune_minorieditorshell\CSharp\SonarLint.xml" Link="SonarLint.xml" />
12-
</ItemGroup>
10+
<ItemGroup>
11+
<AdditionalFiles Include="..\..\..\.sonarlint\torisankitsune_minorieditorshell\CSharp\SonarLint.xml" Link="SonarLint.xml" />
12+
</ItemGroup>
1313

14-
<ItemGroup>
15-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
16-
</ItemGroup>
14+
<ItemGroup>
15+
<PackageReference Include="GitVersion.MsBuild" Version="5.6.11">
16+
<PrivateAssets>all</PrivateAssets>
17+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18+
</PackageReference>
19+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
20+
</ItemGroup>
1721

18-
<ItemGroup>
19-
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.Platforms.Wpf\MinoriEditorShell.Platforms.Wpf.csproj" />
20-
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.Ribbon\MinoriEditorShell.Ribbon.csproj" />
21-
<ProjectReference Include="..\SimpleDemo.Core\SimpleDemo.Core.csproj" />
22-
</ItemGroup>
22+
<ItemGroup>
23+
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.Platforms.Wpf\MinoriEditorShell.Platforms.Wpf.csproj" />
24+
<ProjectReference Include="..\..\..\Modules\MinoriEditorShell.Ribbon\MinoriEditorShell.Ribbon.csproj" />
25+
<ProjectReference Include="..\SimpleDemo.Core\SimpleDemo.Core.csproj" />
26+
</ItemGroup>
2327
</Project>

0 commit comments

Comments
 (0)