Fixed DLL path in nuspec input config (#254)

Deltares · Nov 1, 2023 · 04fea05 · 04fea05
1 parent 1147165
commit 04fea05
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/package/Deltares.MeshKernel.Development.targets b/package/Deltares.MeshKernel.Development.targets
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0"
+  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Target Name="MeshKernelLibsPostBuild" AfterTargets="Build">
     <ItemGroup>
-      <_FilesToCopyMeshKernelLibs Include="$(MSBuildThisFileDirectory)..\..\runtimes\**\*"/>      
+      <_FilesToCopyMeshKernelLibs Include="$(MSBuildThisFileDirectory)..\..\runtimes\**\*"/>
     </ItemGroup>
-    
-    <Copy SourceFiles="@(_FilesToCopyMeshKernelLibs)" DestinationFolder="$(OutDir)\%(RecursiveDir)" SkipUnchangedFiles="true"/>    
+
+    <Copy SourceFiles="@(_FilesToCopyMeshKernelLibs)" DestinationFolder="$(OutDir)\%(RecursiveDir)" SkipUnchangedFiles="true"/>
   </Target>
-  
+
   <Target Name="MeshKernelLibsClean" AfterTargets="Clean">
     <ItemGroup>
       <_OriginalFilesMeshKernel Include="$(MSBuildThisFileDirectory)..\..\runtimes\**\*"/>
-      <_FilesToCleanMeshKernel Include="$(OutDir)\%(_OriginalFilesDimrLibs.RecursiveDir)%(_OriginalFilesDimrLibs.FileName)%(_OriginalFilesDimrLibs.Extension)"/>      
+      <_FilesToCleanMeshKernel Include="$(OutDir)\%(_OriginalFilesDimrLibs.RecursiveDir)%(_OriginalFilesDimrLibs.FileName)%(_OriginalFilesDimrLibs.Extension)"/>
     </ItemGroup>
-    <Delete Files="@(_FilesToCleanMeshKernel)"/>    
+    <Delete Files="@(_FilesToCleanMeshKernel)"/>
   </Target>
 </Project>
diff --git a/package/Deltares.MeshKernel.Release.nuspec.in b/package/Deltares.MeshKernel.Release.nuspec.in
@@ -9,7 +9,7 @@
         <copyright>Copyright 2021</copyright>
     </metadata>
     <files>
-        <file src="..\libs\MeshKernelApi\Release\*" target="native\Lib" />
-        <file src="Deltares.MeshKernel.Release.targets" target="build\net461\Deltares.MeshKernel.targets" />
+        <file src="..\libs\MeshKernelApi\Release\*" target="runtimes/win-x64/native/" />
+        <file src="Deltares.MeshKernel.Release.targets" target="build\netstandard2.0\Deltares.MeshKernel.targets" />
     </files>
 </package>
diff --git a/package/Deltares.MeshKernel.Release.targets b/package/Deltares.MeshKernel.Release.targets
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0"
+  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Target Name="MeshKernelLibsPostBuild" AfterTargets="Build">
     <ItemGroup>
-      <_FilesToCopyMeshKernelLibs Include="$(MSBuildThisFileDirectory)..\..\native\**\*"/>      
+      <_FilesToCopyMeshKernelLibs Include="$(MSBuildThisFileDirectory)..\..\runtimes\**\*"/>
     </ItemGroup>
-    
-    <Copy SourceFiles="@(_FilesToCopyMeshKernelLibs)" DestinationFolder="$(OutDir)\%(RecursiveDir)" SkipUnchangedFiles="true"/>    
+
+    <Copy SourceFiles="@(_FilesToCopyMeshKernelLibs)" DestinationFolder="$(OutDir)\%(RecursiveDir)" SkipUnchangedFiles="true"/>
   </Target>
-  
+
   <Target Name="MeshKernelLibsClean" AfterTargets="Clean">
     <ItemGroup>
-      <_OriginalFilesMeshKernel Include="$(MSBuildThisFileDirectory)..\..\native\**\*"/>
-      <_FilesToCleanMeshKernel Include="$(OutDir)\%(_OriginalFilesDimrLibs.RecursiveDir)%(_OriginalFilesDimrLibs.FileName)%(_OriginalFilesDimrLibs.Extension)"/>      
+      <_OriginalFilesMeshKernel Include="$(MSBuildThisFileDirectory)..\..\runtimes\**\*"/>
+      <_FilesToCleanMeshKernel Include="$(OutDir)\%(_OriginalFilesDimrLibs.RecursiveDir)%(_OriginalFilesDimrLibs.FileName)%(_OriginalFilesDimrLibs.Extension)"/>
     </ItemGroup>
-    <Delete Files="@(_FilesToCleanMeshKernel)"/>    
+    <Delete Files="@(_FilesToCleanMeshKernel)"/>
   </Target>
 </Project>
diff --git a/package/version.rc.in b/package/version.rc.in
@@ -6,7 +6,7 @@
 
 // @MAJOR@,@MINOR@,@BUILD@,@PATCH@
 #define VER_FILEVERSION		@PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,0
-#define VER_FILEVERSION_STR	"@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@@VERSION_SUFFIX@\0"
+#define VER_FILEVERSION_STR	"@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@.@VERSION_SUFFIX@\0"
 
 #define VER_PRODUCTVERSION	VER_FILEVERSION
 #define VER_PRODUCTVERSION_STR	VER_FILEVERSION_STR