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

Reinstalled problematic NuGet pkgs.

pull/63/head
Steven Kirk 11 years ago
parent
8dafd64ae3
commit
0c102d6d60
15 changed files with 56 additions and 80 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. 2
      Perspex.sln
  2. 4
      Tests/Perspex.Base.UnitTests/Perspex.Base.UnitTests.csproj
  3. 1
      Tests/Perspex.Base.UnitTests/packages.config
  4. 4
      Tests/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj
  5. 2
      Tests/Perspex.Controls.UnitTests/app.config
  6. 30
      Tests/Perspex.Controls.UnitTests/packages.config
  7. 4
      Tests/Perspex.Input.UnitTests/Perspex.Input.UnitTests.csproj
  8. 4
      Tests/Perspex.Input.UnitTests/app.config
  9. 17
      Tests/Perspex.Input.UnitTests/packages.config
  10. 4
      Tests/Perspex.Layout.UnitTests/app.config
  11. 3
      Tests/Perspex.Layout.UnitTests/packages.config
  12. 10
      Tests/Perspex.RenderTests/Perspex.Direct2D1.RenderTests.csproj
  13. 19
      Tests/Perspex.RenderTests/packages.config
  14. 4
      Tests/Perspex.Styling.UnitTests/Perspex.Styling.UnitTests.csproj
  15. 28
      Tests/Perspex.Styling.UnitTests/packages.config

2
Perspex.sln
View File

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.22823.1
VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Win32", "Windows\Perspex.Win32\Perspex.Win32.csproj", "{811A76CF-1CF6-440F-963B-BBE31BD72A82}"
EndProject

4
Tests/Perspex.Base.UnitTests/Perspex.Base.UnitTests.csproj
View File

@ -37,10 +37,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Moq, Version=4.2.1502.911, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
<Private>True</Private>

1
Tests/Perspex.Base.UnitTests/packages.config
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Moq" version="4.2.1502.911" targetFramework="net45" userInstalled="true" />
<package id="Rx-Core" version="2.2.5" targetFramework="net45" userInstalled="true" />
<package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" userInstalled="true" />
<package id="Rx-Linq" version="2.2.5" targetFramework="net45" userInstalled="true" />

4
Tests/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj
View File

@ -37,8 +37,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Moq, Version=4.2.1502.911, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll</HintPath>
<Reference Include="Moq, Version=4.2.1507.118, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\..\packages\Moq.4.2.1507.0118\lib\net40\Moq.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Ploeh.AutoFixture, Version=3.30.4.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">

2
Tests/Perspex.Controls.UnitTests/app.config
View File

@ -16,7 +16,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Moq" publicKeyToken="69f491c39445e920" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.1502.911" newVersion="4.2.1502.911" />
<bindingRedirect oldVersion="0.0.0.0-4.2.1507.118" newVersion="4.2.1507.118" />
</dependentAssembly>
</assemblyBinding>
</runtime>

30
Tests/Perspex.Controls.UnitTests/packages.config
View File

@ -1,19 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AutoFixture" version="3.30.4" targetFramework="net45" userInstalled="true" />
<package id="AutoFixture.AutoMoq" version="3.30.4" targetFramework="net45" userInstalled="true" />
<package id="Moq" version="4.2.1502.911" targetFramework="net45" userInstalled="true" />
<package id="Rx-Core" version="2.2.5" targetFramework="net45" userInstalled="true" />
<package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" userInstalled="true" />
<package id="Rx-Linq" version="2.2.5" targetFramework="net45" userInstalled="true" />
<package id="Rx-Main" version="2.2.5" targetFramework="net45" userInstalled="true" />
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" userInstalled="true" />
<package id="Splat" version="1.6.2" targetFramework="net45" userInstalled="true" />
<package id="StyleCop.Analyzers" version="1.0.0-alpha008" targetFramework="net45" userInstalled="true" />
<package id="xunit" version="2.0.0" targetFramework="net45" userInstalled="true" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" userInstalled="true" />
<package id="xunit.assert" version="2.0.0" targetFramework="net45" userInstalled="true" />
<package id="xunit.core" version="2.0.0" targetFramework="net45" userInstalled="true" />
<package id="xunit.extensibility.core" version="2.0.0" targetFramework="net45" userInstalled="true" />
<package id="xunit.runner.visualstudio" version="2.0.0" targetFramework="net45" userInstalled="true" />
<package id="Moq" version="4.2.1507.0118" targetFramework="net45" />
<package id="Rx-Core" version="2.2.5" targetFramework="net45" />
<package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
<package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
<package id="Rx-Main" version="2.2.5" targetFramework="net45" />
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
<package id="Splat" version="1.6.2" targetFramework="net45" />
<package id="StyleCop.Analyzers" version="1.0.0-alpha008" targetFramework="net45" />
<package id="xunit" version="2.0.0" targetFramework="net45" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
<package id="xunit.assert" version="2.0.0" targetFramework="net45" />
<package id="xunit.core" version="2.0.0" targetFramework="net45" />
<package id="xunit.extensibility.core" version="2.0.0" targetFramework="net45" />
<package id="xunit.runner.visualstudio" version="2.0.0" targetFramework="net45" />
</packages>

