[.NET] Update Cantera.csproj to simplify setting up dev environment

We’re able to use the same basic native library name (“cantera_shared”) on all systems and copy that native library and example data files directly from the upstream SCons build output and data directory.
Cantera · Aug 17, 2022 · 8859643 · 8859643
1 parent fd29c09
commit 8859643
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 25 deletions.
diff --git a/interfaces/dotnet/.gitignore b/interfaces/dotnet/.gitignore
@@ -35,6 +35,3 @@ msbuild.wrn
 
 # Visual Studio 2015
 .vs/
-
-lib/
-content/
diff --git a/interfaces/dotnet/Cantera/Cantera.csproj b/interfaces/dotnet/Cantera/Cantera.csproj
@@ -11,26 +11,24 @@
     <IsPackable>false</IsPackable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
 
-    <LibDir>$([MSBuild]::NormalizePath($(MSBuildProjectDirectory)/../lib))</LibDir>
-    <ContentDir>$([MSBuild]::NormalizePath($(MSBuildProjectDirectory)/../content))</ContentDir>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">
-    <DefineConstants>IS_WINDOWS</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">
-    <DefineConstants>IS_MACOS</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">
-    <DefineConstants>IS_LINUX</DefineConstants>
+    <LibDir>$([MSBuild]::NormalizePath($(MSBuildProjectDirectory)/../../../build/lib))</LibDir>
+    <DataDir>$([MSBuild]::NormalizePath($(MSBuildProjectDirectory)/../../../data))</DataDir>
   </PropertyGroup>
 
   <ItemGroup>
     <InternalsVisibleTo Include="Cantera.Tests" />
 
-    <None Include="$(LibDir)/*" CopyToOutputDirectory="PreserveNewest"/>
+    <None Include="$(DataDir)/*" CopyToOutputDirectory="PreserveNewest" LinkBase="data/" />
+  </ItemGroup>
 
-    <None Include="$(ContentDir)/**" CopyToOutputDirectory="PreserveNewest"/>
+  <ItemGroup Condition="$([MSBuild]::IsOsPlatform(Windows))">
+    <None Include="$(LibDir)/cantera_shared.dll" CopyToOutputDirectory="PreserveNewest"/>
+  </ItemGroup>
+  <ItemGroup Condition="$([MSBuild]::IsOsPlatform(OSX))">
+    <None Include="$(LibDir)/libcantera_shared.dylib" CopyToOutputDirectory="PreserveNewest"/>
+  </ItemGroup>
+  <ItemGroup Condition="$([MSBuild]::IsOsPlatform(Linux))">
+    <None Include="$(LibDir)/libcantera_shared.so" CopyToOutputDirectory="PreserveNewest"/>
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
@@ -47,7 +45,8 @@
       <GeneratedPath>$([MSBuild]::NormalizePath($(IntermediateOutputPath)/sourcegen/))</GeneratedPath>
     </PropertyGroup>
 
-    <Exec Command="python3 $(Script) csharp $(GeneratedPath)" Condition="'$(GenerateInterop)' == 'true' Or !Exists('$(GeneratedPath)')"/>
+    <Exec Command="python3 $(Script) csharp $(GeneratedPath)"
+      Condition="'$(GenerateInterop)' == 'true' Or !Exists('$(GeneratedPath)')"/>
 
     <ItemGroup>
       <Compile Remove="$(GeneratedPath)*.cs" />

diff --git a/interfaces/dotnet/Cantera/src/Interop/LibCantera.cs b/interfaces/dotnet/Cantera/src/Interop/LibCantera.cs
@@ -5,13 +5,7 @@ namespace Cantera.Interop;
 
 static partial class LibCantera
 {
-#if IS_WINDOWS
-    const string LibFile = "cantera.3.0.0.dll";
-#elif IS_MACOS
-    const string LibFile = "cantera.3.0.0.dylib";
-#elif IS_LINUX
-    const string LibFile = "cantera.3.0.0.so";
-#endif
+    const string LibFile = "cantera_shared";
 
     public delegate void LogCallback(LogLevel logLevel, string category, string message);
 }