Skip to content

Commit 69d5a22

Browse files
cdrnetcdrnet
committed
Build: explicitly set C# version
1 parent e6041af commit 69d5a22

10 files changed

Lines changed: 143 additions & 145 deletions

File tree

‎.editorconfig‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,6 @@ tab_width = 2
119119
[*.{cs,vb}]
120120
#### Naming styles ####
121121

122-
# Naming rules
123-
124122
dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
125123
dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
126124
dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
@@ -133,8 +131,6 @@ dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
133131
dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
134132
dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
135133

136-
# Symbol specifications
137-
138134
dotnet_naming_symbols.interface.applicable_kinds = interface
139135
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
140136
dotnet_naming_symbols.interface.required_modifiers =
@@ -147,22 +143,15 @@ dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, meth
147143
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
148144
dotnet_naming_symbols.non_field_members.required_modifiers =
149145

150-
# Naming styles
151-
152146
dotnet_naming_style.begins_with_i.required_prefix = I
153147
dotnet_naming_style.begins_with_i.required_suffix =
154148
dotnet_naming_style.begins_with_i.word_separator =
155149
dotnet_naming_style.begins_with_i.capitalization = pascal_case
156-
157150
dotnet_naming_style.pascal_case.required_prefix =
158151
dotnet_naming_style.pascal_case.required_suffix =
159152
dotnet_naming_style.pascal_case.word_separator =
160153
dotnet_naming_style.pascal_case.capitalization = pascal_case
161154

162-
dotnet_naming_style.pascal_case.required_prefix =
163-
dotnet_naming_style.pascal_case.required_suffix =
164-
dotnet_naming_style.pascal_case.word_separator =
165-
dotnet_naming_style.pascal_case.capitalization = pascal_case
166155
dotnet_style_readonly_field = true:suggestion
167156
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
168157
dotnet_style_allow_multiple_blank_lines_experimental = true:silent

‎src/Benchmark/Benchmark.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFrameworks>net6.0;net48</TargetFrameworks>
6+
<LangVersion>7.3</LangVersion>
67
<AssemblyName>Benchmark</AssemblyName>
78
<RootNamespace>Benchmark</RootNamespace>
89
<IsPackable>false</IsPackable>

‎src/Data.Matlab/Data.Matlab.csproj‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
55
<TargetFrameworks>net6.0;net5.0;net461;net48;netstandard2.0</TargetFrameworks>
6+
<LangVersion>7.3</LangVersion>
67
<AssemblyName>MathNet.Numerics.Data.Matlab</AssemblyName>
78
<RootNamespace>MathNet.Numerics.Data.Matlab</RootNamespace>
89
<IsPackable>true</IsPackable>
@@ -54,13 +55,13 @@ Control.Describe now includes CPU architecture and family identifier if know</Pa
5455
<ProjectReference Include="..\Numerics\Numerics.csproj" />
5556
</ItemGroup>
5657
<ItemGroup>
57-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
58-
<PrivateAssets>all</PrivateAssets>
59-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
60-
</PackageReference>
61-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
62-
<PrivateAssets>all</PrivateAssets>
63-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
64-
</PackageReference>
58+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
59+
<PrivateAssets>all</PrivateAssets>
60+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
61+
</PackageReference>
62+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
63+
<PrivateAssets>all</PrivateAssets>
64+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
65+
</PackageReference>
6566
</ItemGroup>
6667
</Project>

‎src/Data.Tests/Data.Tests.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<OutputType>Exe</OutputType>
55
<GenerateProgramFile>false</GenerateProgramFile>
66
<TargetFrameworks>net6.0;net48</TargetFrameworks>
7+
<LangVersion>7.3</LangVersion>
78
<AssemblyName>MathNet.Numerics.Data.Tests</AssemblyName>
89
<RootNamespace>MathNet.Numerics.Data.Tests</RootNamespace>
910
<IsPackable>false</IsPackable>

‎src/Data.Text/Data.Text.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
55
<TargetFrameworks>net6.0;net5.0;net461;net48;netstandard2.0</TargetFrameworks>
6+
<LangVersion>7.3</LangVersion>
67
<AssemblyName>MathNet.Numerics.Data.Text</AssemblyName>
78
<RootNamespace>MathNet.Numerics.Data.Text</RootNamespace>
89
<IsPackable>true</IsPackable>

