tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #586 from wieslawsoltes/UpdateNugetPackagesAndReferences 

Update nuget packages and references
pull/603/head
Jeremy Koritzinsky 10 years ago
committed by GitHub
parent
3c5848bc2c 8eebf738f3
commit
9d2ef79432
26 changed files with 164 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      nuget/template/Avalonia.Android.nuspec
  2. 10
      nuget/template/Avalonia.Desktop.nuspec
  3. 2
      nuget/template/Avalonia.Skia.Desktop.nuspec
  4. 10
      nuget/template/Avalonia.iOS.nuspec
  5. 10
      nuget/template/Avalonia.nuspec
  6. 5
      src/Android/Avalonia.Android/Avalonia.Android.csproj
  7. 11
      src/Android/Avalonia.Android/app.config
  8. 1
      src/Android/Avalonia.Android/packages.config
  9. 10
      src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
  10. 3
      src/Android/Avalonia.AndroidTestApplication/packages.config
  11. 4
      src/Skia/Avalonia.Skia.Android.TestApp/Avalonia.Skia.Android.TestApp.csproj
  12. 4
      src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj
  13. 2
      src/Skia/Avalonia.Skia.Android/packages.config
  14. 6
      src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj
  15. 2
      src/Skia/Avalonia.Skia.Desktop/packages.config
  16. 2
      src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj
  17. 2
      src/Skia/Avalonia.Skia.iOS/packages.config
  18. 22
      src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
  19. 22
      src/iOS/Avalonia.iOS/packages.config
  20. 4
      src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj
  21. 2
      src/iOS/Avalonia.iOSTestApplication/packages.config
  22. 21
      tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj
  23. 6
      tests/Avalonia.Input.UnitTests/packages.config
  24. 12
      tests/Avalonia.Interactivity.UnitTests/GestureTests.cs
  25. 21
      tests/Avalonia.RenderTests/Avalonia.Cairo.RenderTests.csproj
  26. 6
      tests/Avalonia.RenderTests/packages.Avalonia.Cairo.RenderTests.config

10
nuget/template/Avalonia.Android.nuspec
View File

@ -16,11 +16,11 @@
<dependency id="Serilog" version="1.5.14" />
<dependency id="Splat" version="1.6.2" />
<dependency id="Sprache" version="2.0.0.50" />
<dependency id="Rx-Core" version="2.2.5" />
<dependency id="Rx-Interfaces" version="2.2.5" />
<dependency id="Rx-Linq" version="2.2.5" />
<dependency id="Rx-Main" version="2.2.5" />
<dependency id="Rx-PlatformServices" version="2.2.5" />
<dependency id="System.Reactive" version="3.0.0" />
<dependency id="System.Reactive.Core" version="3.0.0" />
<dependency id="System.Reactive.Interfaces" version="3.0.0" />
<dependency id="System.Reactive.Linq" version="3.0.0" />
<dependency id="System.Reactive.PlatformServices" version="3.0.0" />
<dependency id="Avalonia" version="#VERSION#" />
</dependencies>
</metadata>

10
nuget/template/Avalonia.Desktop.nuspec
View File

@ -16,11 +16,11 @@
<dependency id="Serilog" version="1.5.14" />
<dependency id="Splat" version="1.6.2" />
<dependency id="Sprache" version="2.0.0.50" />
<dependency id="Rx-Core" version="2.2.5" />
<dependency id="Rx-Interfaces" version="2.2.5" />
<dependency id="Rx-Linq" version="2.2.5" />
<dependency id="Rx-Main" version="2.2.5" />
<dependency id="Rx-PlatformServices" version="2.2.5" />
<dependency id="System.Reactive" version="3.0.0" />
<dependency id="System.Reactive.Core" version="3.0.0" />
<dependency id="System.Reactive.Interfaces" version="3.0.0" />
<dependency id="System.Reactive.Linq" version="3.0.0" />
<dependency id="System.Reactive.PlatformServices" version="3.0.0" />
<dependency id="SharpDX" version="3.0.2"/>
<dependency id="SharpDX.Direct2D1" version="3.0.2"/>
<dependency id="SharpDX.DXGI" version="3.0.2"/>

