Native with VS2022, Tools 143, Code Analysis, Build Props

Author: cdrnet

.editorconfig

@@ -8,6 +8,7 @@ indent_style = space
 indent_size = 4
 insert_final_newline = true
 trim_trailing_whitespace = true
+tab_width=4
 
 [*.md]
 trim_trailing_whitespace = false

Directory.Build.props

@@ -15,6 +15,11 @@
         <StrongName Condition="'$(StrongName)' == ''">False</StrongName>
         <PackageIdSuffix Condition="'$(PackageIdSuffix)' == ''"></PackageIdSuffix>
         <TitleSuffix Condition="'$(TitleSuffix)' == ''"></TitleSuffix>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+        <Nullable>disable</Nullable>
+        <EnableNETAnalyzers>True</EnableNETAnalyzers>
+        <AnalysisLevel>5.0</AnalysisLevel>
     </PropertyGroup>
     <PropertyGroup Condition="'$(StrongName)'=='True'">
         <SignAssembly>true</SignAssembly>

MathNet.Numerics.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28729.10
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.32112.339
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Readme", "Readme", "{C2F37492-38AE-4186-8A7F-17B0B080942C}"
 	ProjectSection(SolutionItems) = preProject
@@ -27,37 +27,36 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{B54A0B40-DE22-49FB-B1C0-6E5BDA3B0B2F}"
 	ProjectSection(SolutionItems) = preProject
 		appveyor.yml = appveyor.yml
-		build.fsx = build.fsx
-		global.json = global.json
-		paket.dependencies = paket.dependencies
-		paket.lock = paket.lock
 		Directory.Build.props = Directory.Build.props
+		global.json = global.json
 		build\MathNet.Numerics.CUDA.Win.nuspec = build\MathNet.Numerics.CUDA.Win.nuspec
-		build\MathNet.Numerics.MKL.Linux.nuspec = build\MathNet.Numerics.MKL.Linux.nuspec
 		build\MathNet.Numerics.MKL.Linux-x64.nuspec = build\MathNet.Numerics.MKL.Linux-x64.nuspec
 		build\MathNet.Numerics.MKL.Linux-x86.nuspec = build\MathNet.Numerics.MKL.Linux-x86.nuspec
-		build\MathNet.Numerics.MKL.Win.nuspec = build\MathNet.Numerics.MKL.Win.nuspec
+		build\MathNet.Numerics.MKL.Linux.nuspec = build\MathNet.Numerics.MKL.Linux.nuspec
 		build\MathNet.Numerics.MKL.Win-x64.nuspec = build\MathNet.Numerics.MKL.Win-x64.nuspec
 		build\MathNet.Numerics.MKL.Win-x86.nuspec = build\MathNet.Numerics.MKL.Win-x86.nuspec
+		build\MathNet.Numerics.MKL.Win.nuspec = build\MathNet.Numerics.MKL.Win.nuspec
 		build\MathNet.Numerics.OpenBLAS.Win.nuspec = build\MathNet.Numerics.OpenBLAS.Win.nuspec
 		build\NativeProvider.targets = build\NativeProvider.targets
