Skip to content

Commit

Permalink
Merge pull request #10 from madrvojt/netstandard2_0
Browse files Browse the repository at this point in the history
Convert to .NET.Standard
  • Loading branch information
SuavePirate authored Dec 6, 2018
2 parents d184d2e + fc69ab2 commit 76cc1cb
Show file tree
Hide file tree
Showing 32 changed files with 14,608 additions and 3,622 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -250,3 +250,9 @@ paket-files/
# JetBrains Rider
.idea/
*.sln.iml

# mFractor
.mfractor/

# MacOs
.DS_Store
58 changes: 29 additions & 29 deletions BadgeView.sln
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DCBE8DA3-FFF
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BadgeView.Shared", "src\BadgeView.Shared\BadgeView.Shared.csproj", "{3D5011FE-3496-4594-AAA6-08F3CDCE33D6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BadgeView.iOS", "src\BadgeView.iOS\BadgeView.iOS.csproj", "{E4B37C1B-BEC4-4032-9CE0-CBBC805786FB}"
Project("{5DD5E4FA-CB73-4610-85AB-557B54E96AA9}") = "BadgeView.Nuget", "src\BadgeView.Nuget\BadgeView.Nuget.nuproj", "{193E088D-D09F-4F85-A455-DE46347C61D8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BadgeView.Android", "src\BadgeView.Android\BadgeView.Android.csproj", "{3EBD328D-2BDA-4D56-9685-825DCB7828B6}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BadgeView.iOS", "src\BadgeView.iOS\BadgeView.iOS.csproj", "{5B38BD8B-9E98-449C-B86F-EE305A0A5AE2}"
EndProject
Project("{5DD5E4FA-CB73-4610-85AB-557B54E96AA9}") = "BadgeView.Nuget", "src\BadgeView.Nuget\BadgeView.Nuget.nuproj", "{193E088D-D09F-4F85-A455-DE46347C61D8}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BadgeView.Android", "src\BadgeView.Android\BadgeView.Android.csproj", "{1CA25F7C-F44D-4A73-B71E-B3D7E628A37E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -77,30 +77,6 @@ Global
{3D5011FE-3496-4594-AAA6-08F3CDCE33D6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{3D5011FE-3496-4594-AAA6-08F3CDCE33D6}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{3D5011FE-3496-4594-AAA6-08F3CDCE33D6}.Debug|iPhone.Build.0 = Debug|Any CPU
{E4B37C1B-BEC4-4032-9CE0-CBBC805786FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E4B37C1B-BEC4-4032-9CE0-CBBC805786FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E4B37C1B-BEC4-4032-9CE0-CBBC805786FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E4B37C1B-BEC4-4032-9CE0-CBBC805786FB}.Release|Any CPU.Build.0 = Release|Any CPU
{E4B37C1B-BEC4-4032-9CE0-CBBC805786FB}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{E4B37C1B-BEC4-4032-9CE0-CBBC805786FB}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{E4B37C1B-BEC4-4032-9CE0-CBBC805786FB}.Release|iPhone.ActiveCfg = Release|Any CPU
{E4B37C1B-BEC4-4032-9CE0-CBBC805786FB}.Release|iPhone.Build.0 = Release|Any CPU
{E4B37C1B-BEC4-4032-9CE0-CBBC805786FB}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{E4B37C1B-BEC4-4032-9CE0-CBBC805786FB}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{E4B37C1B-BEC4-4032-9CE0-CBBC805786FB}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{E4B37C1B-BEC4-4032-9CE0-CBBC805786FB}.Debug|iPhone.Build.0 = Debug|Any CPU
{3EBD328D-2BDA-4D56-9685-825DCB7828B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3EBD328D-2BDA-4D56-9685-825DCB7828B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3EBD328D-2BDA-4D56-9685-825DCB7828B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3EBD328D-2BDA-4D56-9685-825DCB7828B6}.Release|Any CPU.Build.0 = Release|Any CPU
{3EBD328D-2BDA-4D56-9685-825DCB7828B6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{3EBD328D-2BDA-4D56-9685-825DCB7828B6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{3EBD328D-2BDA-4D56-9685-825DCB7828B6}.Release|iPhone.ActiveCfg = Release|Any CPU
{3EBD328D-2BDA-4D56-9685-825DCB7828B6}.Release|iPhone.Build.0 = Release|Any CPU
{3EBD328D-2BDA-4D56-9685-825DCB7828B6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{3EBD328D-2BDA-4D56-9685-825DCB7828B6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{3EBD328D-2BDA-4D56-9685-825DCB7828B6}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{3EBD328D-2BDA-4D56-9685-825DCB7828B6}.Debug|iPhone.Build.0 = Debug|Any CPU
{193E088D-D09F-4F85-A455-DE46347C61D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{193E088D-D09F-4F85-A455-DE46347C61D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{193E088D-D09F-4F85-A455-DE46347C61D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -113,14 +89,38 @@ Global
{193E088D-D09F-4F85-A455-DE46347C61D8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{193E088D-D09F-4F85-A455-DE46347C61D8}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{193E088D-D09F-4F85-A455-DE46347C61D8}.Debug|iPhone.Build.0 = Debug|Any CPU
{5B38BD8B-9E98-449C-B86F-EE305A0A5AE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5B38BD8B-9E98-449C-B86F-EE305A0A5AE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5B38BD8B-9E98-449C-B86F-EE305A0A5AE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5B38BD8B-9E98-449C-B86F-EE305A0A5AE2}.Release|Any CPU.Build.0 = Release|Any CPU
{5B38BD8B-9E98-449C-B86F-EE305A0A5AE2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{5B38BD8B-9E98-449C-B86F-EE305A0A5AE2}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{5B38BD8B-9E98-449C-B86F-EE305A0A5AE2}.Release|iPhone.ActiveCfg = Release|Any CPU
{5B38BD8B-9E98-449C-B86F-EE305A0A5AE2}.Release|iPhone.Build.0 = Release|Any CPU
{5B38BD8B-9E98-449C-B86F-EE305A0A5AE2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{5B38BD8B-9E98-449C-B86F-EE305A0A5AE2}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{5B38BD8B-9E98-449C-B86F-EE305A0A5AE2}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{5B38BD8B-9E98-449C-B86F-EE305A0A5AE2}.Debug|iPhone.Build.0 = Debug|Any CPU
{1CA25F7C-F44D-4A73-B71E-B3D7E628A37E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1CA25F7C-F44D-4A73-B71E-B3D7E628A37E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1CA25F7C-F44D-4A73-B71E-B3D7E628A37E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1CA25F7C-F44D-4A73-B71E-B3D7E628A37E}.Release|Any CPU.Build.0 = Release|Any CPU
{1CA25F7C-F44D-4A73-B71E-B3D7E628A37E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{1CA25F7C-F44D-4A73-B71E-B3D7E628A37E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{1CA25F7C-F44D-4A73-B71E-B3D7E628A37E}.Release|iPhone.ActiveCfg = Release|Any CPU
{1CA25F7C-F44D-4A73-B71E-B3D7E628A37E}.Release|iPhone.Build.0 = Release|Any CPU
{1CA25F7C-F44D-4A73-B71E-B3D7E628A37E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{1CA25F7C-F44D-4A73-B71E-B3D7E628A37E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{1CA25F7C-F44D-4A73-B71E-B3D7E628A37E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{1CA25F7C-F44D-4A73-B71E-B3D7E628A37E}.Debug|iPhone.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{29B17DB3-1B94-4887-8700-BA7ABDC58E50} = {D441BD1A-C335-4E32-881D-900113EFB70D}
{C553BEF4-330D-490C-9CCF-8233509A2BD6} = {D441BD1A-C335-4E32-881D-900113EFB70D}
{FACF18C9-5FBF-49AD-AEBE-20D1E161B542} = {D441BD1A-C335-4E32-881D-900113EFB70D}
{3D5011FE-3496-4594-AAA6-08F3CDCE33D6} = {DCBE8DA3-FFF2-4F20-B16B-C4AB7036CC9A}
{E4B37C1B-BEC4-4032-9CE0-CBBC805786FB} = {DCBE8DA3-FFF2-4F20-B16B-C4AB7036CC9A}
{3EBD328D-2BDA-4D56-9685-825DCB7828B6} = {DCBE8DA3-FFF2-4F20-B16B-C4AB7036CC9A}
{193E088D-D09F-4F85-A455-DE46347C61D8} = {DCBE8DA3-FFF2-4F20-B16B-C4AB7036CC9A}
{5B38BD8B-9E98-449C-B86F-EE305A0A5AE2} = {DCBE8DA3-FFF2-4F20-B16B-C4AB7036CC9A}
{1CA25F7C-F44D-4A73-B71E-B3D7E628A37E} = {DCBE8DA3-FFF2-4F20-B16B-C4AB7036CC9A}
EndGlobalSection
EndGlobal
2 changes: 2 additions & 0 deletions Example/BadgeViewExample/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using Xamarin.Forms;
using Xamarin.Forms.Xaml;

[assembly: XamlCompilation(XamlCompilationOptions.Compile)]
namespace BadgeViewExample
{
public partial class App : Application
Expand Down
2 changes: 1 addition & 1 deletion Example/BadgeViewExample/BadgePage.xaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms" xmlns:badge="clr-namespace:BadgeView.Shared;assembly=BadgeView.Shared" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="BadgeViewExample.BadgePage">
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="BadgeViewExample.BadgePage" xmlns:badge="clr-namespace:BadgeView.Shared;assembly=BadgeView.Shared">
<ContentPage.Content>
<StackLayout Orientation="Horizontal" HorizontalOptions="CenterAndExpand" VerticalOptions="Center">
<Label HorizontalTextAlignment="Center" Text="Look at me!" />
Expand Down
81 changes: 13 additions & 68 deletions Example/BadgeViewExample/BadgeViewExample.csproj
Original file line number Diff line number Diff line change
@@ -1,68 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{29B17DB3-1B94-4887-8700-BA7ABDC58E50}</ProjectGuid>
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<UseMSBuildEngine>true</UseMSBuildEngine>
<OutputType>Library</OutputType>
<RootNamespace>BadgeViewExample</RootNamespace>
<AssemblyName>BadgeViewExample</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Optimize>true</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="App.xaml" />
<EmbeddedResource Include="BadgePage.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="BadgePage.xaml.cs">
<DependentUpon>BadgePage.xaml</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\..\packages\Xamarin.Forms.2.4.0.282\lib\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.Core.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Xamarin.Forms.Platform">
<HintPath>..\..\packages\Xamarin.Forms.2.4.0.282\lib\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.Platform.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\..\packages\Xamarin.Forms.2.4.0.282\lib\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.Xaml.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="BadgeView.Shared">
<HintPath>..\..\packages\BadgeView.2017.10.17\lib\portable45-net45+win8+wpa81\BadgeView.Shared.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<Import Project="..\packages\Xamarin.Forms.2.3.4.247\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.3.4.247\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
<Import Project="..\..\packages\Xamarin.Forms.2.4.0.282\build\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.4.0.282\build\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.targets')" />
</Project>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\BadgeView.Shared\BadgeView.Shared.csproj" />
</ItemGroup>
</Project>
26 changes: 0 additions & 26 deletions Example/BadgeViewExample/Properties/AssemblyInfo.cs

This file was deleted.

5 changes: 0 additions & 5 deletions Example/BadgeViewExample/packages.config

This file was deleted.

Loading

0 comments on commit 76cc1cb

Please sign in to comment.