diff options
| author | Rui Marinho <me@ruimarinho.net> | 2017-10-18 18:04:03 +0100 |
|---|---|---|
| committer | Rui Marinho <me@ruimarinho.net> | 2017-10-18 18:13:21 +0100 |
| commit | 0927f1e6889a2f92864c8bfc384cfd4c3fa9c7ed (patch) | |
| tree | d95537307a62704716bf07fe1bb9acef9cd569b8 /Xamarin.Forms.Core.macOS.UITests | |
| parent | 8b8d8dcfcb3a5445d740cd747d243b43358e62e4 (diff) | |
| download | xamarin-forms-0927f1e6889a2f92864c8bfc384cfd4c3fa9c7ed.tar.gz xamarin-forms-0927f1e6889a2f92864c8bfc384cfd4c3fa9c7ed.tar.bz2 xamarin-forms-0927f1e6889a2f92864c8bfc384cfd4c3fa9c7ed.zip | |
[Packages] Update UITest and consolidate packages (#1201)
* [Packages] Update UITest and consolidate packages
* [Controls] Remove old packages
* [UITest] Try fix UITests iOS11
* [UITests] Use back instead of custom class
Diffstat (limited to 'Xamarin.Forms.Core.macOS.UITests')
| -rw-r--r-- | Xamarin.Forms.Core.macOS.UITests/Xamarin.Forms.Core.macOS.UITests.csproj | 9 | ||||
| -rw-r--r-- | Xamarin.Forms.Core.macOS.UITests/app.config | 11 | ||||
| -rw-r--r-- | Xamarin.Forms.Core.macOS.UITests/packages.config | 4 |
3 files changed, 19 insertions, 5 deletions
diff --git a/Xamarin.Forms.Core.macOS.UITests/Xamarin.Forms.Core.macOS.UITests.csproj b/Xamarin.Forms.Core.macOS.UITests/Xamarin.Forms.Core.macOS.UITests.csproj index 40c8f083..3c157cac 100644 --- a/Xamarin.Forms.Core.macOS.UITests/Xamarin.Forms.Core.macOS.UITests.csproj +++ b/Xamarin.Forms.Core.macOS.UITests/Xamarin.Forms.Core.macOS.UITests.csproj @@ -29,6 +29,10 @@ </PropertyGroup> <ItemGroup> <Reference Include="System" /> + <Reference Include="Xamarin.UITest, Version=2.1.4.0, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\Xamarin.UITest.2.1.4\lib\net45\Xamarin.UITest.dll</HintPath> + <Private>True</Private> + </Reference> <Reference Include="Xamarin.UITest.Desktop"> <HintPath>..\packages\Xamarin.UITest.Desktop.0.0.7\lib\net45\Xamarin.UITest.Desktop.dll</HintPath> </Reference> @@ -63,15 +67,14 @@ <Reference Include="ServiceStack.Client"> <HintPath>..\packages\ServiceStack.Client.4.5.12\lib\net45\ServiceStack.Client.dll</HintPath> </Reference> - <Reference Include="Xamarin.UITest"> - <HintPath>..\packages\Xamarin.UITest.2.1.1\lib\net45\Xamarin.UITest.dll</HintPath> - </Reference> </ItemGroup> <ItemGroup> + <Compile Include="BaseViewContainerRemoteMac.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="MacOSApp.cs" /> </ItemGroup> <ItemGroup> + <None Include="app.config" /> <None Include="packages.config" /> </ItemGroup> <ItemGroup /> diff --git a/Xamarin.Forms.Core.macOS.UITests/app.config b/Xamarin.Forms.Core.macOS.UITests/app.config new file mode 100644 index 00000000..dde2c3cc --- /dev/null +++ b/Xamarin.Forms.Core.macOS.UITests/app.config @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<configuration> + <runtime> + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> + <dependentAssembly> + <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" /> + </dependentAssembly> + </assemblyBinding> + </runtime> +</configuration>
\ No newline at end of file diff --git a/Xamarin.Forms.Core.macOS.UITests/packages.config b/Xamarin.Forms.Core.macOS.UITests/packages.config index d87d9aab..cf4c336d 100644 --- a/Xamarin.Forms.Core.macOS.UITests/packages.config +++ b/Xamarin.Forms.Core.macOS.UITests/packages.config @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" /> + <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" /> <package id="NUnit" version="2.6.4" targetFramework="net45" /> <package id="ServiceStack.Client" version="4.5.12" targetFramework="net45" /> <package id="ServiceStack.Interfaces" version="4.5.12" targetFramework="net45" /> <package id="ServiceStack.Text" version="4.5.12" targetFramework="net45" /> - <package id="Xamarin.UITest" version="2.1.1" targetFramework="net45" /> + <package id="Xamarin.UITest" version="2.1.4" targetFramework="net45" /> <package id="Xamarin.UITest.Desktop" version="0.0.7" targetFramework="net45" /> </packages>
\ No newline at end of file |