From d0a56695fa93400bd8e185a20d068dc191cce8b6 Mon Sep 17 00:00:00 2001 From: Alexander Luzgarev Date: Sun, 27 May 2018 15:00:25 +0200 Subject: [PATCH] Target .NET Framework 4.6.1 as well as .NET Standard 2.0 --- MatFileHandler/Header.cs | 4 ++++ MatFileHandler/MatFileHandler.csproj | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/MatFileHandler/Header.cs b/MatFileHandler/Header.cs index a291682..f2ade66 100755 --- a/MatFileHandler/Header.cs +++ b/MatFileHandler/Header.cs @@ -80,6 +80,9 @@ namespace MatFileHandler private static string GetOperatingSystem() { +#if NET461 + return "Windows"; +#else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { return "Windows"; @@ -93,6 +96,7 @@ namespace MatFileHandler return "Linux"; } return "Unknown"; +#endif } } } \ No newline at end of file diff --git a/MatFileHandler/MatFileHandler.csproj b/MatFileHandler/MatFileHandler.csproj index d04eb4e..5a9a1d5 100755 --- a/MatFileHandler/MatFileHandler.csproj +++ b/MatFileHandler/MatFileHandler.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.0;net461 1.0.0 MatFileHandler A library for reading and writing MATLAB .mat files. @@ -13,7 +13,7 @@ Matlab https://github.com/mahalex/MatFileHandler bin\$(Configuration)\ - $(OutputPath)\MatFileHandler.xml + $(OutputPath)\$(TargetFramework)\$(AssemblyName).xml true @@ -29,5 +29,6 @@ All + \ No newline at end of file