Skip to content

Commit 432082d

Browse files
committed
UWP .net 9.0 support
1 parent 42a1582 commit 432082d

File tree

13 files changed

+18
-76
lines changed

13 files changed

+18
-76
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,3 @@ jobs:
2121
name: ${{ github.event.repository.name }} Artifacts
2222
path: |
2323
FNA-NET.NativeAssets/bin/Release/*.nupkg
24-
FNA-NET.NativeAssets.UWP/bin/Release/*.nupkg

FNA-NET.NativeAssets.UWP/FNA-NET.NativeAssets.UWP.csproj

Lines changed: 0 additions & 38 deletions
This file was deleted.

FNA-NET.NativeAssets.UWP/LICENSE.txt

Lines changed: 0 additions & 21 deletions
This file was deleted.

FNA-NET.NativeAssets.sln

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ VisualStudioVersion = 17.0.31903.59
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FNA-NET.NativeAssets", "FNA-NET.NativeAssets\FNA-NET.NativeAssets.csproj", "{BE582835-9F98-4A3D-ABB1-77E51F403848}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FNA-NET.NativeAssets.UWP", "FNA-NET.NativeAssets.UWP\FNA-NET.NativeAssets.UWP.csproj", "{9D7404E8-F2CA-4C76-8963-5D5AB92CB092}"
9-
EndProject
108
Global
119
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1210
Debug|Any CPU = Debug|Any CPU
@@ -29,18 +27,6 @@ Global
2927
{BE582835-9F98-4A3D-ABB1-77E51F403848}.Release|x64.Build.0 = Release|Any CPU
3028
{BE582835-9F98-4A3D-ABB1-77E51F403848}.Release|x86.ActiveCfg = Release|Any CPU
3129
{BE582835-9F98-4A3D-ABB1-77E51F403848}.Release|x86.Build.0 = Release|Any CPU
32-
{9D7404E8-F2CA-4C76-8963-5D5AB92CB092}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33-
{9D7404E8-F2CA-4C76-8963-5D5AB92CB092}.Debug|Any CPU.Build.0 = Debug|Any CPU
34-
{9D7404E8-F2CA-4C76-8963-5D5AB92CB092}.Debug|x64.ActiveCfg = Debug|Any CPU
35-
{9D7404E8-F2CA-4C76-8963-5D5AB92CB092}.Debug|x64.Build.0 = Debug|Any CPU
36-
{9D7404E8-F2CA-4C76-8963-5D5AB92CB092}.Debug|x86.ActiveCfg = Debug|Any CPU
37-
{9D7404E8-F2CA-4C76-8963-5D5AB92CB092}.Debug|x86.Build.0 = Debug|Any CPU
38-
{9D7404E8-F2CA-4C76-8963-5D5AB92CB092}.Release|Any CPU.ActiveCfg = Release|Any CPU
39-
{9D7404E8-F2CA-4C76-8963-5D5AB92CB092}.Release|Any CPU.Build.0 = Release|Any CPU
40-
{9D7404E8-F2CA-4C76-8963-5D5AB92CB092}.Release|x64.ActiveCfg = Release|Any CPU
41-
{9D7404E8-F2CA-4C76-8963-5D5AB92CB092}.Release|x64.Build.0 = Release|Any CPU
42-
{9D7404E8-F2CA-4C76-8963-5D5AB92CB092}.Release|x86.ActiveCfg = Release|Any CPU
43-
{9D7404E8-F2CA-4C76-8963-5D5AB92CB092}.Release|x86.Build.0 = Release|Any CPU
4430
EndGlobalSection
4531
GlobalSection(SolutionProperties) = preSolution
4632
HideSolutionNode = FALSE

FNA-NET.NativeAssets/FNA-NET.NativeAssets.csproj

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;net8.0;net8.0-windows;net8.0-android;net8.0-ios;net8.0-tvos</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0;net8.0;net8.0-windows;net8.0-android;net8.0-ios;net8.0-tvos;net9.0-windows10.0.26100.0</TargetFrameworks>
4+
<EnableWindowsTargeting>true</EnableWindowsTargeting>
45
<RootNamespace>Microsoft.Xna.Framework</RootNamespace>
56
<AssemblyName>FNA.NET.NativeAssets</AssemblyName>
67
<EnableDefaultItems>false</EnableDefaultItems>
7-
<VersionPrefix>2.0.1.2506</VersionPrefix>
8+
<VersionPrefix>2.1.0.2506</VersionPrefix>
89
<VersionSuffix></VersionSuffix>
910
</PropertyGroup>
1011

@@ -39,6 +40,10 @@
3940
<ObjcBindingCoreSource Include="Dummy.cs" Exclude="" />
4041
</ItemGroup>
4142

43+
<PropertyGroup Condition="'$(TargetFramework)' == 'net9.0-windows10.0.26100.0'">
44+
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
45+
</PropertyGroup>
46+
4247
<ItemGroup>
4348
<None Include="runtimes\FAudio\win-x64\FAudio.dll" Pack="true" PackagePath="runtimes\win-x64\native\"/>
4449
<None Include="runtimes\FAudio\linux-x64\libFAudio.so.0" Pack="true" PackagePath="runtimes\linux-x64\native\"/>
@@ -128,4 +133,15 @@
128133
<ForceLoad>True</ForceLoad>
129134
</NativeReference>
130135
</ItemGroup>
136+
137+
<ItemGroup>
138+
<None Include="runtimes\FAudio\win10-x64\FAudio.dll" Pack="true" PackagePath="runtimes\win-x64\native_uap\"/>
139+
<None Include="runtimes\FAudio\win10-x64\FAudio.pri" Pack="true" PackagePath="runtimes\win-x64\native_uap\"/>
140+
<None Include="runtimes\FNA3D\win10-x64\FNA3D.dll" Pack="true" PackagePath="runtimes\win-x64\native_uap\"/>
141+
<None Include="runtimes\FNA3D\win10-x64\FNA3D.pri" Pack="true" PackagePath="runtimes\win-x64\native_uap\"/>
142+
<None Include="runtimes\theorafile\win10-x64\libtheorafile.dll" Pack="true" PackagePath="runtimes\win-x64\native_uap\"/>
143+
<None Include="runtimes\theorafile\win10-x64\libtheorafile.pri" Pack="true" PackagePath="runtimes\win-x64\native_uap\"/>
144+
<None Include="runtimes\SDL2\win10-x64\SDL2.dll" Pack="true" PackagePath="runtimes\win-x64\native_uap\"/>
145+
<None Include="runtimes\SDL2\win10-x64\SDL2.pri" Pack="true" PackagePath="runtimes\win-x64\native_uap\"/>
146+
</ItemGroup>
131147
</Project>

FNA-NET.NativeAssets.UWP/runtimes/FAudio/win10-x64/FAudio.dll renamed to FNA-NET.NativeAssets/runtimes/FAudio/win10-x64/FAudio.dll

File renamed without changes.

FNA-NET.NativeAssets.UWP/runtimes/FAudio/win10-x64/FAudio.pri renamed to FNA-NET.NativeAssets/runtimes/FAudio/win10-x64/FAudio.pri

File renamed without changes.

FNA-NET.NativeAssets.UWP/runtimes/FNA3D/win10-x64/FNA3D.dll renamed to FNA-NET.NativeAssets/runtimes/FNA3D/win10-x64/FNA3D.dll

File renamed without changes.

FNA-NET.NativeAssets.UWP/runtimes/FNA3D/win10-x64/FNA3D.pri renamed to FNA-NET.NativeAssets/runtimes/FNA3D/win10-x64/FNA3D.pri

File renamed without changes.

FNA-NET.NativeAssets.UWP/runtimes/SDL2/win10-x64/SDL2.dll renamed to FNA-NET.NativeAssets/runtimes/SDL2/win10-x64/SDL2.dll

File renamed without changes.

0 commit comments

Comments
 (0)