Skip to content

Commit 79d65eb

Browse files
sean-mclsean-mcl
authored
Merge pull request #455 from LayTec-AG/release/v5.3.0
Improve solution structure
2 parents 187b3ee + 4c60c37 commit 79d65eb

24 files changed

+94
-3223
lines changed

‎Directory.Packages.props‎

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,38 @@
11
<Project>
2-
<PropertyGroup>
3-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4-
</PropertyGroup>
5-
<ItemGroup>
6-
<GlobalPackageReference Include="GitVersion.MsBuild" Version="5.12.0">
7-
<PrivateAssets>all</PrivateAssets>
8-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
9-
</GlobalPackageReference>
10-
</ItemGroup>
11-
<ItemGroup>
12-
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
13-
</ItemGroup>
14-
<ItemGroup>
15-
<PackageVersion Condition="'$(TargetFramework)' == 'net6.0'" Include="Microsoft.AspNetCore.Components" Version="6.0.33" />
16-
<PackageVersion Condition="'$(TargetFramework)' == 'net6.0'" Include="Microsoft.AspNetCore.Components.Web" Version="6.0.33" />
17-
<PackageVersion Condition="'$(TargetFramework)' == 'net6.0'" Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.33" />
18-
<PackageVersion Condition="'$(TargetFramework)' == 'net6.0'" Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.33" PrivateAssets="all" />
19-
<PackageVersion Condition="'$(TargetFramework)' == 'net7.0'" Include="Microsoft.AspNetCore.Components" Version="7.0.20" />
20-
<PackageVersion Condition="'$(TargetFramework)' == 'net7.0'" Include="Microsoft.AspNetCore.Components.Web" Version="7.0.20" />
21-
<PackageVersion Condition="'$(TargetFramework)' == 'net7.0'" Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.20" />
22-
<PackageVersion Condition="'$(TargetFramework)' == 'net7.0'" Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.20" PrivateAssets="all" />
23-
<PackageVersion Condition="'$(TargetFramework)' == 'net8.0'" Include="Microsoft.AspNetCore.Components" Version="8.0.8" />
24-
<PackageVersion Condition="'$(TargetFramework)' == 'net8.0'" Include="Microsoft.AspNetCore.Components.Web" Version="8.0.8" />
25-
<PackageVersion Condition="'$(TargetFramework)' == 'net8.0'" Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.8" />
26-
<PackageVersion Condition="'$(TargetFramework)' == 'net8.0'" Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.8" PrivateAssets="all" />
27-
<PackageVersion Include="MudBlazor" Version="6.20.0" />
28-
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
29-
<PackageVersion Include="PublishSPAforGitHubPages.Build" Version="3.0.0" />
30-
<PackageVersion Include="Stubble.Core" Version="1.10.8" />
31-
<PackageVersion Include="WeCantSpell.Hunspell" Version="5.0.0" />
32-
<PackageVersion Include="FluentAssertions" Version="6.12.1" />
33-
<PackageVersion Include="nunit" Version="4.2.2" />
34-
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
35-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
36-
</ItemGroup>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<GlobalPackageReference Include="GitVersion.MsBuild" Version="5.12.0">
7+
<PrivateAssets>all</PrivateAssets>
8+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
9+
</GlobalPackageReference>
10+
</ItemGroup>
11+
<ItemGroup>
12+
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
13+
</ItemGroup>
14+
<ItemGroup>
15+
<PackageVersion Condition="'$(TargetFramework)' == 'net6.0'" Include="Microsoft.AspNetCore.Components" Version="6.0.33" />
16+
<PackageVersion Condition="'$(TargetFramework)' == 'net6.0'" Include="Microsoft.AspNetCore.Components.Web" Version="6.0.33" />
17+
<PackageVersion Condition="'$(TargetFramework)' == 'net6.0'" Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.33" />
18+
<PackageVersion Condition="'$(TargetFramework)' == 'net6.0'" Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.33" PrivateAssets="all" />
19+
<PackageVersion Condition="'$(TargetFramework)' == 'net7.0'" Include="Microsoft.AspNetCore.Components" Version="7.0.20" />
20+
<PackageVersion Condition="'$(TargetFramework)' == 'net7.0'" Include="Microsoft.AspNetCore.Components.Web" Version="7.0.20" />
21+
<PackageVersion Condition="'$(TargetFramework)' == 'net7.0'" Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.20" />
22+
<PackageVersion Condition="'$(TargetFramework)' == 'net7.0'" Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.20" PrivateAssets="all" />
23+
<PackageVersion Condition="'$(TargetFramework)' == 'net8.0'" Include="Microsoft.AspNetCore.Components" Version="8.0.8" />
24+
<PackageVersion Condition="'$(TargetFramework)' == 'net8.0'" Include="Microsoft.AspNetCore.Components.Web" Version="8.0.8" />
25+
<PackageVersion Condition="'$(TargetFramework)' == 'net8.0'" Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.8" />
26+
<PackageVersion Condition="'$(TargetFramework)' == 'net8.0'" Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.8" PrivateAssets="all" />
27+
<PackageVersion Include="MudBlazor" Version="6.20.0" />
28+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
29+
<PackageVersion Include="PublishSPAforGitHubPages.Build" Version="3.0.0" />
30+
<PackageVersion Include="Stubble.Core" Version="1.10.8" />
31+
<PackageVersion Include="WeCantSpell.Hunspell" Version="5.0.0" />
32+
<PackageVersion Include="FluentAssertions" Version="6.12.1" />
33+
<PackageVersion Include="nunit" Version="4.2.2" />
34+
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
35+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
36+
<PackageVersion Update="GitVersion.MsBuild" Version="6.0.2" />
37+
</ItemGroup>
3738
</Project>

