From 076894c24f1873d0de6e8c79af72016349d230b9 Mon Sep 17 00:00:00 2001 From: andy840119 Date: Sun, 19 Jul 2020 12:49:24 +0900 Subject: [PATCH 1/6] Add initial file --- .../Properties/AndroidManifest.xml | 5 + .../TestGameActivity.cs | 16 ++ ....Framework.Microphone.Tests.Android.csproj | 43 ++++ .../AppDelegate.cs | 14 ++ .../Application.cs | 18 ++ .../AppIcon.appiconset/Contents.json | 202 ++++++++++++++++++ .../Assets.xcassets/Contents.json | 6 + .../Entitlements.plist | 6 + osu.Framework.Microphone.Tests.iOS/Info.plist | 44 ++++ .../LaunchScreen.storyboard | 27 +++ osu.Framework.Microphone.Tests.iOS/Linker.xml | 12 ++ .../osu.Framework.Microphone.Tests.iOS.csproj | 56 +++++ 12 files changed, 449 insertions(+) create mode 100644 osu.Framework.Microphone.Tests.Android/Properties/AndroidManifest.xml create mode 100644 osu.Framework.Microphone.Tests.Android/TestGameActivity.cs create mode 100644 osu.Framework.Microphone.Tests.Android/osu.Framework.Microphone.Tests.Android.csproj create mode 100644 osu.Framework.Microphone.Tests.iOS/AppDelegate.cs create mode 100644 osu.Framework.Microphone.Tests.iOS/Application.cs create mode 100644 osu.Framework.Microphone.Tests.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 osu.Framework.Microphone.Tests.iOS/Assets.xcassets/Contents.json create mode 100644 osu.Framework.Microphone.Tests.iOS/Entitlements.plist create mode 100644 osu.Framework.Microphone.Tests.iOS/Info.plist create mode 100644 osu.Framework.Microphone.Tests.iOS/LaunchScreen.storyboard create mode 100644 osu.Framework.Microphone.Tests.iOS/Linker.xml create mode 100644 osu.Framework.Microphone.Tests.iOS/osu.Framework.Microphone.Tests.iOS.csproj diff --git a/osu.Framework.Microphone.Tests.Android/Properties/AndroidManifest.xml b/osu.Framework.Microphone.Tests.Android/Properties/AndroidManifest.xml new file mode 100644 index 0000000..112ca58 --- /dev/null +++ b/osu.Framework.Microphone.Tests.Android/Properties/AndroidManifest.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/osu.Framework.Microphone.Tests.Android/TestGameActivity.cs b/osu.Framework.Microphone.Tests.Android/TestGameActivity.cs new file mode 100644 index 0000000..91094e6 --- /dev/null +++ b/osu.Framework.Microphone.Tests.Android/TestGameActivity.cs @@ -0,0 +1,16 @@ +// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. +// See the LICENCE file in the repository root for full licence text. + +using Android.App; +using Android.Content.PM; +using osu.Framework.Android; + +namespace osu.Framework.Tests.Android +{ + [Activity(MainLauncher = true, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, Theme = "@android:style/Theme.NoTitleBar")] + public class TestGameActivity : AndroidGameActivity + { + protected override Game CreateGame() + => new VisualTestGame(); + } +} diff --git a/osu.Framework.Microphone.Tests.Android/osu.Framework.Microphone.Tests.Android.csproj b/osu.Framework.Microphone.Tests.Android/osu.Framework.Microphone.Tests.Android.csproj new file mode 100644 index 0000000..67adc45 --- /dev/null +++ b/osu.Framework.Microphone.Tests.Android/osu.Framework.Microphone.Tests.Android.csproj @@ -0,0 +1,43 @@ + + + + 8.0 + Debug + AnyCPU + {320089C6-A141-4D3E-BD5F-C4A6CE9E567B} + {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + osu.Framework.Tests.Android + osu.Framework.Tests.Android + Properties\AndroidManifest.xml + armeabi-v7a;x86;arm64-v8a + v10.0 + + + + + + + + + + %(RecursiveDir)%(Filename)%(Extension) + + + Resources\%(RecursiveDir)%(Filename)%(Extension) + + + + + {4d112e30-462b-4264-b44d-53b61abb185e} + osu.Framework.Android + + + {c76bf5b3-985e-4d39-95fe-97c9c879b83a} + osu.Framework + + + + + + + \ No newline at end of file diff --git a/osu.Framework.Microphone.Tests.iOS/AppDelegate.cs b/osu.Framework.Microphone.Tests.iOS/AppDelegate.cs new file mode 100644 index 0000000..474d39c --- /dev/null +++ b/osu.Framework.Microphone.Tests.iOS/AppDelegate.cs @@ -0,0 +1,14 @@ +// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. +// See the LICENCE file in the repository root for full licence text. + +using Foundation; +using osu.Framework.iOS; + +namespace osu.Framework.Tests +{ + [Register("AppDelegate")] + public class AppDelegate : GameAppDelegate + { + protected override Game CreateGame() => new VisualTestGame(); + } +} diff --git a/osu.Framework.Microphone.Tests.iOS/Application.cs b/osu.Framework.Microphone.Tests.iOS/Application.cs new file mode 100644 index 0000000..643ae7c --- /dev/null +++ b/osu.Framework.Microphone.Tests.iOS/Application.cs @@ -0,0 +1,18 @@ +// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. +// See the LICENCE file in the repository root for full licence text. + +using UIKit; + +namespace osu.Framework.Tests +{ + public static class Application + { + // This is the main entry point of the application. + public static void Main(string[] args) + { + // if you want to use a different Application Delegate class from "AppDelegate" + // you can specify it here. + UIApplication.Main(args, "GameUIApplication", "AppDelegate"); + } + } +} diff --git a/osu.Framework.Microphone.Tests.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/osu.Framework.Microphone.Tests.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..64d0e3d --- /dev/null +++ b/osu.Framework.Microphone.Tests.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,202 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "3x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "83.5x83.5", + "scale" : "2x" + }, + { + "idiom" : "ios-marketing", + "size" : "1024x1024", + "scale" : "1x" + }, + { + "size" : "24x24", + "idiom" : "watch", + "scale" : "2x", + "role" : "notificationCenter", + "subtype" : "38mm" + }, + { + "size" : "27.5x27.5", + "idiom" : "watch", + "scale" : "2x", + "role" : "notificationCenter", + "subtype" : "42mm" + }, + { + "size" : "29x29", + "idiom" : "watch", + "role" : "companionSettings", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "watch", + "role" : "companionSettings", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "watch", + "scale" : "2x", + "role" : "appLauncher", + "subtype" : "38mm" + }, + { + "size" : "44x44", + "idiom" : "watch", + "scale" : "2x", + "role" : "longLook", + "subtype" : "42mm" + }, + { + "size" : "86x86", + "idiom" : "watch", + "scale" : "2x", + "role" : "quickLook", + "subtype" : "38mm" + }, + { + "size" : "98x98", + "idiom" : "watch", + "scale" : "2x", + "role" : "quickLook", + "subtype" : "42mm" + }, + { + "idiom" : "mac", + "size" : "16x16", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "16x16", + "scale" : "2x" + }, + { + "idiom" : "mac", + "size" : "32x32", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "32x32", + "scale" : "2x" + }, + { + "idiom" : "mac", + "size" : "128x128", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "128x128", + "scale" : "2x" + }, + { + "idiom" : "mac", + "size" : "256x256", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "256x256", + "scale" : "2x" + }, + { + "idiom" : "mac", + "size" : "512x512", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "512x512", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/osu.Framework.Microphone.Tests.iOS/Assets.xcassets/Contents.json b/osu.Framework.Microphone.Tests.iOS/Assets.xcassets/Contents.json new file mode 100644 index 0000000..4caf392 --- /dev/null +++ b/osu.Framework.Microphone.Tests.iOS/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/osu.Framework.Microphone.Tests.iOS/Entitlements.plist b/osu.Framework.Microphone.Tests.iOS/Entitlements.plist new file mode 100644 index 0000000..9ae5993 --- /dev/null +++ b/osu.Framework.Microphone.Tests.iOS/Entitlements.plist @@ -0,0 +1,6 @@ + + + + + + diff --git a/osu.Framework.Microphone.Tests.iOS/Info.plist b/osu.Framework.Microphone.Tests.iOS/Info.plist new file mode 100644 index 0000000..c73d92a --- /dev/null +++ b/osu.Framework.Microphone.Tests.iOS/Info.plist @@ -0,0 +1,44 @@ + + + + + CFBundleName + osu.Framework.Tests.iOS + CFBundleIdentifier + ppy.osu-Framework-Tests-iOS + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1.0 + LSRequiresIPhoneOS + + MinimumOSVersion + 11.0 + UIDeviceFamily + + 1 + 2 + + UILaunchStoryboardName + LaunchScreen + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + XSAppIconAssets + Assets.xcassets/AppIcon.appiconset + UIStatusBarHidden + + UIRequiresFullScreen + + UIApplicationSupportsIndirectInputEvents + + + diff --git a/osu.Framework.Microphone.Tests.iOS/LaunchScreen.storyboard b/osu.Framework.Microphone.Tests.iOS/LaunchScreen.storyboard new file mode 100644 index 0000000..5d2e905 --- /dev/null +++ b/osu.Framework.Microphone.Tests.iOS/LaunchScreen.storyboard @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/osu.Framework.Microphone.Tests.iOS/Linker.xml b/osu.Framework.Microphone.Tests.iOS/Linker.xml new file mode 100644 index 0000000..18f1579 --- /dev/null +++ b/osu.Framework.Microphone.Tests.iOS/Linker.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/osu.Framework.Microphone.Tests.iOS/osu.Framework.Microphone.Tests.iOS.csproj b/osu.Framework.Microphone.Tests.iOS/osu.Framework.Microphone.Tests.iOS.csproj new file mode 100644 index 0000000..7f79397 --- /dev/null +++ b/osu.Framework.Microphone.Tests.iOS/osu.Framework.Microphone.Tests.iOS.csproj @@ -0,0 +1,56 @@ + + + + Debug + iPhoneSimulator + {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Exe + osu.Framework.Tests + osu.Framework.Tests + Resources + {D972753E-45FC-4B82-B017-34BDE485F1BB} + + + + + false + + + false + + + + + + + + + + + + + + + + + %(RecursiveDir)%(Filename)%(Extension) + + + Resources\%(RecursiveDir)%(Filename)%(Extension) + + + + + {C76BF5B3-985E-4D39-95FE-97C9C879B83A} + osu.Framework + + + {BBC0D18F-8595-43A6-AE61-5BF36A072CCE} + osu.Framework.iOS + + + + + + + \ No newline at end of file From 8fbf3a5ce3fd8db5577afd1f7fe59be95f31fc7a Mon Sep 17 00:00:00 2001 From: andy840119 Date: Sun, 19 Jul 2020 13:02:44 +0900 Subject: [PATCH 2/6] Add android and ios project. --- osu-framework-microphone.sln | 40 ++++++++- osu.Framework.Microphone.Android.props | 61 ++++++++++++++ .../osu.Framework.Microphone.Tests.iOS.csproj | 18 ++-- osu.Framework.Microphone.iOS.props | 84 +++++++++++++++++++ 4 files changed, 190 insertions(+), 13 deletions(-) create mode 100644 osu.Framework.Microphone.Android.props create mode 100644 osu.Framework.Microphone.iOS.props diff --git a/osu-framework-microphone.sln b/osu-framework-microphone.sln index 486287d..558c118 100644 --- a/osu-framework-microphone.sln +++ b/osu-framework-microphone.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.852 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30309.148 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Framework.Microphone", "osu.Framework.Microphone\osu.Framework.Microphone.csproj", "{D0F85C61-800A-4645-8633-AC59208FA732}" EndProject @@ -15,24 +15,56 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution global.json = global.json CodeAnalysis\osu-framework-microphone.ruleset = CodeAnalysis\osu-framework-microphone.ruleset osu-framework-microphone.sln.DotSettings = osu-framework-microphone.sln.DotSettings - osu.Framework.Android.props = osu.Framework.Android.props - osu.Framework.iOS.props = osu.Framework.iOS.props + osu.Framework.Microphone.Android.props = osu.Framework.Microphone.Android.props + osu.Framework.Microphone.iOS.props = osu.Framework.Microphone.iOS.props EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Framework.Microphone.Tests.iOS", "osu.Framework.Microphone.Tests.iOS\osu.Framework.Microphone.Tests.iOS.csproj", "{D972753E-45FC-4B82-B017-34BDE485F1BB}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|iPhone = Debug|iPhone + Debug|iPhoneSimulator = Debug|iPhoneSimulator Release|Any CPU = Release|Any CPU + Release|iPhone = Release|iPhone + Release|iPhoneSimulator = Release|iPhoneSimulator EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {D0F85C61-800A-4645-8633-AC59208FA732}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D0F85C61-800A-4645-8633-AC59208FA732}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D0F85C61-800A-4645-8633-AC59208FA732}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {D0F85C61-800A-4645-8633-AC59208FA732}.Debug|iPhone.Build.0 = Debug|Any CPU + {D0F85C61-800A-4645-8633-AC59208FA732}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {D0F85C61-800A-4645-8633-AC59208FA732}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {D0F85C61-800A-4645-8633-AC59208FA732}.Release|Any CPU.ActiveCfg = Release|Any CPU {D0F85C61-800A-4645-8633-AC59208FA732}.Release|Any CPU.Build.0 = Release|Any CPU + {D0F85C61-800A-4645-8633-AC59208FA732}.Release|iPhone.ActiveCfg = Release|Any CPU + {D0F85C61-800A-4645-8633-AC59208FA732}.Release|iPhone.Build.0 = Release|Any CPU + {D0F85C61-800A-4645-8633-AC59208FA732}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {D0F85C61-800A-4645-8633-AC59208FA732}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {C567CF87-3AD0-4FF3-B839-4502D23FD4D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C567CF87-3AD0-4FF3-B839-4502D23FD4D1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C567CF87-3AD0-4FF3-B839-4502D23FD4D1}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {C567CF87-3AD0-4FF3-B839-4502D23FD4D1}.Debug|iPhone.Build.0 = Debug|Any CPU + {C567CF87-3AD0-4FF3-B839-4502D23FD4D1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {C567CF87-3AD0-4FF3-B839-4502D23FD4D1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {C567CF87-3AD0-4FF3-B839-4502D23FD4D1}.Release|Any CPU.ActiveCfg = Release|Any CPU {C567CF87-3AD0-4FF3-B839-4502D23FD4D1}.Release|Any CPU.Build.0 = Release|Any CPU + {C567CF87-3AD0-4FF3-B839-4502D23FD4D1}.Release|iPhone.ActiveCfg = Release|Any CPU + {C567CF87-3AD0-4FF3-B839-4502D23FD4D1}.Release|iPhone.Build.0 = Release|Any CPU + {C567CF87-3AD0-4FF3-B839-4502D23FD4D1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {C567CF87-3AD0-4FF3-B839-4502D23FD4D1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {D972753E-45FC-4B82-B017-34BDE485F1BB}.Debug|Any CPU.ActiveCfg = Debug|iPhone + {D972753E-45FC-4B82-B017-34BDE485F1BB}.Debug|iPhone.ActiveCfg = Debug|iPhone + {D972753E-45FC-4B82-B017-34BDE485F1BB}.Debug|iPhone.Build.0 = Debug|iPhone + {D972753E-45FC-4B82-B017-34BDE485F1BB}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator + {D972753E-45FC-4B82-B017-34BDE485F1BB}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator + {D972753E-45FC-4B82-B017-34BDE485F1BB}.Release|Any CPU.ActiveCfg = Release|iPhone + {D972753E-45FC-4B82-B017-34BDE485F1BB}.Release|iPhone.ActiveCfg = Release|iPhone + {D972753E-45FC-4B82-B017-34BDE485F1BB}.Release|iPhone.Build.0 = Release|iPhone + {D972753E-45FC-4B82-B017-34BDE485F1BB}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator + {D972753E-45FC-4B82-B017-34BDE485F1BB}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/osu.Framework.Microphone.Android.props b/osu.Framework.Microphone.Android.props new file mode 100644 index 0000000..91c2ff6 --- /dev/null +++ b/osu.Framework.Microphone.Android.props @@ -0,0 +1,61 @@ + + + 8.0 + bin\$(Configuration) + 4 + 2.0 + false + false + Library + 512 + Off + True + Xamarin.Android.Net.AndroidClientHandler + + + false + true + armeabi-v7a;x86;arm64-v8a + true + cjk,mideast,other,rare,west + SdkOnly + prompt + + + True + full + False + DEBUG;TRACE + false + true + false + + + false + pdbonly + true + false + False + true + + + + Always + + + Always + + + + + + + + + + + + + + + diff --git a/osu.Framework.Microphone.Tests.iOS/osu.Framework.Microphone.Tests.iOS.csproj b/osu.Framework.Microphone.Tests.iOS/osu.Framework.Microphone.Tests.iOS.csproj index 7f79397..66f2db6 100644 --- a/osu.Framework.Microphone.Tests.iOS/osu.Framework.Microphone.Tests.iOS.csproj +++ b/osu.Framework.Microphone.Tests.iOS/osu.Framework.Microphone.Tests.iOS.csproj @@ -5,12 +5,12 @@ iPhoneSimulator {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Exe - osu.Framework.Tests - osu.Framework.Tests + osu.Framework.Microphone.Tests + osu.Framework.Microphone.Tests Resources {D972753E-45FC-4B82-B017-34BDE485F1BB} - + false @@ -32,21 +32,21 @@ - + %(RecursiveDir)%(Filename)%(Extension) - + Resources\%(RecursiveDir)%(Filename)%(Extension) - + {C76BF5B3-985E-4D39-95FE-97C9C879B83A} - osu.Framework + osu.Framework.Microphone - + {BBC0D18F-8595-43A6-AE61-5BF36A072CCE} - osu.Framework.iOS + osu.Framework.Microphone.iOS diff --git a/osu.Framework.Microphone.iOS.props b/osu.Framework.Microphone.iOS.props new file mode 100644 index 0000000..13fb55c --- /dev/null +++ b/osu.Framework.Microphone.iOS.props @@ -0,0 +1,84 @@ + + + 8.0 + --nolinkaway + -lstdc++ -lbz2 -framework AudioToolbox -framework AVFoundation -framework CoreMedia -framework VideoToolbox -framework SystemConfiguration -framework CFNetwork -framework Accelerate + PackageReference + bin\$(Platform)\$(Configuration) + cjk,mideast,other,rare,west + false + $(DefaultMtouchExtraArgs) -gcc_flags "$(DefaultMtouchGccFlags)" + NSUrlSessionHandler + + + + true + full + false + DEBUG;ENABLE_TEST_CLOUD; + true + true + + + pdbonly + true + + + x86_64 + None + + + true + SdkOnly + ARM64 + Entitlements.plist + + + true + 25823 + false + + + true + + + true + 28126 + + + + + + + + + + + Static + False + True + + + + + + + + + + + + + + + + + + + + + + + + + From 8c0d3a456fdcdf09abd38f104ae6843afd9a1f21 Mon Sep 17 00:00:00 2001 From: andy840119 Date: Sun, 19 Jul 2020 13:06:01 +0900 Subject: [PATCH 3/6] Add android target. --- osu-framework-microphone.sln | 20 +++++++++++++++++++ ....Framework.Microphone.Tests.Android.csproj | 18 ++++++++--------- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/osu-framework-microphone.sln b/osu-framework-microphone.sln index 558c118..0f9f672 100644 --- a/osu-framework-microphone.sln +++ b/osu-framework-microphone.sln @@ -21,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Framework.Microphone.Tests.iOS", "osu.Framework.Microphone.Tests.iOS\osu.Framework.Microphone.Tests.iOS.csproj", "{D972753E-45FC-4B82-B017-34BDE485F1BB}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Framework.Microphone.Tests.Android", "osu.Framework.Microphone.Tests.Android\osu.Framework.Microphone.Tests.Android.csproj", "{320089C6-A141-4D3E-BD5F-C4A6CE9E567B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -65,6 +67,24 @@ Global {D972753E-45FC-4B82-B017-34BDE485F1BB}.Release|iPhone.Build.0 = Release|iPhone {D972753E-45FC-4B82-B017-34BDE485F1BB}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator {D972753E-45FC-4B82-B017-34BDE485F1BB}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator + {320089C6-A141-4D3E-BD5F-C4A6CE9E567B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {320089C6-A141-4D3E-BD5F-C4A6CE9E567B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {320089C6-A141-4D3E-BD5F-C4A6CE9E567B}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {320089C6-A141-4D3E-BD5F-C4A6CE9E567B}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {320089C6-A141-4D3E-BD5F-C4A6CE9E567B}.Debug|iPhone.Build.0 = Debug|Any CPU + {320089C6-A141-4D3E-BD5F-C4A6CE9E567B}.Debug|iPhone.Deploy.0 = Debug|Any CPU + {320089C6-A141-4D3E-BD5F-C4A6CE9E567B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {320089C6-A141-4D3E-BD5F-C4A6CE9E567B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {320089C6-A141-4D3E-BD5F-C4A6CE9E567B}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU + {320089C6-A141-4D3E-BD5F-C4A6CE9E567B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {320089C6-A141-4D3E-BD5F-C4A6CE9E567B}.Release|Any CPU.Build.0 = Release|Any CPU + {320089C6-A141-4D3E-BD5F-C4A6CE9E567B}.Release|Any CPU.Deploy.0 = Release|Any CPU + {320089C6-A141-4D3E-BD5F-C4A6CE9E567B}.Release|iPhone.ActiveCfg = Release|Any CPU + {320089C6-A141-4D3E-BD5F-C4A6CE9E567B}.Release|iPhone.Build.0 = Release|Any CPU + {320089C6-A141-4D3E-BD5F-C4A6CE9E567B}.Release|iPhone.Deploy.0 = Release|Any CPU + {320089C6-A141-4D3E-BD5F-C4A6CE9E567B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {320089C6-A141-4D3E-BD5F-C4A6CE9E567B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {320089C6-A141-4D3E-BD5F-C4A6CE9E567B}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/osu.Framework.Microphone.Tests.Android/osu.Framework.Microphone.Tests.Android.csproj b/osu.Framework.Microphone.Tests.Android/osu.Framework.Microphone.Tests.Android.csproj index 67adc45..f3967a3 100644 --- a/osu.Framework.Microphone.Tests.Android/osu.Framework.Microphone.Tests.Android.csproj +++ b/osu.Framework.Microphone.Tests.Android/osu.Framework.Microphone.Tests.Android.csproj @@ -1,13 +1,13 @@  - + 8.0 Debug AnyCPU {320089C6-A141-4D3E-BD5F-C4A6CE9E567B} {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - osu.Framework.Tests.Android - osu.Framework.Tests.Android + osu.Framework.Microphone.Tests.Android + osu.Framework.Microphone.Tests.Android Properties\AndroidManifest.xml armeabi-v7a;x86;arm64-v8a v10.0 @@ -19,21 +19,21 @@ - + %(RecursiveDir)%(Filename)%(Extension) - + Resources\%(RecursiveDir)%(Filename)%(Extension) - + {4d112e30-462b-4264-b44d-53b61abb185e} - osu.Framework.Android + osu.Framework.Microphone.Android - + {c76bf5b3-985e-4d39-95fe-97c9c879b83a} - osu.Framework + osu.Framework.Microphone From 0a4ed9ca7f1a5df83a2a6222e05630446311f916 Mon Sep 17 00:00:00 2001 From: andy840119 Date: Sun, 19 Jul 2020 13:06:20 +0900 Subject: [PATCH 4/6] Using nuget package instead of exist project. --- .../osu.Framework.Microphone.Tests.Android.csproj | 9 +++++---- .../osu.Framework.Microphone.Tests.iOS.csproj | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/osu.Framework.Microphone.Tests.Android/osu.Framework.Microphone.Tests.Android.csproj b/osu.Framework.Microphone.Tests.Android/osu.Framework.Microphone.Tests.Android.csproj index f3967a3..f1eb39d 100644 --- a/osu.Framework.Microphone.Tests.Android/osu.Framework.Microphone.Tests.Android.csproj +++ b/osu.Framework.Microphone.Tests.Android/osu.Framework.Microphone.Tests.Android.csproj @@ -27,10 +27,6 @@ - - {4d112e30-462b-4264-b44d-53b61abb185e} - osu.Framework.Microphone.Android - {c76bf5b3-985e-4d39-95fe-97c9c879b83a} osu.Framework.Microphone @@ -39,5 +35,10 @@ + + + 2020.707.0 + + \ No newline at end of file diff --git a/osu.Framework.Microphone.Tests.iOS/osu.Framework.Microphone.Tests.iOS.csproj b/osu.Framework.Microphone.Tests.iOS/osu.Framework.Microphone.Tests.iOS.csproj index 66f2db6..1c13e6d 100644 --- a/osu.Framework.Microphone.Tests.iOS/osu.Framework.Microphone.Tests.iOS.csproj +++ b/osu.Framework.Microphone.Tests.iOS/osu.Framework.Microphone.Tests.iOS.csproj @@ -44,13 +44,14 @@ {C76BF5B3-985E-4D39-95FE-97C9C879B83A} osu.Framework.Microphone - - {BBC0D18F-8595-43A6-AE61-5BF36A072CCE} - osu.Framework.Microphone.iOS - + + + 2020.707.0 + + \ No newline at end of file From 7110f32e36414ed0b33167edb6bbe42e81449249 Mon Sep 17 00:00:00 2001 From: andy840119 Date: Thu, 23 Jul 2020 18:22:17 +0800 Subject: [PATCH 5/6] Update prop file and it works/ --- osu.Framework.Microphone.Tests.iOS/Linker.xml | 2 +- osu.Framework.Microphone.iOS.props | 60 ++++++++++--------- 2 files changed, 34 insertions(+), 28 deletions(-) diff --git a/osu.Framework.Microphone.Tests.iOS/Linker.xml b/osu.Framework.Microphone.Tests.iOS/Linker.xml index 18f1579..51e6f60 100644 --- a/osu.Framework.Microphone.Tests.iOS/Linker.xml +++ b/osu.Framework.Microphone.Tests.iOS/Linker.xml @@ -6,7 +6,7 @@ - + diff --git a/osu.Framework.Microphone.iOS.props b/osu.Framework.Microphone.iOS.props index 13fb55c..535ecbf 100644 --- a/osu.Framework.Microphone.iOS.props +++ b/osu.Framework.Microphone.iOS.props @@ -1,15 +1,19 @@  8.0 + {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Resources + PackageReference --nolinkaway -lstdc++ -lbz2 -framework AudioToolbox -framework AVFoundation -framework CoreMedia -framework VideoToolbox -framework SystemConfiguration -framework CFNetwork -framework Accelerate - PackageReference bin\$(Platform)\$(Configuration) cjk,mideast,other,rare,west false $(DefaultMtouchExtraArgs) -gcc_flags "$(DefaultMtouchGccFlags)" NSUrlSessionHandler + iPhone Developer + true true @@ -45,40 +49,42 @@ true 28126 + + + Static + False + True + + + Static + False + True + + + - - - Static - False - True - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + From ce0ffa23b9fbc36e7048bad45ba6f2b937bdcd7d Mon Sep 17 00:00:00 2001 From: andy840119 Date: Thu, 23 Jul 2020 18:22:32 +0800 Subject: [PATCH 6/6] Update nuget package. --- .../osu.Framework.Microphone.Tests.Android.csproj | 10 ++++++++-- .../osu.Framework.Microphone.Tests.iOS.csproj | 4 ++-- .../osu.Framework.Microphone.csproj | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/osu.Framework.Microphone.Tests.Android/osu.Framework.Microphone.Tests.Android.csproj b/osu.Framework.Microphone.Tests.Android/osu.Framework.Microphone.Tests.Android.csproj index f1eb39d..b56b841 100644 --- a/osu.Framework.Microphone.Tests.Android/osu.Framework.Microphone.Tests.Android.csproj +++ b/osu.Framework.Microphone.Tests.Android/osu.Framework.Microphone.Tests.Android.csproj @@ -12,6 +12,12 @@ armeabi-v7a;x86;arm64-v8a v10.0 + + bin\Debug\ + + + bin\Release\ + @@ -28,7 +34,7 @@ - {c76bf5b3-985e-4d39-95fe-97c9c879b83a} + {D0F85C61-800A-4645-8633-AC59208FA732} osu.Framework.Microphone @@ -37,7 +43,7 @@ - 2020.707.0 + 2020.722.0 diff --git a/osu.Framework.Microphone.Tests.iOS/osu.Framework.Microphone.Tests.iOS.csproj b/osu.Framework.Microphone.Tests.iOS/osu.Framework.Microphone.Tests.iOS.csproj index 1c13e6d..882d355 100644 --- a/osu.Framework.Microphone.Tests.iOS/osu.Framework.Microphone.Tests.iOS.csproj +++ b/osu.Framework.Microphone.Tests.iOS/osu.Framework.Microphone.Tests.iOS.csproj @@ -41,7 +41,7 @@ - {C76BF5B3-985E-4D39-95FE-97C9C879B83A} + {D0F85C61-800A-4645-8633-AC59208FA732} osu.Framework.Microphone @@ -50,7 +50,7 @@ - 2020.707.0 + 2020.722.0 diff --git a/osu.Framework.Microphone/osu.Framework.Microphone.csproj b/osu.Framework.Microphone/osu.Framework.Microphone.csproj index 0931d51..a53c5b4 100644 --- a/osu.Framework.Microphone/osu.Framework.Microphone.csproj +++ b/osu.Framework.Microphone/osu.Framework.Microphone.csproj @@ -24,7 +24,7 @@ - +