‎src/Numerics.Tests/Numerics.Tests.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
<OutputType>Exe</OutputType>
55
<GenerateProgramFile>false</GenerateProgramFile>
66
<TargetFrameworks>net6.0;net48</TargetFrameworks>
7+
<LangVersion>7.3</LangVersion>
78
<AssemblyName>MathNet.Numerics.Tests</AssemblyName>
89
<RootNamespace>MathNet.Numerics.Tests</RootNamespace>
910
<IsPackable>false</IsPackable>
1011
<VersionPrefix>5.0.0</VersionPrefix>
1112
<VersionSuffix>alpha02</VersionSuffix>
1213
<GenerateDocumentationFile>false</GenerateDocumentationFile>
1314
</PropertyGroup>
14-
<ItemGroup>
15+
<ItemGroup>
1516
<None Remove="TestResult.xml" />
1617
</ItemGroup>
1718
<ItemGroup>

‎src/Numerics/Numerics.csproj‎

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
3-
<PropertyGroup>
4-
<OutputType>Library</OutputType>
5-
<TargetFrameworks>net6.0;net5.0;net461;net48;netstandard2.0</TargetFrameworks>
6-
<AssemblyName>MathNet.Numerics</AssemblyName>
7-
<RootNamespace>MathNet.Numerics</RootNamespace>
8-
<IsPackable>true</IsPackable>
9-
<PackageId>MathNet.Numerics</PackageId>
10-
<PackageId Condition="'$(StrongName)'=='True'">MathNet.Numerics.Signed</PackageId>
11-
<VersionPrefix>5.0.0</VersionPrefix>
12-
<VersionSuffix>beta01</VersionSuffix>
13-
<Title>Math.NET Numerics$(TitleSuffix)</Title>
14-
<Description>Math.NET Numerics is the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use. Supports .NET 5.0 or higher, .NET Standard 2.0 and .NET Framework 4.6.1 or higher, on Windows, Linux and Mac.$(DescriptionSuffix)</Description>
15-
<PackageReleaseNotes>COMPATIBILITY: net5.0, net48 better supported with explicit builds
3+
<PropertyGroup>
4+
<OutputType>Library</OutputType>
5+
<TargetFrameworks>net6.0;net5.0;net461;net48;netstandard2.0</TargetFrameworks>
6+
<LangVersion>7.3</LangVersion>
7+
<AssemblyName>MathNet.Numerics</AssemblyName>
8+
<RootNamespace>MathNet.Numerics</RootNamespace>
9+
<IsPackable>true</IsPackable>
10+
<PackageId>MathNet.Numerics</PackageId>
11+
<PackageId Condition="'$(StrongName)'=='True'">MathNet.Numerics.Signed</PackageId>
12+
<VersionPrefix>5.0.0</VersionPrefix>
13+
<VersionSuffix>beta01</VersionSuffix>
14+
<Title>Math.NET Numerics$(TitleSuffix)</Title>
15+
<Description>Math.NET Numerics is the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use. Supports .NET 5.0 or higher, .NET Standard 2.0 and .NET Framework 4.6.1 or higher, on Windows, Linux and Mac.$(DescriptionSuffix)</Description>
16+
<PackageReleaseNotes>COMPATIBILITY: net5.0, net48 better supported with explicit builds
1617
COMPATIBILITY: netstandard1.x, net40, net45 no longer supported
1718
BREAKING: drop all which was marked as obsolete
1819
BREAKING: all native provider adapters moved out to separate NuGet packages
@@ -40,20 +41,20 @@ Better support for System.Text.Json: Polynomial, DescriptiveStatistics ~Joseph P
4041
Lots of internal cleanup, leveraging newer language features
4142
Data: now released always together with Numerics (no longer separate versioning)
4243
Control.Describe now includes CPU architecture and family identifier if know</PackageReleaseNotes>
43-
<PackageTags>math numeric statistics probability integration interpolation regression solve fit linear algebra matrix fft</PackageTags>
44-
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
45-
<EnableDefaultCompileItems>true</EnableDefaultCompileItems>
46-
<NoWarn>1701;1702;1705;1591;1573</NoWarn>
47-
</PropertyGroup>
44+
<PackageTags>math numeric statistics probability integration interpolation regression solve fit linear algebra matrix fft</PackageTags>
45+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
46+
<EnableDefaultCompileItems>true</EnableDefaultCompileItems>
47+
<NoWarn>1701;1702;1705;1591;1573</NoWarn>
48+
</PropertyGroup>
4849
<ItemGroup>
49-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
50-
<PrivateAssets>all</PrivateAssets>
51-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
52-
</PackageReference>
53-
<PackageReference Include="System.ValueTuple" Version="4.4.0" Condition="'$(TargetFramework)' == 'net461'" />
54-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
55-
<PrivateAssets>all</PrivateAssets>
56-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
57-
</PackageReference>
58-
</ItemGroup>
50+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
51+
<PrivateAssets>all</PrivateAssets>
52+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
53+
</PackageReference>
54+
<PackageReference Include="System.ValueTuple" Version="4.4.0" Condition="'$(TargetFramework)' == 'net461'" />
55+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
56+
<PrivateAssets>all</PrivateAssets>
57+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
58+
</PackageReference>
59+
</ItemGroup>
5960
</Project>

