Split solution

This commit is contained in:
Shane Woolcock
2018-12-22 17:12:43 +10:30
parent 56196e17dd
commit 18abff3ac0
7 changed files with 921 additions and 223 deletions

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<dependencies>
<deployment identifier="iOS" />
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530" />
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
@ -10,18 +10,18 @@
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="Llm-lL-Icb" />
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok" />
<viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="600" height="600" />
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" />
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite" />
<rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" customColorSpace="sRGB" colorSpace="calibratedWhite" white="0" alpha="1"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder" />
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="53" y="375" />
<point key="canvasLocation" x="53" y="375"/>
</scene>
</scenes>
</document>
</document>

View File

@ -90,7 +90,7 @@
<Reference Include="System.IO.Compression" />
<Reference Include="System.Net.Http" />
<Reference Include="FFmpeg.AutoGen">
<HintPath>..\packages\FFmpeg.AutoGen.4.0.0.4\lib\netstandard2.0\FFmpeg.AutoGen.dll</HintPath>
<HintPath>..\packages\FFmpeg.AutoGen.4.1.0.1\lib\netstandard2.0\FFmpeg.AutoGen.dll</HintPath>
</Reference>
<Reference Include="JetBrains.Annotations">
<HintPath>..\packages\JetBrains.Annotations.2018.2.1\lib\netstandard2.0\JetBrains.Annotations.dll</HintPath>
@ -102,19 +102,22 @@
<HintPath>..\packages\ManagedBass.Fx.2.0.1\lib\Xamarin.iOS\ManagedBass.Fx.dll</HintPath>
</Reference>
<Reference Include="Markdig">
<HintPath>..\packages\Markdig.0.15.0\lib\netstandard1.1\Markdig.dll</HintPath>
<HintPath>..\packages\Markdig.0.15.4\lib\netstandard2.0\Markdig.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.3.11.0\lib\netstandard2.0\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Diagnostics.Runtime">
<HintPath>..\packages\ppy.Microsoft.Diagnostics.Runtime.0.9.180305.1\lib\netstandard2.0\Microsoft.Diagnostics.Runtime.dll</HintPath>
</Reference>
<Reference Include="osuTK">
<HintPath>..\packages\ppy.osuTK.NS20.1.0.45\lib\netstandard2.0\osuTK.dll</HintPath>
</Reference>
<Reference Include="osuTK.iOS">
<HintPath>..\packages\ppy.osuTK.iOS.1.0.41\lib\xamarinios10\osuTK.iOS.dll</HintPath>
<HintPath>..\packages\ppy.osuTK.NS20.1.0.50\lib\netstandard2.0\osuTK.dll</HintPath>
</Reference>
<Reference Include="SharpFNT">
<HintPath>..\packages\SharpFNT.1.0.0\lib\netstandard1.3\SharpFNT.dll</HintPath>
<HintPath>..\packages\SharpFNT.1.0.1\lib\netstandard1.3\SharpFNT.dll</HintPath>
</Reference>
<Reference Include="System.Buffers">
<HintPath>..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
@ -131,12 +134,6 @@
<Reference Include="System.Memory">
<HintPath>..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll</HintPath>
</Reference>
<Reference Include="SixLabors.Core">
<HintPath>..\packages\SixLabors.Core.1.0.0-beta0006\lib\netstandard1.1\SixLabors.Core.dll</HintPath>
</Reference>
<Reference Include="SixLabors.ImageSharp">
<HintPath>..\packages\SixLabors.ImageSharp.1.0.0-beta0005\lib\netstandard2.0\SixLabors.ImageSharp.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
@ -144,38 +141,23 @@
<HintPath>..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis">
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.2.9.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.2.10.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis.CSharp">
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.2.9.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.2.10.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
</Reference>
<Reference Include="osu.Framework">
<HintPath>..\packages\ppy.osu.Framework.0.0.7645\lib\netstandard2.0\osu.Framework.dll</HintPath>
<HintPath>..\packages\ppy.osu.Framework.0.0.7742\lib\netstandard2.0\osu.Framework.dll</HintPath>
</Reference>
<Reference Include="osuTK.iOS">
<HintPath>..\packages\ppy.osuTK.iOS.1.0.50\lib\xamarinios10\osuTK.iOS.dll</HintPath>
</Reference>
<Reference Include="osu.Framework.iOS">
<HintPath>..\packages\ppy.osu.Framework.iOS.0.0.7645\lib\xamarinios10\osu.Framework.iOS.dll</HintPath>
<HintPath>..\packages\ppy.osu.Framework.iOS.0.0.7742\lib\xamarinios10\osu.Framework.iOS.dll</HintPath>
</Reference>
<Reference Include="Humanizer">
<HintPath>..\packages\Humanizer.Core.2.5.16\lib\netstandard2.0\Humanizer.dll</HintPath>
</Reference>
<Reference Include="Remotion.Linq">
<HintPath>..\packages\Remotion.Linq.2.2.0\lib\portable-net45+win+wpa81+wp80\Remotion.Linq.dll</HintPath>
</Reference>
<Reference Include="SQLitePCLRaw.core">
<HintPath>..\packages\SQLitePCLRaw.core.1.1.11\lib\Xamarin.iOS10\SQLitePCLRaw.core.dll</HintPath>
</Reference>
<Reference Include="SQLitePCLRaw.provider.sqlite3">
<HintPath>..\packages\SQLitePCLRaw.provider.sqlite3.ios_unified.1.1.11\lib\Xamarin.iOS10\SQLitePCLRaw.provider.sqlite3.dll</HintPath>
</Reference>
<Reference Include="SQLitePCLRaw.batteries_green">
<HintPath>..\packages\SQLitePCLRaw.bundle_green.1.1.11\lib\Xamarin.iOS10\SQLitePCLRaw.batteries_green.dll</HintPath>
</Reference>
<Reference Include="SQLitePCLRaw.batteries_v2">
<HintPath>..\packages\SQLitePCLRaw.bundle_green.1.1.11\lib\Xamarin.iOS10\SQLitePCLRaw.batteries_v2.dll</HintPath>
</Reference>
<Reference Include="System.Diagnostics.DiagnosticSource">
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.5.1\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll</HintPath>
</Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Abstractions">
<HintPath>..\packages\Microsoft.EntityFrameworkCore.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
</Reference>
@ -188,9 +170,27 @@
<Reference Include="Microsoft.Extensions.Logging.Abstractions">
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Remotion.Linq">
<HintPath>..\packages\Remotion.Linq.2.2.0\lib\portable-net45+win+wpa81+wp80\Remotion.Linq.dll</HintPath>
</Reference>
<Reference Include="SQLitePCLRaw.core">
<HintPath>..\packages\SQLitePCLRaw.core.1.1.11\lib\Xamarin.iOS10\SQLitePCLRaw.core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Data.Sqlite">
<HintPath>..\packages\Microsoft.Data.Sqlite.Core.2.2.0\lib\netstandard2.0\Microsoft.Data.Sqlite.dll</HintPath>
</Reference>
<Reference Include="SQLitePCLRaw.provider.sqlite3">
<HintPath>..\packages\SQLitePCLRaw.provider.sqlite3.ios_unified.1.1.11\lib\Xamarin.iOS10\SQLitePCLRaw.provider.sqlite3.dll</HintPath>
</Reference>
<Reference Include="SQLitePCLRaw.batteries_green">
<HintPath>..\packages\SQLitePCLRaw.bundle_green.1.1.11\lib\Xamarin.iOS10\SQLitePCLRaw.batteries_green.dll</HintPath>
</Reference>
<Reference Include="SQLitePCLRaw.batteries_v2">
<HintPath>..\packages\SQLitePCLRaw.bundle_green.1.1.11\lib\Xamarin.iOS10\SQLitePCLRaw.batteries_v2.dll</HintPath>
</Reference>
<Reference Include="System.Diagnostics.DiagnosticSource">
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.5.1\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll</HintPath>
</Reference>
<Reference Include="System.Interactive.Async">
<HintPath>..\packages\System.Interactive.Async.3.2.0\lib\netstandard2.0\System.Interactive.Async.dll</HintPath>
</Reference>
@ -224,21 +224,15 @@
<Reference Include="Microsoft.EntityFrameworkCore.Relational">
<HintPath>..\packages\Microsoft.EntityFrameworkCore.Relational.2.2.0\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
</Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Sqlite">
<HintPath>..\packages\Microsoft.EntityFrameworkCore.Sqlite.Core.2.2.0\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Sqlite.dll</HintPath>
</Reference>
<Reference Include="Microsoft.DotNet.PlatformAbstractions">
<HintPath>..\packages\Microsoft.DotNet.PlatformAbstractions.2.1.0\lib\netstandard1.3\Microsoft.DotNet.PlatformAbstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyModel">
<HintPath>..\packages\Microsoft.Extensions.DependencyModel.2.1.0\lib\netstandard1.6\Microsoft.Extensions.DependencyModel.dll</HintPath>
</Reference>
<Reference Include="Microsoft.EntityFrameworkCore.Sqlite">
<HintPath>..\packages\Microsoft.EntityFrameworkCore.Sqlite.Core.2.2.0\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Sqlite.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.3.11.0\lib\netstandard2.0\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="SharpCompress">
<HintPath>..\packages\SharpCompress.0.22.0\lib\netstandard2.0\SharpCompress.dll</HintPath>
</Reference>
@ -248,6 +242,12 @@
<Reference Include="SharpRaven">
<HintPath>..\packages\SharpRaven.2.4.0\lib\netstandard2.0\SharpRaven.dll</HintPath>
</Reference>
<Reference Include="SixLabors.Core">
<HintPath>..\packages\SixLabors.Core.1.0.0-dev000094\lib\netstandard2.0\SixLabors.Core.dll</HintPath>
</Reference>
<Reference Include="SixLabors.ImageSharp">
<HintPath>..\packages\SixLabors.ImageSharp.1.0.0-dev002298\lib\netstandard2.0\SixLabors.ImageSharp.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
@ -305,6 +305,9 @@
<Compile Include="Application.cs" />
<Compile Include="AppDelegate.cs" />
</ItemGroup>
<ItemGroup>
<LinkDescription Include="Linker.xml" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\osu.Game\osu.Game.csproj">
<Project>{2A66DD92-ADB1-4994-89E2-C94E04ACDA0D}</Project>
@ -331,9 +334,6 @@
<Name>osu.Game.Rulesets.Taiko</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<LinkDescription Include="Linker.xml" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
</Project>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FFmpeg.AutoGen" version="4.0.0.4" targetFramework="xamarinios10" />
<package id="FFmpeg.AutoGen" version="4.1.0.1" targetFramework="xamarinios10" />
<package id="Humanizer" version="2.5.16" targetFramework="xamarinios10" />
<package id="Humanizer.Core" version="2.5.16" targetFramework="xamarinios10" />
<package id="Humanizer.Core.af" version="2.5.16" targetFramework="xamarinios10" />
@ -48,10 +48,10 @@
<package id="JetBrains.Annotations" version="2018.2.1" targetFramework="xamarinios10" />
<package id="ManagedBass" version="2.0.4" targetFramework="xamarinios10" />
<package id="ManagedBass.Fx" version="2.0.1" targetFramework="xamarinios10" />
<package id="Markdig" version="0.15.0" targetFramework="xamarinios10" />
<package id="Markdig" version="0.15.4" targetFramework="xamarinios10" />
<package id="Microsoft.CodeAnalysis.Analyzers" version="2.6.1" targetFramework="xamarinios10" developmentDependency="true" />
<package id="Microsoft.CodeAnalysis.Common" version="2.9.0" targetFramework="xamarinios10" />
<package id="Microsoft.CodeAnalysis.CSharp" version="2.9.0" targetFramework="xamarinios10" />
<package id="Microsoft.CodeAnalysis.Common" version="2.10.0" targetFramework="xamarinios10" />
<package id="Microsoft.CodeAnalysis.CSharp" version="2.10.0" targetFramework="xamarinios10" />
<package id="Microsoft.Data.Sqlite.Core" version="2.2.0" targetFramework="xamarinios10" />
<package id="Microsoft.DotNet.PlatformAbstractions" version="2.1.0" targetFramework="xamarinios10" />
<package id="Microsoft.EntityFrameworkCore" version="2.2.0" targetFramework="xamarinios10" />
@ -77,16 +77,16 @@
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="xamarinios10" />
<package id="NUnit" version="3.11.0" targetFramework="xamarinios10" />
<package id="ppy.Microsoft.Diagnostics.Runtime" version="0.9.180305.1" targetFramework="xamarinios10" />
<package id="ppy.osu.Framework" version="0.0.7645" targetFramework="xamarinios10" />
<package id="ppy.osu.Framework.iOS" version="0.0.7645" targetFramework="xamarinios10" />
<package id="ppy.osuTK.iOS" version="1.0.41" targetFramework="xamarinios10" />
<package id="ppy.osuTK.NS20" version="1.0.45" targetFramework="xamarinios10" />
<package id="ppy.osu.Framework" version="0.0.7742" targetFramework="xamarinios10" />
<package id="ppy.osu.Framework.iOS" version="0.0.7742" targetFramework="xamarinios10" />
<package id="ppy.osuTK.iOS" version="1.0.50" targetFramework="xamarinios10" />
<package id="ppy.osuTK.NS20" version="1.0.50" targetFramework="xamarinios10" />
<package id="Remotion.Linq" version="2.2.0" targetFramework="xamarinios10" />
<package id="SharpCompress" version="0.22.0" targetFramework="xamarinios10" />
<package id="SharpFNT" version="1.0.0" targetFramework="xamarinios10" />
<package id="SharpFNT" version="1.0.1" targetFramework="xamarinios10" />
<package id="SharpRaven" version="2.4.0" targetFramework="xamarinios10" />
<package id="SixLabors.Core" version="1.0.0-beta0006" targetFramework="xamarinios10" />
<package id="SixLabors.ImageSharp" version="1.0.0-beta0005" targetFramework="xamarinios10" />
<package id="SixLabors.Core" version="1.0.0-dev000094" targetFramework="xamarinios10" />
<package id="SixLabors.ImageSharp" version="1.0.0-dev002298" targetFramework="xamarinios10" />
<package id="SQLitePCLRaw.bundle_green" version="1.1.11" targetFramework="xamarinios10" />
<package id="SQLitePCLRaw.core" version="1.1.11" targetFramework="xamarinios10" />
<package id="SQLitePCLRaw.provider.sqlite3.ios_unified" version="1.1.11" targetFramework="xamarinios10" />
@ -103,7 +103,7 @@
<package id="System.Diagnostics.FileVersionInfo" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Diagnostics.StackTrace" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Drawing.Common" version="4.5.0" targetFramework="xamarinios10" />
<package id="System.Drawing.Common" version="4.5.1" targetFramework="xamarinios10" />
<package id="System.Dynamic.Runtime" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Globalization" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Interactive.Async" version="3.2.0" targetFramework="xamarinios10" />
@ -114,8 +114,8 @@
<package id="System.Linq" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Memory" version="4.5.1" targetFramework="xamarinios10" />
<package id="System.Net.Http" version="4.3.3" targetFramework="xamarinios10" />
<package id="System.Numerics.Vectors" version="4.4.0" targetFramework="xamarinios10" />
<package id="System.Net.Http" version="4.3.4" targetFramework="xamarinios10" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="xamarinios10" />
<package id="System.Reflection" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Reflection.Emit.ILGeneration" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Reflection.Emit.Lightweight" version="4.3.0" targetFramework="xamarinios10" />