Merge remote-tracking branch 'opensource/develop' into develop

Yubico · Oct 13, 2023 · ebd735c · ebd735c
2 parents e44ddc7 + bbe13bb
commit ebd735c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Yubico.NativeShims/msbuild/Yubico.NativeShims.targets b/Yubico.NativeShims/msbuild/Yubico.NativeShims.targets
@@ -3,14 +3,14 @@
     <!-- .NET Framework versions don't seem to include the native runtime files that
         are needed for this package. This makes sure they are included in downlevel projects.
         Since .NET Framework is Windows only, we only need to worry about that platform. -->
-    <ItemGroup Condition="'$(Platform)' == 'x86' OR '$(Platform)' == 'AnyCPU'">
+    <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>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
             <Visible>false</Visible>
         </Content>
     </ItemGroup>
-    <ItemGroup Condition="'$(Platform)' == '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>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>