diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 0000000..dba82fb --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,17 @@ +Please fill out either the bug or feature request section and remove whatever section you are not using. + +## Bug + +Version Number of Plugin: +Device Tested On: +Simulator Tested On: + +### Expected Behavior + +### Actual Behavior + +### Steps to reproduce the Behavior + + +## Feature Request: +Please fill in what you would like diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..7fb0f39 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,8 @@ +Please take a moment to fill out the following: + +Fixes # . + +Changes Proposed in this pull request: +- +- +- diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..ad7b069 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,13 @@ +version: 1.0.0.{build}-beta +assembly_info: + patch: true + file: '**\AssemblyInfo.*' + assembly_version: '{version}' + assembly_file_version: '{version}' + assembly_informational_version: '{version}' +build_script: +- cmd: >- + powershell .\bootstrapper.ps1 -Target Default -Verbosity diagnostic +artifacts: +- path: ./Build/nuget/*.nupkg + name: NuGet diff --git a/bootstrapper.ps1 b/bootstrapper.ps1 new file mode 100644 index 0000000..2c2db53 --- /dev/null +++ b/bootstrapper.ps1 @@ -0,0 +1,72 @@ +Param( + [string]$Script = ".\build.cake", + [string]$Target = "Default", + [string]$Configuration = "Release", + [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")] + [string]$Verbosity = "Verbose", + [switch]$Experimental, + [Alias("DryRun","Noop")] + [switch]$WhatIf +) + +$TOOLS_DIR = Join-Path $PSScriptRoot "tools" +$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe" +$NUGET3_EXE = Join-Path $TOOLS_DIR "nuget3.exe" +$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config" +$CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe" + +# Should we use the new Roslyn? +$UseExperimental = ""; +if($Experimental.IsPresent) { + $UseExperimental = "-experimental" +} + +# Is this a dry run? +$UseDryRun = ""; +if($WhatIf.IsPresent) { + $UseDryRun = "-dryrun" +} + +# Make sure tools folder exists +if (!(Test-Path $TOOLS_DIR)) { + New-Item -ItemType directory -Path $TOOLS_DIR | Out-Null +} + +# Make sure packages.config exists where we expect it. +if (!(Test-Path $PACKAGES_CONFIG)) { + Invoke-WebRequest -Uri http://cakebuild.net/download/bootstrapper/packages -OutFile $PACKAGES_CONFIG +} + +# Make sure NuGet exists where we expect it. +if (!(Test-Path $NUGET_EXE)) { + Invoke-WebRequest -Uri http://nuget.org/nuget.exe -OutFile $NUGET_EXE +} + +# Make sure NuGet exists where we expect it. +if (!(Test-Path $NUGET3_EXE)) { + Invoke-WebRequest -Uri https://dist.nuget.org/win-x86-commandline/latest/nuget.exe -OutFile $NUGET3_EXE +} + +# Make sure NuGet exists where we expect it. +if (!(Test-Path $NUGET_EXE)) { + Throw "Could not find NuGet.exe" +} + +# Restore tools from NuGet. +Push-Location +Set-Location $TOOLS_DIR +Invoke-Expression "$NUGET_EXE install -ExcludeVersion -Source https://www.nuget.org/api/v2" +Pop-Location +if ($LASTEXITCODE -ne 0) +{ + exit $LASTEXITCODE +} + +# Make sure that Cake has been installed. +if (!(Test-Path $CAKE_EXE)) { + Throw "Could not find Cake.exe" +} + +# Start Cake +Invoke-Expression "$CAKE_EXE `"$Script`" -target=`"$Target`" -configuration=`"$Configuration`" -verbosity=`"$Verbosity`" $UseDryRun $UseExperimental" +exit $LASTEXITCODE diff --git a/build.cake b/build.cake new file mode 100644 index 0000000..5d136ec --- /dev/null +++ b/build.cake @@ -0,0 +1,113 @@ +#addin nuget:https://nuget.org/api/v2/?package=Cake.FileHelpers&version=1.0.3.2 +#addin nuget:https://nuget.org/api/v2/?package=Cake.Xamarin&version=1.2.3 + +var TARGET = Argument ("target", Argument ("t", "Default")); +var version = EnvironmentVariable ("APPVEYOR_BUILD_VERSION") ?? Argument("version", "0.0.9999"); + +var libraries = new Dictionary { + { "./src/Converters.sln", "Any" }, + { "./src/Controls.sln", "Any" }, + { "./src/Behaviors.sln", "Any" }, + { "./src/Effects.sln", "Any" }, +}; + + +var BuildAction = new Action> (solutions => +{ + + foreach (var sln in solutions) + { + + // If the platform is Any build regardless + // If the platform is Win and we are running on windows build + // If the platform is Mac and we are running on Mac, build + if ((sln.Value == "Any") + || (sln.Value == "Win" && IsRunningOnWindows ()) + || (sln.Value == "Mac" && IsRunningOnUnix ())) + { + + // Bit of a hack to use nuget3 to restore packages for project.json + if (IsRunningOnWindows ()) + { + + Information ("RunningOn: {0}", "Windows"); + + NuGetRestore (sln.Key, new NuGetRestoreSettings + { + ToolPath = "./tools/nuget3.exe" + }); + + // Windows Phone / Universal projects require not using the amd64 msbuild + MSBuild (sln.Key, c => + { + c.Configuration = "Release"; + c.MSBuildPlatform = Cake.Common.Tools.MSBuild.MSBuildPlatform.x86; + }); + } + else + { + // Mac is easy ;) + NuGetRestore (sln.Key); + + DotNetBuild (sln.Key, c => c.Configuration = "Release"); + } + } + } +}); + +Task("Libraries").Does(()=> +{ + BuildAction(libraries); +}); + +Task ("NuGet") + .IsDependentOn ("Libraries") + .Does (() => +{ + if(!DirectoryExists("./Build/nuget/")) + CreateDirectory("./Build/nuget"); + + NuGetPack ("./nuget/Converters.nuspec", new NuGetPackSettings { + Version = version, + Verbosity = NuGetVerbosity.Detailed, + OutputDirectory = "./Build/nuget/", + BasePath = "./", + }); + + NuGetPack ("./nuget/Behaviors.nuspec", new NuGetPackSettings { + Version = version, + Verbosity = NuGetVerbosity.Detailed, + OutputDirectory = "./Build/nuget/", + BasePath = "./", + }); + + NuGetPack ("./nuget/Controls.nuspec", new NuGetPackSettings { + Version = version, + Verbosity = NuGetVerbosity.Detailed, + OutputDirectory = "./Build/nuget/", + BasePath = "./", + }); + + NuGetPack ("./nuget/Effects.nuspec", new NuGetPackSettings { + Version = version, + Verbosity = NuGetVerbosity.Detailed, + OutputDirectory = "./Build/nuget/", + BasePath = "./", + }); +}); + + +//Build nugets and libraries +Task ("Default").IsDependentOn("NuGet"); + + +Task ("Clean").Does (() => +{ + CleanDirectories ("./Build/"); + + CleanDirectories ("./**/bin"); + CleanDirectories ("./**/obj"); +}); + + +RunTarget (TARGET); diff --git a/install-android-sdk.ps1 b/install-android-sdk.ps1 new file mode 100644 index 0000000..815fa4c --- /dev/null +++ b/install-android-sdk.ps1 @@ -0,0 +1,31 @@ +$AndroidToolPath = "${env:ProgramFiles(x86)}\Android\android-sdk\tools\android" +#$AndroidToolPath = "$env:localappdata\Android\android-sdk\tools\android" + +Function Get-AndroidSDKs() { + $output = & $AndroidToolPath list sdk --all + $sdks = $output |% { + if ($_ -match '(?\d+)- (?.+), revision (?[\d\.]+)') { + $sdk = New-Object PSObject + Add-Member -InputObject $sdk -MemberType NoteProperty -Name Index -Value $Matches.index + Add-Member -InputObject $sdk -MemberType NoteProperty -Name Name -Value $Matches.sdk + Add-Member -InputObject $sdk -MemberType NoteProperty -Name Revision -Value $Matches.revision + $sdk + } + } + $sdks +} + +Function Install-AndroidSDK() { + [CmdletBinding()] + Param( + [Parameter(Mandatory=$true, Position=0)] + [PSObject[]]$sdks + ) + + $sdkIndexes = $sdks |% { $_.Index } + $sdkIndexArgument = [string]::Join(',', $sdkIndexes) + Echo 'y' | & $AndroidToolPath update sdk -u -a -t $sdkIndexArgument +} + +$sdks = Get-AndroidSDKs |? { $_.name -like 'sdk platform*API 15*' -or $_.name -like 'google apis*api 15' } +Install-AndroidSDK -sdks $sdks \ No newline at end of file diff --git a/nuget/Behaviors.nuspec b/nuget/Behaviors.nuspec new file mode 100644 index 0000000..5c0713f --- /dev/null +++ b/nuget/Behaviors.nuspec @@ -0,0 +1,31 @@ + + + + FormsCommunityToolkit.Behaviors + $version$ + Xamarin.Forms Community Toolkit: Behaviors + FormsCommunityToolkit + FormsCommunityToolkit + https://github.com/FormsCommunityToolkit/Behaviors + https://github.com/FormsCommunityToolkit/Behaviors/blob/master/LICENSE + https://github.com/FormsCommunityToolkit/Effects/blob/master/Media/OrganonLogo.64x64.png + false + + Xamarin.Forms Community Toolkit: Behaviors + Built against: 2.3.2.127 + + Xamarin.Forms Community Toolkit: Behaviors + community, toolkit, xamarin, pcl, android, xamarin.forms, ios, uwp, onverters + + + + + + + + + + + + + \ No newline at end of file diff --git a/nuget/Controls.nuspec b/nuget/Controls.nuspec new file mode 100644 index 0000000..7f7e80e --- /dev/null +++ b/nuget/Controls.nuspec @@ -0,0 +1,56 @@ + + + + FormsCommunityToolkit.Controls + $version$ + Forms Community Toolkit Controls for Xamarin.Forms + FormsCommunityToolkit + FormsCommunityToolkit + https://github.com/FormsCommunityToolkit/Controls + https://github.com/FormsCommunityToolkit/Controls/blob/master/LICENSE + https://github.com/FormsCommunityToolkit/Effects/blob/master/Media/OrganonLogo.64x64.png + false + + Xamarin.Forms Community Toolkit: Controls + Built against: 2.3.2.127 + + Xamarin.Forms Community Toolkit: Controls + community, toolkit, xamarin, pcl, android, xamarin.forms, ios, uwp, onverters + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nuget/Converters.nuspec b/nuget/Converters.nuspec new file mode 100644 index 0000000..8d4c65e --- /dev/null +++ b/nuget/Converters.nuspec @@ -0,0 +1,31 @@ + + + + FormsCommunityToolkit.Converters + $version$ + Forms Community Toolkit Converters for Xamarin.Forms + Jim Bennett, Glenn Versweyveld, Matthew Robbins, Gerald Versluis, James Montemagno + Jim Bennett, Glenn Versweyveld, Matthew Robbins, Gerald Versluis, James Montemagno + https://github.com/FormsCommunityToolkit/Converters + https://github.com/FormsCommunityToolkit/Converters/blob/master/LICENSE + https://github.com/FormsCommunityToolkit/Effects/blob/master/Media/OrganonLogo.64x64.png + false + + Forms Community Toolkit Converters for Xamarin.Forms + Built against: 2.3.2.127 + + Converters for Xamarin.Form + community, toolkit, xamarin, pcl, android, xamarin.forms, ios, uwp, onverters + + + + + + + + + + + + + \ No newline at end of file diff --git a/nuget/Effects.nuspec b/nuget/Effects.nuspec new file mode 100644 index 0000000..a5cfe76 --- /dev/null +++ b/nuget/Effects.nuspec @@ -0,0 +1,56 @@ + + + + FormsCommunityToolkit.Effects + $version$ + Xamarin.Forms Community Toolkit: Effects + FormsCommunityToolkit + FormsCommunityToolkit + https://github.com/FormsCommunityToolkit/Effects + https://github.com/FormsCommunityToolkit/Effects/blob/master/LICENSE + https://github.com/FormsCommunityToolkit/Effects/blob/master/Media/OrganonLogo.64x64.png + false + + Xamarin.Forms Community Toolkit Effects Library + Built against: 2.3.2.127 + + Xamarin.Forms Community Toolkit Effects Library + community, toolkit, xamarin, pcl, android, xamarin.forms, ios, uwp, effects + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Animations.sln b/src/Animations.sln index 33cefa6..965043b 100644 --- a/src/Animations.sln +++ b/src/Animations.sln @@ -3,23 +3,23 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Animations", "Animations\Animations.csproj", "{572B958E-CC33-47C1-95FA-1B3A0506F2ED}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Animations", "Animations\Animations\Animations.csproj", "{572B958E-CC33-47C1-95FA-1B3A0506F2ED}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4CF83A7E-B02C-4DEC-A0B7-EFC68623D928}" ProjectSection(SolutionItems) = preProject - ..\appveyor.yml = ..\appveyor.yml - ..\bootstrapper.ps1 = ..\bootstrapper.ps1 - ..\build.cake = ..\build.cake - ..\CHANGELOG.md = ..\CHANGELOG.md - ..\nuget\Animations.nuspec = ..\nuget\Animations.nuspec - ..\README.md = ..\README.md + ..\appveyor.yml = ..\..\appveyor.yml + ..\bootstrapper.ps1 = ..\..\bootstrapper.ps1 + ..\build.cake = ..\..\build.cake + ..\CHANGELOG.md = ..\..\CHANGELOG.md + ..\nuget\Animations.nuspec = ..\..\nuget\Animations.nuspec + ..\README.md = ..\..\README.md EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Animations.Android", "Animations.Android\Animations.Android.csproj", "{88DC2010-BE3A-4B86-A72F-3DF68413858B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Animations.Android", "Animations\Animations.Android\Animations.Android.csproj", "{88DC2010-BE3A-4B86-A72F-3DF68413858B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Animations.iOS", "Animations.iOS\Animations.iOS.csproj", "{F09F8CAF-701A-4673-A880-1580ACCB926B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Animations.iOS", "Animations\Animations.iOS\Animations.iOS.csproj", "{F09F8CAF-701A-4673-A880-1580ACCB926B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Animations.UWP", "Animations.UWP\Animations.UWP.csproj", "{98F91808-0410-4362-9B3A-BD5110BEECDE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Animations.UWP", "Animations\Animations.UWP\Animations.UWP.csproj", "{98F91808-0410-4362-9B3A-BD5110BEECDE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/Animations.Android/Animations.Android.csproj b/src/Animations/Animations.Android/Animations.Android.csproj similarity index 100% rename from src/Animations.Android/Animations.Android.csproj rename to src/Animations/Animations.Android/Animations.Android.csproj diff --git a/src/Animations.Android/Properties/AssemblyInfo.cs b/src/Animations/Animations.Android/Properties/AssemblyInfo.cs similarity index 100% rename from src/Animations.Android/Properties/AssemblyInfo.cs rename to src/Animations/Animations.Android/Properties/AssemblyInfo.cs diff --git a/src/Animations.Android/Resources/AboutResources.txt b/src/Animations/Animations.Android/Resources/AboutResources.txt similarity index 100% rename from src/Animations.Android/Resources/AboutResources.txt rename to src/Animations/Animations.Android/Resources/AboutResources.txt diff --git a/src/Animations.Android/Resources/Resource.Designer.cs b/src/Animations/Animations.Android/Resources/Resource.Designer.cs similarity index 100% rename from src/Animations.Android/Resources/Resource.Designer.cs rename to src/Animations/Animations.Android/Resources/Resource.Designer.cs diff --git a/src/Animations.Android/packages.config b/src/Animations/Animations.Android/packages.config similarity index 100% rename from src/Animations.Android/packages.config rename to src/Animations/Animations.Android/packages.config diff --git a/src/Animations.UWP/Animations.UWP.csproj b/src/Animations/Animations.UWP/Animations.UWP.csproj similarity index 100% rename from src/Animations.UWP/Animations.UWP.csproj rename to src/Animations/Animations.UWP/Animations.UWP.csproj diff --git a/src/Animations.UWP/Properties/Animations.UWP.rd.xml b/src/Animations/Animations.UWP/Properties/Animations.UWP.rd.xml similarity index 100% rename from src/Animations.UWP/Properties/Animations.UWP.rd.xml rename to src/Animations/Animations.UWP/Properties/Animations.UWP.rd.xml diff --git a/src/Animations.UWP/Properties/AssemblyInfo.cs b/src/Animations/Animations.UWP/Properties/AssemblyInfo.cs similarity index 100% rename from src/Animations.UWP/Properties/AssemblyInfo.cs rename to src/Animations/Animations.UWP/Properties/AssemblyInfo.cs diff --git a/src/Animations.UWP/project.json b/src/Animations/Animations.UWP/project.json similarity index 100% rename from src/Animations.UWP/project.json rename to src/Animations/Animations.UWP/project.json diff --git a/src/Animations.iOS/Animations.iOS.csproj b/src/Animations/Animations.iOS/Animations.iOS.csproj similarity index 100% rename from src/Animations.iOS/Animations.iOS.csproj rename to src/Animations/Animations.iOS/Animations.iOS.csproj diff --git a/src/Animations.iOS/Properties/AssemblyInfo.cs b/src/Animations/Animations.iOS/Properties/AssemblyInfo.cs similarity index 100% rename from src/Animations.iOS/Properties/AssemblyInfo.cs rename to src/Animations/Animations.iOS/Properties/AssemblyInfo.cs diff --git a/src/Animations.iOS/packages.config b/src/Animations/Animations.iOS/packages.config similarity index 100% rename from src/Animations.iOS/packages.config rename to src/Animations/Animations.iOS/packages.config diff --git a/src/Animations/Animations.csproj b/src/Animations/Animations/Animations.csproj similarity index 100% rename from src/Animations/Animations.csproj rename to src/Animations/Animations/Animations.csproj diff --git a/src/Animations/Properties/AssemblyInfo.cs b/src/Animations/Animations/Properties/AssemblyInfo.cs similarity index 100% rename from src/Animations/Properties/AssemblyInfo.cs rename to src/Animations/Animations/Properties/AssemblyInfo.cs diff --git a/src/Animations/packages.config b/src/Animations/Animations/packages.config similarity index 100% rename from src/Animations/packages.config rename to src/Animations/Animations/packages.config diff --git a/src/Behaviors.sln b/src/Behaviors.sln index 1ddac1a..a256b9f 100644 --- a/src/Behaviors.sln +++ b/src/Behaviors.sln @@ -3,18 +3,18 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Behaviors", "Behaviors\Behaviors.csproj", "{572B958E-CC33-47C1-95FA-1B3A0506F2ED}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Behaviors", "Behaviors\Behaviors\Behaviors.csproj", "{572B958E-CC33-47C1-95FA-1B3A0506F2ED}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Behaviors.Tests", "Behaviors.Tests\Behaviors.Tests.csproj", "{8EDF4429-251A-416D-BB68-93F227191BCF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Behaviors.Tests", "Behaviors\Behaviors.Tests\Behaviors.Tests.csproj", "{8EDF4429-251A-416D-BB68-93F227191BCF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4CF83A7E-B02C-4DEC-A0B7-EFC68623D928}" ProjectSection(SolutionItems) = preProject - ..\appveyor.yml = ..\appveyor.yml - ..\bootstrapper.ps1 = ..\bootstrapper.ps1 - ..\build.cake = ..\build.cake - ..\CHANGELOG.md = ..\CHANGELOG.md - ..\nuget\Behaviors.nuspec = ..\nuget\Behaviors.nuspec - ..\README.md = ..\README.md + ..\appveyor.yml = ..\..\appveyor.yml + ..\bootstrapper.ps1 = ..\..\bootstrapper.ps1 + ..\build.cake = ..\..\build.cake + ..\CHANGELOG.md = ..\..\CHANGELOG.md + ..\nuget\Behaviors.nuspec = ..\..\nuget\Behaviors.nuspec + ..\README.md = ..\..\README.md EndProjectSection EndProject Global diff --git a/src/Behaviors.Tests/Behaviors.Tests.csproj b/src/Behaviors/Behaviors.Tests/Behaviors.Tests.csproj similarity index 100% rename from src/Behaviors.Tests/Behaviors.Tests.csproj rename to src/Behaviors/Behaviors.Tests/Behaviors.Tests.csproj diff --git a/src/Behaviors.Tests/Entry/EntryEmailValidationTests.cs b/src/Behaviors/Behaviors.Tests/Entry/EntryEmailValidationTests.cs similarity index 100% rename from src/Behaviors.Tests/Entry/EntryEmailValidationTests.cs rename to src/Behaviors/Behaviors.Tests/Entry/EntryEmailValidationTests.cs diff --git a/src/Behaviors.Tests/Entry/EntryEmptyValidationTests.cs b/src/Behaviors/Behaviors.Tests/Entry/EntryEmptyValidationTests.cs similarity index 100% rename from src/Behaviors.Tests/Entry/EntryEmptyValidationTests.cs rename to src/Behaviors/Behaviors.Tests/Entry/EntryEmptyValidationTests.cs diff --git a/src/Behaviors.Tests/Properties/AssemblyInfo.cs b/src/Behaviors/Behaviors.Tests/Properties/AssemblyInfo.cs similarity index 100% rename from src/Behaviors.Tests/Properties/AssemblyInfo.cs rename to src/Behaviors/Behaviors.Tests/Properties/AssemblyInfo.cs diff --git a/src/Behaviors.Tests/packages.config b/src/Behaviors/Behaviors.Tests/packages.config similarity index 100% rename from src/Behaviors.Tests/packages.config rename to src/Behaviors/Behaviors.Tests/packages.config diff --git a/src/Behaviors/BaseBehavior.cs b/src/Behaviors/Behaviors/BaseBehavior.cs similarity index 100% rename from src/Behaviors/BaseBehavior.cs rename to src/Behaviors/Behaviors/BaseBehavior.cs diff --git a/src/Behaviors/Behaviors.csproj b/src/Behaviors/Behaviors/Behaviors.csproj similarity index 100% rename from src/Behaviors/Behaviors.csproj rename to src/Behaviors/Behaviors/Behaviors.csproj diff --git a/src/Behaviors/Entry/EntryEmailValidation.cs b/src/Behaviors/Behaviors/Entry/EntryEmailValidation.cs similarity index 100% rename from src/Behaviors/Entry/EntryEmailValidation.cs rename to src/Behaviors/Behaviors/Entry/EntryEmailValidation.cs diff --git a/src/Behaviors/Entry/EntryEmptyValidation.cs b/src/Behaviors/Behaviors/Entry/EntryEmptyValidation.cs similarity index 100% rename from src/Behaviors/Entry/EntryEmptyValidation.cs rename to src/Behaviors/Behaviors/Entry/EntryEmptyValidation.cs diff --git a/src/Behaviors/Entry/EntryNumericValidation.cs b/src/Behaviors/Behaviors/Entry/EntryNumericValidation.cs similarity index 100% rename from src/Behaviors/Entry/EntryNumericValidation.cs rename to src/Behaviors/Behaviors/Entry/EntryNumericValidation.cs diff --git a/src/Behaviors/Properties/AssemblyInfo.cs b/src/Behaviors/Behaviors/Properties/AssemblyInfo.cs similarity index 100% rename from src/Behaviors/Properties/AssemblyInfo.cs rename to src/Behaviors/Behaviors/Properties/AssemblyInfo.cs diff --git a/src/Behaviors/View/AddEffect.cs b/src/Behaviors/Behaviors/View/AddEffect.cs similarity index 100% rename from src/Behaviors/View/AddEffect.cs rename to src/Behaviors/Behaviors/View/AddEffect.cs diff --git a/src/Behaviors/View/EventToCommand.cs b/src/Behaviors/Behaviors/View/EventToCommand.cs similarity index 100% rename from src/Behaviors/View/EventToCommand.cs rename to src/Behaviors/Behaviors/View/EventToCommand.cs diff --git a/src/Behaviors/packages.config b/src/Behaviors/Behaviors/packages.config similarity index 100% rename from src/Behaviors/packages.config rename to src/Behaviors/Behaviors/packages.config diff --git a/src/Controls.sln b/src/Controls.sln index 9b073f4..7077bcc 100644 --- a/src/Controls.sln +++ b/src/Controls.sln @@ -3,23 +3,23 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls", "Controls\Controls.csproj", "{572B958E-CC33-47C1-95FA-1B3A0506F2ED}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls", "Controls\Controls\Controls.csproj", "{572B958E-CC33-47C1-95FA-1B3A0506F2ED}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4CF83A7E-B02C-4DEC-A0B7-EFC68623D928}" ProjectSection(SolutionItems) = preProject - ..\appveyor.yml = ..\appveyor.yml - ..\bootstrapper.ps1 = ..\bootstrapper.ps1 - ..\build.cake = ..\build.cake - ..\CHANGELOG.md = ..\CHANGELOG.md - ..\nuget\Controls.nuspec = ..\nuget\Controls.nuspec - ..\README.md = ..\README.md + ..\appveyor.yml = ..\..\appveyor.yml + ..\bootstrapper.ps1 = ..\..\bootstrapper.ps1 + ..\build.cake = ..\..\build.cake + ..\CHANGELOG.md = ..\..\CHANGELOG.md + ..\nuget\Controls.nuspec = ..\..\nuget\Controls.nuspec + ..\README.md = ..\..\README.md EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls.Android", "Controls.Android\Controls.Android.csproj", "{88DC2010-BE3A-4B86-A72F-3DF68413858B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls.Android", "Controls\Controls.Android\Controls.Android.csproj", "{88DC2010-BE3A-4B86-A72F-3DF68413858B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls.iOS", "Controls.iOS\Controls.iOS.csproj", "{F09F8CAF-701A-4673-A880-1580ACCB926B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls.iOS", "Controls\Controls.iOS\Controls.iOS.csproj", "{F09F8CAF-701A-4673-A880-1580ACCB926B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls.UWP", "Controls.UWP\Controls.UWP.csproj", "{98F91808-0410-4362-9B3A-BD5110BEECDE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls.UWP", "Controls\Controls.UWP\Controls.UWP.csproj", "{98F91808-0410-4362-9B3A-BD5110BEECDE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/Controls.Android/Controls.Android.csproj b/src/Controls/Controls.Android/Controls.Android.csproj similarity index 100% rename from src/Controls.Android/Controls.Android.csproj rename to src/Controls/Controls.Android/Controls.Android.csproj diff --git a/src/Controls.Android/Properties/AssemblyInfo.cs b/src/Controls/Controls.Android/Properties/AssemblyInfo.cs similarity index 100% rename from src/Controls.Android/Properties/AssemblyInfo.cs rename to src/Controls/Controls.Android/Properties/AssemblyInfo.cs diff --git a/src/Controls.Android/Resources/AboutResources.txt b/src/Controls/Controls.Android/Resources/AboutResources.txt similarity index 100% rename from src/Controls.Android/Resources/AboutResources.txt rename to src/Controls/Controls.Android/Resources/AboutResources.txt diff --git a/src/Controls.Android/Resources/Resource.Designer.cs b/src/Controls/Controls.Android/Resources/Resource.Designer.cs similarity index 100% rename from src/Controls.Android/Resources/Resource.Designer.cs rename to src/Controls/Controls.Android/Resources/Resource.Designer.cs diff --git a/src/Controls.Android/packages.config b/src/Controls/Controls.Android/packages.config similarity index 100% rename from src/Controls.Android/packages.config rename to src/Controls/Controls.Android/packages.config diff --git a/src/Controls.UWP/Controls.UWP.csproj b/src/Controls/Controls.UWP/Controls.UWP.csproj similarity index 100% rename from src/Controls.UWP/Controls.UWP.csproj rename to src/Controls/Controls.UWP/Controls.UWP.csproj diff --git a/src/Controls.UWP/Properties/AssemblyInfo.cs b/src/Controls/Controls.UWP/Properties/AssemblyInfo.cs similarity index 100% rename from src/Controls.UWP/Properties/AssemblyInfo.cs rename to src/Controls/Controls.UWP/Properties/AssemblyInfo.cs diff --git a/src/Controls.UWP/Properties/Controls.UWP.rd.xml b/src/Controls/Controls.UWP/Properties/Controls.UWP.rd.xml similarity index 100% rename from src/Controls.UWP/Properties/Controls.UWP.rd.xml rename to src/Controls/Controls.UWP/Properties/Controls.UWP.rd.xml diff --git a/src/Controls.UWP/project.json b/src/Controls/Controls.UWP/project.json similarity index 100% rename from src/Controls.UWP/project.json rename to src/Controls/Controls.UWP/project.json diff --git a/src/Controls.iOS/Controls.iOS.csproj b/src/Controls/Controls.iOS/Controls.iOS.csproj similarity index 100% rename from src/Controls.iOS/Controls.iOS.csproj rename to src/Controls/Controls.iOS/Controls.iOS.csproj diff --git a/src/Controls.iOS/Properties/AssemblyInfo.cs b/src/Controls/Controls.iOS/Properties/AssemblyInfo.cs similarity index 100% rename from src/Controls.iOS/Properties/AssemblyInfo.cs rename to src/Controls/Controls.iOS/Properties/AssemblyInfo.cs diff --git a/src/Controls.iOS/packages.config b/src/Controls/Controls.iOS/packages.config similarity index 100% rename from src/Controls.iOS/packages.config rename to src/Controls/Controls.iOS/packages.config diff --git a/src/Controls/Controls.csproj b/src/Controls/Controls/Controls.csproj similarity index 100% rename from src/Controls/Controls.csproj rename to src/Controls/Controls/Controls.csproj diff --git a/src/Controls/Properties/AssemblyInfo.cs b/src/Controls/Controls/Properties/AssemblyInfo.cs similarity index 100% rename from src/Controls/Properties/AssemblyInfo.cs rename to src/Controls/Controls/Properties/AssemblyInfo.cs diff --git a/src/Controls/packages.config b/src/Controls/Controls/packages.config similarity index 100% rename from src/Controls/packages.config rename to src/Controls/Controls/packages.config diff --git a/src/Converters.sln b/src/Converters.sln index 9f71a5b..4de0e83 100644 --- a/src/Converters.sln +++ b/src/Converters.sln @@ -3,18 +3,18 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Converters", "Converters\Converters.csproj", "{572B958E-CC33-47C1-95FA-1B3A0506F2ED}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Converters", "Converters\Converters\Converters.csproj", "{572B958E-CC33-47C1-95FA-1B3A0506F2ED}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Converters.Tests", "Converters.Tests\Converters.Tests.csproj", "{8EDF4429-251A-416D-BB68-93F227191BCF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Converters.Tests", "Converters\Converters.Tests\Converters.Tests.csproj", "{8EDF4429-251A-416D-BB68-93F227191BCF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4CF83A7E-B02C-4DEC-A0B7-EFC68623D928}" ProjectSection(SolutionItems) = preProject - ..\appveyor.yml = ..\appveyor.yml - ..\bootstrapper.ps1 = ..\bootstrapper.ps1 - ..\build.cake = ..\build.cake - ..\CHANGELOG.md = ..\CHANGELOG.md - ..\nuget\Converters.nuspec = ..\nuget\Converters.nuspec - ..\README.md = ..\README.md + ..\appveyor.yml = ..\..\appveyor.yml + ..\bootstrapper.ps1 = ..\..\bootstrapper.ps1 + ..\build.cake = ..\..\build.cake + ..\CHANGELOG.md = ..\..\CHANGELOG.md + ..\nuget\Converters.nuspec = ..\..\nuget\Converters.nuspec + ..\README.md = ..\..\README.md EndProjectSection EndProject Global diff --git a/src/Converters.Tests/BooleanToObjectTests.cs b/src/Converters/Converters.Tests/BooleanToObjectTests.cs similarity index 100% rename from src/Converters.Tests/BooleanToObjectTests.cs rename to src/Converters/Converters.Tests/BooleanToObjectTests.cs diff --git a/src/Converters.Tests/Converters.Tests.csproj b/src/Converters/Converters.Tests/Converters.Tests.csproj similarity index 100% rename from src/Converters.Tests/Converters.Tests.csproj rename to src/Converters/Converters.Tests/Converters.Tests.csproj diff --git a/src/Converters.Tests/HasDataTests.cs b/src/Converters/Converters.Tests/HasDataTests.cs similarity index 100% rename from src/Converters.Tests/HasDataTests.cs rename to src/Converters/Converters.Tests/HasDataTests.cs diff --git a/src/Converters.Tests/HexToColorTests.cs b/src/Converters/Converters.Tests/HexToColorTests.cs similarity index 100% rename from src/Converters.Tests/HexToColorTests.cs rename to src/Converters/Converters.Tests/HexToColorTests.cs diff --git a/src/Converters.Tests/InvertedBooleanTests.cs b/src/Converters/Converters.Tests/InvertedBooleanTests.cs similarity index 100% rename from src/Converters.Tests/InvertedBooleanTests.cs rename to src/Converters/Converters.Tests/InvertedBooleanTests.cs diff --git a/src/Converters.Tests/LowerTextTests.cs b/src/Converters/Converters.Tests/LowerTextTests.cs similarity index 100% rename from src/Converters.Tests/LowerTextTests.cs rename to src/Converters/Converters.Tests/LowerTextTests.cs diff --git a/src/Converters.Tests/Properties/AssemblyInfo.cs b/src/Converters/Converters.Tests/Properties/AssemblyInfo.cs similarity index 100% rename from src/Converters.Tests/Properties/AssemblyInfo.cs rename to src/Converters/Converters.Tests/Properties/AssemblyInfo.cs diff --git a/src/Converters.Tests/UpperTextTests.cs b/src/Converters/Converters.Tests/UpperTextTests.cs similarity index 100% rename from src/Converters.Tests/UpperTextTests.cs rename to src/Converters/Converters.Tests/UpperTextTests.cs diff --git a/src/Converters.Tests/packages.config b/src/Converters/Converters.Tests/packages.config similarity index 100% rename from src/Converters.Tests/packages.config rename to src/Converters/Converters.Tests/packages.config diff --git a/src/Converters/BooleanToObjectConverter.cs b/src/Converters/Converters/BooleanToObjectConverter.cs similarity index 100% rename from src/Converters/BooleanToObjectConverter.cs rename to src/Converters/Converters/BooleanToObjectConverter.cs diff --git a/src/Converters/Converters.csproj b/src/Converters/Converters/Converters.csproj similarity index 100% rename from src/Converters/Converters.csproj rename to src/Converters/Converters/Converters.csproj diff --git a/src/Converters/HasDataConverter.cs b/src/Converters/Converters/HasDataConverter.cs similarity index 100% rename from src/Converters/HasDataConverter.cs rename to src/Converters/Converters/HasDataConverter.cs diff --git a/src/Converters/HexToColorConverter.cs b/src/Converters/Converters/HexToColorConverter.cs similarity index 100% rename from src/Converters/HexToColorConverter.cs rename to src/Converters/Converters/HexToColorConverter.cs diff --git a/src/Converters/InvertedBooleanConverter.cs b/src/Converters/Converters/InvertedBooleanConverter.cs similarity index 100% rename from src/Converters/InvertedBooleanConverter.cs rename to src/Converters/Converters/InvertedBooleanConverter.cs diff --git a/src/Converters/LowerTextConverter.cs b/src/Converters/Converters/LowerTextConverter.cs similarity index 100% rename from src/Converters/LowerTextConverter.cs rename to src/Converters/Converters/LowerTextConverter.cs diff --git a/src/Converters/Properties/AssemblyInfo.cs b/src/Converters/Converters/Properties/AssemblyInfo.cs similarity index 100% rename from src/Converters/Properties/AssemblyInfo.cs rename to src/Converters/Converters/Properties/AssemblyInfo.cs diff --git a/src/Converters/UpperTextConverter.cs b/src/Converters/Converters/UpperTextConverter.cs similarity index 100% rename from src/Converters/UpperTextConverter.cs rename to src/Converters/Converters/UpperTextConverter.cs diff --git a/src/Converters/ValueConversionAttribute.cs b/src/Converters/Converters/ValueConversionAttribute.cs similarity index 100% rename from src/Converters/ValueConversionAttribute.cs rename to src/Converters/Converters/ValueConversionAttribute.cs diff --git a/src/Converters/packages.config b/src/Converters/Converters/packages.config similarity index 100% rename from src/Converters/packages.config rename to src/Converters/Converters/packages.config diff --git a/src/Effects.sln b/src/Effects.sln index 9221847..cb97b52 100644 --- a/src/Effects.sln +++ b/src/Effects.sln @@ -3,22 +3,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Effects.iOS", "Effects.iOS\Effects.iOS.csproj", "{F09F8CAF-701A-4673-A880-1580ACCB926B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Effects.iOS", "Effects\Effects.iOS\Effects.iOS.csproj", "{F09F8CAF-701A-4673-A880-1580ACCB926B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Effects.Android", "Effects.Android\Effects.Android.csproj", "{88DC2010-BE3A-4B86-A72F-3DF68413858B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Effects.Android", "Effects\Effects.Android\Effects.Android.csproj", "{88DC2010-BE3A-4B86-A72F-3DF68413858B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Effects", "Effects\Effects.csproj", "{67F9D3A8-F71E-4428-913F-C37AE82CDB24}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Effects", "Effects\Effects\Effects.csproj", "{67F9D3A8-F71E-4428-913F-C37AE82CDB24}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Effects.UWP", "Effects.UWP\Effects.UWP.csproj", "{98F91808-0410-4362-9B3A-BD5110BEECDE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Effects.UWP", "Effects\Effects.UWP\Effects.UWP.csproj", "{98F91808-0410-4362-9B3A-BD5110BEECDE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5D176F5C-88F0-4466-A0A2-B91B40FE9199}" ProjectSection(SolutionItems) = preProject - ..\appveyor.yml = ..\appveyor.yml - ..\build.cake = ..\build.cake - ..\CHANGELOG.md = ..\CHANGELOG.md - ..\nuget\Effects.nuspec = ..\nuget\Effects.nuspec - ..\README.md = ..\README.md - ..\nuget\readme.txt = ..\nuget\readme.txt + ..\appveyor.yml = ..\..\appveyor.yml + ..\build.cake = ..\..\build.cake + ..\CHANGELOG.md = ..\..\CHANGELOG.md + ..\nuget\Effects.nuspec = ..\..\nuget\Effects.nuspec + ..\README.md = ..\..\README.md + ..\nuget\readme.txt = ..\..\nuget\readme.txt EndProjectSection EndProject Global diff --git a/src/Effects.Android/Effects.Android.csproj b/src/Effects/Effects.Android/Effects.Android.csproj similarity index 100% rename from src/Effects.Android/Effects.Android.csproj rename to src/Effects/Effects.Android/Effects.Android.csproj diff --git a/src/Effects.Android/Effects.cs b/src/Effects/Effects.Android/Effects.cs similarity index 100% rename from src/Effects.Android/Effects.cs rename to src/Effects/Effects.Android/Effects.cs diff --git a/src/Effects.Android/Effects/CapitalizeKeyboardEffect.cs b/src/Effects/Effects.Android/Effects/CapitalizeKeyboardEffect.cs similarity index 100% rename from src/Effects.Android/Effects/CapitalizeKeyboardEffect.cs rename to src/Effects/Effects.Android/Effects/CapitalizeKeyboardEffect.cs diff --git a/src/Effects.Android/Effects/ChangeColorPickerEffect.cs b/src/Effects/Effects.Android/Effects/ChangeColorPickerEffect.cs similarity index 100% rename from src/Effects.Android/Effects/ChangeColorPickerEffect.cs rename to src/Effects/Effects.Android/Effects/ChangeColorPickerEffect.cs diff --git a/src/Effects.Android/Effects/ChangeColorSwitchEffect.cs b/src/Effects/Effects.Android/Effects/ChangeColorSwitchEffect.cs similarity index 100% rename from src/Effects.Android/Effects/ChangeColorSwitchEffect.cs rename to src/Effects/Effects.Android/Effects/ChangeColorSwitchEffect.cs diff --git a/src/Effects.Android/Effects/ClearEntryEffect.cs b/src/Effects/Effects.Android/Effects/ClearEntryEffect.cs similarity index 100% rename from src/Effects.Android/Effects/ClearEntryEffect.cs rename to src/Effects/Effects.Android/Effects/ClearEntryEffect.cs diff --git a/src/Effects.Android/Effects/CustomFontEffect.cs b/src/Effects/Effects.Android/Effects/CustomFontEffect.cs similarity index 100% rename from src/Effects.Android/Effects/CustomFontEffect.cs rename to src/Effects/Effects.Android/Effects/CustomFontEffect.cs diff --git a/src/Effects.Android/Effects/DisableAutoCorrectEffect.cs b/src/Effects/Effects.Android/Effects/DisableAutoCorrectEffect.cs similarity index 100% rename from src/Effects.Android/Effects/DisableAutoCorrectEffect.cs rename to src/Effects/Effects.Android/Effects/DisableAutoCorrectEffect.cs diff --git a/src/Effects.Android/Effects/MultiLineLabelEffect.cs b/src/Effects/Effects.Android/Effects/MultiLineLabelEffect.cs similarity index 100% rename from src/Effects.Android/Effects/MultiLineLabelEffect.cs rename to src/Effects/Effects.Android/Effects/MultiLineLabelEffect.cs diff --git a/src/Effects.Android/Effects/RemoveBorderEffect.cs b/src/Effects/Effects.Android/Effects/RemoveBorderEffect.cs similarity index 100% rename from src/Effects.Android/Effects/RemoveBorderEffect.cs rename to src/Effects/Effects.Android/Effects/RemoveBorderEffect.cs diff --git a/src/Effects.Android/Effects/RemoveEntryLineEffect.cs b/src/Effects/Effects.Android/Effects/RemoveEntryLineEffect.cs similarity index 100% rename from src/Effects.Android/Effects/RemoveEntryLineEffect.cs rename to src/Effects/Effects.Android/Effects/RemoveEntryLineEffect.cs diff --git a/src/Effects.Android/Effects/SelectAllTextEntryEffect.cs b/src/Effects/Effects.Android/Effects/SelectAllTextEntryEffect.cs similarity index 100% rename from src/Effects.Android/Effects/SelectAllTextEntryEffect.cs rename to src/Effects/Effects.Android/Effects/SelectAllTextEntryEffect.cs diff --git a/src/Effects.Android/Effects/SizeFontToFitEffect.cs b/src/Effects/Effects.Android/Effects/SizeFontToFitEffect.cs similarity index 100% rename from src/Effects.Android/Effects/SizeFontToFitEffect.cs rename to src/Effects/Effects.Android/Effects/SizeFontToFitEffect.cs diff --git a/src/Effects.Android/Properties/AssemblyInfo.cs b/src/Effects/Effects.Android/Properties/AssemblyInfo.cs similarity index 100% rename from src/Effects.Android/Properties/AssemblyInfo.cs rename to src/Effects/Effects.Android/Properties/AssemblyInfo.cs diff --git a/src/Effects.Android/Resources/AboutResources.txt b/src/Effects/Effects.Android/Resources/AboutResources.txt similarity index 100% rename from src/Effects.Android/Resources/AboutResources.txt rename to src/Effects/Effects.Android/Resources/AboutResources.txt diff --git a/src/Effects.Android/Resources/Resource.Designer.cs b/src/Effects/Effects.Android/Resources/Resource.Designer.cs similarity index 100% rename from src/Effects.Android/Resources/Resource.Designer.cs rename to src/Effects/Effects.Android/Resources/Resource.Designer.cs diff --git a/src/Effects.Android/Resources/drawable-hdpi/fct_ic_clear_icon.png b/src/Effects/Effects.Android/Resources/drawable-hdpi/fct_ic_clear_icon.png similarity index 100% rename from src/Effects.Android/Resources/drawable-hdpi/fct_ic_clear_icon.png rename to src/Effects/Effects.Android/Resources/drawable-hdpi/fct_ic_clear_icon.png diff --git a/src/Effects.Android/Resources/drawable-mdpi/fct_ic_clear_icon.png b/src/Effects/Effects.Android/Resources/drawable-mdpi/fct_ic_clear_icon.png similarity index 100% rename from src/Effects.Android/Resources/drawable-mdpi/fct_ic_clear_icon.png rename to src/Effects/Effects.Android/Resources/drawable-mdpi/fct_ic_clear_icon.png diff --git a/src/Effects.Android/Resources/drawable-xhdpi/fct_ic_clear_icon.png b/src/Effects/Effects.Android/Resources/drawable-xhdpi/fct_ic_clear_icon.png similarity index 100% rename from src/Effects.Android/Resources/drawable-xhdpi/fct_ic_clear_icon.png rename to src/Effects/Effects.Android/Resources/drawable-xhdpi/fct_ic_clear_icon.png diff --git a/src/Effects.Android/Resources/drawable-xxhdpi/fct_ic_clear_icon.png b/src/Effects/Effects.Android/Resources/drawable-xxhdpi/fct_ic_clear_icon.png similarity index 100% rename from src/Effects.Android/Resources/drawable-xxhdpi/fct_ic_clear_icon.png rename to src/Effects/Effects.Android/Resources/drawable-xxhdpi/fct_ic_clear_icon.png diff --git a/src/Effects.Android/Resources/drawable-xxxhdpi/fct_ic_clear_icon.png b/src/Effects/Effects.Android/Resources/drawable-xxxhdpi/fct_ic_clear_icon.png similarity index 100% rename from src/Effects.Android/Resources/drawable-xxxhdpi/fct_ic_clear_icon.png rename to src/Effects/Effects.Android/Resources/drawable-xxxhdpi/fct_ic_clear_icon.png diff --git a/src/Effects.Android/packages.config b/src/Effects/Effects.Android/packages.config similarity index 100% rename from src/Effects.Android/packages.config rename to src/Effects/Effects.Android/packages.config diff --git a/src/Effects.UWP/Effects.UWP.csproj b/src/Effects/Effects.UWP/Effects.UWP.csproj similarity index 100% rename from src/Effects.UWP/Effects.UWP.csproj rename to src/Effects/Effects.UWP/Effects.UWP.csproj diff --git a/src/Effects.UWP/Effects/CapitalizeKeyboardEffect.cs b/src/Effects/Effects.UWP/Effects/CapitalizeKeyboardEffect.cs similarity index 100% rename from src/Effects.UWP/Effects/CapitalizeKeyboardEffect.cs rename to src/Effects/Effects.UWP/Effects/CapitalizeKeyboardEffect.cs diff --git a/src/Effects.UWP/Effects/ChangeColorPickerEffect.cs b/src/Effects/Effects.UWP/Effects/ChangeColorPickerEffect.cs similarity index 100% rename from src/Effects.UWP/Effects/ChangeColorPickerEffect.cs rename to src/Effects/Effects.UWP/Effects/ChangeColorPickerEffect.cs diff --git a/src/Effects.UWP/Effects/ChangeColorSwitchEffect.cs b/src/Effects/Effects.UWP/Effects/ChangeColorSwitchEffect.cs similarity index 100% rename from src/Effects.UWP/Effects/ChangeColorSwitchEffect.cs rename to src/Effects/Effects.UWP/Effects/ChangeColorSwitchEffect.cs diff --git a/src/Effects.UWP/Effects/MultiLineLabelEffect.cs b/src/Effects/Effects.UWP/Effects/MultiLineLabelEffect.cs similarity index 100% rename from src/Effects.UWP/Effects/MultiLineLabelEffect.cs rename to src/Effects/Effects.UWP/Effects/MultiLineLabelEffect.cs diff --git a/src/Effects.UWP/Effects/RemoveBorderEffect.cs b/src/Effects/Effects.UWP/Effects/RemoveBorderEffect.cs similarity index 100% rename from src/Effects.UWP/Effects/RemoveBorderEffect.cs rename to src/Effects/Effects.UWP/Effects/RemoveBorderEffect.cs diff --git a/src/Effects.UWP/Effects/SelectAllTextEntryEffect.cs b/src/Effects/Effects.UWP/Effects/SelectAllTextEntryEffect.cs similarity index 100% rename from src/Effects.UWP/Effects/SelectAllTextEntryEffect.cs rename to src/Effects/Effects.UWP/Effects/SelectAllTextEntryEffect.cs diff --git a/src/Effects.UWP/Effects/UWPSearchBarSuggestionEffect.cs b/src/Effects/Effects.UWP/Effects/UWPSearchBarSuggestionEffect.cs similarity index 100% rename from src/Effects.UWP/Effects/UWPSearchBarSuggestionEffect.cs rename to src/Effects/Effects.UWP/Effects/UWPSearchBarSuggestionEffect.cs diff --git a/src/Effects.UWP/Effects/ViewBlurEffect.cs b/src/Effects/Effects.UWP/Effects/ViewBlurEffect.cs similarity index 100% rename from src/Effects.UWP/Effects/ViewBlurEffect.cs rename to src/Effects/Effects.UWP/Effects/ViewBlurEffect.cs diff --git a/src/Effects.UWP/Properties/AssemblyInfo.cs b/src/Effects/Effects.UWP/Properties/AssemblyInfo.cs similarity index 100% rename from src/Effects.UWP/Properties/AssemblyInfo.cs rename to src/Effects/Effects.UWP/Properties/AssemblyInfo.cs diff --git a/src/Effects.UWP/Properties/Effects.UWP.rd.xml b/src/Effects/Effects.UWP/Properties/Effects.UWP.rd.xml similarity index 100% rename from src/Effects.UWP/Properties/Effects.UWP.rd.xml rename to src/Effects/Effects.UWP/Properties/Effects.UWP.rd.xml diff --git a/src/Effects.UWP/VisualTreeExtensions.cs b/src/Effects/Effects.UWP/VisualTreeExtensions.cs similarity index 100% rename from src/Effects.UWP/VisualTreeExtensions.cs rename to src/Effects/Effects.UWP/VisualTreeExtensions.cs diff --git a/src/Effects.UWP/project.json b/src/Effects/Effects.UWP/project.json similarity index 100% rename from src/Effects.UWP/project.json rename to src/Effects/Effects.UWP/project.json diff --git a/src/Effects.iOS/Effects.cs b/src/Effects/Effects.iOS/Effects.cs similarity index 100% rename from src/Effects.iOS/Effects.cs rename to src/Effects/Effects.iOS/Effects.cs diff --git a/src/Effects.iOS/Effects.iOS.csproj b/src/Effects/Effects.iOS/Effects.iOS.csproj similarity index 100% rename from src/Effects.iOS/Effects.iOS.csproj rename to src/Effects/Effects.iOS/Effects.iOS.csproj diff --git a/src/Effects.iOS/Effects/CapitalizeKeyboardEffect.cs b/src/Effects/Effects.iOS/Effects/CapitalizeKeyboardEffect.cs similarity index 100% rename from src/Effects.iOS/Effects/CapitalizeKeyboardEffect.cs rename to src/Effects/Effects.iOS/Effects/CapitalizeKeyboardEffect.cs diff --git a/src/Effects.iOS/Effects/ChangeColorPickerEffect.cs b/src/Effects/Effects.iOS/Effects/ChangeColorPickerEffect.cs similarity index 100% rename from src/Effects.iOS/Effects/ChangeColorPickerEffect.cs rename to src/Effects/Effects.iOS/Effects/ChangeColorPickerEffect.cs diff --git a/src/Effects.iOS/Effects/ChangeColorSwitchEffect.cs b/src/Effects/Effects.iOS/Effects/ChangeColorSwitchEffect.cs similarity index 100% rename from src/Effects.iOS/Effects/ChangeColorSwitchEffect.cs rename to src/Effects/Effects.iOS/Effects/ChangeColorSwitchEffect.cs diff --git a/src/Effects.iOS/Effects/ClearEntryEffect.cs b/src/Effects/Effects.iOS/Effects/ClearEntryEffect.cs similarity index 100% rename from src/Effects.iOS/Effects/ClearEntryEffect.cs rename to src/Effects/Effects.iOS/Effects/ClearEntryEffect.cs diff --git a/src/Effects.iOS/Effects/CustomFontEffect.cs b/src/Effects/Effects.iOS/Effects/CustomFontEffect.cs similarity index 100% rename from src/Effects.iOS/Effects/CustomFontEffect.cs rename to src/Effects/Effects.iOS/Effects/CustomFontEffect.cs diff --git a/src/Effects.iOS/Effects/DisableAutoCorrectEffect.cs b/src/Effects/Effects.iOS/Effects/DisableAutoCorrectEffect.cs similarity index 100% rename from src/Effects.iOS/Effects/DisableAutoCorrectEffect.cs rename to src/Effects/Effects.iOS/Effects/DisableAutoCorrectEffect.cs diff --git a/src/Effects.iOS/Effects/ItalicPlaceholderEffect.cs b/src/Effects/Effects.iOS/Effects/ItalicPlaceholderEffect.cs similarity index 100% rename from src/Effects.iOS/Effects/ItalicPlaceholderEffect.cs rename to src/Effects/Effects.iOS/Effects/ItalicPlaceholderEffect.cs diff --git a/src/Effects.iOS/Effects/MultiLineLabelEffect.cs b/src/Effects/Effects.iOS/Effects/MultiLineLabelEffect.cs similarity index 100% rename from src/Effects.iOS/Effects/MultiLineLabelEffect.cs rename to src/Effects/Effects.iOS/Effects/MultiLineLabelEffect.cs diff --git a/src/Effects.iOS/Effects/RemoveBorderEffect.cs b/src/Effects/Effects.iOS/Effects/RemoveBorderEffect.cs similarity index 100% rename from src/Effects.iOS/Effects/RemoveBorderEffect.cs rename to src/Effects/Effects.iOS/Effects/RemoveBorderEffect.cs diff --git a/src/Effects.iOS/Effects/SelectAllTextEntryEffect.cs b/src/Effects/Effects.iOS/Effects/SelectAllTextEntryEffect.cs similarity index 100% rename from src/Effects.iOS/Effects/SelectAllTextEntryEffect.cs rename to src/Effects/Effects.iOS/Effects/SelectAllTextEntryEffect.cs diff --git a/src/Effects.iOS/Effects/SizeFontToFitEffect.cs b/src/Effects/Effects.iOS/Effects/SizeFontToFitEffect.cs similarity index 100% rename from src/Effects.iOS/Effects/SizeFontToFitEffect.cs rename to src/Effects/Effects.iOS/Effects/SizeFontToFitEffect.cs diff --git a/src/Effects.iOS/Effects/ViewBlurEffect.cs b/src/Effects/Effects.iOS/Effects/ViewBlurEffect.cs similarity index 100% rename from src/Effects.iOS/Effects/ViewBlurEffect.cs rename to src/Effects/Effects.iOS/Effects/ViewBlurEffect.cs diff --git a/src/Effects.iOS/Properties/AssemblyInfo.cs b/src/Effects/Effects.iOS/Properties/AssemblyInfo.cs similarity index 100% rename from src/Effects.iOS/Properties/AssemblyInfo.cs rename to src/Effects/Effects.iOS/Properties/AssemblyInfo.cs diff --git a/src/Effects.iOS/packages.config b/src/Effects/Effects.iOS/packages.config similarity index 100% rename from src/Effects.iOS/packages.config rename to src/Effects/Effects.iOS/packages.config diff --git a/src/Effects/BlurEffect.cs b/src/Effects/Effects/BlurEffect.cs similarity index 100% rename from src/Effects/BlurEffect.cs rename to src/Effects/Effects/BlurEffect.cs diff --git a/src/Effects/CapitializeKeyboardEffect.cs b/src/Effects/Effects/CapitializeKeyboardEffect.cs similarity index 100% rename from src/Effects/CapitializeKeyboardEffect.cs rename to src/Effects/Effects/CapitializeKeyboardEffect.cs diff --git a/src/Effects/ChangeColorEffect.cs b/src/Effects/Effects/ChangeColorEffect.cs similarity index 100% rename from src/Effects/ChangeColorEffect.cs rename to src/Effects/Effects/ChangeColorEffect.cs diff --git a/src/Effects/ChangePickerColorEffect.cs b/src/Effects/Effects/ChangePickerColorEffect.cs similarity index 100% rename from src/Effects/ChangePickerColorEffect.cs rename to src/Effects/Effects/ChangePickerColorEffect.cs diff --git a/src/Effects/ClearEntryEffect.cs b/src/Effects/Effects/ClearEntryEffect.cs similarity index 100% rename from src/Effects/ClearEntryEffect.cs rename to src/Effects/Effects/ClearEntryEffect.cs diff --git a/src/Effects/CustomFontEffect.cs b/src/Effects/Effects/CustomFontEffect.cs similarity index 100% rename from src/Effects/CustomFontEffect.cs rename to src/Effects/Effects/CustomFontEffect.cs diff --git a/src/Effects/DisableAutoCorrectEffect.cs b/src/Effects/Effects/DisableAutoCorrectEffect.cs similarity index 100% rename from src/Effects/DisableAutoCorrectEffect.cs rename to src/Effects/Effects/DisableAutoCorrectEffect.cs diff --git a/src/Effects/EffectIds.cs b/src/Effects/Effects/EffectIds.cs similarity index 100% rename from src/Effects/EffectIds.cs rename to src/Effects/Effects/EffectIds.cs diff --git a/src/Effects/Effects.csproj b/src/Effects/Effects/Effects.csproj similarity index 100% rename from src/Effects/Effects.csproj rename to src/Effects/Effects/Effects.csproj diff --git a/src/Effects/ItalicPlaceholderEffect.cs b/src/Effects/Effects/ItalicPlaceholderEffect.cs similarity index 100% rename from src/Effects/ItalicPlaceholderEffect.cs rename to src/Effects/Effects/ItalicPlaceholderEffect.cs diff --git a/src/Effects/MultiLineLabelEffect.cs b/src/Effects/Effects/MultiLineLabelEffect.cs similarity index 100% rename from src/Effects/MultiLineLabelEffect.cs rename to src/Effects/Effects/MultiLineLabelEffect.cs diff --git a/src/Effects/Properties/AssemblyInfo.cs b/src/Effects/Effects/Properties/AssemblyInfo.cs similarity index 100% rename from src/Effects/Properties/AssemblyInfo.cs rename to src/Effects/Effects/Properties/AssemblyInfo.cs diff --git a/src/Effects/RemoveBorderEffect.cs b/src/Effects/Effects/RemoveBorderEffect.cs similarity index 100% rename from src/Effects/RemoveBorderEffect.cs rename to src/Effects/Effects/RemoveBorderEffect.cs diff --git a/src/Effects/RemoveEntryLineEffect.cs b/src/Effects/Effects/RemoveEntryLineEffect.cs similarity index 100% rename from src/Effects/RemoveEntryLineEffect.cs rename to src/Effects/Effects/RemoveEntryLineEffect.cs diff --git a/src/Effects/SearchBarSuggestionEffect.cs b/src/Effects/Effects/SearchBarSuggestionEffect.cs similarity index 100% rename from src/Effects/SearchBarSuggestionEffect.cs rename to src/Effects/Effects/SearchBarSuggestionEffect.cs diff --git a/src/Effects/SelectAllTextEntryEffect.cs b/src/Effects/Effects/SelectAllTextEntryEffect.cs similarity index 100% rename from src/Effects/SelectAllTextEntryEffect.cs rename to src/Effects/Effects/SelectAllTextEntryEffect.cs diff --git a/src/Effects/SizeFontToFitEffect.cs b/src/Effects/Effects/SizeFontToFitEffect.cs similarity index 100% rename from src/Effects/SizeFontToFitEffect.cs rename to src/Effects/Effects/SizeFontToFitEffect.cs diff --git a/src/Effects/packages.config b/src/Effects/Effects/packages.config similarity index 100% rename from src/Effects/packages.config rename to src/Effects/Effects/packages.config diff --git a/src/Gestures.sln b/src/Gestures.sln index 5356771..d05b22e 100644 --- a/src/Gestures.sln +++ b/src/Gestures.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gestures", "Gestures\Gestures.csproj", "{572B958E-CC33-47C1-95FA-1B3A0506F2ED}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gestures", "Gestures\Gestures\Gestures.csproj", "{572B958E-CC33-47C1-95FA-1B3A0506F2ED}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4CF83A7E-B02C-4DEC-A0B7-EFC68623D928}" ProjectSection(SolutionItems) = preProject @@ -15,11 +15,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ..\README.md = ..\README.md EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gestures.Android", "Gestures.Android\Gestures.Android.csproj", "{88DC2010-BE3A-4B86-A72F-3DF68413858B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gestures.Android", "Gestures\Gestures.Android\Gestures.Android.csproj", "{88DC2010-BE3A-4B86-A72F-3DF68413858B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gestures.iOS", "Gestures.iOS\Gestures.iOS.csproj", "{F09F8CAF-701A-4673-A880-1580ACCB926B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gestures.iOS", "Gestures\Gestures.iOS\Gestures.iOS.csproj", "{F09F8CAF-701A-4673-A880-1580ACCB926B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gestures.UWP", "Gestures.UWP\Gestures.UWP.csproj", "{98F91808-0410-4362-9B3A-BD5110BEECDE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gestures.UWP", "Gestures\Gestures.UWP\Gestures.UWP.csproj", "{98F91808-0410-4362-9B3A-BD5110BEECDE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/Gestures.Android/Gestures.Android.csproj b/src/Gestures/Gestures.Android/Gestures.Android.csproj similarity index 100% rename from src/Gestures.Android/Gestures.Android.csproj rename to src/Gestures/Gestures.Android/Gestures.Android.csproj diff --git a/src/Gestures.Android/Properties/AssemblyInfo.cs b/src/Gestures/Gestures.Android/Properties/AssemblyInfo.cs similarity index 100% rename from src/Gestures.Android/Properties/AssemblyInfo.cs rename to src/Gestures/Gestures.Android/Properties/AssemblyInfo.cs diff --git a/src/Gestures.Android/Resources/AboutResources.txt b/src/Gestures/Gestures.Android/Resources/AboutResources.txt similarity index 100% rename from src/Gestures.Android/Resources/AboutResources.txt rename to src/Gestures/Gestures.Android/Resources/AboutResources.txt diff --git a/src/Gestures.Android/Resources/Resource.Designer.cs b/src/Gestures/Gestures.Android/Resources/Resource.Designer.cs similarity index 100% rename from src/Gestures.Android/Resources/Resource.Designer.cs rename to src/Gestures/Gestures.Android/Resources/Resource.Designer.cs diff --git a/src/Gestures.Android/packages.config b/src/Gestures/Gestures.Android/packages.config similarity index 100% rename from src/Gestures.Android/packages.config rename to src/Gestures/Gestures.Android/packages.config diff --git a/src/Gestures.UWP/Gestures.UWP.csproj b/src/Gestures/Gestures.UWP/Gestures.UWP.csproj similarity index 100% rename from src/Gestures.UWP/Gestures.UWP.csproj rename to src/Gestures/Gestures.UWP/Gestures.UWP.csproj diff --git a/src/Gestures.UWP/Properties/AssemblyInfo.cs b/src/Gestures/Gestures.UWP/Properties/AssemblyInfo.cs similarity index 100% rename from src/Gestures.UWP/Properties/AssemblyInfo.cs rename to src/Gestures/Gestures.UWP/Properties/AssemblyInfo.cs diff --git a/src/Gestures.UWP/Properties/Gestures.UWP.rd.xml b/src/Gestures/Gestures.UWP/Properties/Gestures.UWP.rd.xml similarity index 100% rename from src/Gestures.UWP/Properties/Gestures.UWP.rd.xml rename to src/Gestures/Gestures.UWP/Properties/Gestures.UWP.rd.xml diff --git a/src/Gestures.UWP/project.json b/src/Gestures/Gestures.UWP/project.json similarity index 100% rename from src/Gestures.UWP/project.json rename to src/Gestures/Gestures.UWP/project.json diff --git a/src/Gestures.iOS/Gestures.iOS.csproj b/src/Gestures/Gestures.iOS/Gestures.iOS.csproj similarity index 100% rename from src/Gestures.iOS/Gestures.iOS.csproj rename to src/Gestures/Gestures.iOS/Gestures.iOS.csproj diff --git a/src/Gestures.iOS/Properties/AssemblyInfo.cs b/src/Gestures/Gestures.iOS/Properties/AssemblyInfo.cs similarity index 100% rename from src/Gestures.iOS/Properties/AssemblyInfo.cs rename to src/Gestures/Gestures.iOS/Properties/AssemblyInfo.cs diff --git a/src/Gestures.iOS/packages.config b/src/Gestures/Gestures.iOS/packages.config similarity index 100% rename from src/Gestures.iOS/packages.config rename to src/Gestures/Gestures.iOS/packages.config diff --git a/src/Gestures/Gestures.csproj b/src/Gestures/Gestures/Gestures.csproj similarity index 100% rename from src/Gestures/Gestures.csproj rename to src/Gestures/Gestures/Gestures.csproj diff --git a/src/Gestures/Properties/AssemblyInfo.cs b/src/Gestures/Gestures/Properties/AssemblyInfo.cs similarity index 100% rename from src/Gestures/Properties/AssemblyInfo.cs rename to src/Gestures/Gestures/Properties/AssemblyInfo.cs diff --git a/src/Gestures/packages.config b/src/Gestures/Gestures/packages.config similarity index 100% rename from src/Gestures/packages.config rename to src/Gestures/Gestures/packages.config