Skip to content

Commit 3ce09e6

Browse files
Cleanup and package update (#213)
* .NET 9 target * readme update * Update package versions and project references - Upgrade `AngleSharp` to version `1.2.0` in multiple projects. - Modify `Microsoft.Extensions.ObjectPool` to conditionally reference versions based on target framework. - Update `coverlet.collector` to version `6.0.3` in `Tests.csproj`. * Update deploy.yml * Downgrade AngleSharp.Css to stable version in order for publishing to work. Reference Readme file. Update analyzer version. * Format csproj * Update package versions and modify BindGenerator.cs - Updated `StyleCop.Analyzers` to version `1.2.0-beta.556` across multiple project files. - AngleSharp.Css was not causing publish issues. * fix readme file reference. * Nuget package version increase --------- Co-authored-by: Sebastian Stehle <[email protected]>
1 parent d95a682 commit 3ce09e6

File tree

8 files changed

+47
-44
lines changed

8 files changed

+47
-44
lines changed

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
<RepositoryUrl>https://github.com/SebastianStehle/mjml-net.git</RepositoryUrl>
1313
<RepositoryType>git</RepositoryType>
1414
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
15-
<Version>4.6.0</Version>
15+
<Version>4.7.0</Version>
1616
</PropertyGroup>
1717
</Project>

Mjml.Net.Benchmark/Mjml.Net.Benchmark.csproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,28 @@
77
<IsPackable>false</IsPackable>
88
<Nullable>enable</Nullable>
99
<Configurations>Debug;Release;V1_24;v2_0;V2_1</Configurations>
10-
<LangVersion>latest</LangVersion>
10+
<LangVersion>latest</LangVersion>
1111
</PropertyGroup>
1212

1313
<ItemGroup>
1414
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
1515
<PackageReference Include="CommandLineParser" Version="2.9.1" />
1616
</ItemGroup>
17-
17+
1818
<ItemGroup Condition="'$(Configuration)'=='V1_24'">
19-
<PackageReference Include="Mjml.Net" Version="1.24.0" />
19+
<PackageReference Include="Mjml.Net" Version="1.24.0" />
2020
</ItemGroup>
21-
21+
2222
<ItemGroup Condition="'$(Configuration)'=='V2_0'">
23-
<PackageReference Include="Mjml.Net" Version="2.0.0" />
23+
<PackageReference Include="Mjml.Net" Version="2.0.0" />
2424
</ItemGroup>
25-
25+
2626
<ItemGroup Condition="'$(Configuration)'=='V2_1'">
27-
<PackageReference Include="Mjml.Net" Version="2.1.0-beta1" />
27+
<PackageReference Include="Mjml.Net" Version="2.1.0-beta1" />
2828
</ItemGroup>
29-
29+
3030
<ItemGroup Condition="'$(Configuration)'=='V3_8'">
31-
<PackageReference Include="Mjml.Net" Version="3.8.0" />
31+
<PackageReference Include="Mjml.Net" Version="3.8.0" />
3232
</ItemGroup>
3333

3434
<ItemGroup Condition="'$(Configuration)'=='Debug'">

Mjml.Net.Generator/BindGenerator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
using HandlebarsDotNet;
1+
using System.Text;
2+
using HandlebarsDotNet;
23
using Microsoft.CodeAnalysis;
34
using Microsoft.CodeAnalysis.CSharp.Syntax;
45
using Microsoft.CodeAnalysis.Text;
5-
using System.Text;
66

77
namespace Mjml.Net.Generator;
88

Mjml.Net.Generator/Mjml.Net.Generator.csproj

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5-
<LangVersion>latest</LangVersion>
5+
<LangVersion>latest</LangVersion>
66
<ImplicitUsings>enable</ImplicitUsings>
7-
<IsRoslynComponent>true</IsRoslynComponent>
7+
<IsRoslynComponent>true</IsRoslynComponent>
88
<Nullable>enable</Nullable>
9-
<LangVersion>latest</LangVersion>
10-
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
9+
<LangVersion>latest</LangVersion>
10+
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
11+
<PackageReadmeFile>README.md</PackageReadmeFile>
1112
</PropertyGroup>
1213

1314
<ItemGroup>
@@ -16,7 +17,7 @@
1617

1718
<ItemGroup>
1819
<PackageReference Include="Handlebars.Net" Version="2.1.6" PrivateAssets="all" GeneratePathProperty="true" />
19-
<PackageReference Include="Meziantou.Analyzer" Version="2.0.184">
20+
<PackageReference Include="Meziantou.Analyzer" Version="2.0.185">
2021
<PrivateAssets>all</PrivateAssets>
2122
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2223
</PackageReference>
@@ -30,7 +31,7 @@
3031
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3132
</PackageReference>
3233
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
33-
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507" PrivateAssets="all" />
34+
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
3435
</ItemGroup>
3536

3637
<PropertyGroup>
@@ -42,21 +43,21 @@
4243
<TargetPathWithTargetPlatformMoniker Include="$(PKGHandlebars_Net)\lib\netstandard2.0\Handlebars.dll" IncludeRuntimeDependency="false" />
4344
</ItemGroup>
4445
</Target>
45-
46+
4647
<ItemGroup>
4748
<AdditionalFiles Include="..\stylecop.json" Link="stylecop.json" />
4849
</ItemGroup>
4950

5051
<ItemGroup>
5152
<EmbeddedResource Include="Template.handlebar" />
5253
</ItemGroup>
53-
54+
5455
<ItemGroup>
5556
<None Include="..\README.md">
5657
<Pack>True</Pack>
5758
<PackagePath></PackagePath>
5859
</None>
59-
60+
6061
<None Include="icon.png">
6162
<Pack>True</Pack>
6263
<PackagePath></PackagePath>

Mjml.Net.PostProcessors/Mjml.Net.PostProcessors.csproj

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,30 @@
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<NoWarn>1591</NoWarn>
1010
<NeutralLanguage>en</NeutralLanguage>
11-
<LangVersion>latest</LangVersion>
12-
<RootNamespace>Mjml.Net</RootNamespace>
11+
<LangVersion>latest</LangVersion>
12+
<RootNamespace>Mjml.Net</RootNamespace>
13+
<PackageReadmeFile>README.md</PackageReadmeFile>
1314
</PropertyGroup>
1415

1516
<ItemGroup>
1617
<PackageReference Include="AngleSharp" Version="1.2.0" />
1718
<PackageReference Include="AngleSharp.Css" Version="1.0.0-beta.144" />
18-
<PackageReference Include="Meziantou.Analyzer" Version="2.0.184">
19+
<PackageReference Include="Meziantou.Analyzer" Version="2.0.185">
1920
<PrivateAssets>all</PrivateAssets>
2021
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2122
</PackageReference>
2223
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
2324
<PrivateAssets>all</PrivateAssets>
2425
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2526
</PackageReference>
26-
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
27-
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507" PrivateAssets="all" />
27+
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
28+
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
2829
</ItemGroup>
29-
30+
3031
<ItemGroup>
3132
<AdditionalFiles Include="..\stylecop.json" Link="stylecop.json" />
3233
</ItemGroup>
33-
34+
3435
<ItemGroup>
3536
<None Include="..\README.md">
3637
<Pack>True</Pack>
@@ -42,7 +43,7 @@
4243
<PackagePath></PackagePath>
4344
</None>
4445
</ItemGroup>
45-
46+
4647
<ItemGroup>
4748
<ProjectReference Include="..\Mjml.Net.Generator\Mjml.Net.Generator.csproj" OutputItemType="Analyzer" SetTargetFramework="TargetFramework=netstandard2.0" ReferenceOutputAssembly="false" />
4849
<ProjectReference Include="..\Mjml.Net\Mjml.Net.csproj" />

Mjml.Net/Mjml.Net.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99
<NoWarn>1591</NoWarn>
1010
<NeutralLanguage>en</NeutralLanguage>
1111
<LangVersion>latest</LangVersion>
12+
<PackageReadmeFile>README.md</PackageReadmeFile>
1213
</PropertyGroup>
1314

1415
<ItemGroup>
1516
<PackageReference Include="HtmlPerformanceKit" Version="1.0.0" />
16-
<PackageReference Include="Meziantou.Analyzer" Version="2.0.184">
17+
<PackageReference Include="Meziantou.Analyzer" Version="2.0.185">
1718
<PrivateAssets>all</PrivateAssets>
1819
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1920
</PackageReference>
@@ -24,7 +25,7 @@
2425
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2526
</PackageReference>
2627
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
27-
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507" PrivateAssets="all" />
28+
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
2829
</ItemGroup>
2930

3031
<ItemGroup>

Tests/Tests.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<PropertyGroup>
44
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
6-
<IsPackable>false</IsPackable>
6+
<IsPackable>false</IsPackable>
77
<Nullable>enable</Nullable>
8-
<LangVersion>latest</LangVersion>
8+
<LangVersion>latest</LangVersion>
99
</PropertyGroup>
1010

1111
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -32,7 +32,7 @@
3232
<PackageReference Include="FakeItEasy" Version="8.3.0" />
3333
<PackageReference Include="FluentAssertions" Version="7.0.0" />
3434
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
35-
<PackageReference Include="xunit" Version="2.9.2" />
35+
<PackageReference Include="xunit" Version="2.9.3" />
3636
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
3737
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3838
<PrivateAssets>all</PrivateAssets>
@@ -41,14 +41,14 @@
4141
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4242
<PrivateAssets>all</PrivateAssets>
4343
</PackageReference>
44-
<PackageReference Include="Meziantou.Analyzer" Version="2.0.184">
44+
<PackageReference Include="Meziantou.Analyzer" Version="2.0.185">
4545
<PrivateAssets>all</PrivateAssets>
4646
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4747
</PackageReference>
4848
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
49-
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507" PrivateAssets="all" />
49+
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
5050
</ItemGroup>
51-
51+
5252
<ItemGroup>
5353
<ProjectReference Include="..\Mjml.Net.Generator\Mjml.Net.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
5454
<ProjectReference Include="..\Mjml.Net.PostProcessors\Mjml.Net.PostProcessors.csproj" />
@@ -137,7 +137,7 @@
137137
<EmbeddedResource Include="Components\Outputs\Title.html" />
138138
<EmbeddedResource Include="Components\Outputs\Wrapper.html" />
139139
</ItemGroup>
140-
140+
141141
<ItemGroup>
142142
<Using Include="Xunit" />
143143
</ItemGroup>

Tools/Tools.csproj

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net9.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
7-
<IsPackable>false</IsPackable>
7+
<IsPackable>false</IsPackable>
88
<Nullable>enable</Nullable>
9-
<LangVersion>latest</LangVersion>
9+
<LangVersion>latest</LangVersion>
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Meziantou.Analyzer" Version="2.0.184">
13+
<PackageReference Include="Meziantou.Analyzer" Version="2.0.185">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>
1717
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
18-
<PackageReference Include="Squidex.Text" Version="6.23.0" />
19-
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507" PrivateAssets="all" />
18+
<PackageReference Include="Squidex.Text" Version="6.23.0" />
19+
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

0 commit comments

Comments
 (0)