Merge pull request #211 from Yubico/bug/193-nativeshims

fix(net47): NativeShims correctly outputs net47 dlls in the correct folders

Author: DennisDyallo

Yubico.Core/src/Yubico/PlatformInterop/Libraries.Net47.cs

@@ -16,6 +16,7 @@
 
 using System;
 using System.IO;
+using System.Runtime.InteropServices;
 
 namespace Yubico.PlatformInterop
 {
@@ -72,9 +73,13 @@ private static class Net47Implementation
             private static string NativeShimsPath =>
                 Path.Combine(
                     AppDomain.CurrentDomain.BaseDirectory,
-                    Environment.Is64BitProcess
-                        ? "x64"
-                        : "x86",
+                    RuntimeInformation.OSArchitecture switch
+                    {
+                        Architecture.X86 => "x86",
+                        Architecture.X64 => "x64",
+                        Architecture.Arm64 => "arm64",
+                        var unsupportedArch  => throw new ArgumentOutOfRangeException($"Architecture {unsupportedArch } is not supported!")
+                    },
                     NativeShims);
 
             /// <summary>

Yubico.NativeShims/msbuild/Yubico.NativeShims.targets

@@ -9,7 +9,7 @@
     <!-- x86 -->
     <ItemGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'X86' OR '$(Platform)' == 'x86'">
         <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x86\native\Yubico.NativeShims.dll">
-            <Link>Yubico.NativeShims.dll</Link>
+            <Link>x86\Yubico.NativeShims.dll</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
             <Visible>false</Visible>
         </Content>
@@ -18,16 +18,16 @@
     <!-- x64 -->
     <ItemGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'X64' OR '$(Platform)' == 'x64'">
         <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\Yubico.NativeShims.dll">
-            <Link>Yubico.NativeShims.dll</Link>
+            <Link>x64\Yubico.NativeShims.dll</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
             <Visible>false</Visible>
         </Content>
     </ItemGroup>
 
     <!-- Arm64 -->
-    <ItemGroup Condition="'$(Platform)' == 'arm64'">
+    <ItemGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'Arm64' OR '$(Platform)' == 'arm64'">
         <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-arm64\native\Yubico.NativeShims.dll">
-            <Link>Yubico.NativeShims.dll</Link>
+            <Link>arm64\Yubico.NativeShims.dll</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
             <Visible>false</Visible>
         </Content>
@@ -45,5 +45,10 @@
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
             <Visible>false</Visible>
         </Content>
+        <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-arm64\native\Yubico.NativeShims.dll">
+            <Link>arm64\Yubico.NativeShims.dll</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Visible>false</Visible>
+        </Content>
     </ItemGroup>
-</Project>
+</Project>