2
nuget/template/Avalonia.Skia.Desktop.nuspec
View File

@ -13,7 +13,7 @@
<copyright>Copyright 2015</copyright>
<tags>Avalonia</tags>
<dependencies>
<dependency id="SkiaSharp" version="1.49.3.0-beta"/>
<dependency id="SkiaSharp" version="1.49.4.0-beta"/>
<dependency id="Avalonia" version="#VERSION#" />
</dependencies>
</metadata>

10
nuget/template/Avalonia.iOS.nuspec
View File

@ -16,11 +16,11 @@
<dependency id="Serilog" version="1.5.14" />
<dependency id="Splat" version="1.6.2" />
<dependency id="Sprache" version="2.0.0.50" />
<dependency id="Rx-Core" version="2.2.5" />
<dependency id="Rx-Interfaces" version="2.2.5" />
<dependency id="Rx-Linq" version="2.2.5" />
<dependency id="Rx-Main" version="2.2.5" />
<dependency id="Rx-PlatformServices" version="2.2.5" />
<dependency id="System.Reactive" version="3.0.0" />
<dependency id="System.Reactive.Core" version="3.0.0" />
<dependency id="System.Reactive.Interfaces" version="3.0.0" />
<dependency id="System.Reactive.Linq" version="3.0.0" />
<dependency id="System.Reactive.PlatformServices" version="3.0.0" />
<dependency id="Avalonia" version="#VERSION#" />
</dependencies>
</metadata>

10
nuget/template/Avalonia.nuspec
View File

@ -16,11 +16,11 @@
<dependency id="Serilog" version="1.5.14" />
<dependency id="Splat" version="1.6.2" />
<dependency id="Sprache" version="2.0.0.50" />
<dependency id="Rx-Core" version="2.2.5" />
<dependency id="Rx-Interfaces" version="2.2.5" />
<dependency id="Rx-Linq" version="2.2.5" />
<dependency id="Rx-Main" version="2.2.5" />
<dependency id="Rx-PlatformServices" version="2.2.5" />
<dependency id="System.Reactive" version="3.0.0" />
<dependency id="System.Reactive.Core" version="3.0.0" />
<dependency id="System.Reactive.Interfaces" version="3.0.0" />
<dependency id="System.Reactive.Linq" version="3.0.0" />
<dependency id="System.Reactive.PlatformServices" version="3.0.0" />
</dependencies>
</metadata>
</package>

5
src/Android/Avalonia.Android/Avalonia.Android.csproj
View File

@ -49,6 +49,10 @@
<HintPath>..\..\..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Reactive.PlatformServices, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.3\System.Reactive.PlatformServices.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Reflection" />
<Reference Include="System.ObjectModel" />
<Reference Include="System.Threading.Tasks" />
@ -76,6 +80,7 @@
<Compile Include="SystemDialogImpl.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
<None Include="Resources\AboutResources.txt" />
</ItemGroup>

11
src/Android/Avalonia.Android/app.config
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices.WindowsRuntime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

1
src/Android/Avalonia.Android/packages.config
View File

@ -9,6 +9,7 @@
<package id="System.Linq" version="4.1.0" targetFramework="monoandroid44" />
<package id="System.Reactive.Core" version="3.0.0" targetFramework="monoandroid44" />
<package id="System.Reactive.Interfaces" version="3.0.0" targetFramework="monoandroid44" />
<package id="System.Reactive.PlatformServices" version="3.0.0" targetFramework="monoandroid44" />
<package id="System.Reflection" version="4.1.0" targetFramework="monoandroid44" />
<package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="monoandroid44" />
<package id="System.Runtime" version="4.1.0" targetFramework="monoandroid44" />

10
src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
View File