4
Tests/Perspex.Input.UnitTests/Perspex.Input.UnitTests.csproj
View File

@ -34,10 +34,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Ploeh.AutoFixture, Version=3.30.4.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
<HintPath>..\..\packages\AutoFixture.3.30.4\lib\net40\Ploeh.AutoFixture.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
<Private>True</Private>

4
Tests/Perspex.Input.UnitTests/app.config
View File

@ -2,10 +2,6 @@
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Moq" publicKeyToken="69f491c39445e920" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.1502.911" newVersion="4.2.1502.911" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

17
Tests/Perspex.Input.UnitTests/packages.config
View File

@ -1,12 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AutoFixture" version="3.30.4" targetFramework="net45" userInstalled="true" />
<package id="Splat" version="1.6.2" targetFramework="net45" userInstalled="true" />
<package id="StyleCop.Analyzers" version="1.0.0-alpha008" targetFramework="net45" userInstalled="true" />
<package id="xunit" version="2.0.0" targetFramework="net45" userInstalled="true" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" userInstalled="true" />
<package id="xunit.assert" version="2.0.0" targetFramework="net45" userInstalled="true" />
<package id="xunit.core" version="2.0.0" targetFramework="net45" userInstalled="true" />
<package id="xunit.extensibility.core" version="2.0.0" targetFramework="net45" userInstalled="true" />
<package id="xunit.runner.visualstudio" version="2.0.0" targetFramework="net45" userInstalled="true" />
<package id="Splat" version="1.6.2" targetFramework="net45" />
<package id="StyleCop.Analyzers" version="1.0.0-alpha008" targetFramework="net45" />
<package id="xunit" version="2.0.0" targetFramework="net45" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
<package id="xunit.assert" version="2.0.0" targetFramework="net45" />
<package id="xunit.core" version="2.0.0" targetFramework="net45" />
<package id="xunit.extensibility.core" version="2.0.0" targetFramework="net45" />
<package id="xunit.runner.visualstudio" version="2.0.0" targetFramework="net45" />
</packages>

4
Tests/Perspex.Layout.UnitTests/app.config
View File

@ -2,10 +2,6 @@
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Moq" publicKeyToken="69f491c39445e920" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.1502.911" newVersion="4.2.1502.911" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

3
Tests/Perspex.Layout.UnitTests/packages.config
View File

@ -1,8 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AutoFixture" version="3.30.4" targetFramework="net45" userInstalled="true" />
<package id="AutoFixture.AutoMoq" version="3.30.4" targetFramework="net45" userInstalled="true" />
<package id="Moq" version="4.2.1502.911" targetFramework="net45" userInstalled="true" />
<package id="Splat" version="1.6.2" targetFramework="net45" userInstalled="true" />
<package id="StyleCop.Analyzers" version="1.0.0-alpha008" targetFramework="net45" userInstalled="true" />
<package id="xunit" version="2.0.0" targetFramework="net45" userInstalled="true" />

10
Tests/Perspex.RenderTests/Perspex.Direct2D1.RenderTests.csproj
View File

@ -38,16 +38,16 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Magick.NET-x86, Version=7.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=x86">
<HintPath>..\..\packages\Magick.NET-Q16-x86.7.0.0.0014\lib\net40-client\Magick.NET-x86.dll</HintPath>
<Reference Include="Magick.NET-x64, Version=7.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=AMD64">
<HintPath>..\..\packages\Magick.NET-Q16-x64.7.0.0.0016\lib\net40-client\Magick.NET-x64.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Magick.NET.Core, Version=7.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
<HintPath>..\..\packages\Magick.NET-Q16-x86.7.0.0.0014\lib\net40-client\Magick.NET.Core.dll</HintPath>
<HintPath>..\..\packages\Magick.NET-Q16-x64.7.0.0.0016\lib\net40-client\Magick.NET.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Magick.NET.Wrapper-x86, Version=7.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=x86">
<HintPath>..\..\packages\Magick.NET-Q16-x86.7.0.0.0014\lib\net40-client\Magick.NET.Wrapper-x86.dll</HintPath>
<Reference Include="Magick.NET.Wrapper-x64, Version=7.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=AMD64">
<HintPath>..\..\packages\Magick.NET-Q16-x64.7.0.0.0016\lib\net40-client\Magick.NET.Wrapper-x64.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">