+		paket.dependencies = paket.dependencies
+		paket.lock = paket.lock
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestData", "src\TestData\TestData.csproj", "{AF3253C9-4DB5-45A0-98CF-C105FDA9DA47}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmark", "src\Benchmark\Benchmark.csproj", "{82444930-9FD7-41B6-B476-CCE41A0C0A0B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Providers.MKL", "src\Providers.MKL\Providers.MKL.csproj", "{0B5FAFAA-4286-4D92-B5AB-CBA75ADDA0BB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Providers.MKL", "src\Providers.MKL\Providers.MKL.csproj", "{0B5FAFAA-4286-4D92-B5AB-CBA75ADDA0BB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Providers.CUDA", "src\Providers.CUDA\Providers.CUDA.csproj", "{3C0D4A87-CC89-43B6-B028-4122099D692F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Providers.CUDA", "src\Providers.CUDA\Providers.CUDA.csproj", "{3C0D4A87-CC89-43B6-B028-4122099D692F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Providers.OpenBLAS", "src\Providers.OpenBLAS\Providers.OpenBLAS.csproj", "{FBE18DF3-EEC3-4812-9FB4-B9EA6EAEC029}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Providers.OpenBLAS", "src\Providers.OpenBLAS\Providers.OpenBLAS.csproj", "{FBE18DF3-EEC3-4812-9FB4-B9EA6EAEC029}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data.Matlab", "src\Data.Matlab\Data.Matlab.csproj", "{2AA6CF31-96A1-4BB5-AD2E-7840167FE4DA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Data.Matlab", "src\Data.Matlab\Data.Matlab.csproj", "{2AA6CF31-96A1-4BB5-AD2E-7840167FE4DA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data.Text", "src\Data.Text\Data.Text.csproj", "{B626F8B8-51A5-4FB6-BE5A-E94B27B1A050}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Data.Text", "src\Data.Text\Data.Text.csproj", "{B626F8B8-51A5-4FB6-BE5A-E94B27B1A050}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data.Tests", "src\Data.Tests\Data.Tests.csproj", "{1FBB8988-3F40-4FCE-BEA8-2C705888804A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Data.Tests", "src\Data.Tests\Data.Tests.csproj", "{1FBB8988-3F40-4FCE-BEA8-2C705888804A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

build/Building.fs

@@ -14,7 +14,7 @@ let inline private packOptions args (p:DotNet.PackOptions) = { p with NoRestore
 
 let private normal = { MSBuild.CliArguments.Create() with NodeReuse = false; Properties = [ ("StrongName", "False") ] }
 let private strongNamed = { MSBuild.CliArguments.Create() with NodeReuse = false; Properties = [ ("StrongName", "True") ] }
-   
+
 let restore (solution:Solution) = DotNet.restore minimal solution.SolutionFile
 
 let build (solution:Solution) = DotNet.build (minimal >> buildOptions normal) solution.SolutionFile
@@ -23,17 +23,17 @@ let buildStrongNamed (solution:Solution) = DotNet.build (minimal >> buildOptions
 let pack (solution:Solution) = DotNet.pack (minimal >> packOptions normal) solution.SolutionFile
 let packStrongNamed (solution:Solution) = DotNet.pack (minimal >> packOptions strongNamed) solution.SolutionFile
 
-let buildVS2019x86 config isIncremental subject =
+let buildVS2022x86 config isIncremental subject =
     MSBuild.run
-        (fun p -> {p with ToolPath = Environment.environVar "VS2019INSTALLDIR" </> @"MSBuild\Current\Bin\MSBuild.exe"})
+        (fun p -> {p with ToolPath = Environment.environVar "VS2022INSTALLDIR" </> @"MSBuild\Current\Bin\MSBuild.exe"})
         ""
         (if isIncremental then "Build" else "Rebuild")
         [("Configuration", config); ("Platform","Win32")]
         subject
         |> ignore<string list>
-let buildVS2019x64 config isIncremental subject =
+let buildVS2022x64 config isIncremental subject =
     MSBuild.run
-        (fun p -> {p with ToolPath = Environment.environVar "VS2019INSTALLDIR" </> @"MSBuild\Current\Bin\MSBuild.exe"})
+        (fun p -> {p with ToolPath = Environment.environVar "VS2022INSTALLDIR" </> @"MSBuild\Current\Bin\MSBuild.exe"})
         ""
         (if isIncremental then "Build" else "Rebuild")
         [("Configuration", config); ("Platform","x64")]

build/Testing.fs

@@ -3,8 +3,10 @@
 open FSharp.Core
 open Fake.Core
 open Fake.DotNet
+//open Fake.DotNet.DotNet.Options
 
 let test testsDir testsProj framework =
+    //DotNet.test (withWorkingDirectory testsDir >> (fun o -> { o with Framework = Some framework; NoRestore = true; NoBuild = true; Configuration = DotNet.BuildConfiguration.Release })) testsProj
     DotNet.exec
         (fun c -> { c with WorkingDirectory = testsDir })
         (sprintf "run --project %s --configuration Release --framework %s --no-restore --no-build" testsProj framework)

build/build.fs

@@ -180,7 +180,7 @@ let ``Apply Version`` _ =
 
 let ``Restore`` _ =
     allSolutions |> List.iter restore
-    
+
 let fingerprint = "490408de3618bed0a28e68dc5face46e5a3a97dd"
 let timeserver = "http://time.certum.pl/"
 
@@ -196,7 +196,7 @@ let ``Build`` isStrongname isSign _ =
         zip numericsStrongNameZipPackage header numericsSolution.OutputZipDir numericsSolution.OutputLibStrongNameDir (fun f -> f.Contains("MathNet.Numerics.") || f.Contains("System.Threading.") || f.Contains("FSharp.Core."))
         packStrongNamed numericsSolution
         collectNuGetPackages numericsSolution
-    
+
     // Normal Build (without strong name, with certificate signature)
     Shell.cleanDirs (!! "src/**/obj/" ++ "src/**/bin/" )
     restore numericsSolution
@@ -206,7 +206,7 @@ let ``Build`` isStrongname isSign _ =
     zip numericsZipPackage header numericsSolution.OutputZipDir numericsSolution.OutputLibDir (fun f -> f.Contains("MathNet.Numerics.") || f.Contains("System.Threading.") || f.Contains("FSharp.Core."))
     pack numericsSolution
     collectNuGetPackages numericsSolution
-    
+
     // NuGet Sign (all or nothing)
     if isSign then signNuGet fingerprint timeserver [numericsSolution]
 
@@ -218,40 +218,40 @@ let ``Build MKL Windows`` isIncremental isSign _ =
     //    |> CreateProcess.withTimeout (TimeSpan.FromMinutes 10.)
     //    |> Proc.run
     //if result.ExitCode <> 0 then failwith "Error while setting oneAPI environment variables."
-    
+
     restore mklSolution
-    buildVS2019x86 "Release-MKL" isIncremental !! "MathNet.Numerics.MKL.sln"
-    buildVS2019x64 "Release-MKL" isIncremental !! "MathNet.Numerics.MKL.sln"
+    buildVS2022x86 "Release-MKL" isIncremental !! "MathNet.Numerics.MKL.sln"
+    buildVS2022x64 "Release-MKL" isIncremental !! "MathNet.Numerics.MKL.sln"
     Directory.create mklSolution.OutputZipDir
     zip mklWinZipPackage header mklSolution.OutputZipDir "out/MKL/Windows" (fun f -> f.Contains("MathNet.Numerics.Providers.MKL.") || f.Contains("MathNet.Numerics.MKL.") || f.Contains("libiomp5md.dll"))
     Directory.create mklSolution.OutputNuGetDir
     nugetPackManually mklSolution [ mklWinPack; mklWin32Pack; mklWin64Pack ] header
-    
+
     // NuGet Sign (all or nothing)
     if isSign then signNuGet fingerprint timeserver [mklSolution]
 
 let ``Build CUDA Windows`` isIncremental isSign _ =
 
     restore cudaSolution
-    buildVS2019x64 "Release-CUDA" isIncremental !! "MathNet.Numerics.CUDA.sln"
+    buildVS2022x64 "Release-CUDA" isIncremental !! "MathNet.Numerics.CUDA.sln"
     Directory.create cudaSolution.OutputZipDir
     zip cudaWinZipPackage header cudaSolution.OutputZipDir "out/CUDA/Windows" (fun f -> f.Contains("MathNet.Numerics.Providers.CUDA.") || f.Contains("MathNet.Numerics.CUDA.") || f.Contains("cublas") || f.Contains("cudart") || f.Contains("cusolver"))
     Directory.create cudaSolution.OutputNuGetDir
     nugetPackManually cudaSolution [ cudaWinPack ] header
-    
+
     // NuGet Sign (all or nothing)
     if isSign then signNuGet fingerprint timeserver [cudaSolution]
 
 let ``Build OpenBLAS Windows`` isIncremental isSign _ =
-    
+
     restore openBlasSolution
-    buildVS2019x86 "Release-OpenBLAS" isIncremental !! "MathNet.Numerics.OpenBLAS.sln"
-    buildVS2019x64 "Release-OpenBLAS" isIncremental !! "MathNet.Numerics.OpenBLAS.sln"
+    buildVS2022x86 "Release-OpenBLAS" isIncremental !! "MathNet.Numerics.OpenBLAS.sln"
+    buildVS2022x64 "Release-OpenBLAS" isIncremental !! "MathNet.Numerics.OpenBLAS.sln"
     Directory.create openBlasSolution.OutputZipDir
     zip openBlasWinZipPackage header openBlasSolution.OutputZipDir "out/OpenBLAS/Windows" (fun f -> f.Contains("MathNet.Numerics.Providers.OpenBLAS.") || f.Contains("MathNet.Numerics.OpenBLAS.") || f.Contains("libgcc") || f.Contains("libgfortran") || f.Contains("libopenblas") || f.Contains("libquadmath"))
     Directory.create openBlasSolution.OutputNuGetDir
     nugetPackManually openBlasSolution [ openBlasWinPack ] header
-    
+
     // NuGet Sign (all or nothing)
     if isSign then signNuGet fingerprint timeserver [openBlasSolution]
 
@@ -320,7 +320,7 @@ let initTargets strongname sign incremental =
     "Start" =?> ("Clean", not incremental) ==> "Restore" |> ignore
     Target.create "Prepare" ignore
     "Start" =?> ("Clean", not incremental) ==> "ApplyVersion" ==> "Prepare" |> ignore
-    
+
     // BUILD, SIGN, COLLECT
     Target.create "Build" (``Build`` strongname sign)
     "Prepare" ==> "Build" |> ignore
@@ -330,7 +330,7 @@ let initTargets strongname sign incremental =
     "Prepare" ==> "CudaWinBuild" |> ignore
     Target.create "OpenBlasWinBuild" (``Build OpenBLAS Windows`` incremental sign)
     "Prepare" ==> "OpenBlasWinBuild" |> ignore
-    
+
     // TEST
     Target.create "TestNumerics" ignore
     Target.create "TestNumericsNET50" (``Test Numerics`` "net5.0")
@@ -419,13 +419,13 @@ let initTargets strongname sign incremental =
 
     Target.create "All" ignore
     "All" <== [ "Build"; "Docs"; "Api"; "Test" ]
-    
+
     Target.create "MklWinAll" ignore
     "MklWinAll" <== [ "MklWinBuild"; "MklTest" ]
-    
+
     Target.create "CudaWinAll" ignore
     "CudaWinAll" <== [ "CudaWinBuild"; "CudaTest" ]
-    
+
     Target.create "OpenBlasWinAll" ignore
     "OpenBlasWinAll" <== [ "OpenBlasWinBuild"; "OpenBlasTest" ]
 
@@ -460,7 +460,7 @@ let main argv =
             args |> Seq.contains "--sign" && Environment.isWindows,
             args |> Seq.contains "--incremental"
         | None -> false, false, false
-        
+
     if isStrongname then Trace.log " Option: Strongnamed"
     if isSign then Trace.log " Option: Signed"
     if isIncremental then Trace.log " Option: Incremental"

src/Benchmark/Benchmark.csproj

@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net5.0;net48</TargetFrameworks>
-    <AssemblyName>Benchmark</AssemblyName>
-    <RootNamespace>Benchmark</RootNamespace>
-    <IsPackable>false</IsPackable>
-    <VersionPrefix>5.0.0</VersionPrefix>
-    <VersionSuffix>alpha02</VersionSuffix>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Remove="BenchmarkDotNet.Artifacts\**" />
-    <EmbeddedResource Remove="BenchmarkDotNet.Artifacts\**" />
-    <None Remove="BenchmarkDotNet.Artifacts\**" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Numerics\Numerics.csproj" />
-    <ProjectReference Include="..\Providers.MKL\Providers.MKL.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFrameworks>net5.0;net48</TargetFrameworks>
+        <AssemblyName>Benchmark</AssemblyName>
+        <RootNamespace>Benchmark</RootNamespace>
+        <IsPackable>false</IsPackable>
+        <VersionPrefix>5.0.0</VersionPrefix>
+        <VersionSuffix>alpha02</VersionSuffix>
+        <GenerateDocumentationFile>false</GenerateDocumentationFile>
+    </PropertyGroup>
+    <ItemGroup>
+        <Compile Remove="BenchmarkDotNet.Artifacts\**" />
+        <EmbeddedResource Remove="BenchmarkDotNet.Artifacts\**" />
+        <None Remove="BenchmarkDotNet.Artifacts\**" />
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\Numerics\Numerics.csproj" />
+        <ProjectReference Include="..\Providers.MKL\Providers.MKL.csproj" />
+    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
+        <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
 </Project>

src/Data.Matlab/Data.Matlab.csproj

@@ -42,15 +42,17 @@ Control.Describe now includes CPU architecture and family identifier if know</Pa
         <NeutralLanguage>en</NeutralLanguage>
         <NoPackageAnalysis>false</NoPackageAnalysis>
         <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <EnableDefaultCompileItems>true</EnableDefaultCompileItems>
         <NoWarn>1701;1702;1705;1591;1573</NoWarn>
-        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="..\Numerics\Numerics.csproj" />
     </ItemGroup>
     <ItemGroup>
+      <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
+        <PrivateAssets>all</PrivateAssets>
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      </PackageReference>
       <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/Data.Tests/Data.Tests.csproj

@@ -9,7 +9,7 @@
         <IsPackable>false</IsPackable>
         <VersionPrefix>5.0.0</VersionPrefix>
         <VersionSuffix>alpha02</VersionSuffix>
-        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+        <GenerateDocumentationFile>false</GenerateDocumentationFile>
     </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="..\Numerics\Numerics.csproj" />

src/Data.Text/Data.Text.csproj

@@ -42,15 +42,17 @@ Control.Describe now includes CPU architecture and family identifier if know</Pa
         <NeutralLanguage>en</NeutralLanguage>
         <NoPackageAnalysis>false</NoPackageAnalysis>
         <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <EnableDefaultCompileItems>true</EnableDefaultCompileItems>
         <NoWarn>1701;1702;1705;1591;1573</NoWarn>
-        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="..\Numerics\Numerics.csproj" />
     </ItemGroup>
     <ItemGroup>
+      <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
+        <PrivateAssets>all</PrivateAssets>
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      </PackageReference>
       <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>