Merge pull request #37 from NHSISL/users/cjdutoit/releases-v1.0.0.3

RELEASES: v1.0.0.4
NHSISL · May 20, 2024 · 464f77a · 464f77a
2 parents e5cd419 + 58ad838
commit 464f77a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/NHSISL.LibPostalClient/NHSISL.LibPostalClient.csproj b/NHSISL.LibPostalClient/NHSISL.LibPostalClient.csproj
@@ -16,9 +16,9 @@
 
 		<PackageIcon>LibPostalClient.png</PackageIcon>
 		<PackageIconUrl />
-		<Version>1.0.0.3</Version>
-		<AssemblyVersion>1.0.0.3</AssemblyVersion>
-		<FileVersion>1.0.0.3</FileVersion>
+		<Version>1.0.0.4</Version>
+		<AssemblyVersion>1.0.0.4</AssemblyVersion>
+		<FileVersion>1.0.0.4</FileVersion>
 		<NeutralLanguage>en-US</NeutralLanguage>
 		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
 		<PackageLicenseFile>License.txt</PackageLicenseFile>
@@ -56,7 +56,7 @@
 	<ItemGroup>
 		<Content Include="libpostal.h" />
 		<Content Include="libpostal-1.dll" PackagePath="contentFiles/any/net8.0/windows/libpostal-1.dll" />
-		<Content Include="libpostal-1.so" PackagePath="contentFiles/any/net8.0/linux_x86_64/libpostal-1.dll" />
+		<Content Include="libpostal-1.so" PackagePath="contentFiles/any/net8.0/linux_x86_64/libpostal-1.so" />
 		<Content Include="NHSISL.LibPostalClient.targets" PackagePath="build\NHSISL.LibPostalClient.targets" />
 	</ItemGroup>
 

diff --git a/NHSISL.LibPostalClient/NHSISL.LibPostalClient.targets b/NHSISL.LibPostalClient/NHSISL.LibPostalClient.targets
@@ -2,7 +2,9 @@
 
 	<ItemGroup>
 		<WindowsNativeFiles Include="$(MSBuildThisFileDirectory)\..\contentFiles\any\net8.0\windows\libpostal-1.dll" />
-		<LinuxNativeFiles Include="$(MSBuildThisFileDirectory)\..\contentFiles\any\net8.0\linux_x86_64\libpostal-1.dll" />
+		<WindowsHeaders Include="$(MSBuildThisFileDirectory)\..\contentFiles\any\net8.0\windows\libpostal.h" />
+		<LinuxNativeFiles Include="$(MSBuildThisFileDirectory)\..\contentFiles\any\net8.0\linux_x86_64\libpostal-1.so" />
+		<LinuxHeaders Include="$(MSBuildThisFileDirectory)\..\contentFiles\any\net8.0\linux_x86_64\libpostal.h" />
 	</ItemGroup>
 
 	<Target Name="CleanLibPostal" AfterTargets="Clean">
@@ -45,4 +47,12 @@
 		<Copy SourceFiles="@(LinuxNativeFiles)" DestinationFolder="$(PublishDir)"/>
 	</Target>
 
+	<Target Name="CopyLibPostalFiles" BeforeTargets="Build">
+		<Message Importance="high" Text="Copying libpostal library files to output directory" />
+		<Copy SourceFiles="@(WindowsNativeFiles)" DestinationFolder="$(TargetDir)" Condition="'$(OS)' == 'Windows_NT'"/>
+		<Copy SourceFiles="@(WindowsHeaders)" DestinationFolder="$(TargetDir)" Condition="'$(OS)' == 'Windows_NT'"/>
+		<Copy SourceFiles="@(LinuxNativeFiles)" DestinationFolder="$(TargetDir)" Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'"/>
+		<Copy SourceFiles="@(LinuxHeaders)" DestinationFolder="$(TargetDir)" Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'"/>
+	</Target>
+
 </Project>