19
Tests/Perspex.RenderTests/packages.config
View File

@ -1,13 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Magick.NET-Q16-x86" version="7.0.0.14" targetFramework="net45" userInstalled="true" />
<package id="Magick.NET-Q8-x86" version="7.0.0.14" targetFramework="net45" userInstalled="true" />
<package id="Splat" version="1.6.2" targetFramework="net45" userInstalled="true" />
<package id="StyleCop.Analyzers" version="1.0.0-alpha008" targetFramework="net45" userInstalled="true" />
<package id="xunit" version="2.0.0" targetFramework="net45" userInstalled="true" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" userInstalled="true" />
<package id="xunit.assert" version="2.0.0" targetFramework="net45" userInstalled="true" />
<package id="xunit.core" version="2.0.0" targetFramework="net45" userInstalled="true" />
<package id="xunit.extensibility.core" version="2.0.0" targetFramework="net45" userInstalled="true" />
<package id="xunit.runner.visualstudio" version="2.0.0" targetFramework="net45" userInstalled="true" />
<package id="Magick.NET-Q16-x64" version="7.0.0.0016" targetFramework="net45" />
<package id="Splat" version="1.6.2" targetFramework="net45" />
<package id="StyleCop.Analyzers" version="1.0.0-alpha008" targetFramework="net45" />
<package id="xunit" version="2.0.0" targetFramework="net45" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
<package id="xunit.assert" version="2.0.0" targetFramework="net45" />
<package id="xunit.core" version="2.0.0" targetFramework="net45" />
<package id="xunit.extensibility.core" version="2.0.0" targetFramework="net45" />
<package id="xunit.runner.visualstudio" version="2.0.0" targetFramework="net45" />
</packages>

4
Tests/Perspex.Styling.UnitTests/Perspex.Styling.UnitTests.csproj
View File

@ -37,8 +37,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Moq, Version=4.2.1502.911, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll</HintPath>
<Reference Include="Moq, Version=4.2.1507.118, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\..\packages\Moq.4.2.1507.0118\lib\net40\Moq.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">

28
Tests/Perspex.Styling.UnitTests/packages.config
View File

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Moq" version="4.2.1502.911" targetFramework="net45" userInstalled="true" />
<package id="Rx-Core" version="2.2.5" targetFramework="net45" userInstalled="true" />
<package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" userInstalled="true" />
<package id="Rx-Linq" version="2.2.5" targetFramework="net45" userInstalled="true" />
<package id="Rx-Main" version="2.2.5" targetFramework="net45" userInstalled="true" />
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" userInstalled="true" />
<package id="Splat" version="1.6.2" targetFramework="net45" userInstalled="true" />
<package id="StyleCop.Analyzers" version="1.0.0-alpha008" targetFramework="net45" userInstalled="true" />
<package id="xunit" version="2.0.0" targetFramework="net45" userInstalled="true" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" userInstalled="true" />
<package id="xunit.assert" version="2.0.0" targetFramework="net45" userInstalled="true" />
<package id="xunit.core" version="2.0.0" targetFramework="net45" userInstalled="true" />
<package id="xunit.extensibility.core" version="2.0.0" targetFramework="net45" userInstalled="true" />
<package id="xunit.runner.visualstudio" version="2.0.0" targetFramework="net45" userInstalled="true" />
<package id="Moq" version="4.2.1507.0118" targetFramework="net45" />
<package id="Rx-Core" version="2.2.5" targetFramework="net45" />
<package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
<package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
<package id="Rx-Main" version="2.2.5" targetFramework="net45" />
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
<package id="Splat" version="1.6.2" targetFramework="net45" />
<package id="StyleCop.Analyzers" version="1.0.0-alpha008" targetFramework="net45" />
<package id="xunit" version="2.0.0" targetFramework="net45" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
<package id="xunit.assert" version="2.0.0" targetFramework="net45" />
<package id="xunit.core" version="2.0.0" targetFramework="net45" />
<package id="xunit.extensibility.core" version="2.0.0" targetFramework="net45" />
<package id="xunit.runner.visualstudio" version="2.0.0" targetFramework="net45" />
</packages>
Write Preview
Loading…
Cancel
Save