[.NET] Clean-up project files

Ensures that the Cantera native libs and example data files are copied to output directories. The Cantera project is marked not-packable. We’ll need a separate project that gathers all the native libs and managed assemblies for creating a complete nuget package for upload to NuGet.org
Cantera · Aug 17, 2022 · fbaa5d1 · fbaa5d1
1 parent e2fabf9
commit fbaa5d1
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 31 deletions.
diff --git a/interfaces/dotnet/.gitignore b/interfaces/dotnet/.gitignore
@@ -36,4 +36,5 @@ msbuild.wrn
 # Visual Studio 2015
 .vs/
 
-lib
+lib/
+content/
diff --git a/interfaces/dotnet/Cantera.Examples/Cantera.Examples.csproj b/interfaces/dotnet/Cantera.Examples/Cantera.Examples.csproj
@@ -6,21 +6,11 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="../Cantera/Cantera.csproj" />
-
-    <None Include="../../../data/gri30.yaml" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
-  <Target Name="CopyLibraries" AfterTargets="AfterBuild">
-
-    <ItemGroup>
-      <Libraries Include="$([MSBuild]::NormalizePath(../lib/))*" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(Libraries)" DestinationFolder="$(OutDir)" />
-  </Target>
-
 </Project>
diff --git a/interfaces/dotnet/Cantera.Tests/Cantera.Tests.csproj b/interfaces/dotnet/Cantera.Tests/Cantera.Tests.csproj
@@ -21,17 +21,6 @@
     </PackageReference>
 
     <ProjectReference Include="../Cantera/Cantera.csproj" />
-
-    <None Include="../../../data/gri30.yaml" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
-  <Target Name="CopyLibraries" AfterTargets="AfterBuild">
-
-    <ItemGroup>
-      <Libraries Include="$([MSBuild]::NormalizePath(../lib/))*" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(Libraries)" DestinationFolder="$(OutDir)" />
-  </Target>
-
 </Project>
diff --git a/interfaces/dotnet/Cantera/Cantera.csproj b/interfaces/dotnet/Cantera/Cantera.csproj
@@ -8,22 +8,28 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AssemblyName>CanteraDotNet</AssemblyName>
+    <IsPackable>false</IsPackable>
+
+    <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> 
+    <DefineConstants>IS_MACOS</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">
     <DefineConstants>IS_LINUX</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
-    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
-      <_Parameter1>Cantera.Tests</_Parameter1>
-    </AssemblyAttribute>
+    <InternalsVisibleTo Include="Cantera.Tests" />
+
+    <None Include="$(LibDir)/*" CopyToOutputDirectory="PreserveNewest"/>
+
+    <None Include="$(ContentDir)/**" CopyToOutputDirectory="PreserveNewest"/>
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
@@ -40,11 +46,11 @@
       <GeneratedPath>$([MSBuild]::NormalizePath($(IntermediateOutputPath)/sourcegen/))</GeneratedPath>
     </PropertyGroup>
 
-    <Exec Command="python3 $(Script) csharp $(GeneratedPath)"/>
+    <Exec Command="python3 $(Script) csharp $(GeneratedPath)" Condition="'$(GenerateInterop)' == 'true' Or !Exists('$(GeneratedPath)')"/>
 
     <ItemGroup>
-			<Compile Remove="$(GeneratedPath)*.cs" />
-			<Compile Include="$(GeneratedPath)*.cs" />
+      <Compile Remove="$(GeneratedPath)*.cs" />
+      <Compile Include="$(GeneratedPath)*.cs" />
     </ItemGroup>
   </Target>
 </Project>
diff --git a/interfaces/dotnet/Cantera/src/CanteraInfo.cs b/interfaces/dotnet/Cantera/src/CanteraInfo.cs
@@ -47,7 +47,7 @@ public void Add(DirectoryInfo dir)
             _dirs.GetEnumerator();
 
         public void AddAssemblyDirectory() =>
-            Add(Path.GetDirectoryName(GetType().Assembly.Location)!);
+            Add(Path.Combine(Path.GetDirectoryName(GetType().Assembly.Location)!, "data"));
     }
 
     unsafe static readonly Lazy<string> _version =