aecw/osu-framework
1
0
Fork 0
mirror of https://github.com/SK-la/osu-framework.git synced 2026-03-15 03:20:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move framework projects away from .NET Standard

Browse Source
This commit is contained in:
Salman Ahmed
2022-12-12 14:18:19 +03:00
parent 4d7dccbec4
commit 841a2d0300
7 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SampleGame/SampleGame.csproj
View File

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="..\osu.Framework\osu.Framework.csproj" />

4
osu.Framework.Templates/osu.Framework.Templates.csproj
View File

@@ -5,7 +5,7 @@
<Title>osu! framework templates</Title>
<Description>Templates that can be used as starting points for new games, built with of osu! framework.</Description>
<PackageTags>dotnet-new;templates;osu;framework</PackageTags>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<IncludeContentInPack>true</IncludeContentInPack>
<IncludeBuildOutput>false</IncludeBuildOutput>
<ContentTargetFolders>content</ContentTargetFolders>
@@ -18,4 +18,4 @@
<Content Include="templates\**\*" Exclude="templates\**\bin\**;templates\**\obj\**" />
<Compile Remove="**\*" />
</ItemGroup>
</Project>
</Project>

2
osu.Framework.Templates/templates/template-empty/TemplateGame.Game/TemplateGame.Game.csproj
View File

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\TemplateGame.Resources\TemplateGame.Resources.csproj" />

2
osu.Framework.Templates/templates/template-empty/TemplateGame.Resources/TemplateGame.Resources.csproj
View File

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="Fonts\**\*" />

2
osu.Framework.Templates/templates/template-flappy/FlappyDon.Game/FlappyDon.Game.csproj
View File

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\FlappyDon.Resources\FlappyDon.Resources.csproj" />

2
osu.Framework.Templates/templates/template-flappy/FlappyDon.Resources/FlappyDon.Resources.csproj
View File

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="Fonts\**\*" />

13
osu.Framework/osu.Framework.csproj
View File

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup Label="Project">
<TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
<TargetFramework>net6.0</TargetFramework>
<OutputType>Library</OutputType>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AssemblyTitle>osu!framework</AssemblyTitle>
@@ -32,12 +32,17 @@
<PackageReference Include="ManagedBass.Fx" Version="3.1.0" />
<PackageReference Include="ManagedBass.Mix" Version="3.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="OpenTabletDriver" Version="0.6.0.4" />
<PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
<PackageReference Include="ppy.osuTK.NS20" Version="1.0.211" />
<PackageReference Include="StbiSharp" Version="1.1.0" />
<PackageReference Include="ppy.SDL2-CS" Version="1.0.630-alpha" />
<PackageReference Include="ppy.osu.Framework.SourceGeneration" Version="2022.1205.0" />
<!-- DO NOT use ProjectReference for native packaging project.
See https://github.com/NuGet/Home/issues/4514 and https://github.com/dotnet/sdk/issues/765 . -->
<PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2022.525.0" />
<!-- Any version ahead of this will cause AOT issues with iOS
See https://github.com/mono/mono/issues/21188 -->
<PackageReference Include="Microsoft.Diagnostics.Runtime" Version="2.0.161401" />
@@ -46,10 +51,4 @@
See https://github.com/xoofx/markdig/issues/564 -->
<PackageReference Include="Markdig" Version="0.23.0" />
</ItemGroup>
<ItemGroup Condition="$(TargetFrameworkIdentifier) == '.NETCoreApp'">
<PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2022.525.0" />
<!-- DO NOT use ProjectReference for native packaging project.
See https://github.com/NuGet/Home/issues/4514 and https://github.com/dotnet/sdk/issues/765 . -->
<PackageReference Include="OpenTabletDriver" Version="0.6.0.4" />
</ItemGroup>
</Project>