Nuget package 1.0.0

bhrnjica · Jun 23, 2021 · 6847cb4 · 6847cb4
1 parent 8a17255
commit 6847cb4
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 15 deletions.
diff --git a/Daany.LinA-linux-x64.nuspec b/Daany.LinA-linux-x64.nuspec
@@ -18,7 +18,9 @@
         <tags>linear algebra, math, matrix, lapack, blass, data preparation, data analytics</tags>
         <dependencies>
 		<group targetFramework=".NETStandard2.1">
-			<dependency id="MKL.NET.linux-x64" version="2020.4.304" />			
+			<dependency id="intelmkl.devel.linux-x64" version="2020.4.304" />
+			<dependency id="intelopenmp.devel.linux" version="2021.2.0.610" />	
+			<dependency id="inteltbb.devel.linux" version="2021.2.0.357" />			
 		</group>			
         </dependencies>
     </metadata>

diff --git a/Daany.LinA-win-x64.nuspec b/Daany.LinA-win-x64.nuspec
@@ -18,7 +18,9 @@
         <tags>linear algebra, math, matrix, lapack, blass, data preparation, data analytics</tags>
         <dependencies>
 		<group targetFramework=".NETStandard2.1">
-			<dependency id="MKL.NET.win-x64" version="2021.2.0.296" />				
+			<dependency id="intelmkl.redist.win-x64" version="2021.2.0.296" />	
+			<dependency id="intelopenmp.redist.win" version="2021.2.0.616" />
+			<dependency id="inteltbb.redist.win" version="2021.2.0.371" />
 		</group>			
         </dependencies>
     </metadata>

diff --git a/nuget commands.txt b/nuget commands.txt
@@ -1,5 +1,5 @@
 
-msbuild daany.sln -p:Configuration=Release
+dotnet msbuild daany.sln  /p:DefineConstants=LINUX /p:Configuration=Release 
 
 
 

diff --git a/nuget/Daany.DataFrame.1.0.0.nupkg b/nuget/Daany.DataFrame.1.0.0.nupkg
diff --git a/nuget/Daany.DataFrame.Ext.1.0.0.nupkg b/nuget/Daany.DataFrame.Ext.1.0.0.nupkg
diff --git a/nuget/Daany.LinA-linux-x64.1.0.0.nupkg b/nuget/Daany.LinA-linux-x64.1.0.0.nupkg
diff --git a/nuget/Daany.LinA-win-x64.1.0.0.nupkg b/nuget/Daany.LinA-win-x64.1.0.0.nupkg
diff --git a/nuget/Daany.Stat.1.0.0.nupkg b/nuget/Daany.Stat.1.0.0.nupkg
diff --git a/test/XUnit.Test/XUnit.Test.csproj b/test/XUnit.Test/XUnit.Test.csproj
@@ -6,18 +6,6 @@
 		<IsPackable>false</IsPackable>
 		<RootNamespace>Daany.Unit.Test.DataFrame</RootNamespace>
 		<Platforms>AnyCPU;x64</Platforms>
-		<IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
-		<IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
-		<IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(IsWindows)'=='true'">
-		<DefineConstants>Windows</DefineConstants>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(IsOSX)'=='true'">
-		<DefineConstants>OSX</DefineConstants>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(IsLinux)'=='true'">
-		<DefineConstants>Linux</DefineConstants>
 	</PropertyGroup>
 
 	<ItemGroup>