Merge pull request #1262 from dotnet/arm64-fix-csproj

Fix csproj for arm64 (how did i forget this????)

Author: Perksey

src/Native/Silk.NET.GLFW.Native/Silk.NET.GLFW.Native.csproj

@@ -9,7 +9,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net4.6.1</TargetFrameworks>
     <PackageId>Ultz.Native.GLFW</PackageId> <!-- TODO change this in 3.0 -->
-    <PackageVersion>3.3.8</PackageVersion>
+    <PackageVersion>3.3.9</PackageVersion>
     <Authors>.NET Foundation and Contributors</Authors>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageLicenseExpression>Zlib</PackageLicenseExpression>
@@ -27,6 +27,7 @@
     <Content Include="runtimes\osx-x64\native\libglfw.3.dylib" PackagePath="runtimes\osx-x64\native\libglfw.3.dylib" />
     <Content Include="runtimes\osx-arm64\native\libglfw.3.dylib" PackagePath="runtimes\osx-arm64\native\libglfw.3.dylib" />
     <Content Include="runtimes\win-x64\native\glfw3.dll" PackagePath="runtimes\win-x64\native\glfw3.dll" />
+    <Content Include="runtimes\win-arm64\native\glfw3.dll" PackagePath="runtimes\win-arm64\native\glfw3.dll" />
     <Content Include="runtimes\win-x86\native\glfw3.dll" PackagePath="runtimes\win-x86\native\glfw3.dll" />
   </ItemGroup>
 

src/Native/Silk.NET.GLFW.Native/build/net461/Ultz.Native.GLFW.props

@@ -9,9 +9,11 @@
     <_Ultz_NativePackages_GLFW_NativeRuntime Condition=" '$(_Ultz_NativePackages_GLFW_NativeRuntime)' == '' And '$(_Ultz_NativePackages_GLFW_IsLinux)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">linux-x64</_Ultz_NativePackages_GLFW_NativeRuntime>
     <_Ultz_NativePackages_GLFW_NativeRuntime Condition=" '$(_Ultz_NativePackages_GLFW_NativeRuntime)' == '' And '$(_Ultz_NativePackages_GLFW_IsWindows)' == 'true' And ('$(Prefer32Bit)' == 'true' Or '$(PlatformTarget)' == 'x86')">win-x86</_Ultz_NativePackages_GLFW_NativeRuntime>
     <_Ultz_NativePackages_GLFW_NativeRuntime Condition=" '$(_Ultz_NativePackages_GLFW_NativeRuntime)' == '' And '$(_Ultz_NativePackages_GLFW_IsWindows)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">win-x64</_Ultz_NativePackages_GLFW_NativeRuntime>
+    <_Ultz_NativePackages_GLFW_NativeRuntime Condition=" '$(_Ultz_NativePackages_GLFW_NativeRuntime)' == '' And '$(_Ultz_NativePackages_GLFW_IsWindows)' == 'true' And '$(PlatformTarget)' == 'arm64'">win-arm64</_Ultz_NativePackages_GLFW_NativeRuntime>
 
     <_Ultz_NativePackages_GLFW_NativeLibName Condition="'$(_Ultz_NativePackages_GLFW_NativeRuntime)' == 'win-x86'">glfw3.dll</_Ultz_NativePackages_GLFW_NativeLibName>
     <_Ultz_NativePackages_GLFW_NativeLibName Condition="'$(_Ultz_NativePackages_GLFW_NativeRuntime)' == 'win-x64'">glfw3.dll</_Ultz_NativePackages_GLFW_NativeLibName>
+    <_Ultz_NativePackages_GLFW_NativeLibName Condition="'$(_Ultz_NativePackages_GLFW_NativeRuntime)' == 'win-arm64'">glfw3.dll</_Ultz_NativePackages_GLFW_NativeLibName>
     <_Ultz_NativePackages_GLFW_NativeLibName Condition="'$(_Ultz_NativePackages_GLFW_NativeRuntime)' == 'osx-x64'">libglfw.3.dylib</_Ultz_NativePackages_GLFW_NativeLibName>
     <_Ultz_NativePackages_GLFW_NativeLibName Condition="'$(_Ultz_NativePackages_GLFW_NativeRuntime)' == 'linux-x64'">libglfw.so.3</_Ultz_NativePackages_GLFW_NativeLibName>
   </PropertyGroup>

src/Native/Silk.NET.SDL.Native/Silk.NET.SDL.Native.csproj