‎src/Providers.CUDA/Providers.CUDA.csproj‎

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
3-
<PropertyGroup>
4-
<OutputType>Library</OutputType>
5-
<TargetFrameworks>net6.0;net5.0;net461;net48;netstandard2.0</TargetFrameworks>
6-
<AssemblyName>MathNet.Numerics.Providers.CUDA</AssemblyName>
7-
<RootNamespace>MathNet.Numerics.Providers.CUDA</RootNamespace>
8-
<IsPackable>true</IsPackable>
9-
<PackageId>MathNet.Numerics.Providers.CUDA</PackageId>
10-
<PackageId Condition="'$(StrongName)'=='True'">MathNet.Numerics.Providers.CUDA.Signed</PackageId>
11-
<VersionPrefix>5.0.0</VersionPrefix>
12-
<VersionSuffix>beta01</VersionSuffix>
13-
<Title>Math.NET Numerics CUDA Provider$(TitleSuffix)</Title>
14-
<Description>Math.NET Numerics is the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use.$(DescriptionSuffix)</Description>
15-
<PackageReleaseNotes>COMPATIBILITY: net5.0, net48 better supported with explicit builds
3+
<PropertyGroup>
4+
<OutputType>Library</OutputType>
5+
<TargetFrameworks>net6.0;net5.0;net461;net48;netstandard2.0</TargetFrameworks>
6+
<LangVersion>7.3</LangVersion>
7+
<AssemblyName>MathNet.Numerics.Providers.CUDA</AssemblyName>
8+
<RootNamespace>MathNet.Numerics.Providers.CUDA</RootNamespace>
9+
<IsPackable>true</IsPackable>
10+
<PackageId>MathNet.Numerics.Providers.CUDA</PackageId>
11+
<PackageId Condition="'$(StrongName)'=='True'">MathNet.Numerics.Providers.CUDA.Signed</PackageId>
12+
<VersionPrefix>5.0.0</VersionPrefix>
13+
<VersionSuffix>beta01</VersionSuffix>
14+
<Title>Math.NET Numerics CUDA Provider$(TitleSuffix)</Title>
15+
<Description>Math.NET Numerics is the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use.$(DescriptionSuffix)</Description>
16+
<PackageReleaseNotes>COMPATIBILITY: net5.0, net48 better supported with explicit builds
1617
COMPATIBILITY: netstandard1.x, net40, net45 no longer supported
1718
BREAKING: drop all which was marked as obsolete
1819
BREAKING: all native provider adapters moved out to separate NuGet packages
@@ -40,26 +41,26 @@ Better support for System.Text.Json: Polynomial, DescriptiveStatistics ~Joseph P
4041
Lots of internal cleanup, leveraging newer language features
4142
Data: now released always together with Numerics (no longer separate versioning)
4243
Control.Describe now includes CPU architecture and family identifier if know</PackageReleaseNotes>
43-
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
44-
<EnableDefaultCompileItems>true</EnableDefaultCompileItems>
45-
<NoWarn>1701;1702;1705;1591;1573</NoWarn>
46-
</PropertyGroup>
44+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
45+
<EnableDefaultCompileItems>true</EnableDefaultCompileItems>
46+
<NoWarn>1701;1702;1705;1591;1573</NoWarn>
47+
</PropertyGroup>
4748
<ItemGroup>
48-
<ProjectReference Include="..\Numerics\Numerics.csproj" />
49-
</ItemGroup>
50-
<ItemGroup>
51-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
52-
<PrivateAssets>all</PrivateAssets>
53-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
54-
</PackageReference>
55-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
56-
<PrivateAssets>all</PrivateAssets>
57-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
58-
</PackageReference>
59-
</ItemGroup>
60-
<ItemGroup>
61-
<Compile Include="..\Providers.MKL\NativeProviderLoader.cs">
62-
<Link>NativeProviderLoader.cs</Link>
63-
</Compile>
64-
</ItemGroup>
49+
<ProjectReference Include="..\Numerics\Numerics.csproj" />
50+
</ItemGroup>
51+
<ItemGroup>
52+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
53+
<PrivateAssets>all</PrivateAssets>
54+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
55+
</PackageReference>
56+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
57+
<PrivateAssets>all</PrivateAssets>
58+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
59+
</PackageReference>
60+
</ItemGroup>
61+
<ItemGroup>
62+
<Compile Include="..\Providers.MKL\NativeProviderLoader.cs">
63+
<Link>NativeProviderLoader.cs</Link>
64+
</Compile>
65+
</ItemGroup>
6566
</Project>