‎Plotly.Blazor.Examples/Plotly.Blazor.Examples.csproj‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,4 @@
3636
<ItemGroup>
3737
<Folder Include="wwwroot\css\highlight\" />
3838
</ItemGroup>
39-
<ItemGroup>
40-
<PackageVersion Update="GitVersion.MsBuild" Version="6.0.2" />
41-
</ItemGroup>
42-
<ItemGroup>
43-
<PackageReference Update="GitVersion.MsBuild">
44-
<PrivateAssets>all</PrivateAssets>
45-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
46-
</PackageReference>
47-
</ItemGroup>
4839
</Project>

‎Plotly.Blazor.Generator/Plotly.Blazor.Generator.csproj‎

Lines changed: 57 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,16 @@
33
<OutputType>Exe</OutputType>
44
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
55
</PropertyGroup>
6-
<ItemGroup>
7-
<Compile Remove="src\ArrayAttribute.cs" />
8-
<Compile Remove="src\DateTimeConverter.cs" />
9-
<Compile Remove="src\EnumConverter.cs" />
10-
<Compile Remove="src\Extensions.cs" />
11-
<Compile Remove="src\ImageFormat.cs" />
12-
<Compile Remove="src\Interop\EventDataPoint.cs" />
13-
<Compile Remove="src\Interop\RelayoutEventData.cs" />
14-
<Compile Remove="src\PlotlyChart.razor.cs" />
15-
<Compile Remove="src\PlotlyConverter.cs" />
16-
<Compile Remove="src\PlotlyJsInterop.cs" />
17-
<Compile Remove="src\PolymorphicConverter.cs" />
18-
<Compile Remove="src\SubplotAttribute.cs" />
19-
</ItemGroup>
20-
<ItemGroup>
21-
<None Remove="English %28American%29.aff" />
22-
<None Remove="English %28American%29.dic" />
23-
</ItemGroup>
246
<ItemGroup>
257
<PackageReference Include="Stubble.Core" />
268
<PackageReference Include="WeCantSpell.Hunspell" />
279
</ItemGroup>
10+
11+
<!-- Generator Files -->
2812
<ItemGroup>
2913
<None Update="CustomDic.txt">
3014
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
3115
</None>
32-
<None Update="src\PlotlyChart.razor">
33-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
34-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
35-
</None>
36-
<None Update="src\wwwroot\plotly-interop-5.2.0.js">
37-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
38-
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
39-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
40-
</None>
41-
<None Update="src\_Imports.razor">
42-
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
43-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
44-
</None>
4516
<None Update="Templates\Class\Class.txt">
4617
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
4718
</None>
@@ -54,27 +25,69 @@
5425
<None Update="Templates\Interface\Interface.txt">
5526
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
5627
</None>
57-
</ItemGroup>
58-
<ItemGroup>
5928
<Content Include="English %28American%29.aff">
6029
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
6130
</Content>
6231
<Content Include="English %28American%29.dic">
6332
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
6433
</Content>
6534
</ItemGroup>
35+
36+
<!-- Plotly Files-->
6637
<ItemGroup>
67-
<None Include="src\**\*.*">
68-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
38+
<None Include="..\Plotly.Blazor\wwwroot\plotly-basic-1.58.5.min.js" Link="src\wwwroot\plotly-basic-1.58.5.min.js" >
39+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
40+
</None>
41+
<None Include="..\Plotly.Blazor\wwwroot\plotly-interop-5.3.0.js" Link="src\wwwroot\plotly-interop-5.3.0.js">
42+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
43+
</None>
44+
<None Include="..\Plotly.Blazor\_Imports.razor" Link="src\_Imports.razor">
45+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
46+
</None>
47+
<None Include="..\Plotly.Blazor\ArrayAttribute.cs" Link="src\ArrayAttribute.cs" >
48+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
49+
</None>
50+
<None Include="..\Plotly.Blazor\ChartDefinition.cs" Link="src\ChartDefinition.cs">
51+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
52+
</None>
53+
<None Include="..\Plotly.Blazor\DateTimeConverter.cs" Link="src\DateTimeConverter.cs">
54+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
55+
</None>
56+
<None Include="..\Plotly.Blazor\EnumConverter.cs" Link="src\EnumConverter.cs" >
57+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
58+
</None>
59+
<None Include="..\Plotly.Blazor\Extensions.cs" Link="src\Extensions.cs">
60+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
61+
</None>
62+
<None Include="..\Plotly.Blazor\ImageFormat.cs" Link="src\ImageFormat.cs">
63+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
64+
</None>
65+
<None Include="..\Plotly.Blazor\Interop\EventDataPoint.cs" Link="src\Interop\EventDataPoint.cs">
66+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
67+
</None>
68+
<None Include="..\Plotly.Blazor\Interop\RelayoutEventData.cs" Link="src\Interop\RelayoutEventData.cs" >
69+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
70+
</None>
71+
<None Include="..\Plotly.Blazor\Interop\RestyleEventData.cs" Link="src\Interop\RestyleEventData.cs" >
72+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
73+
</None>
74+
<None Include="..\Plotly.Blazor\PlotlyChart.razor" Link="src\PlotlyChart.razor">
75+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
76+
</None>
77+
<None Include="..\Plotly.Blazor\PlotlyChart.razor.cs" Link="src\PlotlyChart.razor.cs" >
78+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
79+
</None>
80+
<None Include="..\Plotly.Blazor\PlotlyConverter.cs" Link="src\PlotlyConverter.cs" >
81+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
82+
</None>
83+
<None Include="..\Plotly.Blazor\PlotlyJsInterop.cs" Link="src\PlotlyJsInterop.cs" >
84+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
85+
</None>
86+
<None Include="..\Plotly.Blazor\PolymorphicConverter.cs" Link="src\PolymorphicConverter.cs" >
87+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
88+
</None>
89+
<None Include="..\Plotly.Blazor\SubplotAttribute.cs" Link="src\SubplotAttribute.cs">
90+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
6991
</None>
70-
</ItemGroup>
71-
<ItemGroup>
72-
<PackageVersion Update="GitVersion.MsBuild" Version="6.0.2" />
73-
</ItemGroup>
74-
<ItemGroup>
75-
<PackageReference Update="GitVersion.MsBuild">
76-
<PrivateAssets>all</PrivateAssets>
77-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
78-
</PackageReference>
7992
</ItemGroup>
8093
</Project>

‎Plotly.Blazor.Generator/src/ArrayAttribute.cs‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎Plotly.Blazor.Generator/src/DateTimeConverter.cs‎

Lines changed: 0 additions & 61 deletions
This file was deleted.

0 commit comments

Comments
 (0)