@@ -9,7 +9,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net4.6.1</TargetFrameworks>
     <PackageId>Ultz.Native.SDL</PackageId> <!-- TODO change this in 3.0 -->
-    <PackageVersion>2.24.2</PackageVersion>
+    <PackageVersion>2.24.3</PackageVersion>
     <Authors>.NET Foundation and Contributors</Authors>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageLicenseExpression>Zlib</PackageLicenseExpression>
@@ -26,6 +26,7 @@
     <Content Include="runtimes\linux-x64\native\libSDL2-2.0.so" PackagePath="runtimes\linux-x64\native\libSDL2-2.0.so" />
     <Content Include="runtimes\osx-x64\native\libSDL2-2.0.dylib" PackagePath="runtimes\osx-x64\native\libSDL2-2.0.dylib" />
     <Content Include="runtimes\win-x64\native\SDL2.dll" PackagePath="runtimes\win-x64\native\SDL2.dll" />
+    <Content Include="runtimes\win-arm64\native\SDL2.dll" PackagePath="runtimes\win-arm64\native\SDL2.dll" />
   </ItemGroup>
 
 </Project>

src/Native/Silk.NET.SDL.Native/build/net461/Ultz.Native.SDL.props

@@ -9,9 +9,11 @@
     <_Ultz_NativePackages_SDL_NativeRuntime Condition=" '$(_Ultz_NativePackages_SDL_NativeRuntime)' == '' And '$(_Ultz_NativePackages_SDL_IsLinux)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">linux-x64</_Ultz_NativePackages_SDL_NativeRuntime>
     <_Ultz_NativePackages_SDL_NativeRuntime Condition=" '$(_Ultz_NativePackages_SDL_NativeRuntime)' == '' And '$(_Ultz_NativePackages_SDL_IsWindows)' == 'true' And ('$(Prefer32Bit)' == 'true' Or '$(PlatformTarget)' == 'x86')">win-x86</_Ultz_NativePackages_SDL_NativeRuntime>
     <_Ultz_NativePackages_SDL_NativeRuntime Condition=" '$(_Ultz_NativePackages_SDL_NativeRuntime)' == '' And '$(_Ultz_NativePackages_SDL_IsWindows)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">win-x64</_Ultz_NativePackages_SDL_NativeRuntime>
+    <_Ultz_NativePackages_SDL_NativeRuntime Condition=" '$(_Ultz_NativePackages_SDL_NativeRuntime)' == '' And '$(_Ultz_NativePackages_SDL_IsWindows)' == 'true' And '$(PlatformTarget)' == 'arm64'">win-arm64</_Ultz_NativePackages_SDL_NativeRuntime>
 
     <_Ultz_NativePackages_SDL_NativeLibName Condition="'$(_Ultz_NativePackages_SDL_NativeRuntime)' == 'win-x86'">SDL2.dll</_Ultz_NativePackages_SDL_NativeLibName>
     <_Ultz_NativePackages_SDL_NativeLibName Condition="'$(_Ultz_NativePackages_SDL_NativeRuntime)' == 'win-x64'">SDL2.dll</_Ultz_NativePackages_SDL_NativeLibName>
+    <_Ultz_NativePackages_SDL_NativeLibName Condition="'$(_Ultz_NativePackages_SDL_NativeRuntime)' == 'win-arm64'">SDL2.dll</_Ultz_NativePackages_SDL_NativeLibName>
     <_Ultz_NativePackages_SDL_NativeLibName Condition="'$(_Ultz_NativePackages_SDL_NativeRuntime)' == 'osx-x64'">libSDL-2.0.dylib</_Ultz_NativePackages_SDL_NativeLibName>
     <_Ultz_NativePackages_SDL_NativeLibName Condition="'$(_Ultz_NativePackages_SDL_NativeRuntime)' == 'linux-x64'">libSDL2-2.0.so</_Ultz_NativePackages_SDL_NativeLibName>
   </PropertyGroup>

src/Windowing/Silk.NET.GLFW/Silk.NET.GLFW.csproj

@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Ultz.Native.GLFW" Version="3.3.3.1" />
+      <PackageReference Include="Ultz.Native.GLFW" Version="3.3.*" />
     </ItemGroup>
 
     <Import Project="..\..\..\build\props\bindings.props" />

src/Windowing/Silk.NET.SDL/Silk.NET.SDL.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Ultz.Native.SDL" Version="2.0.14.1" />
+    <PackageReference Include="Ultz.Native.SDL" Version="2.*" />
   </ItemGroup>
 
   <ItemGroup>