@ -48,20 +48,18 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
<AndroidLinkSkip />
<AndroidLinkMode>Full</AndroidLinkMode>
<EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
<BundleAssemblies>False</BundleAssemblies>
<AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
<AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis>
<AndroidStoreUncompressedFileExtensions />
<MandroidI18n />
<Debugger>Xamarin</Debugger>
<AotAssemblies>False</AotAssemblies>
<EnableLLVM>False</EnableLLVM>
<AndroidEnableMultiDex>False</AndroidEnableMultiDex>
<EnableProguard>False</EnableProguard>
<DevInstrumentationEnabled>False</DevInstrumentationEnabled>
<DebugSymbols>False</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Android" />
@ -96,6 +94,10 @@
<HintPath>..\..\..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.3\System.Reactive.Linq.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Reactive.PlatformServices, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.3\System.Reactive.PlatformServices.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Runtime" />
<Reference Include="System.Runtime.Extensions" />
<Reference Include="System.Xml.Linq" />

3
src/Android/Avalonia.AndroidTestApplication/packages.config
View File

@ -10,14 +10,15 @@
<package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="monoandroid44" />
<package id="System.Globalization" version="4.0.11" targetFramework="monoandroid44" />
<package id="System.Linq" version="4.1.0" targetFramework="monoandroid44" />
<package id="System.Reactive" version="3.0.0" targetFramework="monoandroid44" />
<package id="System.Reactive.Core" version="3.0.0" targetFramework="monoandroid44" />
<package id="System.Reactive.Interfaces" version="3.0.0" targetFramework="monoandroid44" />
<package id="System.Reactive.Linq" version="3.0.0" targetFramework="monoandroid44" />
<package id="System.Reactive.PlatformServices" version="3.0.0" targetFramework="monoandroid44" />
<package id="System.Reflection" version="4.1.0" targetFramework="monoandroid44" />
<package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="monoandroid44" />
<package id="System.Runtime" version="4.1.0" targetFramework="monoandroid44" />
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="monoandroid44" />
<package id="System.Runtime.InteropServices.WindowsRuntime" version="4.0.1" targetFramework="monoandroid44" />
<package id="System.Threading" version="4.0.11" targetFramework="monoandroid44" />
<package id="System.Threading.Tasks" version="4.0.11" targetFramework="monoandroid44" />
</packages>

4
src/Skia/Avalonia.Skia.Android.TestApp/Avalonia.Skia.Android.TestApp.csproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -16,7 +16,7 @@
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

4
src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj
View File

@ -15,7 +15,7 @@
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -40,7 +40,7 @@
<Reference Include="Mono.Android" />
<Reference Include="mscorlib" />
<Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\SkiaSharp.1.49.3.0-beta\lib\MonoAndroid\SkiaSharp.dll</HintPath>
<HintPath>..\..\..\packages\SkiaSharp.1.49.4-beta\lib\MonoAndroid\SkiaSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />

2
src/Skia/Avalonia.Skia.Android/packages.config
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.49.3.0-beta" targetFramework="monoandroid50" />
<package id="SkiaSharp" version="1.49.4-beta" targetFramework="monoandroid44" />
</packages>

6
src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj
View File

@ -57,7 +57,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\SkiaSharp.1.49.3.0-beta\lib\net45\SkiaSharp.dll</HintPath>
<HintPath>..\..\..\packages\SkiaSharp.1.49.4-beta\lib\net45\SkiaSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
@ -116,12 +116,12 @@
<Import Project="..\Avalonia.Skia\Avalonia.Skia.projitems" Label="Shared" />
<Import Project="..\..\Shared\RenderHelpers\RenderHelpers.projitems" Label="Shared" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\..\packages\SkiaSharp.1.49.3.0-beta\build\net45\SkiaSharp.targets" Condition="Exists('..\..\..\packages\SkiaSharp.1.49.3.0-beta\build\net45\SkiaSharp.targets')" />
<Import Project="..\..\..\packages\SkiaSharp.1.49.4-beta\build\net45\SkiaSharp.targets" Condition="Exists('..\..\..\packages\SkiaSharp.1.49.4-beta\build\net45\SkiaSharp.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\..\packages\SkiaSharp.1.49.3.0-beta\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\SkiaSharp.1.49.3.0-beta\build\net45\SkiaSharp.targets'))" />
<Error Condition="!Exists('..\..\..\packages\SkiaSharp.1.49.4-beta\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\SkiaSharp.1.49.4-beta\build\net45\SkiaSharp.targets'))" />
</Target>
<!-- 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.

