Skip to content

Commit

Permalink
TPV Initial Project Setup (xamarin#9418)
Browse files Browse the repository at this point in the history
* TPV Initial Setup

* Update Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj

* - project fixes

* - partial

* code cleanup

* - nuspec updates

* - uitest fixes for mac

* - project fixes

* netcore app tests

* - tests

* mac fixes

* - yaml search filter

* - yaml

* - yaml

* - pane priority fixes

* - tall and wide mode config tests

* - add files back in

* - spacing fixes
  • Loading branch information
PureWeen authored Feb 4, 2020
1 parent 3fa35e9 commit cfcf816
Show file tree
Hide file tree
Showing 31 changed files with 2,016 additions and 15 deletions.
56 changes: 56 additions & 0 deletions .nuspec/Xamarin.Forms.DualScreen.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?xml version="1.0"?>
<package >
<metadata>
<id>Xamarin.Forms.DualScreen</id>
<version>$version$</version>
<authors>Microsoft</authors>
<owners>microsoft xamarin</owners>
<tags>xamarin forms twopaneview DualScreen xamarinforms xamarinformsdualscreen xamarin.forms.dualscreen</tags>
<license type="expression">MIT</license>
<iconUrl>https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Assets/xamarin_128x128.png</iconUrl>
<projectUrl>http://xamarin.com/forms</projectUrl>
<repository type="git" url="https://github.com/xamarin/xamarin.forms"/>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>DualScreen support for Xamarin.Forms</description>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<dependencies>
<group>
<dependency id="Xamarin.Forms" version="$version$"/>
</group>
<group targetFramework="MonoAndroid90">
<dependency id="Xamarin.DuoSdk" version="0.0.3.2" />
</group>
<group targetFramework="MonoAndroid10.0">
<dependency id="Xamarin.DuoSdk" version="0.0.3.2" />
</group>
</dependencies>
</metadata>
<files>

<!--netstandard 1.0-->
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\netstandard1.0\Xamarin.Forms.DualScreen.dll" target="lib\netstandard1.0" />
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\netstandard1.0\Xamarin.Forms.DualScreen.*pdb" target="lib\netstandard1.0" />
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\netstandard1.0\Xamarin.Forms.DualScreen.*mdb" target="lib\netstandard1.0" />

<!--netstandard 2.0 -->
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\netstandard2.0\Xamarin.Forms.DualScreen.dll" target="lib\netstandard2.0" />
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\netstandard2.0\Xamarin.Forms.DualScreen.*pdb" target="lib\netstandard2.0" />
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\netstandard2.0\Xamarin.Forms.DualScreen.*mdb" target="lib\netstandard2.0" />

<!--Android 90-->
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid90\Xamarin.Forms.DualScreen.dll" target="lib\MonoAndroid90" />
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid90\Xamarin.Forms.DualScreen.*pdb" target="lib\MonoAndroid90" />
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid90\Xamarin.Forms.DualScreen.*mdb" target="lib\MonoAndroid90" />

<!--Android 10.0-->
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid10.0\Xamarin.Forms.DualScreen.dll" target="lib\MonoAndroid10.0" />
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid10.0\Xamarin.Forms.DualScreen.*pdb" target="lib\MonoAndroid10.0" />
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid10.0\Xamarin.Forms.DualScreen.*mdb" target="lib\MonoAndroid10.0" />

<!--UAP-->
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\uap10.0.16299\Xamarin.Forms.DualScreen.dll" target="lib\uap10.0.16299" />
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\uap10.0.16299\Xamarin.Forms.DualScreen.*pdb" target="lib\uap10.0.16299" />
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\uap10.0.16299\Xamarin.Forms.DualScreen.*mdb" target="lib\uap10.0.16299" />

</files>
</package>
4 changes: 0 additions & 4 deletions UWP.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
<Name>Windows Mobile Extensions for the UWP</Name>
</SDKReference>
</ItemGroup>
<ItemGroup Condition=" '$(OS)' != 'Windows_NT' ">
<Compile Remove="**\*.*" />
<None Include="**\*.*" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('uap10.0')) AND '$(OS)' == 'Windows_NT' ">
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.15" />
</ItemGroup>
Expand Down
Binary file added Visual Studio 2019/Visualizers/attribcache140.bin
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,10 @@
<Project>{4dcd0420-1168-4b77-86db-6196ee4bd491}</Project>
<Name>Xamarin.Forms.CustomAttributes</Name>
</ProjectReference>
<ProjectReference Include="..\Xamarin.Forms.DualScreen\Xamarin.Forms.DualScreen.csproj">
<Project>{fb4a866a-5721-4545-9e5d-b7f7d59875a4}</Project>
<Name>Xamarin.Forms.DualScreen</Name>
</ProjectReference>
<ProjectReference Include="..\Xamarin.Forms.Maps.Android\Xamarin.Forms.Maps.Android.csproj">
<Project>{bd50b39a-ebc5-408f-9c5e-923a8ebae473}</Project>
<Name>Xamarin.Forms.Maps.Android</Name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@
<Project>{57b8b73d-c3b5-4c42-869e-7b2f17d354ac}</Project>
<Name>Xamarin.Forms.Core</Name>
</ProjectReference>
<ProjectReference Include="..\Xamarin.Forms.DualScreen\Xamarin.Forms.DualScreen.csproj">
<Project>{fb4a866a-5721-4545-9e5d-b7f7d59875a4}</Project>
<Name>Xamarin.Forms.DualScreen</Name>
</ProjectReference>
<ProjectReference Include="..\Xamarin.Forms.Maps.GTK\Xamarin.Forms.Maps.GTK.csproj">
<Project>{a9772bb1-0e17-42f5-a6db-60bfccbfdb9d}</Project>
<Name>Xamarin.Forms.Maps.GTK</Name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@
<Project>{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}</Project>
<Name>Xamarin.Forms.Core</Name>
</ProjectReference>
<ProjectReference Include="..\Xamarin.Forms.DualScreen\Xamarin.Forms.DualScreen.csproj">
<Project>{fb4a866a-5721-4545-9e5d-b7f7d59875a4}</Project>
<Name>Xamarin.Forms.DualScreen</Name>
</ProjectReference>
<ProjectReference Include="..\Xamarin.Forms.Maps\Xamarin.Forms.Maps.csproj">
<Project>{7D13BAC2-C6A4-416A-B07E-C169B199E52B}</Project>
<Name>Xamarin.Forms.Maps</Name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,10 @@
<Project>{57b8b73d-c3b5-4c42-869e-7b2f17d354ac}</Project>
<Name>Xamarin.Forms.Core</Name>
</ProjectReference>
<ProjectReference Include="..\Xamarin.Forms.DualScreen\Xamarin.Forms.DualScreen.csproj">
<Project>{fb4a866a-5721-4545-9e5d-b7f7d59875a4}</Project>
<Name>Xamarin.Forms.DualScreen</Name>
</ProjectReference>
<ProjectReference Include="..\Xamarin.Forms.Maps.WPF\Xamarin.Forms.Maps.WPF.csproj">
<Project>{89b0db73-a32e-447c-9390-a2a59d89b2e4}</Project>
<Name>Xamarin.Forms.Maps.WPF</Name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@
<Project>{57b8b73d-c3b5-4c42-869e-7b2f17d354ac}</Project>
<Name>Xamarin.Forms.Core</Name>
</ProjectReference>
<ProjectReference Include="..\Xamarin.Forms.DualScreen\Xamarin.Forms.DualScreen.csproj">
<Project>{fb4a866a-5721-4545-9e5d-b7f7d59875a4}</Project>
<Name>Xamarin.Forms.DualScreen</Name>
</ProjectReference>
<ProjectReference Include="..\Xamarin.Forms.Maps.UWP\Xamarin.Forms.Maps.UWP.csproj">
<Project>{04d89a60-78ef-4a32-ae17-87e47e0233a5}</Project>
<Name>Xamarin.Forms.Maps.UWP</Name>
Expand Down Expand Up @@ -272,4 +276,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,10 @@
<Project>{cb9c96ce-125c-4a68-b6a1-c3ff1fbf93e1}</Project>
<Name>Xamarin.Forms.Controls</Name>
</ProjectReference>
<ProjectReference Include="..\Xamarin.Forms.DualScreen\Xamarin.Forms.DualScreen.csproj">
<Project>{fb4a866a-5721-4545-9e5d-b7f7d59875a4}</Project>
<Name>Xamarin.Forms.DualScreen</Name>
</ProjectReference>
<ProjectReference Include="..\Xamarin.Forms.Maps.iOS\Xamarin.Forms.Maps.iOS.csproj">
<Project>{aba078c4-f9bb-4924-8b2b-10fe0d2f5491}</Project>
<Name>Xamarin.Forms.Maps.iOS</Name>
Expand Down
1 change: 1 addition & 0 deletions Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<!-- A reference to the entire .NET Framework is automatically included -->
<ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj" />
<ProjectReference Include="..\Xamarin.Forms.CustomAttributes\Xamarin.Forms.CustomAttributes.csproj" />
<ProjectReference Include="..\Xamarin.Forms.DualScreen\Xamarin.Forms.DualScreen.csproj" />
<ProjectReference Include="..\Xamarin.Forms.Maps\Xamarin.Forms.Maps.csproj" />
<ProjectReference Include="..\Xamarin.Forms.Xaml\Xamarin.Forms.Xaml.csproj" />
</ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions Xamarin.Forms.Core/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
[assembly: InternalsVisibleTo("Xamarin.Forms.Pages")]
[assembly: InternalsVisibleTo("Xamarin.Forms.Pages.UnitTests")]
[assembly: InternalsVisibleTo("Xamarin.Forms.CarouselView")]
[assembly: InternalsVisibleTo("Xamarin.Forms.DualScreen")]
[assembly: Preserve]

[assembly: XmlnsDefinition("http://xamarin.com/schemas/2014/forms", "Xamarin.Forms")]
Expand Down
30 changes: 30 additions & 0 deletions Xamarin.Forms.DualScreen.UnitTests/BaseTestFixture.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
using System;
using System.Globalization;
using System.Threading;

using NUnit.Framework;

namespace Xamarin.Forms.DualScreen.UnitTests
{
public class BaseTestFixture
{
CultureInfo _defaultCulture;
CultureInfo _defaultUICulture;

[SetUp]
public virtual void Setup()
{
_defaultCulture = System.Threading.Thread.CurrentThread.CurrentCulture;
_defaultUICulture = System.Threading.Thread.CurrentThread.CurrentUICulture;
Device.PlatformServices = new MockPlatformServices();
}

[TearDown]
public virtual void TearDown()
{
Device.PlatformServices = null;
System.Threading.Thread.CurrentThread.CurrentCulture = _defaultCulture;
System.Threading.Thread.CurrentThread.CurrentUICulture = _defaultUICulture;
}
}
}
Loading

0 comments on commit cfcf816

Please sign in to comment.