From c3def1cf0038c5a8bcbe35a56914ffeebb25b10b Mon Sep 17 00:00:00 2001 From: smoogipoo <smoogipoo@smgi.me> Date: Tue, 14 Nov 2017 11:14:20 +0900 Subject: [PATCH 1/5] Convert to netstandard1.0 --- .vscode/tasks.json | 17 + osu.Game.Resources/Properties/AssemblyInfo.cs | 38 - osu.Game.Resources/osu.Game.Resources.csproj | 674 +----------------- 3 files changed, 24 insertions(+), 705 deletions(-) create mode 100644 .vscode/tasks.json delete mode 100644 osu.Game.Resources/Properties/AssemblyInfo.cs diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..b5ec7cb --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,17 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [{ + "label": "build", + "command": "dotnet build", + "type": "shell", + "options": { + "cwd": "${workspaceRoot}/osu.Game.Resources" + }, + "group": { + "kind": "build", + "isDefault": true + } + }] +} \ No newline at end of file diff --git a/osu.Game.Resources/Properties/AssemblyInfo.cs b/osu.Game.Resources/Properties/AssemblyInfo.cs deleted file mode 100644 index c7c9a07..0000000 --- a/osu.Game.Resources/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>. -// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE - -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("osu!ui")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("osu!ui")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("d9a367c9-4c1a-489f-9b05-a0cea2b53b58")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/osu.Game.Resources/osu.Game.Resources.csproj b/osu.Game.Resources/osu.Game.Resources.csproj index e311c1a..d0bcc8e 100644 --- a/osu.Game.Resources/osu.Game.Resources.csproj +++ b/osu.Game.Resources/osu.Game.Resources.csproj @@ -1,672 +1,12 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{D9A367C9-4C1A-489F-9B05-A0CEA2B53B58}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>osu.Game.Resources</RootNamespace> - <AssemblyName>osu.Game.Resources</AssemblyName> - <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> - <FileAlignment>512</FileAlignment> - <TargetFrameworkProfile /> + <TargetFramework>netstandard1.0</TargetFramework> + <Title>osu!ui</Title> + <Product>osu!ui</Product> + <Company>ppy Pty Ltd</Company> + <Copyright>ppy Pty Ltd 2007-2017</Copyright> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>bin\Debug\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <LangVersion>6</LangVersion> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <ItemGroup> - <Reference Include="System" /> - <Reference Include="System.Core" /> - </ItemGroup> - <ItemGroup> - <Compile Include="Properties\AssemblyInfo.cs" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Textures\Menu\logo.png" /> - <EmbeddedResource Include="Textures\KeyCounter\key-glow.png" /> - <EmbeddedResource Include="Textures\KeyCounter\key-hit.png" /> - <EmbeddedResource Include="Textures\KeyCounter\key-up.png" /> - <EmbeddedResource Include="Beatmaps\241526 Soleily - Renatus.osz" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Shaders\sh_CircularProgressBar.fs" /> - <EmbeddedResource Include="Shaders\sh_CursorTrail.vs" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Samples\welcome.mp3" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Fonts\Exo2.0-Regular.fnt" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Fonts\Exo2.0-Regular_0.png" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Samples\Keyboard\key-caps.mp3" /> - <EmbeddedResource Include="Samples\Keyboard\key-confirm.mp3" /> - <EmbeddedResource Include="Samples\Keyboard\key-delete.mp3" /> - <EmbeddedResource Include="Samples\Keyboard\key-movement.mp3" /> - <EmbeddedResource Include="Samples\Keyboard\key-press-1.mp3" /> - <EmbeddedResource Include="Samples\Keyboard\key-press-2.mp3" /> - <EmbeddedResource Include="Samples\Keyboard\key-press-3.mp3" /> - <EmbeddedResource Include="Samples\Keyboard\key-press-4.mp3" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Fonts\FontAwesome.fnt" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Fonts\FontAwesome_0.png" /> - <EmbeddedResource Include="Fonts\FontAwesome_1.png" /> - <EmbeddedResource Include="Fonts\FontAwesome_2.png" /> - <EmbeddedResource Include="Fonts\FontAwesome_3.png" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Fonts\osuFont.fnt" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Fonts\osuFont_0.png" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Textures\Backgrounds\bg3.jpg" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Textures\Backgrounds\bg1.jpg" /> - <EmbeddedResource Include="Textures\Backgrounds\bg2.jpg" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Textures\Backgrounds\bg4.jpg" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Textures\Play\osu\approachcircle.png" /> - <EmbeddedResource Include="Textures\Play\osu\disc.png" /> - <EmbeddedResource Include="Textures\Play\osu\number.png" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Textures\Play\osu\ring-glow.png" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Fonts\Exo2.0-Black.fnt" /> - <EmbeddedResource Include="Fonts\Exo2.0-BlackItalic.fnt" /> - <EmbeddedResource Include="Fonts\Exo2.0-Bold.fnt" /> - <EmbeddedResource Include="Fonts\Exo2.0-BoldItalic.fnt" /> - <EmbeddedResource Include="Fonts\Exo2.0-Light.fnt" /> - <EmbeddedResource Include="Fonts\Exo2.0-LightItalic.fnt" /> - <EmbeddedResource Include="Fonts\Exo2.0-Medium.fnt" /> - <EmbeddedResource Include="Fonts\Exo2.0-MediumItalic.fnt" /> - <EmbeddedResource Include="Fonts\Exo2.0-RegularItalic.fnt" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Fonts\Exo2.0-BlackItalic_0.png" /> - <EmbeddedResource Include="Fonts\Exo2.0-BlackItalic_1.png" /> - <EmbeddedResource Include="Fonts\Exo2.0-Black_0.png" /> - <EmbeddedResource Include="Fonts\Exo2.0-Black_1.png" /> - <EmbeddedResource Include="Fonts\Exo2.0-BoldItalic_0.png" /> - <EmbeddedResource Include="Fonts\Exo2.0-BoldItalic_1.png" /> - <EmbeddedResource Include="Fonts\Exo2.0-Bold_0.png" /> - <EmbeddedResource Include="Fonts\Exo2.0-license.txt" /> - <EmbeddedResource Include="Fonts\Exo2.0-LightItalic_0.png" /> - <EmbeddedResource Include="Fonts\Exo2.0-Light_0.png" /> - <EmbeddedResource Include="Fonts\Exo2.0-MediumItalic_0.png" /> - <EmbeddedResource Include="Fonts\Exo2.0-Medium_0.png" /> - <EmbeddedResource Include="Fonts\Exo2.0-RegularItalic_0.png" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Fonts\Exo2.0-SemiBoldItalic_0.png" /> - <EmbeddedResource Include="Fonts\Exo2.0-SemiBold_0.png" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Fonts\Exo2.0-SemiBold.fnt" /> - <EmbeddedResource Include="Fonts\Exo2.0-SemiBoldItalic.fnt" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Fonts\Venera_0.png" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Fonts\Venera.fnt" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Fonts\FontAwesome_4.png" /> - <EmbeddedResource Include="Fonts\FontAwesome_5.png" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Textures\Cursor\cursortrail.png" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Textures\Online\avatar-guest.png" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Samples\seeya.mp3" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Samples\SongSelect\select-difficulty.mp3" /> - <EmbeddedResource Include="Samples\SongSelect\select-expand.mp3" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Samples\Menu\heartbeat.mp3" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Samples\Gameplay\drum-hitclap.wav" /> - <EmbeddedResource Include="Samples\Gameplay\drum-hitfinish.wav" /> - <EmbeddedResource Include="Samples\Gameplay\drum-hitnormal.wav" /> - <EmbeddedResource Include="Samples\Gameplay\drum-hitwhistle.wav" /> - <EmbeddedResource Include="Samples\Gameplay\drum-sliderslide.wav" /> - <EmbeddedResource Include="Samples\Gameplay\drum-slidertick.wav" /> - <EmbeddedResource Include="Samples\Gameplay\drum-sliderwhistle.wav" /> - <EmbeddedResource Include="Samples\Gameplay\normal-hitclap.wav" /> - <EmbeddedResource Include="Samples\Gameplay\normal-hitfinish.wav" /> - <EmbeddedResource Include="Samples\Gameplay\normal-hitnormal.wav" /> - <EmbeddedResource Include="Samples\Gameplay\normal-hitwhistle.wav" /> - <EmbeddedResource Include="Samples\Gameplay\normal-sliderslide.wav" /> - <EmbeddedResource Include="Samples\Gameplay\normal-slidertick.wav" /> - <EmbeddedResource Include="Samples\Gameplay\normal-sliderwhistle.wav" /> - <EmbeddedResource Include="Samples\Gameplay\soft-hitclap.wav" /> - <EmbeddedResource Include="Samples\Gameplay\soft-hitfinish.wav" /> - <EmbeddedResource Include="Samples\Gameplay\soft-hitnormal.wav" /> - <EmbeddedResource Include="Samples\Gameplay\soft-hitwhistle.wav" /> - <EmbeddedResource Include="Samples\Gameplay\soft-sliderslide.wav" /> - <EmbeddedResource Include="Samples\Gameplay\soft-slidertick.wav" /> - <EmbeddedResource Include="Samples\Gameplay\soft-sliderwhistle.wav" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Samples\Gameplay\sectionfail.mp3" /> - <EmbeddedResource Include="Samples\Gameplay\sectionpass.mp3" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Textures\Menu\dev-build-footer.png" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Textures\Play\Taiko\taiko-drum-inner.png" /> - <EmbeddedResource Include="Textures\Play\Taiko\taiko-drum-inner-hit.png" /> - <EmbeddedResource Include="Textures\Play\Taiko\taiko-drum-outer-hit.png" /> - <EmbeddedResource Include="Textures\Play\Taiko\taiko-drum-outer.png" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Textures\Flags\AD.png" /> - <EmbeddedResource Include="Textures\Flags\AE.png" /> - <EmbeddedResource Include="Textures\Flags\AF.png" /> - <EmbeddedResource Include="Textures\Flags\AG.png" /> - <EmbeddedResource Include="Textures\Flags\AL.png" /> - <EmbeddedResource Include="Textures\Flags\AM.png" /> - <EmbeddedResource Include="Textures\Flags\AR.png" /> - <EmbeddedResource Include="Textures\Flags\AT.png" /> - <EmbeddedResource Include="Textures\Flags\AU.png" /> - <EmbeddedResource Include="Textures\Flags\AZ.png" /> - <EmbeddedResource Include="Textures\Flags\BA.png" /> - <EmbeddedResource Include="Textures\Flags\BB.png" /> - <EmbeddedResource Include="Textures\Flags\BD.png" /> - <EmbeddedResource Include="Textures\Flags\BE.png" /> - <EmbeddedResource Include="Textures\Flags\BF.png" /> - <EmbeddedResource Include="Textures\Flags\BG.png" /> - <EmbeddedResource Include="Textures\Flags\BH.png" /> - <EmbeddedResource Include="Textures\Flags\BI.png" /> - <EmbeddedResource Include="Textures\Flags\BJ.png" /> - <EmbeddedResource Include="Textures\Flags\BN.png" /> - <EmbeddedResource Include="Textures\Flags\BO.png" /> - <EmbeddedResource Include="Textures\Flags\BR.png" /> - <EmbeddedResource Include="Textures\Flags\BS.png" /> - <EmbeddedResource Include="Textures\Flags\BT.png" /> - <EmbeddedResource Include="Textures\Flags\BW.png" /> - <EmbeddedResource Include="Textures\Flags\BY.png" /> - <EmbeddedResource Include="Textures\Flags\BZ.png" /> - <EmbeddedResource Include="Textures\Flags\CA.png" /> - <EmbeddedResource Include="Textures\Flags\CD.png" /> - <EmbeddedResource Include="Textures\Flags\CF.png" /> - <EmbeddedResource Include="Textures\Flags\CG.png" /> - <EmbeddedResource Include="Textures\Flags\CH.png" /> - <EmbeddedResource Include="Textures\Flags\CI.png" /> - <EmbeddedResource Include="Textures\Flags\CL.png" /> - <EmbeddedResource Include="Textures\Flags\CM.png" /> - <EmbeddedResource Include="Textures\Flags\CN.png" /> - <EmbeddedResource Include="Textures\Flags\CO.png" /> - <EmbeddedResource Include="Textures\Flags\CR.png" /> - <EmbeddedResource Include="Textures\Flags\CU.png" /> - <EmbeddedResource Include="Textures\Flags\CV.png" /> - <EmbeddedResource Include="Textures\Flags\CY.png" /> - <EmbeddedResource Include="Textures\Flags\CZ.png" /> - <EmbeddedResource Include="Textures\Flags\DE.png" /> - <EmbeddedResource Include="Textures\Flags\DJ.png" /> - <EmbeddedResource Include="Textures\Flags\DK.png" /> - <EmbeddedResource Include="Textures\Flags\DM.png" /> - <EmbeddedResource Include="Textures\Flags\DO.png" /> - <EmbeddedResource Include="Textures\Flags\DZ.png" /> - <EmbeddedResource Include="Textures\Flags\EC.png" /> - <EmbeddedResource Include="Textures\Flags\EE.png" /> - <EmbeddedResource Include="Textures\Flags\EG.png" /> - <EmbeddedResource Include="Textures\Flags\ER.png" /> - <EmbeddedResource Include="Textures\Flags\ES.png" /> - <EmbeddedResource Include="Textures\Flags\ET.png" /> - <EmbeddedResource Include="Textures\Flags\FI.png" /> - <EmbeddedResource Include="Textures\Flags\FJ.png" /> - <EmbeddedResource Include="Textures\Flags\FM.png" /> - <EmbeddedResource Include="Textures\Flags\FR.png" /> - <EmbeddedResource Include="Textures\Flags\GA.png" /> - <EmbeddedResource Include="Textures\Flags\GB.png" /> - <EmbeddedResource Include="Textures\Flags\GD.png" /> - <EmbeddedResource Include="Textures\Flags\GE.png" /> - <EmbeddedResource Include="Textures\Flags\GH.png" /> - <EmbeddedResource Include="Textures\Flags\GM.png" /> - <EmbeddedResource Include="Textures\Flags\GN.png" /> - <EmbeddedResource Include="Textures\Flags\GQ.png" /> - <EmbeddedResource Include="Textures\Flags\GR.png" /> - <EmbeddedResource Include="Textures\Flags\GT.png" /> - <EmbeddedResource Include="Textures\Flags\GW.png" /> - <EmbeddedResource Include="Textures\Flags\GY.png" /> - <EmbeddedResource Include="Textures\Flags\HK.png" /> - <EmbeddedResource Include="Textures\Flags\HN.png" /> - <EmbeddedResource Include="Textures\Flags\HR.png" /> - <EmbeddedResource Include="Textures\Flags\HT.png" /> - <EmbeddedResource Include="Textures\Flags\HU.png" /> - <EmbeddedResource Include="Textures\Flags\ID.png" /> - <EmbeddedResource Include="Textures\Flags\IE.png" /> - <EmbeddedResource Include="Textures\Flags\IL.png" /> - <EmbeddedResource Include="Textures\Flags\IN.png" /> - <EmbeddedResource Include="Textures\Flags\IQ.png" /> - <EmbeddedResource Include="Textures\Flags\IR.png" /> - <EmbeddedResource Include="Textures\Flags\IS.png" /> - <EmbeddedResource Include="Textures\Flags\IT.png" /> - <EmbeddedResource Include="Textures\Flags\JM.png" /> - <EmbeddedResource Include="Textures\Flags\JO.png" /> - <EmbeddedResource Include="Textures\Flags\JP.png" /> - <EmbeddedResource Include="Textures\Flags\KE.png" /> - <EmbeddedResource Include="Textures\Flags\KG.png" /> - <EmbeddedResource Include="Textures\Flags\KH.png" /> - <EmbeddedResource Include="Textures\Flags\KI.png" /> - <EmbeddedResource Include="Textures\Flags\KM.png" /> - <EmbeddedResource Include="Textures\Flags\KN.png" /> - <EmbeddedResource Include="Textures\Flags\KP.png" /> - <EmbeddedResource Include="Textures\Flags\KR.png" /> - <EmbeddedResource Include="Textures\Flags\KW.png" /> - <EmbeddedResource Include="Textures\Flags\KZ.png" /> - <EmbeddedResource Include="Textures\Flags\LA.png" /> - <EmbeddedResource Include="Textures\Flags\LB.png" /> - <EmbeddedResource Include="Textures\Flags\LC.png" /> - <EmbeddedResource Include="Textures\Flags\LI.png" /> - <EmbeddedResource Include="Textures\Flags\LK.png" /> - <EmbeddedResource Include="Textures\Flags\LR.png" /> - <EmbeddedResource Include="Textures\Flags\LS.png" /> - <EmbeddedResource Include="Textures\Flags\LT.png" /> - <EmbeddedResource Include="Textures\Flags\LU.png" /> - <EmbeddedResource Include="Textures\Flags\LV.png" /> - <EmbeddedResource Include="Textures\Flags\LY.png" /> - <EmbeddedResource Include="Textures\Flags\MA.png" /> - <EmbeddedResource Include="Textures\Flags\MC.png" /> - <EmbeddedResource Include="Textures\Flags\MD.png" /> - <EmbeddedResource Include="Textures\Flags\ME.png" /> - <EmbeddedResource Include="Textures\Flags\MG.png" /> - <EmbeddedResource Include="Textures\Flags\MH.png" /> - <EmbeddedResource Include="Textures\Flags\MK.png" /> - <EmbeddedResource Include="Textures\Flags\ML.png" /> - <EmbeddedResource Include="Textures\Flags\MM.png" /> - <EmbeddedResource Include="Textures\Flags\MN.png" /> - <EmbeddedResource Include="Textures\Flags\MO.png" /> - <EmbeddedResource Include="Textures\Flags\MR.png" /> - <EmbeddedResource Include="Textures\Flags\MT.png" /> - <EmbeddedResource Include="Textures\Flags\MU.png" /> - <EmbeddedResource Include="Textures\Flags\MV.png" /> - <EmbeddedResource Include="Textures\Flags\MW.png" /> - <EmbeddedResource Include="Textures\Flags\MX.png" /> - <EmbeddedResource Include="Textures\Flags\MY.png" /> - <EmbeddedResource Include="Textures\Flags\MZ.png" /> - <EmbeddedResource Include="Textures\Flags\NA.png" /> - <EmbeddedResource Include="Textures\Flags\NE.png" /> - <EmbeddedResource Include="Textures\Flags\NG.png" /> - <EmbeddedResource Include="Textures\Flags\NI.png" /> - <EmbeddedResource Include="Textures\Flags\NL.png" /> - <EmbeddedResource Include="Textures\Flags\NO.png" /> - <EmbeddedResource Include="Textures\Flags\NP.png" /> - <EmbeddedResource Include="Textures\Flags\NR.png" /> - <EmbeddedResource Include="Textures\Flags\NZ.png" /> - <EmbeddedResource Include="Textures\Flags\OM.png" /> - <EmbeddedResource Include="Textures\Flags\PA.png" /> - <EmbeddedResource Include="Textures\Flags\PE.png" /> - <EmbeddedResource Include="Textures\Flags\PG.png" /> - <EmbeddedResource Include="Textures\Flags\PH.png" /> - <EmbeddedResource Include="Textures\Flags\PK.png" /> - <EmbeddedResource Include="Textures\Flags\PL.png" /> - <EmbeddedResource Include="Textures\Flags\PR.png" /> - <EmbeddedResource Include="Textures\Flags\PT.png" /> - <EmbeddedResource Include="Textures\Flags\PW.png" /> - <EmbeddedResource Include="Textures\Flags\PY.png" /> - <EmbeddedResource Include="Textures\Flags\QA.png" /> - <EmbeddedResource Include="Textures\Flags\RO.png" /> - <EmbeddedResource Include="Textures\Flags\RS.png" /> - <EmbeddedResource Include="Textures\Flags\RU.png" /> - <EmbeddedResource Include="Textures\Flags\RW.png" /> - <EmbeddedResource Include="Textures\Flags\SA.png" /> - <EmbeddedResource Include="Textures\Flags\SB.png" /> - <EmbeddedResource Include="Textures\Flags\SC.png" /> - <EmbeddedResource Include="Textures\Flags\SD.png" /> - <EmbeddedResource Include="Textures\Flags\SE.png" /> - <EmbeddedResource Include="Textures\Flags\SG.png" /> - <EmbeddedResource Include="Textures\Flags\SI.png" /> - <EmbeddedResource Include="Textures\Flags\SK.png" /> - <EmbeddedResource Include="Textures\Flags\SL.png" /> - <EmbeddedResource Include="Textures\Flags\SM.png" /> - <EmbeddedResource Include="Textures\Flags\SN.png" /> - <EmbeddedResource Include="Textures\Flags\SO.png" /> - <EmbeddedResource Include="Textures\Flags\SR.png" /> - <EmbeddedResource Include="Textures\Flags\SS.png" /> - <EmbeddedResource Include="Textures\Flags\ST.png" /> - <EmbeddedResource Include="Textures\Flags\SV.png" /> - <EmbeddedResource Include="Textures\Flags\SY.png" /> - <EmbeddedResource Include="Textures\Flags\SZ.png" /> - <EmbeddedResource Include="Textures\Flags\TD.png" /> - <EmbeddedResource Include="Textures\Flags\TG.png" /> - <EmbeddedResource Include="Textures\Flags\TH.png" /> - <EmbeddedResource Include="Textures\Flags\TJ.png" /> - <EmbeddedResource Include="Textures\Flags\TL.png" /> - <EmbeddedResource Include="Textures\Flags\TM.png" /> - <EmbeddedResource Include="Textures\Flags\TN.png" /> - <EmbeddedResource Include="Textures\Flags\TO.png" /> - <EmbeddedResource Include="Textures\Flags\TR.png" /> - <EmbeddedResource Include="Textures\Flags\TT.png" /> - <EmbeddedResource Include="Textures\Flags\TV.png" /> - <EmbeddedResource Include="Textures\Flags\TW.png" /> - <EmbeddedResource Include="Textures\Flags\TZ.png" /> - <EmbeddedResource Include="Textures\Flags\UA.png" /> - <EmbeddedResource Include="Textures\Flags\UG.png" /> - <EmbeddedResource Include="Textures\Flags\US.png" /> - <EmbeddedResource Include="Textures\Flags\UY.png" /> - <EmbeddedResource Include="Textures\Flags\UZ.png" /> - <EmbeddedResource Include="Textures\Flags\VA.png" /> - <EmbeddedResource Include="Textures\Flags\VC.png" /> - <EmbeddedResource Include="Textures\Flags\VE.png" /> - <EmbeddedResource Include="Textures\Flags\VN.png" /> - <EmbeddedResource Include="Textures\Flags\VU.png" /> - <EmbeddedResource Include="Textures\Flags\WS.png" /> - <EmbeddedResource Include="Textures\Flags\XK.png" /> - <EmbeddedResource Include="Textures\Flags\YE.png" /> - <EmbeddedResource Include="Textures\Flags\ZA.png" /> - <EmbeddedResource Include="Textures\Flags\ZM.png" /> - <EmbeddedResource Include="Textures\Flags\ZW.png" /> - <EmbeddedResource Include="Textures\Flags\__.png" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Textures\Backgrounds\Drawings\background.png" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Textures\Drawings\visualiser-line.png" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Textures\Cursor\menu-cursor.png" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Textures\Cursor\menu-cursor-additive.png" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Textures\Grades\A.png" /> - <EmbeddedResource Include="Textures\Grades\B.png" /> - <EmbeddedResource Include="Textures\Grades\C.png" /> - <EmbeddedResource Include="Textures\Grades\F.png" /> - <EmbeddedResource Include="Textures\Grades\SPlus.png" /> - <EmbeddedResource Include="Textures\Grades\SS.png" /> - <EmbeddedResource Include="Textures\Grades\SSPlus.png" /> - <EmbeddedResource Include="Textures\Grades\S.png" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Fonts\Noto-Basic_0.png" /> - <EmbeddedResource Include="Fonts\Noto-Basic_1.png" /> - <EmbeddedResource Include="Fonts\Noto-Basic_2.png" /> - <EmbeddedResource Include="Fonts\Noto-Basic_3.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_00.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_01.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_02.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_03.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_04.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_05.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_06.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_07.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_08.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_09.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_10.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_11.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_12.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_13.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_14.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_15.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_16.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_17.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_18.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_19.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_20.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_21.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_22.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_23.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_24.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_25.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_26.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_27.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_28.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_29.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_30.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_31.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_32.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_33.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_34.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_35.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_36.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_37.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_38.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_39.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_40.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_41.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_42.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_43.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_44.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_45.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_46.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_47.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_48.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_49.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_50.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_51.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_52.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_53.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_54.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_55.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_56.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_57.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_58.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_59.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_60.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_61.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_62.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_63.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_64.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_65.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_66.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_67.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_68.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_69.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_70.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_71.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_72.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_73.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_74.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_75.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_76.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_77.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_78.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_79.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_80.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_81.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_82.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_83.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_84.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_85.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_86.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_87.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_88.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_89.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_90.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_91.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_92.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic_93.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_00.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_01.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_02.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_03.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_04.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_05.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_06.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_07.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_08.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_09.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_10.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_11.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_12.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_13.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_14.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_15.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_16.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_17.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_18.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_19.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_20.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_21.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_22.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_23.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_24.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_25.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_26.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_27.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_28.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_29.png" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility_30.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_00.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_01.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_02.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_03.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_04.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_05.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_06.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_07.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_08.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_09.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_10.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_11.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_12.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_13.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_14.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_15.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_16.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_17.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_18.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_19.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_20.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_21.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_22.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_23.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_24.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_25.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_26.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_27.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_28.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_29.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_30.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_31.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_32.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_33.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_34.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_35.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_36.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_37.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_38.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_39.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_40.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_41.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_42.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_43.png" /> - <EmbeddedResource Include="Fonts\Noto-Hangul_44.png" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Fonts\Noto-Basic.fnt" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Basic.fnt" /> - <EmbeddedResource Include="Fonts\Noto-CJK-Compatibility.fnt" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Fonts\Noto-Hangul.fnt" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Fonts\Venera-Light.fnt" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Fonts\Venera-Light_0.png" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Tracks\circles.osz" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Samples\MedalSplash\medal-get.mp3" /> - <EmbeddedResource Include="Textures\MedalSplash\disc-spin.png" /> - <EmbeddedResource Include="Textures\MedalSplash\medal-glow.png" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Textures\Profile\levelbadge.png" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Samples\UI\check-off.wav" /> - <EmbeddedResource Include="Samples\UI\check-on.wav" /> - <EmbeddedResource Include="Samples\UI\sliderbar-notch.wav" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Samples\UI\generic-hover.wav" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Samples\UI\generic-click.wav" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Samples\UI\melodic-1.wav" /> - <EmbeddedResource Include="Samples\UI\melodic-2.wav" /> - <EmbeddedResource Include="Samples\UI\melodic-3.wav" /> - <EmbeddedResource Include="Samples\UI\melodic-4.wav" /> - <EmbeddedResource Include="Samples\UI\melodic-5.wav" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Samples\Gameplay\restart.wav" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Samples\Menu\select-1.wav" /> - <EmbeddedResource Include="Samples\Menu\select-2.wav" /> - <EmbeddedResource Include="Samples\Menu\select-3.wav" /> - <EmbeddedResource Include="Samples\Menu\select-4.wav" /> - <EmbeddedResource Include="Samples\Menu\select-5.wav" /> - <EmbeddedResource Include="Samples\Menu\select-6.wav" /> - <EmbeddedResource Include="Samples\Menu\select-7.wav" /> - <EmbeddedResource Include="Textures\Menu\menu-background-1.jpg" /> - <EmbeddedResource Include="Textures\Menu\menu-background-2.jpg" /> - <EmbeddedResource Include="Textures\Menu\menu-background-3.jpg" /> - <EmbeddedResource Include="Textures\Menu\menu-background-4.jpg" /> - <EmbeddedResource Include="Textures\Menu\menu-background-5.jpg" /> - </ItemGroup> <ItemGroup> - <EmbeddedResource Include="Textures\Play\Catch\fruit-catcher-fail.png" /> - <EmbeddedResource Include="Textures\Play\Catch\fruit-catcher-idle.png" /> - <EmbeddedResource Include="Textures\Play\Catch\fruit-catcher-kiai.png" /> + <EmbeddedResource Include="**\*.*" /> </ItemGroup> - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <!-- To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - --> </Project> \ No newline at end of file From 752302fc55fdee21a4706242d9eb2d80d392aa43 Mon Sep 17 00:00:00 2001 From: smoogipoo <smoogipoo@smgi.me> Date: Mon, 26 Mar 2018 09:13:55 +0900 Subject: [PATCH 2/5] Limit scope of resource globs --- osu.Game.Resources/osu.Game.Resources.csproj | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/osu.Game.Resources/osu.Game.Resources.csproj b/osu.Game.Resources/osu.Game.Resources.csproj index d0bcc8e..3472e0a 100644 --- a/osu.Game.Resources/osu.Game.Resources.csproj +++ b/osu.Game.Resources/osu.Game.Resources.csproj @@ -7,6 +7,11 @@ <Copyright>ppy Pty Ltd 2007-2017</Copyright> </PropertyGroup> <ItemGroup> - <EmbeddedResource Include="**\*.*" /> + <EmbeddedResource Include="Beatmaps\**\*" /> + <EmbeddedResource Include="Fonts\**\*" /> + <EmbeddedResource Include="Samples\**\*" /> + <EmbeddedResource Include="Shaders\**\*" /> + <EmbeddedResource Include="Textures\**\*" /> + <EmbeddedResource Include="Tracks\**\*" /> </ItemGroup> </Project> \ No newline at end of file From dca651b26fbdfa92fad9bc537497fd47ebcd4130 Mon Sep 17 00:00:00 2001 From: smoogipoo <smoogipoo@smgi.me> Date: Mon, 26 Mar 2018 10:51:02 +0900 Subject: [PATCH 3/5] Add net461 framework target, remove netstandard1.0 --- osu.Game.Resources/osu.Game.Resources.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game.Resources/osu.Game.Resources.csproj b/osu.Game.Resources/osu.Game.Resources.csproj index 3472e0a..92138bb 100644 --- a/osu.Game.Resources/osu.Game.Resources.csproj +++ b/osu.Game.Resources/osu.Game.Resources.csproj @@ -1,6 +1,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>netstandard1.0</TargetFramework> + <TargetFrameworks>net461;netstandard2.0;netcoreapp2.0</TargetFrameworks> <Title>osu!ui</Title> <Product>osu!ui</Product> <Company>ppy Pty Ltd</Company> From 3958127d95ee230021e9946c989400e71c9dbb3c Mon Sep 17 00:00:00 2001 From: smoogipoo <smoogipoo@smgi.me> Date: Mon, 26 Mar 2018 15:45:18 +0900 Subject: [PATCH 4/5] Only compile with net461 in visual studio --- osu.Game.Resources/osu.Game.Resources.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/osu.Game.Resources/osu.Game.Resources.csproj b/osu.Game.Resources/osu.Game.Resources.csproj index 92138bb..86974ed 100644 --- a/osu.Game.Resources/osu.Game.Resources.csproj +++ b/osu.Game.Resources/osu.Game.Resources.csproj @@ -1,6 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>net461;netstandard2.0;netcoreapp2.0</TargetFrameworks> + <TargetFramework Condition="'$(BuildingInsideVisualStudio)' == 'true'">net461</TargetFramework> + <TargetFrameworks Condition="'$(BuildingInsideVisualStudio)' != 'true'">net461;netstandard2.0;netcoreapp2.0</TargetFrameworks> <Title>osu!ui</Title> <Product>osu!ui</Product> <Company>ppy Pty Ltd</Company> From b335a7195d60ab8d83ae9eba1150ee022163f3ba Mon Sep 17 00:00:00 2001 From: Dean Herbert <pe@ppy.sh> Date: Tue, 27 Mar 2018 18:56:20 +0900 Subject: [PATCH 5/5] Make better --- .vscode/tasks.json | 17 ----------------- osu.Game.Resources/osu.Game.Resources.csproj | 3 +-- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 .vscode/tasks.json diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index b5ec7cb..0000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - // See https://go.microsoft.com/fwlink/?LinkId=733558 - // for the documentation about the tasks.json format - "version": "2.0.0", - "tasks": [{ - "label": "build", - "command": "dotnet build", - "type": "shell", - "options": { - "cwd": "${workspaceRoot}/osu.Game.Resources" - }, - "group": { - "kind": "build", - "isDefault": true - } - }] -} \ No newline at end of file diff --git a/osu.Game.Resources/osu.Game.Resources.csproj b/osu.Game.Resources/osu.Game.Resources.csproj index 86974ed..5cb326f 100644 --- a/osu.Game.Resources/osu.Game.Resources.csproj +++ b/osu.Game.Resources/osu.Game.Resources.csproj @@ -1,7 +1,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework Condition="'$(BuildingInsideVisualStudio)' == 'true'">net461</TargetFramework> - <TargetFrameworks Condition="'$(BuildingInsideVisualStudio)' != 'true'">net461;netstandard2.0;netcoreapp2.0</TargetFrameworks> + <TargetFramework>netstandard2.0</TargetFramework> <Title>osu!ui</Title> <Product>osu!ui</Product> <Company>ppy Pty Ltd</Company>