2
src/Skia/Avalonia.Skia.Desktop/packages.config
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.49.3.0-beta" targetFramework="net45" />
<package id="SkiaSharp" version="1.49.4-beta" targetFramework="net45" />
</packages>

2
src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj
View File

@ -41,7 +41,7 @@
</ItemGroup>
<ItemGroup>
<Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\SkiaSharp.1.49.3.0-beta\lib\XamariniOS\SkiaSharp.dll</HintPath>
<HintPath>..\..\..\packages\SkiaSharp.1.49.4-beta\lib\XamariniOS\SkiaSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />

2
src/Skia/Avalonia.Skia.iOS/packages.config
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.49.3.0-beta" targetFramework="xamarinios10" />
<package id="SkiaSharp" version="1.49.4-beta" targetFramework="xamarinios10" />
</packages>

22
src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -87,13 +87,29 @@
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Reactive.Core">
<HintPath>..\..\..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
<Reference Include="System.Reactive.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Reactive.Core.3.0.0\lib\netstandard1.3\System.Reactive.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Reactive.Interfaces, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Reactive.Linq, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.3\System.Reactive.Linq.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Reactive.PlatformServices, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.3\System.Reactive.PlatformServices.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="..\..\Shared\PlatformSupport\PlatformSupport.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
</Project>

22
src/iOS/Avalonia.iOS/packages.config
View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="System.Collections" version="4.0.11" targetFramework="xamarinios10" />
<package id="System.Collections.Concurrent" version="4.0.12" targetFramework="xamarinios10" />
<package id="System.ComponentModel" version="4.0.1" targetFramework="xamarinios10" />
<package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="xamarinios10" />
<package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="xamarinios10" />
<package id="System.Globalization" version="4.0.11" targetFramework="xamarinios10" />
<package id="System.Linq" version="4.1.0" targetFramework="xamarinios10" />
<package id="System.Reactive" version="3.0.0" targetFramework="xamarinios10" />
<package id="System.Reactive.Core" version="3.0.0" targetFramework="xamarinios10" />
<package id="System.Reactive.Interfaces" version="3.0.0" targetFramework="xamarinios10" />
<package id="System.Reactive.Linq" version="3.0.0" targetFramework="xamarinios10" />
<package id="System.Reactive.PlatformServices" version="3.0.0" targetFramework="xamarinios10" />
<package id="System.Reflection" version="4.1.0" targetFramework="xamarinios10" />
<package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="xamarinios10" />
<package id="System.Runtime" version="4.1.0" targetFramework="xamarinios10" />
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="xamarinios10" />
<package id="System.Runtime.InteropServices.WindowsRuntime" version="4.0.1" targetFramework="xamarinios10" />
<package id="System.Threading" version="4.0.11" targetFramework="xamarinios10" />
<package id="System.Threading.Tasks" version="4.0.11" targetFramework="xamarinios10" />
</packages>

4
src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj
View File

@ -119,6 +119,10 @@
<HintPath>..\..\..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.3\System.Reactive.Linq.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Reactive.PlatformServices, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.3\System.Reactive.PlatformServices.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" />

2
src/iOS/Avalonia.iOSTestApplication/packages.config
View File

@ -7,9 +7,11 @@
<package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="xamarinios10" />
<package id="System.Globalization" version="4.0.11" targetFramework="xamarinios10" />
<package id="System.Linq" version="4.1.0" targetFramework="xamarinios10" />
<package id="System.Reactive" version="3.0.0" targetFramework="xamarinios10" />
<package id="System.Reactive.Core" version="3.0.0" targetFramework="xamarinios10" />
<package id="System.Reactive.Interfaces" version="3.0.0" targetFramework="xamarinios10" />
<package id="System.Reactive.Linq" version="3.0.0" targetFramework="xamarinios10" />
<package id="System.Reactive.PlatformServices" version="3.0.0" targetFramework="xamarinios10" />
<package id="System.Reflection" version="4.1.0" targetFramework="xamarinios10" />
<package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="xamarinios10" />
<package id="System.Runtime" version="4.1.0" targetFramework="xamarinios10" />

21
tests/Avalonia.Input.UnitTests/Avalonia.Input.UnitTests.csproj
View File

