Skip to content

Commit

Permalink
Merge pull request #10 from hiroxpepe/issue/9
Browse files Browse the repository at this point in the history
update: #9 changing target .NET
  • Loading branch information
hiroxpepe authored Feb 27, 2021
2 parents f731f6c + 19a5a79 commit 4dcc2f2
Show file tree
Hide file tree
Showing 136 changed files with 9,294 additions and 23,760 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ mono_crash.*
[Rr]elease/
[Rr]eleases/
x64/
x86/
#x86/
[Aa][Rr][Mm]/
[Aa][Rr][Mm]64/
bld/
Expand Down
12,453 changes: 0 additions & 12,453 deletions MidiPlayer.Activity/Resources/Resource.designer.cs

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Android.Support.V7.App;
using Android.Widget;

namespace MidiPlayer.Activity {
namespace MidiPlayer.Droid {
/// <summary>
/// partial class for initialize the component
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
using System.Threading.Tasks;
using Xamarin.Essentials;

namespace MidiPlayer.Activity {
namespace MidiPlayer.Droid {

[Activity(Label = "@string/app_name", Theme = "@style/Base.Theme.MaterialComponents.Light.DarkActionBar.Bridge", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation, ScreenOrientation = ScreenOrientation.Landscape)]
public partial class MainActivity : AppCompatActivity {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<TemplateGuid>{122416d6-6b49-4ee2-a1e8-b825f31c79fe}</TemplateGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MidiPlayer.Activity</RootNamespace>
<AssemblyName>MidiPlayer.Activity</AssemblyName>
<RootNamespace>MidiPlayer.Droid</RootNamespace>
<AssemblyName>MidiPlayer.Droid</AssemblyName>
<FileAlignment>512</FileAlignment>
<Deterministic>True</Deterministic>
<AndroidApplication>True</AndroidApplication>
Expand Down Expand Up @@ -382,11 +382,11 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MidiPlayer.FluidSynth\MidiPlayer.FluidSynth.csproj">
<Project>{3cda4cb0-d5d4-4373-a9db-e6a399d4a933}</Project>
<Project>{d63ee98d-8a01-440e-8e7a-b924b41fafa6}</Project>
<Name>MidiPlayer.FluidSynth</Name>
</ProjectReference>
<ProjectReference Include="..\MidiPlayer\MidiPlayer.csproj">
<Project>{5db6bf4d-68da-455a-94a4-34c945aaa1c7}</Project>
<Project>{c772ad89-14ee-40cb-91ef-f96debeb6f35}</Project>
<Name>MidiPlayer</Name>
</ProjectReference>
</ItemGroup>
Expand Down
File renamed without changes.
9,236 changes: 9,236 additions & 0 deletions MidiPlayer.Droid/Resources/Resource.designer.cs

Large diffs are not rendered by default.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file added MidiPlayer.Droid/libs/x86/libFLAC.so
Binary file not shown.
Binary file added MidiPlayer.Droid/libs/x86/libc++_shared.so
Binary file not shown.
Binary file added MidiPlayer.Droid/libs/x86/libcharset.so
Binary file not shown.
Binary file added MidiPlayer.Droid/libs/x86/libffi.so
Binary file not shown.
Binary file not shown.
Binary file added MidiPlayer.Droid/libs/x86/libfluidsynth.so
Binary file not shown.
Binary file added MidiPlayer.Droid/libs/x86/libgio-2.0.so
Binary file not shown.
Binary file added MidiPlayer.Droid/libs/x86/libglib-2.0.so
Binary file not shown.
Binary file added MidiPlayer.Droid/libs/x86/libgmodule-2.0.so
Binary file not shown.
Binary file added MidiPlayer.Droid/libs/x86/libgobject-2.0.so
Binary file not shown.
Binary file added MidiPlayer.Droid/libs/x86/libgthread-2.0.so
Binary file not shown.
Binary file added MidiPlayer.Droid/libs/x86/libiconv.so
Binary file not shown.
Binary file added MidiPlayer.Droid/libs/x86/libintl.so
Binary file not shown.
Binary file added MidiPlayer.Droid/libs/x86/liboboe.so
Binary file not shown.
Binary file added MidiPlayer.Droid/libs/x86/libogg.so
Binary file not shown.
Binary file added MidiPlayer.Droid/libs/x86/libsndfile.so
Binary file not shown.
Binary file added MidiPlayer.Droid/libs/x86/libvorbis.so
Binary file not shown.
Binary file added MidiPlayer.Droid/libs/x86/libvorbisenc.so
Binary file not shown.
Binary file added MidiPlayer.Droid/libs/x86/libvorbisfile.so
Binary file not shown.
Binary file added MidiPlayer.Droid/libs/x86/libz.so
Binary file not shown.
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
84 changes: 9 additions & 75 deletions MidiPlayer.FluidSynth/MidiPlayer.FluidSynth.csproj
Original file line number Diff line number Diff line change
@@ -1,81 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{3CDA4CB0-D5D4-4373-A9DB-E6A399D4A933}</ProjectGuid>
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<TemplateGuid>{9ef11e43-1701-4396-8835-8392d57abb70}</TemplateGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MidiPlayer.FluidSynth</RootNamespace>
<AssemblyName>MidiPlayer.FluidSynth</AssemblyName>
<FileAlignment>512</FileAlignment>
<Deterministic>True</Deterministic>
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
<AndroidUseAapt2>true</AndroidUseAapt2>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>portable</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>portable</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Mono.Android" />
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Fluidsynth.cs" />
<Compile Include="Resources\Resource.designer.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Synth.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\AboutResources.txt" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.3" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\strings.xml" />
</ItemGroup>

<ItemGroup>
<Folder Include="Resources\drawable\" />
<PackageReference Include="NLog" Version="4.7.7" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\MidiPlayer\MidiPlayer.csproj">
<Project>{5db6bf4d-68da-455a-94a4-34c945aaa1c7}</Project>
<Name>MidiPlayer</Name>
</ProjectReference>
<ProjectReference Include="..\MidiPlayer\MidiPlayer.csproj" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.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>

</Project>
26 changes: 0 additions & 26 deletions MidiPlayer.FluidSynth/Properties/AssemblyInfo.cs

This file was deleted.

44 changes: 0 additions & 44 deletions MidiPlayer.FluidSynth/Resources/AboutResources.txt

This file was deleted.

Loading

0 comments on commit 4dcc2f2

Please sign in to comment.