Steven Kirk 11 years ago
parent
commit
6167bacf54
  1. 1
      Perspex.Xaml.Desktop/Perspex.Xaml.Desktop.nugetreferenceswitcher
  2. 2
      Perspex.Xaml/Perspex.Xaml.previous.nugetreferenceswitcher
  3. 56
      Perspex.sln
  4. BIN
      Perspex.v2.ncrunchsolution
  5. 5
      Tests/Perspex.Base.UnitTests/Perspex.Base.UnitTests.csproj
  6. 19
      Tests/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj
  7. 21
      Tests/Perspex.Direct2D1.UnitTests/Perspex.Direct2D1.UnitTests.csproj
  8. 19
      Tests/Perspex.Input.UnitTests/Perspex.Input.UnitTests.csproj
  9. 0
      Tests/Perspex.Interactivity.UnitTests/GlobalSuppressions.cs
  10. 2
      Tests/Perspex.Interactivity.UnitTests/InteractiveTests.cs
  11. 39
      Tests/Perspex.Interactivity.UnitTests/Perspex.Interactivity.UnitTests.csproj
  12. 0
      Tests/Perspex.Interactivity.UnitTests/Properties/AssemblyInfo.cs
  13. 0
      Tests/Perspex.Interactivity.UnitTests/packages.config
  14. 25
      Tests/Perspex.Layout.UnitTests/Perspex.Layout.UnitTests.csproj
  15. 21
      Tests/Perspex.RenderTests/Perspex.Direct2D1.RenderTests.csproj
  16. 4
      Tests/Perspex.RenderTests/TestBase.cs
  17. 19
      Tests/Perspex.SceneGraph.UnitTests/Perspex.SceneGraph.UnitTests.csproj
  18. 19
      Tests/Perspex.Styling.UnitTests/Perspex.Styling.UnitTests.csproj
  19. 0
      Tests/TestFiles/.gitignore
  20. 0
      Tests/TestFiles/Cairo/Controls/Border/Border_1px_Border.expected.png
  21. 0
      Tests/TestFiles/Cairo/Controls/Border/Border_2px_Border.expected.png
  22. 0
      Tests/TestFiles/Cairo/Controls/Border/Border_Bottom_Aligns_Content.expected.png
  23. 0
      Tests/TestFiles/Cairo/Controls/Border/Border_Brush_Offsets_Content.expected.png
  24. 0
      Tests/TestFiles/Cairo/Controls/Border/Border_Centers_Content_Horizontally.expected.png
  25. 0
      Tests/TestFiles/Cairo/Controls/Border/Border_Centers_Content_Vertically.expected.png
  26. 0
      Tests/TestFiles/Cairo/Controls/Border/Border_Fill.expected.png
  27. 0
      Tests/TestFiles/Cairo/Controls/Border/Border_Left_Aligns_Content.expected.png
  28. 0
      Tests/TestFiles/Cairo/Controls/Border/Border_Margin_Offsets_Content.expected.png
  29. 0
      Tests/TestFiles/Cairo/Controls/Border/Border_Nested_Rotate.expected.png
  30. 0
      Tests/TestFiles/Cairo/Controls/Border/Border_Padding_Offsets_Content.expected.png
  31. 0
      Tests/TestFiles/Cairo/Controls/Border/Border_Right_Aligns_Content.expected.png
  32. 0
      Tests/TestFiles/Cairo/Controls/Border/Border_Stretches_Content_Horizontally.expected.png
  33. 0
      Tests/TestFiles/Cairo/Controls/Border/Border_Stretches_Content_Vertically.expected.png
  34. 0
      Tests/TestFiles/Cairo/Controls/Border/Border_Top_Aligns_Content.expected.png
  35. 0
      Tests/TestFiles/Cairo/Controls/Image/Image_Stretch_Fill.expected.png
  36. 0
      Tests/TestFiles/Cairo/Controls/Image/Image_Stretch_None.expected.png
  37. 0
      Tests/TestFiles/Cairo/Controls/Image/Image_Stretch_Uniform.expected.png
  38. 0
      Tests/TestFiles/Cairo/Controls/Image/Image_Stretch_UniformToFill.expected.png
  39. 0
      Tests/TestFiles/Cairo/Controls/Image/test.png
  40. 0
      Tests/TestFiles/Cairo/Shapes/Ellipse/Circle_1px_Stroke.expected.png
  41. 0
      Tests/TestFiles/Cairo/Shapes/Path/Path_100px_Triangle_Centered.expected.png
  42. 0
      Tests/TestFiles/Cairo/Shapes/Path/Path_Expander_With_Border.expected.png
  43. 0
      Tests/TestFiles/Cairo/Shapes/Path/Path_Tick_Scaled.expected.png
  44. 0
      Tests/TestFiles/Cairo/Shapes/Rectangle/Rectangle_1px_Stroke.expected.png
  45. 0
      Tests/TestFiles/Cairo/Shapes/Rectangle/Rectangle_2px_Stroke.expected.png
  46. 0
      Tests/TestFiles/Cairo/Shapes/Rectangle/Rectangle_Stroke_Fill.expected.png
  47. 0
      Tests/TestFiles/Direct2D1/Controls/Border/Border_1px_Border.expected.png
  48. 0
      Tests/TestFiles/Direct2D1/Controls/Border/Border_2px_Border.expected.png
  49. 0
      Tests/TestFiles/Direct2D1/Controls/Border/Border_Bottom_Aligns_Content.expected.png
  50. 0
      Tests/TestFiles/Direct2D1/Controls/Border/Border_Brush_Offsets_Content.expected.png
  51. 0
      Tests/TestFiles/Direct2D1/Controls/Border/Border_Centers_Content_Horizontally.expected.png
  52. 0
      Tests/TestFiles/Direct2D1/Controls/Border/Border_Centers_Content_Vertically.expected.png
  53. 0
      Tests/TestFiles/Direct2D1/Controls/Border/Border_Fill.expected.png
  54. 0
      Tests/TestFiles/Direct2D1/Controls/Border/Border_Left_Aligns_Content.expected.png
  55. 0
      Tests/TestFiles/Direct2D1/Controls/Border/Border_Margin_Offsets_Content.expected.png
  56. 0
      Tests/TestFiles/Direct2D1/Controls/Border/Border_Nested_Rotate.expected.png
  57. 0
      Tests/TestFiles/Direct2D1/Controls/Border/Border_Padding_Offsets_Content.expected.png
  58. 0
      Tests/TestFiles/Direct2D1/Controls/Border/Border_Right_Aligns_Content.expected.png
  59. 0
      Tests/TestFiles/Direct2D1/Controls/Border/Border_Stretches_Content_Horizontally.expected.png
  60. 0
      Tests/TestFiles/Direct2D1/Controls/Border/Border_Stretches_Content_Vertically.expected.png
  61. 0
      Tests/TestFiles/Direct2D1/Controls/Border/Border_Top_Aligns_Content.expected.png
  62. 0
      Tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_Fill.expected.png
  63. 0
      Tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_None.expected.png
  64. 0
      Tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_Uniform.expected.png
  65. 0
      Tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_UniformToFill.expected.png
  66. 0
      Tests/TestFiles/Direct2D1/Controls/Image/test.png
  67. 0
      Tests/TestFiles/Direct2D1/Shapes/Ellipse/Circle_1px_Stroke.expected.png
  68. 0
      Tests/TestFiles/Direct2D1/Shapes/Path/Path_100px_Triangle_Centered.expected.png
  69. 0
      Tests/TestFiles/Direct2D1/Shapes/Path/Path_Expander_With_Border.expected.png
  70. 0
      Tests/TestFiles/Direct2D1/Shapes/Path/Path_Tick_Scaled.expected.png
  71. 0
      Tests/TestFiles/Direct2D1/Shapes/Path/Path_Tick_Scaled_Stroke_8px.expected.png
  72. 0
      Tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_1px_Stroke.expected.png
  73. 0
      Tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_2px_Stroke.expected.png
  74. 0
      Tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_Stroke_Fill.expected.png
  75. 0
      samples/TestApplication/App.config
  76. 0
      samples/TestApplication/App.cs
  77. 0
      samples/TestApplication/Program.cs
  78. 0
      samples/TestApplication/Properties/AssemblyInfo.cs
  79. 0
      samples/TestApplication/TestApplication-Mono.csproj
  80. 26
      samples/TestApplication/TestApplication.csproj
  81. 0
      samples/TestApplication/github_icon.png
  82. 0
      samples/TestApplication/packages.config
  83. 0
      samples/XamlTestApplication/App.config
  84. 0
      samples/XamlTestApplication/App.cs
  85. 0
      samples/XamlTestApplication/MainViewModel.cs
  86. 0
      samples/XamlTestApplication/Program.cs
  87. 0
      samples/XamlTestApplication/Properties/AssemblyInfo.cs
  88. 0
      samples/XamlTestApplication/Views/MainWindow.cs
  89. 0
      samples/XamlTestApplication/Views/MainWindow.xaml
  90. 32
      samples/XamlTestApplication/XamlTestApplication.csproj
  91. 0
      samples/XamlTestApplication/github_icon.png
  92. 0
      samples/XamlTestApplication/packages.config
  93. 0
      src/Cairo/Perspex.Cairo/CairoExtensions.cs
  94. 0
      src/Cairo/Perspex.Cairo/CairoPlatform.cs
  95. 0
      src/Cairo/Perspex.Cairo/Media/DrawingContext.cs
  96. 0
      src/Cairo/Perspex.Cairo/Media/FormattedTextImpl.cs
  97. 0
      src/Cairo/Perspex.Cairo/Media/Imaging/BitmapImpl.cs
  98. 0
      src/Cairo/Perspex.Cairo/Media/Imaging/RenderTargetBitmapImpl.cs
  99. 0
      src/Cairo/Perspex.Cairo/Media/StreamGeometryContextImpl.cs
  100. 0
      src/Cairo/Perspex.Cairo/Media/StreamGeometryImpl.cs

