Skip to content

Commit 82ecd01

Browse files
floberndflobernd
authored
Add support for net7 target framework (#16)
1 parent e664e46 commit 82ecd01

13 files changed

+1237
-264
lines changed

‎.editorconfig‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1456,6 +1456,27 @@ dotnet_naming_style.camelcase.capitalization = camel_case
14561456

14571457
### Undocumented ###################################################################################
14581458

1459+
# IDE0200: Remove unnecessary lambda expression
1460+
dotnet_diagnostic.IDE0200.severity = warning
1461+
csharp_style_prefer_method_group_conversion = true
1462+
# IDE0210: Convert to top-level statements
1463+
dotnet_diagnostic.IDE0210.severity = none
1464+
csharp_style_prefer_top_level_statements = false
1465+
# IDE0211: Convert to 'Program.Main' style program
1466+
dotnet_diagnostic.IDE0211.severity = none
1467+
# IDE0220: Add explicit cast
1468+
dotnet_diagnostic.IDE0220.severity = suggestion
1469+
dotnet_style_prefer_foreach_explicit_cast_in_source = false
1470+
# IDE0230: Use UTF-8 string literal
1471+
dotnet_diagnostic.IDE0230.severity = warning
1472+
csharp_style_prefer_utf8_string_literals = true
1473+
# IDE0240: Remove redundant nullable directive
1474+
dotnet_diagnostic.IDE0240.severity = warning
1475+
# IDE0241: Remove unnecessary nullable directive
1476+
dotnet_diagnostic.IDE0241.severity = warning
1477+
# IDE0250: Make struct 'readonly'
1478+
dotnet_diagnostic.IDE0250.severity = warning
1479+
14591480
# IDE2000:
14601481
dotnet_diagnostic.IDE2000.severity = suggestion
14611482
dotnet_style_allow_multiple_blank_lines_experimental = false
@@ -1471,17 +1492,9 @@ dotnet_style_allow_statement_immediately_after_block_experimental = false
14711492
# IDE2004:
14721493
dotnet_diagnostic.IDE2004.severity = suggestion
14731494
csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true
1495+
14741496
#
14751497
dotnet_style_operator_placement_when_wrapping = end_of_line
1476-
#
1477-
csharp_style_prefer_method_group_conversion = true
1478-
#
1479-
csharp_style_prefer_top_level_statements = false
1480-
#
1481-
csharp_style_prefer_utf8_string_literals = true
1482-
# IDE0220: Add explicit cast
1483-
dotnet_diagnostic.IDE0220.severity = suggestion
1484-
dotnet_style_prefer_foreach_explicit_cast_in_source = false
14851498

14861499
### License ########################################################################################
14871500

‎Directory.Build.props‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<!-- Language Features -->
5+
<LangVersion>latest</LangVersion>
6+
<Nullable>enable</Nullable>
7+
<ImplicitUsings>disable</ImplicitUsings>
8+
9+
<!-- Restore Behavior -->
10+
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
11+
12+
<!-- Compiler Options -->
13+
<Deterministic>true</Deterministic>
14+
15+
<!-- Analyzer Options -->
16+
<EnableNETAnalyzers>true</EnableNETAnalyzers>
17+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
18+
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
19+
</PropertyGroup>
20+
</Project>

‎Directory.Packages.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageVersion Include="coverlet.collector" Version="3.1.2" />
8+
<PackageVersion Include="coverlet.collector" Version="3.2.0" />
99
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
1010
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
11-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
12-
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
13-
<PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="17.3.1" />
14-
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.5.109" PrivateAssets="all" />
15-
<PackageVersion Include="Nullable" Version="1.3.1" PrivateAssets="all" />
11+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
12+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
13+
<PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="17.4.0" />
14+
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.5.119" />
15+
<PackageVersion Include="Nullable" Version="1.3.1" />
1616
<PackageVersion Include="xunit" Version="2.4.2" />
1717
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
18-
<PackageVersion Include="ZySharp.Validation" Version="1.2.6" />
18+
<PackageVersion Include="ZySharp.Validation" Version="1.3.1" />
1919
</ItemGroup>
20-
</Project>
20+
</Project>

‎ZySharp.Metaprogramming.Examples/ZySharp.Metaprogramming.Examples.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
<LangVersion>latest</LangVersion>
6-
<Nullable>enable</Nullable>
7-
<ImplicitUsings>disable</ImplicitUsings>
4+
<TargetFramework>net7</TargetFramework>
85

9-
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
106
<RestoreLockedMode Condition="'$(ContinuousIntegrationBuild)' == 'true'" />
117

128
<OutputType>Exe</OutputType>
139
<IsPublishable>false</IsPublishable>
1410
<IsPackable>false</IsPackable>
15-
16-
<EnableNETAnalyzers>true</EnableNETAnalyzers>
17-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
18-
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
1911
</PropertyGroup>
2012

2113
<ItemGroup>

‎ZySharp.Metaprogramming.Examples/packages.lock.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
{
22
"version": 2,
33
"dependencies": {
4-
"net6.0": {
4+
"net7.0": {
55
"JetBrains.Annotations": {
66
"type": "Transitive",
7-
"resolved": "2022.1.0",
8-
"contentHash": "ASfpoFJxiRsC9Xc4TWuPM41Zb/gl64xwfMOhnOZ3RnVWGYIZchjpWQV5zshJgoc/ZxVtgjaF7b577lURj7E6ig=="
7+
"resolved": "2022.3.1",
8+
"contentHash": "11nsS3+lFICGkztVs9PP2NRItxf9fF+qD6xEW/T0YGto52zj07wseUeBdMAU1ah9HNVTDZyRC1u4NWdtJScwhw=="
99
},
1010
"zysharp.metaprogramming": {
1111
"type": "Project",
1212
"dependencies": {
13-
"ZySharp.Validation": "[1.2.6, )"
13+
"ZySharp.Validation": "[1.3.1, )"
1414
}
1515
},
1616
"ZySharp.Validation": {
1717
"type": "CentralTransitive",
18-
"requested": "[1.2.6, )",
19-
"resolved": "1.2.6",
20-
"contentHash": "nz8AfHi7E59k9ArgapYXG/UHQJNCGHW3LVcj/spHlKZErjMMvjDuzOoKiToqIZk2UtRnoYPR2XE4Nh9XlnM7KA==",
18+
"requested": "[1.3.1, )",
19+
"resolved": "1.3.1",
20+
"contentHash": "hPuTlGBUmk5an/CLFhzYtPexYxeDB9SmuglAES+nwPJhbm6hRHnByPUdZENk3lwA90CeAgLmRIAVMTL8HK7c9A==",
2121
"dependencies": {
22-
"JetBrains.Annotations": "2022.1.0"
22+
"JetBrains.Annotations": "2022.3.1"
2323
}
2424
}
2525
}

‎ZySharp.Metaprogramming.Tests/Test.Extensions.Expr.Evaluate.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void EvaluateFailure()
8686
{
8787
var input = Expression.Add(Expression.Parameter(typeof(int)), Expression.Constant(0));
8888

89-
Assert.Throws<EvaluationException>(() => input.Evaluate());
89+
Assert.Throws<EvaluationException>(input.Evaluate);
9090
}
9191

9292
[Fact]

‎ZySharp.Metaprogramming.Tests/ZySharp.Metaprogramming.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net4.8;netcoreapp3.1;net6.0</TargetFrameworks>
5-
<LangVersion>latest</LangVersion>
6-
<Nullable>enable</Nullable>
7-
<ImplicitUsings>disable</ImplicitUsings>
4+
<TargetFrameworks>net4.8;netcoreapp3.1;net6;net7</TargetFrameworks>
85

9-
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
106
<!-- https://github.com/NuGet/Home/issues/9195 -->
117
<!-- https://github.com/NuGet/Home/issues/10456 -->
128
<!-- https://github.com/dotnet/sdk/issues/26505 -->
@@ -15,10 +11,6 @@
1511

1612
<IsPublishable>false</IsPublishable>
1713
<IsPackable>false</IsPackable>
18-
19-
<EnableNETAnalyzers>true</EnableNETAnalyzers>
20-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
21-
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
2214
</PropertyGroup>
2315

2416
<ItemGroup>

0 commit comments

Comments
 (0)