‎src/Providers.MKL/Providers.MKL.csproj‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
3-
<PropertyGroup>
4-
<OutputType>Library</OutputType>
5-
<TargetFrameworks>net6.0;net5.0;net461;net48;netstandard2.0</TargetFrameworks>
6-
<AssemblyName>MathNet.Numerics.Providers.MKL</AssemblyName>
7-
<RootNamespace>MathNet.Numerics.Providers.MKL</RootNamespace>
8-
<IsPackable>true</IsPackable>
9-
<PackageId>MathNet.Numerics.Providers.MKL</PackageId>
10-
<PackageId Condition="'$(StrongName)'=='True'">MathNet.Numerics.Providers.MKL.Signed</PackageId>
11-
<VersionPrefix>5.0.0</VersionPrefix>
12-
<VersionSuffix>beta01</VersionSuffix>
13-
<Title>Math.NET Numerics MKL Provider$(TitleSuffix)</Title>
14-
<Description>Math.NET Numerics is the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use.$(DescriptionSuffix)</Description>
15-
<PackageReleaseNotes>COMPATIBILITY: net5.0, net48 better supported with explicit builds
3+
<PropertyGroup>
4+
<OutputType>Library</OutputType>
5+
<TargetFrameworks>net6.0;net5.0;net461;net48;netstandard2.0</TargetFrameworks>
6+
<LangVersion>7.3</LangVersion>
7+
<AssemblyName>MathNet.Numerics.Providers.MKL</AssemblyName>
8+
<RootNamespace>MathNet.Numerics.Providers.MKL</RootNamespace>
9+
<IsPackable>true</IsPackable>
10+
<PackageId>MathNet.Numerics.Providers.MKL</PackageId>
11+
<PackageId Condition="'$(StrongName)'=='True'">MathNet.Numerics.Providers.MKL.Signed</PackageId>
12+
<VersionPrefix>5.0.0</VersionPrefix>
13+
<VersionSuffix>beta01</VersionSuffix>
14+
<Title>Math.NET Numerics MKL Provider$(TitleSuffix)</Title>
15+
<Description>Math.NET Numerics is the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use.$(DescriptionSuffix)</Description>
16+
<PackageReleaseNotes>COMPATIBILITY: net5.0, net48 better supported with explicit builds
1617
COMPATIBILITY: netstandard1.x, net40, net45 no longer supported
1718
BREAKING: drop all which was marked as obsolete
1819
BREAKING: all native provider adapters moved out to separate NuGet packages
@@ -40,21 +41,21 @@ Better support for System.Text.Json: Polynomial, DescriptiveStatistics ~Joseph P
4041
Lots of internal cleanup, leveraging newer language features
4142
Data: now released always together with Numerics (no longer separate versioning)
4243
Control.Describe now includes CPU architecture and family identifier if know</PackageReleaseNotes>
43-
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
44-
<EnableDefaultCompileItems>true</EnableDefaultCompileItems>
45-
<NoWarn>1701;1702;1705;1591;1573</NoWarn>
46-
</PropertyGroup>
44+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
45+
<EnableDefaultCompileItems>true</EnableDefaultCompileItems>
46+
<NoWarn>1701;1702;1705;1591;1573</NoWarn>
47+
</PropertyGroup>
4748
<ItemGroup>
48-
<ProjectReference Include="..\Numerics\Numerics.csproj" />
49-
</ItemGroup>
50-
<ItemGroup>
51-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
52-
<PrivateAssets>all</PrivateAssets>
53-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
54-
</PackageReference>
55-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
56-
<PrivateAssets>all</PrivateAssets>
57-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
58-
</PackageReference>
59-
</ItemGroup>
49+
<ProjectReference Include="..\Numerics\Numerics.csproj" />
50+
</ItemGroup>
51+
<ItemGroup>
52+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
53+
<PrivateAssets>all</PrivateAssets>
54+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
55+
</PackageReference>
56+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
57+
<PrivateAssets>all</PrivateAssets>
58+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
59+
</PackageReference>
60+
</ItemGroup>
6061
</Project>

0 commit comments

Comments
 (0)