1
Perspex.Xaml.Desktop/Perspex.Xaml.Desktop.nugetreferenceswitcher

@ -1 +0,0 @@
OmniXaml.AppServices ../../OmniXAML/Source/OmniXaml.AppServices/OmniXaml.AppServices.csproj ../packages/OmniXaml.AppServices.1.4.0.0/lib/portable-net451+win81+wpa81/OmniXaml.AppServices.dll

2
Perspex.Xaml/Perspex.Xaml.previous.nugetreferenceswitcher

@ -1,2 +0,0 @@
Glass ../../GitHub/OmniXAML/Glass/Glass.csproj ../packages/OmniXaml.1.0.11/lib/portable-net451+win81/Glass.dll
OmniXaml ../../GitHub/OmniXAML/OmniXaml/OmniXaml/OmniXaml.csproj ../packages/OmniXaml.1.0.11/lib/portable-net451+win81/OmniXaml.dll

56
Perspex.sln

@ -3,65 +3,65 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
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}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Win32", "src\Windows\Perspex.Win32\Perspex.Win32.csproj", "{811A76CF-1CF6-440F-963B-BBE31BD72A82}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApplication", "Demos\TestApplication\TestApplication.csproj", "{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApplication", "samples\TestApplication\TestApplication.csproj", "{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Direct2D1", "Windows\Perspex.Direct2D1\Perspex.Direct2D1.csproj", "{3E908F67-5543-4879-A1DC-08EACE79B3CD}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Direct2D1", "src\Windows\Perspex.Direct2D1\Perspex.Direct2D1.csproj", "{3E908F67-5543-4879-A1DC-08EACE79B3CD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Base", "Perspex.Base\Perspex.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Base", "src\Perspex.Base\Perspex.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.SceneGraph", "Perspex.SceneGraph\Perspex.SceneGraph.csproj", "{EB582467-6ABB-43A1-B052-E981BA910E3A}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.SceneGraph", "src\Perspex.SceneGraph\Perspex.SceneGraph.csproj", "{EB582467-6ABB-43A1-B052-E981BA910E3A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Layout", "Perspex.Layout\Perspex.Layout.csproj", "{42472427-4774-4C81-8AFF-9F27B8E31721}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Layout", "src\Perspex.Layout\Perspex.Layout.csproj", "{42472427-4774-4C81-8AFF-9F27B8E31721}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Windows", "Windows", "{B39A8919-9F95-48FE-AD7B-76E08B509888}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Input", "Perspex.Input\Perspex.Input.csproj", "{62024B2D-53EB-4638-B26B-85EEAA54866E}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Input", "src\Perspex.Input\Perspex.Input.csproj", "{62024B2D-53EB-4638-B26B-85EEAA54866E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Interactivity", "Perspex.Interactivity\Perspex.Interactivity.csproj", "{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Interactivity", "src\Perspex.Interactivity\Perspex.Interactivity.csproj", "{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Controls", "Perspex.Controls\Perspex.Controls.csproj", "{D2221C82-4A25-4583-9B43-D791E3F6820C}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Controls", "src\Perspex.Controls\Perspex.Controls.csproj", "{D2221C82-4A25-4583-9B43-D791E3F6820C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Styling", "Perspex.Styling\Perspex.Styling.csproj", "{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Styling", "src\Perspex.Styling\Perspex.Styling.csproj", "{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Styling.UnitTests", "Tests\Perspex.Styling.UnitTests\Perspex.Styling.UnitTests.csproj", "{47ECDF59-DEF8-4C53-87B1-2098A3429059}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Styling.UnitTests", "tests\Perspex.Styling.UnitTests\Perspex.Styling.UnitTests.csproj", "{47ECDF59-DEF8-4C53-87B1-2098A3429059}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Controls.UnitTests", "Tests\Perspex.Controls.UnitTests\Perspex.Controls.UnitTests.csproj", "{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Controls.UnitTests", "tests\Perspex.Controls.UnitTests\Perspex.Controls.UnitTests.csproj", "{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Themes.Default", "Perspex.Themes.Default\Perspex.Themes.Default.csproj", "{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Themes.Default", "src\Perspex.Themes.Default\Perspex.Themes.Default.csproj", "{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.SceneGraph.UnitTests", "Tests\Perspex.SceneGraph.UnitTests\Perspex.SceneGraph.UnitTests.csproj", "{76716382-3159-460E-BDA6-C5715CF606D7}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.SceneGraph.UnitTests", "tests\Perspex.SceneGraph.UnitTests\Perspex.SceneGraph.UnitTests.csproj", "{76716382-3159-460E-BDA6-C5715CF606D7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Application", "Perspex.Application\Perspex.Application.csproj", "{799A7BB5-3C2C-48B6-85A7-406A12C420DA}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Application", "src\Perspex.Application\Perspex.Application.csproj", "{799A7BB5-3C2C-48B6-85A7-406A12C420DA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Diagnostics", "Perspex.Diagnostics\Perspex.Diagnostics.csproj", "{7062AE20-5DCC-4442-9645-8195BDECE63E}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Diagnostics", "src\Perspex.Diagnostics\Perspex.Diagnostics.csproj", "{7062AE20-5DCC-4442-9645-8195BDECE63E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Base.UnitTests", "Tests\Perspex.Base.UnitTests\Perspex.Base.UnitTests.csproj", "{2905FF23-53FB-45E6-AA49-6AF47A172056}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Base.UnitTests", "tests\Perspex.Base.UnitTests\Perspex.Base.UnitTests.csproj", "{2905FF23-53FB-45E6-AA49-6AF47A172056}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utils", "Utils", "{2BAFBE53-7FA4-4BB9-976F-9AFCC4F9847D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NGenerics", "NGenerics\NGenerics.csproj", "{415E048E-4611-4815-9CF2-D774E29079AC}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NGenerics", "src\NGenerics\NGenerics.csproj", "{415E048E-4611-4815-9CF2-D774E29079AC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Layout.UnitTests", "Tests\Perspex.Layout.UnitTests\Perspex.Layout.UnitTests.csproj", "{DB070A10-BF39-4752-8456-86E9D5928478}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Layout.UnitTests", "tests\Perspex.Layout.UnitTests\Perspex.Layout.UnitTests.csproj", "{DB070A10-BF39-4752-8456-86E9D5928478}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Animation", "Perspex.Animation\Perspex.Animation.csproj", "{D211E587-D8BC-45B9-95A4-F297C8FA5200}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Animation", "src\Perspex.Animation\Perspex.Animation.csproj", "{D211E587-D8BC-45B9-95A4-F297C8FA5200}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Interactive.UnitTests", "Perspex.Interactive.UnitTests\Perspex.Interactive.UnitTests.csproj", "{08478EF5-44E8-42E9-92D6-15E00EC038D8}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Interactivity.UnitTests", "tests\Perspex.Interactivity.UnitTests\Perspex.Interactivity.UnitTests.csproj", "{08478EF5-44E8-42E9-92D6-15E00EC038D8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Direct2D1.RenderTests", "Tests\Perspex.RenderTests\Perspex.Direct2D1.RenderTests.csproj", "{DABFD304-D6A4-4752-8123-C2CCF7AC7831}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Direct2D1.RenderTests", "tests\Perspex.RenderTests\Perspex.Direct2D1.RenderTests.csproj", "{DABFD304-D6A4-4752-8123-C2CCF7AC7831}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Input.UnitTests", "Tests\Perspex.Input.UnitTests\Perspex.Input.UnitTests.csproj", "{AC18926A-E784-40FE-B09D-BB0FE2B599F0}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Input.UnitTests", "tests\Perspex.Input.UnitTests\Perspex.Input.UnitTests.csproj", "{AC18926A-E784-40FE-B09D-BB0FE2B599F0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Direct2D1.UnitTests", "Tests\Perspex.Direct2D1.UnitTests\Perspex.Direct2D1.UnitTests.csproj", "{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Direct2D1.UnitTests", "tests\Perspex.Direct2D1.UnitTests\Perspex.Direct2D1.UnitTests.csproj", "{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Xaml", "Perspex.Xaml\Perspex.Xaml.csproj", "{3E53A01A-B331-47F3-B828-4A5717E77A24}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Xaml", "src\Markup\Perspex.Xaml\Perspex.Xaml.csproj", "{3E53A01A-B331-47F3-B828-4A5717E77A24}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Xaml.Desktop", "Perspex.Xaml.Desktop\Perspex.Xaml.Desktop.csproj", "{EB468C39-AAC4-4963-A7B2-0A405EA63EDD}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Xaml.Desktop", "src\Markup\Perspex.Xaml.Desktop\Perspex.Xaml.Desktop.csproj", "{EB468C39-AAC4-4963-A7B2-0A405EA63EDD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlTestApplication", "Demos\XamlTestApplication\XamlTestApplication.csproj", "{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlTestApplication", "samples\XamlTestApplication\XamlTestApplication.csproj", "{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Markup", "Markup", "{8B6A8209-894F-4BA1-B880-965FD453982C}"
EndProject
@ -69,7 +69,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demos", "Demos", "{9B9E3891
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{A689DEF5-D50F-4975-8B72-124C9EB54066}"
ProjectSection(SolutionItems) = preProject
Shared\SharedAssemblyInfo.cs = Shared\SharedAssemblyInfo.cs
src\Shared\SharedAssemblyInfo.cs = src\Shared\SharedAssemblyInfo.cs
EndProjectSection
EndProject
Global

BIN
Perspex.v2.ncrunchsolution

Binary file not shown.

5
Tests/Perspex.Base.UnitTests/Perspex.Base.UnitTests.csproj

@ -76,9 +76,6 @@
<Otherwise />
</Choose>
<ItemGroup>
<Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
</Compile>
<Compile Include="Collections\PerspexListTests.cs" />
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="PerspexObjectTests_GetObservable.cs" />
@ -100,7 +97,7 @@
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Perspex.Base\Perspex.Base.csproj">
<ProjectReference Include="..\..\src\Perspex.Base\Perspex.Base.csproj">
<Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
<Name>Perspex.Base</Name>
</ProjectReference>

19
Tests/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj

@ -91,9 +91,6 @@
<Otherwise />
</Choose>
<ItemGroup>
<Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
</Compile>
<Compile Include="ContentPresenterTests.cs" />
<Compile Include="BorderTests.cs" />
<Compile Include="GlobalSuppressions.cs" />
@ -128,35 +125,35 @@
<Compile Include="TestRoot.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Perspex.Animation\Perspex.Animation.csproj">
<ProjectReference Include="..\..\src\Perspex.Animation\Perspex.Animation.csproj">
<Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
<Name>Perspex.Animation</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Base\Perspex.Base.csproj">
<ProjectReference Include="..\..\src\Perspex.Base\Perspex.Base.csproj">
<Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
<Name>Perspex.Base</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Controls\Perspex.Controls.csproj">
<ProjectReference Include="..\..\src\Perspex.Controls\Perspex.Controls.csproj">
<Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project>
<Name>Perspex.Controls</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Input\Perspex.Input.csproj">
<ProjectReference Include="..\..\src\Perspex.Input\Perspex.Input.csproj">
<Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
<Name>Perspex.Input</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Interactivity\Perspex.Interactivity.csproj">
<ProjectReference Include="..\..\src\Perspex.Interactivity\Perspex.Interactivity.csproj">
<Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
<Name>Perspex.Interactivity</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Layout\Perspex.Layout.csproj">
<ProjectReference Include="..\..\src\Perspex.Layout\Perspex.Layout.csproj">
<Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
<Name>Perspex.Layout</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
<ProjectReference Include="..\..\src\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
<Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
<Name>Perspex.SceneGraph</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Styling\Perspex.Styling.csproj">
<ProjectReference Include="..\..\src\Perspex.Styling\Perspex.Styling.csproj">
<Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project>
<Name>Perspex.Styling</Name>
</ProjectReference>

21
Tests/Perspex.Direct2D1.UnitTests/Perspex.Direct2D1.UnitTests.csproj

@ -62,9 +62,6 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
</Compile>
<Compile Include="Controls\Shapes\PathTests.cs" />
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="Media\GeometryTests.cs" />
@ -72,39 +69,39 @@
<Compile Include="RectComparer.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Perspex.Animation\Perspex.Animation.csproj">
<ProjectReference Include="..\..\src\Perspex.Animation\Perspex.Animation.csproj">
<Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
<Name>Perspex.Animation</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Base\Perspex.Base.csproj">
<ProjectReference Include="..\..\src\Perspex.Base\Perspex.Base.csproj">
<Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
<Name>Perspex.Base</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Controls\Perspex.Controls.csproj">
<ProjectReference Include="..\..\src\Perspex.Controls\Perspex.Controls.csproj">
<Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project>
<Name>Perspex.Controls</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Input\Perspex.Input.csproj">
<ProjectReference Include="..\..\src\Perspex.Input\Perspex.Input.csproj">
<Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
<Name>Perspex.Input</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Interactivity\Perspex.Interactivity.csproj">
<ProjectReference Include="..\..\src\Perspex.Interactivity\Perspex.Interactivity.csproj">
<Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
<Name>Perspex.Interactivity</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Layout\Perspex.Layout.csproj">
<ProjectReference Include="..\..\src\Perspex.Layout\Perspex.Layout.csproj">
<Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
<Name>Perspex.Layout</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
<ProjectReference Include="..\..\src\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
<Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
<Name>Perspex.SceneGraph</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Styling\Perspex.Styling.csproj">
<ProjectReference Include="..\..\src\Perspex.Styling\Perspex.Styling.csproj">
<Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project>
<Name>Perspex.Styling</Name>
</ProjectReference>
<ProjectReference Include="..\..\Windows\Perspex.Direct2D1\Perspex.Direct2D1.csproj">
<ProjectReference Include="..\..\src\Windows\Perspex.Direct2D1\Perspex.Direct2D1.csproj">
<Project>{3e908f67-5543-4879-a1dc-08eace79b3cd}</Project>
<Name>Perspex.Direct2D1</Name>
</ProjectReference>

19
Tests/Perspex.Input.UnitTests/Perspex.Input.UnitTests.csproj

@ -62,9 +62,6 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
</Compile>
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="KeyboardNavigationTests_Arrows.cs" />
<Compile Include="KeyboardNavigationTests_Tab.cs" />
@ -75,35 +72,35 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Perspex.Animation\Perspex.Animation.csproj">
<ProjectReference Include="..\..\src\Perspex.Animation\Perspex.Animation.csproj">
<Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
<Name>Perspex.Animation</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Base\Perspex.Base.csproj">
<ProjectReference Include="..\..\src\Perspex.Base\Perspex.Base.csproj">
<Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
<Name>Perspex.Base</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Controls\Perspex.Controls.csproj">
<ProjectReference Include="..\..\src\Perspex.Controls\Perspex.Controls.csproj">
<Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project>
<Name>Perspex.Controls</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Input\Perspex.Input.csproj">
<ProjectReference Include="..\..\src\Perspex.Input\Perspex.Input.csproj">
<Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
<Name>Perspex.Input</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Interactivity\Perspex.Interactivity.csproj">
<ProjectReference Include="..\..\src\Perspex.Interactivity\Perspex.Interactivity.csproj">
<Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
<Name>Perspex.Interactivity</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Layout\Perspex.Layout.csproj">
<ProjectReference Include="..\..\src\Perspex.Layout\Perspex.Layout.csproj">
<Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
<Name>Perspex.Layout</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
<ProjectReference Include="..\..\src\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
<Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
<Name>Perspex.SceneGraph</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Styling\Perspex.Styling.csproj">
<ProjectReference Include="..\..\src\Perspex.Styling\Perspex.Styling.csproj">
<Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project>
<Name>Perspex.Styling</Name>
</ProjectReference>

0
Perspex.Interactive.UnitTests/GlobalSuppressions.cs → Tests/Perspex.Interactivity.UnitTests/GlobalSuppressions.cs

2
Perspex.Interactive.UnitTests/InteractiveTests.cs → Tests/Perspex.Interactivity.UnitTests/InteractiveTests.cs

@ -4,7 +4,7 @@
// </copyright>
// -----------------------------------------------------------------------
namespace Perspex.Interactive.UnitTests
namespace Perspex.Interactivity.UnitTests
{
using System;
using System.Collections.Generic;

39
Perspex.Interactive.UnitTests/Perspex.Interactive.UnitTests.csproj → Tests/Perspex.Interactivity.UnitTests/Perspex.Interactivity.UnitTests.csproj

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props')" />
<Import Project="..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
<Import Project="..\..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props')" />
<Import Project="..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -9,8 +9,8 @@
<ProjectGuid>{08478EF5-44E8-42E9-92D6-15E00EC038D8}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Perspex.Interactive.UnitTests</RootNamespace>
<AssemblyName>Perspex.Interactive.UnitTests</AssemblyName>
<RootNamespace>Perspex.Interactivity.UnitTests</RootNamespace>
<AssemblyName>Perspex.Interactivity.UnitTests</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>
@ -24,7 +24,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug\Perspex.Interactive.UnitTests.XML</DocumentationFile>
<DocumentationFile>bin\Debug\Perspex.Interactivity.UnitTests.xml</DocumentationFile>
<NoWarn>CS1591</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@ -37,7 +37,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
<HintPath>..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
@ -48,19 +48,16 @@
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<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>
<HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
</Reference>
<Reference Include="xunit.assert">
<HintPath>..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
<HintPath>..\..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
</Reference>
<Reference Include="xunit.core">
<HintPath>..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
<HintPath>..\..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Shared\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
</Compile>
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="InteractiveTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
@ -69,27 +66,27 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NGenerics\NGenerics.csproj">
<ProjectReference Include="..\..\src\NGenerics\NGenerics.csproj">
<Project>{415e048e-4611-4815-9cf2-d774e29079ac}</Project>
<Name>NGenerics</Name>
</ProjectReference>
<ProjectReference Include="..\Perspex.Animation\Perspex.Animation.csproj">
<ProjectReference Include="..\..\src\Perspex.Animation\Perspex.Animation.csproj">
<Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
<Name>Perspex.Animation</Name>
</ProjectReference>
<ProjectReference Include="..\Perspex.Base\Perspex.Base.csproj">
<ProjectReference Include="..\..\src\Perspex.Base\Perspex.Base.csproj">
<Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
<Name>Perspex.Base</Name>
</ProjectReference>
<ProjectReference Include="..\Perspex.Interactivity\Perspex.Interactivity.csproj">
<ProjectReference Include="..\..\src\Perspex.Interactivity\Perspex.Interactivity.csproj">
<Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
<Name>Perspex.Interactivity</Name>
</ProjectReference>
<ProjectReference Include="..\Perspex.Layout\Perspex.Layout.csproj">
<ProjectReference Include="..\..\src\Perspex.Layout\Perspex.Layout.csproj">
<Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
<Name>Perspex.Layout</Name>
</ProjectReference>
<ProjectReference Include="..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
<ProjectReference Include="..\..\src\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
<Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
<Name>Perspex.SceneGraph</Name>
</ProjectReference>
@ -98,15 +95,15 @@
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
<Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props'))" />
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props'))" />
<Error Condition="!Exists('..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props'))" />
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props'))" />
</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.

0
Perspex.Interactive.UnitTests/Properties/AssemblyInfo.cs → Tests/Perspex.Interactivity.UnitTests/Properties/AssemblyInfo.cs

0
Perspex.Interactive.UnitTests/packages.config → Tests/Perspex.Interactivity.UnitTests/packages.config

25
Tests/Perspex.Layout.UnitTests/Perspex.Layout.UnitTests.csproj

@ -76,55 +76,52 @@
<Otherwise />
</Choose>
<ItemGroup>
<Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
</Compile>
<Compile Include="FullLayoutTests.cs" />
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\NGenerics\NGenerics.csproj">
<ProjectReference Include="..\..\src\NGenerics\NGenerics.csproj">
<Project>{415e048e-4611-4815-9cf2-d774e29079ac}</Project>
<Name>NGenerics</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Animation\Perspex.Animation.csproj">
<ProjectReference Include="..\..\src\Perspex.Animation\Perspex.Animation.csproj">
<Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
<Name>Perspex.Animation</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Base\Perspex.Base.csproj">
<ProjectReference Include="..\..\src\Perspex.Base\Perspex.Base.csproj">
<Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
<Name>Perspex.Base</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Controls\Perspex.Controls.csproj">
<ProjectReference Include="..\..\src\Perspex.Controls\Perspex.Controls.csproj">
<Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project>
<Name>Perspex.Controls</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Diagnostics\Perspex.Diagnostics.csproj">
<ProjectReference Include="..\..\src\Perspex.Diagnostics\Perspex.Diagnostics.csproj">
<Project>{7062ae20-5dcc-4442-9645-8195bdece63e}</Project>
<Name>Perspex.Diagnostics</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Input\Perspex.Input.csproj">
<ProjectReference Include="..\..\src\Perspex.Input\Perspex.Input.csproj">
<Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
<Name>Perspex.Input</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Interactivity\Perspex.Interactivity.csproj">
<ProjectReference Include="..\..\src\Perspex.Interactivity\Perspex.Interactivity.csproj">
<Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
<Name>Perspex.Interactivity</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Layout\Perspex.Layout.csproj">
<ProjectReference Include="..\..\src\Perspex.Layout\Perspex.Layout.csproj">
<Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
<Name>Perspex.Layout</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
<ProjectReference Include="..\..\src\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
<Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
<Name>Perspex.SceneGraph</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Styling\Perspex.Styling.csproj">
<ProjectReference Include="..\..\src\Perspex.Styling\Perspex.Styling.csproj">
<Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project>
<Name>Perspex.Styling</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Themes.Default\Perspex.Themes.Default.csproj">
<ProjectReference Include="..\..\src\Perspex.Themes.Default\Perspex.Themes.Default.csproj">
<Project>{3e10a5fa-e8da-48b1-ad44-6a5b6cb7750f}</Project>
<Name>Perspex.Themes.Default</Name>
</ProjectReference>

21
Tests/Perspex.RenderTests/Perspex.Direct2D1.RenderTests.csproj

@ -77,9 +77,6 @@
<Otherwise />
</Choose>
<ItemGroup>
<Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
</Compile>
<Compile Include="Controls\ImageTests.cs" />
<Compile Include="Controls\BorderTests.cs" />
<Compile Include="GlobalSuppressions.cs" />
@ -90,39 +87,39 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Perspex.Animation\Perspex.Animation.csproj">
<ProjectReference Include="..\..\src\Perspex.Animation\Perspex.Animation.csproj">
<Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
<Name>Perspex.Animation</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Base\Perspex.Base.csproj">
<ProjectReference Include="..\..\src\Perspex.Base\Perspex.Base.csproj">
<Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
<Name>Perspex.Base</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Controls\Perspex.Controls.csproj">
<ProjectReference Include="..\..\src\Perspex.Controls\Perspex.Controls.csproj">
<Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project>
<Name>Perspex.Controls</Name>
</ProjectReference>
<ProjectReference Include="..\..\Windows\Perspex.Direct2D1\Perspex.Direct2D1.csproj">
<ProjectReference Include="..\..\src\Windows\Perspex.Direct2D1\Perspex.Direct2D1.csproj">
<Project>{3e908f67-5543-4879-a1dc-08eace79b3cd}</Project>
<Name>Perspex.Direct2D1</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Input\Perspex.Input.csproj">
<ProjectReference Include="..\..\src\Perspex.Input\Perspex.Input.csproj">
<Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
<Name>Perspex.Input</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Interactivity\Perspex.Interactivity.csproj">
<ProjectReference Include="..\..\src\Perspex.Interactivity\Perspex.Interactivity.csproj">
<Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
<Name>Perspex.Interactivity</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Layout\Perspex.Layout.csproj">
<ProjectReference Include="..\..\src\Perspex.Layout\Perspex.Layout.csproj">
<Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
<Name>Perspex.Layout</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
<ProjectReference Include="..\..\src\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
<Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
<Name>Perspex.SceneGraph</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Styling\Perspex.Styling.csproj">
<ProjectReference Include="..\..\src\Perspex.Styling\Perspex.Styling.csproj">
<Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project>
<Name>Perspex.Styling</Name>
</ProjectReference>

4
Tests/Perspex.RenderTests/TestBase.cs

@ -32,9 +32,9 @@ namespace Perspex.Direct2D1.RenderTests
public TestBase(string outputPath)
{
#if PERSPEX_CAIRO
string testFiles = Path.GetFullPath(@"..\..\..\..\TestFiles\Cairo");
string testFiles = Path.GetFullPath(@"..\..\..\TestFiles\Cairo");
#else
string testFiles = Path.GetFullPath(@"..\..\..\..\TestFiles\Direct2D1");
string testFiles = Path.GetFullPath(@"..\..\..\TestFiles\Direct2D1");
#endif
this.OutputPath = Path.Combine(testFiles, outputPath);
}

19
Tests/Perspex.SceneGraph.UnitTests/Perspex.SceneGraph.UnitTests.csproj

@ -80,9 +80,6 @@
<Otherwise />
</Choose>
<ItemGroup>
<Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
</Compile>
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="TestRoot.cs" />
<Compile Include="TestVisual.cs" />
@ -91,35 +88,35 @@
<Compile Include="VisualTree\BoundsTrackerTests.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Perspex.Animation\Perspex.Animation.csproj">
<ProjectReference Include="..\..\src\Perspex.Animation\Perspex.Animation.csproj">
<Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
<Name>Perspex.Animation</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Base\Perspex.Base.csproj">
<ProjectReference Include="..\..\src\Perspex.Base\Perspex.Base.csproj">
<Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
<Name>Perspex.Base</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Controls\Perspex.Controls.csproj">
<ProjectReference Include="..\..\src\Perspex.Controls\Perspex.Controls.csproj">
<Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project>
<Name>Perspex.Controls</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Input\Perspex.Input.csproj">
<ProjectReference Include="..\..\src\Perspex.Input\Perspex.Input.csproj">
<Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
<Name>Perspex.Input</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Interactivity\Perspex.Interactivity.csproj">
<ProjectReference Include="..\..\src\Perspex.Interactivity\Perspex.Interactivity.csproj">
<Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
<Name>Perspex.Interactivity</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Layout\Perspex.Layout.csproj">
<ProjectReference Include="..\..\src\Perspex.Layout\Perspex.Layout.csproj">
<Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
<Name>Perspex.Layout</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
<ProjectReference Include="..\..\src\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
<Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
<Name>Perspex.SceneGraph</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Styling\Perspex.Styling.csproj">
<ProjectReference Include="..\..\src\Perspex.Styling\Perspex.Styling.csproj">
<Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project>
<Name>Perspex.Styling</Name>
</ProjectReference>

19
Tests/Perspex.Styling.UnitTests/Perspex.Styling.UnitTests.csproj

@ -84,9 +84,6 @@
<Otherwise />
</Choose>
<ItemGroup>
<Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
</Compile>
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SelectorTests_Class.cs" />
@ -107,35 +104,35 @@
<Compile Include="TestTemplatedControl.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Perspex.Animation\Perspex.Animation.csproj">
<ProjectReference Include="..\..\src\Perspex.Animation\Perspex.Animation.csproj">
<Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
<Name>Perspex.Animation</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Base\Perspex.Base.csproj">
<ProjectReference Include="..\..\src\Perspex.Base\Perspex.Base.csproj">
<Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
<Name>Perspex.Base</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Controls\Perspex.Controls.csproj">
<ProjectReference Include="..\..\src\Perspex.Controls\Perspex.Controls.csproj">
<Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project>
<Name>Perspex.Controls</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Input\Perspex.Input.csproj">
<ProjectReference Include="..\..\src\Perspex.Input\Perspex.Input.csproj">
<Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
<Name>Perspex.Input</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Interactivity\Perspex.Interactivity.csproj">
<ProjectReference Include="..\..\src\Perspex.Interactivity\Perspex.Interactivity.csproj">
<Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
<Name>Perspex.Interactivity</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Layout\Perspex.Layout.csproj">
<ProjectReference Include="..\..\src\Perspex.Layout\Perspex.Layout.csproj">
<Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
<Name>Perspex.Layout</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
<ProjectReference Include="..\..\src\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
<Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
<Name>Perspex.SceneGraph</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Styling\Perspex.Styling.csproj">
<ProjectReference Include="..\..\src\Perspex.Styling\Perspex.Styling.csproj">
<Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project>
<Name>Perspex.Styling</Name>
</ProjectReference>

0
TestFiles/.gitignore → Tests/TestFiles/.gitignore

0
TestFiles/Cairo/Controls/Border/Border_1px_Border.expected.png → Tests/TestFiles/Cairo/Controls/Border/Border_1px_Border.expected.png

Before

Width:  |  Height:  |  Size: 609 B

After

Width:  |  Height:  |  Size: 609 B

0
TestFiles/Cairo/Controls/Border/Border_2px_Border.expected.png → Tests/TestFiles/Cairo/Controls/Border/Border_2px_Border.expected.png

Before

Width:  |  Height:  |  Size: 611 B

After

Width:  |  Height:  |  Size: 611 B

0
TestFiles/Cairo/Controls/Border/Border_Bottom_Aligns_Content.expected.png → Tests/TestFiles/Cairo/Controls/Border/Border_Bottom_Aligns_Content.expected.png

Before

Width:  |  Height:  |  Size: 797 B

After

Width:  |  Height:  |  Size: 797 B

0
TestFiles/Cairo/Controls/Border/Border_Brush_Offsets_Content.expected.png → Tests/TestFiles/Cairo/Controls/Border/Border_Brush_Offsets_Content.expected.png

Before

Width:  |  Height:  |  Size: 615 B

After

Width:  |  Height:  |  Size: 615 B

0
TestFiles/Cairo/Controls/Border/Border_Centers_Content_Horizontally.expected.png → Tests/TestFiles/Cairo/Controls/Border/Border_Centers_Content_Horizontally.expected.png

Before

Width:  |  Height:  |  Size: 830 B

After

Width:  |  Height:  |  Size: 830 B

0
TestFiles/Cairo/Controls/Border/Border_Centers_Content_Vertically.expected.png → Tests/TestFiles/Cairo/Controls/Border/Border_Centers_Content_Vertically.expected.png

Before

Width:  |  Height:  |  Size: 811 B

After

Width:  |  Height:  |  Size: 811 B

0
TestFiles/Cairo/Controls/Border/Border_Fill.expected.png → Tests/TestFiles/Cairo/Controls/Border/Border_Fill.expected.png

Before

Width:  |  Height:  |  Size: 601 B

After

Width:  |  Height:  |  Size: 601 B

0
TestFiles/Cairo/Controls/Border/Border_Left_Aligns_Content.expected.png → Tests/TestFiles/Cairo/Controls/Border/Border_Left_Aligns_Content.expected.png

Before

Width:  |  Height:  |  Size: 838 B

After

Width:  |  Height:  |  Size: 838 B

0
TestFiles/Cairo/Controls/Border/Border_Margin_Offsets_Content.expected.png → Tests/TestFiles/Cairo/Controls/Border/Border_Margin_Offsets_Content.expected.png

Before

Width:  |  Height:  |  Size: 640 B

After

Width:  |  Height:  |  Size: 640 B

0
TestFiles/Cairo/Controls/Border/Border_Nested_Rotate.expected.png → Tests/TestFiles/Cairo/Controls/Border/Border_Nested_Rotate.expected.png

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
TestFiles/Cairo/Controls/Border/Border_Padding_Offsets_Content.expected.png → Tests/TestFiles/Cairo/Controls/Border/Border_Padding_Offsets_Content.expected.png

Before

Width:  |  Height:  |  Size: 640 B

After

Width:  |  Height:  |  Size: 640 B

0
TestFiles/Cairo/Controls/Border/Border_Right_Aligns_Content.expected.png → Tests/TestFiles/Cairo/Controls/Border/Border_Right_Aligns_Content.expected.png

Before

Width:  |  Height:  |  Size: 800 B

After

Width:  |  Height:  |  Size: 800 B

0
TestFiles/Cairo/Controls/Border/Border_Stretches_Content_Horizontally.expected.png → Tests/TestFiles/Cairo/Controls/Border/Border_Stretches_Content_Horizontally.expected.png

Before

Width:  |  Height:  |  Size: 793 B

After

Width:  |  Height:  |  Size: 793 B

0
TestFiles/Cairo/Controls/Border/Border_Stretches_Content_Vertically.expected.png → Tests/TestFiles/Cairo/Controls/Border/Border_Stretches_Content_Vertically.expected.png

Before

Width:  |  Height:  |  Size: 793 B

After

Width:  |  Height:  |  Size: 793 B

0
TestFiles/Cairo/Controls/Border/Border_Top_Aligns_Content.expected.png → Tests/TestFiles/Cairo/Controls/Border/Border_Top_Aligns_Content.expected.png

Before

Width:  |  Height:  |  Size: 801 B

After

Width:  |  Height:  |  Size: 801 B

0
TestFiles/Cairo/Controls/Image/Image_Stretch_Fill.expected.png → Tests/TestFiles/Cairo/Controls/Image/Image_Stretch_Fill.expected.png

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

0
TestFiles/Cairo/Controls/Image/Image_Stretch_None.expected.png → Tests/TestFiles/Cairo/Controls/Image/Image_Stretch_None.expected.png

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

0
TestFiles/Cairo/Controls/Image/Image_Stretch_Uniform.expected.png → Tests/TestFiles/Cairo/Controls/Image/Image_Stretch_Uniform.expected.png

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

0
TestFiles/Cairo/Controls/Image/Image_Stretch_UniformToFill.expected.png → Tests/TestFiles/Cairo/Controls/Image/Image_Stretch_UniformToFill.expected.png

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

0
TestFiles/Cairo/Controls/Image/test.png → Tests/TestFiles/Cairo/Controls/Image/test.png

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

0
TestFiles/Cairo/Shapes/Ellipse/Circle_1px_Stroke.expected.png → Tests/TestFiles/Cairo/Shapes/Ellipse/Circle_1px_Stroke.expected.png

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

0
TestFiles/Cairo/Shapes/Path/Path_100px_Triangle_Centered.expected.png → Tests/TestFiles/Cairo/Shapes/Path/Path_100px_Triangle_Centered.expected.png

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
TestFiles/Cairo/Shapes/Path/Path_Expander_With_Border.expected.png → Tests/TestFiles/Cairo/Shapes/Path/Path_Expander_With_Border.expected.png

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
TestFiles/Cairo/Shapes/Path/Path_Tick_Scaled.expected.png → Tests/TestFiles/Cairo/Shapes/Path/Path_Tick_Scaled.expected.png

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

0
TestFiles/Cairo/Shapes/Rectangle/Rectangle_1px_Stroke.expected.png → Tests/TestFiles/Cairo/Shapes/Rectangle/Rectangle_1px_Stroke.expected.png

Before

Width:  |  Height:  |  Size: 628 B

After

Width:  |  Height:  |  Size: 628 B

0
TestFiles/Cairo/Shapes/Rectangle/Rectangle_2px_Stroke.expected.png → Tests/TestFiles/Cairo/Shapes/Rectangle/Rectangle_2px_Stroke.expected.png

Before

Width:  |  Height:  |  Size: 619 B

After

Width:  |  Height:  |  Size: 619 B

0
TestFiles/Cairo/Shapes/Rectangle/Rectangle_Stroke_Fill.expected.png → Tests/TestFiles/Cairo/Shapes/Rectangle/Rectangle_Stroke_Fill.expected.png

Before

Width:  |  Height:  |  Size: 620 B

After

Width:  |  Height:  |  Size: 620 B

0
TestFiles/Direct2D1/Controls/Border/Border_1px_Border.expected.png → Tests/TestFiles/Direct2D1/Controls/Border/Border_1px_Border.expected.png

Before

Width:  |  Height:  |  Size: 609 B

After

Width:  |  Height:  |  Size: 609 B

0
TestFiles/Direct2D1/Controls/Border/Border_2px_Border.expected.png → Tests/TestFiles/Direct2D1/Controls/Border/Border_2px_Border.expected.png

Before

Width:  |  Height:  |  Size: 611 B

After

Width:  |  Height:  |  Size: 611 B

0
TestFiles/Direct2D1/Controls/Border/Border_Bottom_Aligns_Content.expected.png → Tests/TestFiles/Direct2D1/Controls/Border/Border_Bottom_Aligns_Content.expected.png

Before

Width:  |  Height:  |  Size: 797 B

After

Width:  |  Height:  |  Size: 797 B

0
TestFiles/Direct2D1/Controls/Border/Border_Brush_Offsets_Content.expected.png → Tests/TestFiles/Direct2D1/Controls/Border/Border_Brush_Offsets_Content.expected.png

Before

Width:  |  Height:  |  Size: 615 B

After

Width:  |  Height:  |  Size: 615 B

0
TestFiles/Direct2D1/Controls/Border/Border_Centers_Content_Horizontally.expected.png → Tests/TestFiles/Direct2D1/Controls/Border/Border_Centers_Content_Horizontally.expected.png

Before

Width:  |  Height:  |  Size: 830 B

After

Width:  |  Height:  |  Size: 830 B

0
TestFiles/Direct2D1/Controls/Border/Border_Centers_Content_Vertically.expected.png → Tests/TestFiles/Direct2D1/Controls/Border/Border_Centers_Content_Vertically.expected.png

Before

Width:  |  Height:  |  Size: 811 B

After

Width:  |  Height:  |  Size: 811 B

0
TestFiles/Direct2D1/Controls/Border/Border_Fill.expected.png → Tests/TestFiles/Direct2D1/Controls/Border/Border_Fill.expected.png

Before

Width:  |  Height:  |  Size: 601 B

After

Width:  |  Height:  |  Size: 601 B

0
TestFiles/Direct2D1/Controls/Border/Border_Left_Aligns_Content.expected.png → Tests/TestFiles/Direct2D1/Controls/Border/Border_Left_Aligns_Content.expected.png

Before

Width:  |  Height:  |  Size: 838 B

After

Width:  |  Height:  |  Size: 838 B

0
TestFiles/Direct2D1/Controls/Border/Border_Margin_Offsets_Content.expected.png → Tests/TestFiles/Direct2D1/Controls/Border/Border_Margin_Offsets_Content.expected.png

Before

Width:  |  Height:  |  Size: 640 B

After

Width:  |  Height:  |  Size: 640 B

0
TestFiles/Direct2D1/Controls/Border/Border_Nested_Rotate.expected.png → Tests/TestFiles/Direct2D1/Controls/Border/Border_Nested_Rotate.expected.png

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
TestFiles/Direct2D1/Controls/Border/Border_Padding_Offsets_Content.expected.png → Tests/TestFiles/Direct2D1/Controls/Border/Border_Padding_Offsets_Content.expected.png

Before

Width:  |  Height:  |  Size: 640 B

After

Width:  |  Height:  |  Size: 640 B

0
TestFiles/Direct2D1/Controls/Border/Border_Right_Aligns_Content.expected.png → Tests/TestFiles/Direct2D1/Controls/Border/Border_Right_Aligns_Content.expected.png

Before

Width:  |  Height:  |  Size: 800 B

After

Width:  |  Height:  |  Size: 800 B

0
TestFiles/Direct2D1/Controls/Border/Border_Stretches_Content_Horizontally.expected.png → Tests/TestFiles/Direct2D1/Controls/Border/Border_Stretches_Content_Horizontally.expected.png

Before

Width:  |  Height:  |  Size: 793 B

After

Width:  |  Height:  |  Size: 793 B

0
TestFiles/Direct2D1/Controls/Border/Border_Stretches_Content_Vertically.expected.png → Tests/TestFiles/Direct2D1/Controls/Border/Border_Stretches_Content_Vertically.expected.png

Before

Width:  |  Height:  |  Size: 793 B

After

Width:  |  Height:  |  Size: 793 B

0
TestFiles/Direct2D1/Controls/Border/Border_Top_Aligns_Content.expected.png → Tests/TestFiles/Direct2D1/Controls/Border/Border_Top_Aligns_Content.expected.png

Before

Width:  |  Height:  |  Size: 801 B

After

Width:  |  Height:  |  Size: 801 B

0
TestFiles/Direct2D1/Controls/Image/Image_Stretch_Fill.expected.png → Tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_Fill.expected.png

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

0
TestFiles/Direct2D1/Controls/Image/Image_Stretch_None.expected.png → Tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_None.expected.png

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

0
TestFiles/Direct2D1/Controls/Image/Image_Stretch_Uniform.expected.png → Tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_Uniform.expected.png

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

0
TestFiles/Direct2D1/Controls/Image/Image_Stretch_UniformToFill.expected.png → Tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_UniformToFill.expected.png

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

0
TestFiles/Direct2D1/Controls/Image/test.png → Tests/TestFiles/Direct2D1/Controls/Image/test.png

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

0
TestFiles/Direct2D1/Shapes/Ellipse/Circle_1px_Stroke.expected.png → Tests/TestFiles/Direct2D1/Shapes/Ellipse/Circle_1px_Stroke.expected.png

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

0
TestFiles/Direct2D1/Shapes/Path/Path_100px_Triangle_Centered.expected.png → Tests/TestFiles/Direct2D1/Shapes/Path/Path_100px_Triangle_Centered.expected.png

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
TestFiles/Direct2D1/Shapes/Path/Path_Expander_With_Border.expected.png → Tests/TestFiles/Direct2D1/Shapes/Path/Path_Expander_With_Border.expected.png

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
TestFiles/Direct2D1/Shapes/Path/Path_Tick_Scaled.expected.png → Tests/TestFiles/Direct2D1/Shapes/Path/Path_Tick_Scaled.expected.png

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

0
TestFiles/Direct2D1/Shapes/Path/Path_Tick_Scaled_Stroke_8px.expected.png → Tests/TestFiles/Direct2D1/Shapes/Path/Path_Tick_Scaled_Stroke_8px.expected.png

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

0
TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_1px_Stroke.expected.png → Tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_1px_Stroke.expected.png

Before

Width:  |  Height:  |  Size: 609 B

After

Width:  |  Height:  |  Size: 609 B

0
TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_2px_Stroke.expected.png → Tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_2px_Stroke.expected.png

Before

Width:  |  Height:  |  Size: 611 B

After

Width:  |  Height:  |  Size: 611 B

0
TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_Stroke_Fill.expected.png → Tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_Stroke_Fill.expected.png

Before

Width:  |  Height:  |  Size: 615 B

After

Width:  |  Height:  |  Size: 615 B

0
Demos/TestApplication/App.config → samples/TestApplication/App.config

0
Demos/TestApplication/App.cs → samples/TestApplication/App.cs

0
Demos/TestApplication/Program.cs → samples/TestApplication/Program.cs

0
Demos/TestApplication/Properties/AssemblyInfo.cs → samples/TestApplication/Properties/AssemblyInfo.cs

0
Demos/TestApplication/TestApplication-Mono.csproj → samples/TestApplication/TestApplication-Mono.csproj

26
Demos/TestApplication/TestApplication.csproj → samples/TestApplication/TestApplication.csproj

@ -86,55 +86,55 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Perspex.Animation\Perspex.Animation.csproj">
<ProjectReference Include="..\..\src\Perspex.Animation\Perspex.Animation.csproj">
<Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
<Name>Perspex.Animation</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Application\Perspex.Application.csproj">
<ProjectReference Include="..\..\src\Perspex.Application\Perspex.Application.csproj">
<Project>{799A7BB5-3C2C-48B6-85A7-406A12C420DA}</Project>
<Name>Perspex.Application</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Base\Perspex.Base.csproj">
<ProjectReference Include="..\..\src\Perspex.Base\Perspex.Base.csproj">
<Project>{B09B78D8-9B26-48B0-9149-D64A2F120F3F}</Project>
<Name>Perspex.Base</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Controls\Perspex.Controls.csproj">
<ProjectReference Include="..\..\src\Perspex.Controls\Perspex.Controls.csproj">
<Project>{D2221C82-4A25-4583-9B43-D791E3F6820C}</Project>
<Name>Perspex.Controls</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Diagnostics\Perspex.Diagnostics.csproj">
<ProjectReference Include="..\..\src\Perspex.Diagnostics\Perspex.Diagnostics.csproj">
<Project>{7062AE20-5DCC-4442-9645-8195BDECE63E}</Project>
<Name>Perspex.Diagnostics</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Input\Perspex.Input.csproj">
<ProjectReference Include="..\..\src\Perspex.Input\Perspex.Input.csproj">
<Project>{62024B2D-53EB-4638-B26B-85EEAA54866E}</Project>
<Name>Perspex.Input</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Interactivity\Perspex.Interactivity.csproj">
<ProjectReference Include="..\..\src\Perspex.Interactivity\Perspex.Interactivity.csproj">
<Project>{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}</Project>
<Name>Perspex.Interactivity</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Layout\Perspex.Layout.csproj">
<ProjectReference Include="..\..\src\Perspex.Layout\Perspex.Layout.csproj">
<Project>{42472427-4774-4C81-8AFF-9F27B8E31721}</Project>
<Name>Perspex.Layout</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
<ProjectReference Include="..\..\src\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
<Project>{EB582467-6ABB-43A1-B052-E981BA910E3A}</Project>
<Name>Perspex.SceneGraph</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Styling\Perspex.Styling.csproj">
<ProjectReference Include="..\..\src\Perspex.Styling\Perspex.Styling.csproj">
<Project>{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}</Project>
<Name>Perspex.Styling</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Themes.Default\Perspex.Themes.Default.csproj">
<ProjectReference Include="..\..\src\Perspex.Themes.Default\Perspex.Themes.Default.csproj">
<Project>{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}</Project>
<Name>Perspex.Themes.Default</Name>
</ProjectReference>
<ProjectReference Include="..\..\Windows\Perspex.Direct2D1\Perspex.Direct2D1.csproj">
<ProjectReference Include="..\..\src\Windows\Perspex.Direct2D1\Perspex.Direct2D1.csproj">
<Project>{3e908f67-5543-4879-a1dc-08eace79b3cd}</Project>
<Name>Perspex.Direct2D1</Name>
</ProjectReference>
<ProjectReference Include="..\..\Windows\Perspex.Win32\Perspex.Win32.csproj">
<ProjectReference Include="..\..\src\Windows\Perspex.Win32\Perspex.Win32.csproj">
<Project>{811a76cf-1cf6-440f-963b-bbe31bd72a82}</Project>
<Name>Perspex.Win32</Name>
</ProjectReference>

0
Demos/TestApplication/github_icon.png → samples/TestApplication/github_icon.png

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

0
Demos/TestApplication/packages.config → samples/TestApplication/packages.config

0
Demos/XamlTestApplication/App.config → samples/XamlTestApplication/App.config

0
Demos/XamlTestApplication/App.cs → samples/XamlTestApplication/App.cs

0
Demos/XamlTestApplication/MainViewModel.cs → samples/XamlTestApplication/MainViewModel.cs

0
Demos/XamlTestApplication/Program.cs → samples/XamlTestApplication/Program.cs

0
Demos/XamlTestApplication/Properties/AssemblyInfo.cs → samples/XamlTestApplication/Properties/AssemblyInfo.cs

0
Demos/XamlTestApplication/Views/MainWindow.cs → samples/XamlTestApplication/Views/MainWindow.cs

0
Demos/XamlTestApplication/Views/MainWindow.xaml → samples/XamlTestApplication/Views/MainWindow.xaml

32
Demos/XamlTestApplication/XamlTestApplication.csproj → samples/XamlTestApplication/XamlTestApplication.csproj

@ -129,67 +129,67 @@
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\NGenerics\NGenerics.csproj">
<ProjectReference Include="..\..\src\NGenerics\NGenerics.csproj">
<Project>{415e048e-4611-4815-9cf2-d774e29079ac}</Project>
<Name>NGenerics</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Animation\Perspex.Animation.csproj">
<ProjectReference Include="..\..\src\Perspex.Animation\Perspex.Animation.csproj">
<Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
<Name>Perspex.Animation</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Application\Perspex.Application.csproj">
<ProjectReference Include="..\..\src\Perspex.Application\Perspex.Application.csproj">
<Project>{799a7bb5-3c2c-48b6-85a7-406a12c420da}</Project>
<Name>Perspex.Application</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Base\Perspex.Base.csproj">
<ProjectReference Include="..\..\src\Perspex.Base\Perspex.Base.csproj">
<Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
<Name>Perspex.Base</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Controls\Perspex.Controls.csproj">
<ProjectReference Include="..\..\src\Perspex.Controls\Perspex.Controls.csproj">
<Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project>
<Name>Perspex.Controls</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Diagnostics\Perspex.Diagnostics.csproj">
<ProjectReference Include="..\..\src\Perspex.Diagnostics\Perspex.Diagnostics.csproj">
<Project>{7062ae20-5dcc-4442-9645-8195bdece63e}</Project>
<Name>Perspex.Diagnostics</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Input\Perspex.Input.csproj">
<ProjectReference Include="..\..\src\Perspex.Input\Perspex.Input.csproj">
<Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
<Name>Perspex.Input</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Interactivity\Perspex.Interactivity.csproj">
<ProjectReference Include="..\..\src\Perspex.Interactivity\Perspex.Interactivity.csproj">
<Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
<Name>Perspex.Interactivity</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Layout\Perspex.Layout.csproj">
<ProjectReference Include="..\..\src\Perspex.Layout\Perspex.Layout.csproj">
<Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
<Name>Perspex.Layout</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
<ProjectReference Include="..\..\src\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
<Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
<Name>Perspex.SceneGraph</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Styling\Perspex.Styling.csproj">
<ProjectReference Include="..\..\src\Perspex.Styling\Perspex.Styling.csproj">
<Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project>
<Name>Perspex.Styling</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Themes.Default\Perspex.Themes.Default.csproj">
<ProjectReference Include="..\..\src\Perspex.Themes.Default\Perspex.Themes.Default.csproj">
<Project>{3e10a5fa-e8da-48b1-ad44-6a5b6cb7750f}</Project>
<Name>Perspex.Themes.Default</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Xaml.Desktop\Perspex.Xaml.Desktop.csproj">
<ProjectReference Include="..\..\src\Markup\Perspex.Xaml.Desktop\Perspex.Xaml.Desktop.csproj">
<Project>{eb468c39-aac4-4963-a7b2-0a405ea63edd}</Project>
<Name>Perspex.Xaml.Desktop</Name>
</ProjectReference>
<ProjectReference Include="..\..\Perspex.Xaml\Perspex.Xaml.csproj">
<ProjectReference Include="..\..\src\Markup\Perspex.Xaml\Perspex.Xaml.csproj">
<Project>{3e53a01a-b331-47f3-b828-4a5717e77a24}</Project>
<Name>Perspex.Xaml</Name>
</ProjectReference>
<ProjectReference Include="..\..\Windows\Perspex.Direct2D1\Perspex.Direct2D1.csproj">
<ProjectReference Include="..\..\src\Windows\Perspex.Direct2D1\Perspex.Direct2D1.csproj">
<Project>{3e908f67-5543-4879-a1dc-08eace79b3cd}</Project>
<Name>Perspex.Direct2D1</Name>
</ProjectReference>
<ProjectReference Include="..\..\Windows\Perspex.Win32\Perspex.Win32.csproj">
<ProjectReference Include="..\..\src\Windows\Perspex.Win32\Perspex.Win32.csproj">
<Project>{811a76cf-1cf6-440f-963b-bbe31bd72a82}</Project>
<Name>Perspex.Win32</Name>
</ProjectReference>

0
Demos/XamlTestApplication/github_icon.png → samples/XamlTestApplication/github_icon.png

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

0
Demos/XamlTestApplication/packages.config → samples/XamlTestApplication/packages.config

0
Cairo/Perspex.Cairo/CairoExtensions.cs → src/Cairo/Perspex.Cairo/CairoExtensions.cs

0
Cairo/Perspex.Cairo/CairoPlatform.cs → src/Cairo/Perspex.Cairo/CairoPlatform.cs

0
Cairo/Perspex.Cairo/Media/DrawingContext.cs → src/Cairo/Perspex.Cairo/Media/DrawingContext.cs

0
Cairo/Perspex.Cairo/Media/FormattedTextImpl.cs → src/Cairo/Perspex.Cairo/Media/FormattedTextImpl.cs

0
Cairo/Perspex.Cairo/Media/Imaging/BitmapImpl.cs → src/Cairo/Perspex.Cairo/Media/Imaging/BitmapImpl.cs

0
Cairo/Perspex.Cairo/Media/Imaging/RenderTargetBitmapImpl.cs → src/Cairo/Perspex.Cairo/Media/Imaging/RenderTargetBitmapImpl.cs

0
Cairo/Perspex.Cairo/Media/StreamGeometryContextImpl.cs → src/Cairo/Perspex.Cairo/Media/StreamGeometryContextImpl.cs

0
Cairo/Perspex.Cairo/Media/StreamGeometryImpl.cs → src/Cairo/Perspex.Cairo/Media/StreamGeometryImpl.cs

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save