@ -41,11 +41,32 @@
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Reactive.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Reactive.Core.3.0.0\lib\net45\System.Reactive.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Reactive.Interfaces, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Reactive.Interfaces.3.0.0\lib\net45\System.Reactive.Interfaces.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Reactive.Linq, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Reactive.Linq.3.0.0\lib\net45\System.Reactive.Linq.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Reactive.PlatformServices, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Reactive.Windows.Threading, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Reactive.Windows.Threading.3.0.0\lib\net45\System.Reactive.Windows.Threading.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
<Private>True</Private>

6
tests/Avalonia.Input.UnitTests/packages.config
View File

@ -1,6 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Moq" version="4.2.1510.2205" targetFramework="net45" />
<package id="System.Reactive" version="3.0.0" targetFramework="net45" />
<package id="System.Reactive.Core" version="3.0.0" targetFramework="net45" />
<package id="System.Reactive.Interfaces" version="3.0.0" targetFramework="net45" />
<package id="System.Reactive.Linq" version="3.0.0" targetFramework="net45" />
<package id="System.Reactive.PlatformServices" version="3.0.0" targetFramework="net45" />
<package id="System.Reactive.Windows.Threading" version="3.0.0" targetFramework="net45" />
<package id="xunit" version="2.1.0" targetFramework="net45" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
<package id="xunit.assert" version="2.1.0" targetFramework="net45" />

12
tests/Avalonia.Interactivity.UnitTests/GestureTests.cs
View File

@ -13,10 +13,10 @@ namespace Avalonia.Interactivity.UnitTests
[Fact]
public void Tapped_Should_Follow_Pointer_Pressed_Released()
{
Border border;
Border border = new Border();
var decorator = new Decorator
{
Child = border = new Border()
Child = border
};
var result = new List<string>();
@ -36,10 +36,10 @@ namespace Avalonia.Interactivity.UnitTests
[Fact]
public void Tapped_Should_Be_Raised_Even_When_PointerPressed_Handled()
{
Border border;
Border border = new Border();
var decorator = new Decorator
{
Child = border = new Border()
Child = border
};
var result = new List<string>();
@ -56,10 +56,10 @@ namespace Avalonia.Interactivity.UnitTests
[Fact]
public void DoubleTapped_Should_Follow_Pointer_Pressed_Released_Pressed()
{
Border border;
Border border = new Border();
var decorator = new Decorator
{
Child = border = new Border()
Child = border
};
var result = new List<string>();

21
tests/Avalonia.RenderTests/Avalonia.Cairo.RenderTests.csproj
View File

@ -43,6 +43,27 @@
</Reference>
<Reference Include="System" />
<Reference Include="System.Drawing" />
<Reference Include="System.Reactive.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Reactive.Core.3.0.0\lib\net45\System.Reactive.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Reactive.Interfaces, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Reactive.Interfaces.3.0.0\lib\net45\System.Reactive.Interfaces.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Reactive.Linq, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Reactive.Linq.3.0.0\lib\net45\System.Reactive.Linq.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Reactive.PlatformServices, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Reactive.PlatformServices.3.0.0\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Reactive.Windows.Threading, Version=3.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Reactive.Windows.Threading.3.0.0\lib\net45\System.Reactive.Windows.Threading.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
<Private>True</Private>

6
tests/Avalonia.RenderTests/packages.Avalonia.Cairo.RenderTests.config
View File

@ -1,6 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Magick.NET-Q16-AnyCPU" version="7.0.0.0101" targetFramework="net45" />
<package id="System.Reactive" version="3.0.0" targetFramework="net45" />
<package id="System.Reactive.Core" version="3.0.0" targetFramework="net45" />
<package id="System.Reactive.Interfaces" version="3.0.0" targetFramework="net45" />
<package id="System.Reactive.Linq" version="3.0.0" targetFramework="net45" />
<package id="System.Reactive.PlatformServices" version="3.0.0" targetFramework="net45" />
<package id="System.Reactive.Windows.Threading" version="3.0.0" targetFramework="net45" />
<package id="xunit" version="2.1.0" targetFramework="net45" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
<package id="xunit.assert" version="2.1.0" targetFramework="net45" />

Write Preview
Loading…
Cancel
Save