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

Switched to nuget version of Portable.Xaml and updated to use netstandard1.3

pull/1079/head
Nikita Tsukanov 9 years ago
parent
9234eb7909
commit
cce1c7af60
54 changed files with 148 additions and 136 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. 6
      .gitmodules
  2. 203
      Avalonia.sln
  3. 2
      samples/BindingTest/BindingTest.csproj
  4. 2
      samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj
  5. 2
      samples/ControlCatalog/ControlCatalog.csproj
  6. 2
      samples/RenderTest/RenderTest.csproj
  7. 2
      samples/VirtualizationTest/VirtualizationTest.csproj
  8. 2
      samples/interop/GtkInteropDemo/GtkInteropDemo.csproj
  9. 2
      samples/interop/WindowsInteropTest/WindowsInteropTest.csproj
  10. 2
      src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
  11. 2
      src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
  12. 2
      src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj
  13. 2
      src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
  14. 2
      src/Gtk/Avalonia.Cairo/Avalonia.Cairo.csproj
  15. 2
      src/Gtk/Avalonia.Gtk/Avalonia.Gtk.csproj
  16. 4
      src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
  17. 1
      src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaListTypeConverter.cs
  18. 2
      src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs
  19. 1
      src/Markup/Avalonia.Markup.Xaml/Converters/BitmapTypeConverter.cs
  20. 1
      src/Markup/Avalonia.Markup.Xaml/Converters/BrushTypeConverter.cs
  21. 1
      src/Markup/Avalonia.Markup.Xaml/Converters/ClassesTypeConverter.cs
  22. 1
      src/Markup/Avalonia.Markup.Xaml/Converters/ColorTypeConverter.cs
  23. 1
      src/Markup/Avalonia.Markup.Xaml/Converters/ColumnDefinitionsTypeConverter.cs
  24. 1
      src/Markup/Avalonia.Markup.Xaml/Converters/CursorTypeConverter.cs
  25. 1
      src/Markup/Avalonia.Markup.Xaml/Converters/GeometryTypeConverter.cs
  26. 1
      src/Markup/Avalonia.Markup.Xaml/Converters/GridLengthTypeConverter.cs
  27. 1
      src/Markup/Avalonia.Markup.Xaml/Converters/IconTypeConverter.cs
  28. 1
      src/Markup/Avalonia.Markup.Xaml/Converters/KeyGestureConverter.cs
  29. 1
      src/Markup/Avalonia.Markup.Xaml/Converters/MemberSelectorTypeConverter.cs
  30. 1
      src/Markup/Avalonia.Markup.Xaml/Converters/PointTypeConverter.cs
  31. 1
      src/Markup/Avalonia.Markup.Xaml/Converters/PointsListTypeConverter.cs
  32. 1
      src/Markup/Avalonia.Markup.Xaml/Converters/RelativePointTypeConverter.cs
  33. 1
      src/Markup/Avalonia.Markup.Xaml/Converters/RelativeRectTypeConverter.cs
  34. 1
      src/Markup/Avalonia.Markup.Xaml/Converters/RowDefinitionsTypeConverter.cs
  35. 1
      src/Markup/Avalonia.Markup.Xaml/Converters/SelectorTypeConverter.cs
  36. 1
      src/Markup/Avalonia.Markup.Xaml/Converters/SetterValueTypeConverter.cs
  37. 1
      src/Markup/Avalonia.Markup.Xaml/Converters/SizeTypeConverter.cs
  38. 1
      src/Markup/Avalonia.Markup.Xaml/Converters/ThicknessTypeConverter.cs
  39. 3
      src/Markup/Avalonia.Markup.Xaml/Converters/TimeSpanTypeConverter.cs
  40. 1
      src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StyleIncludeExtension.cs
  41. 1
      src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaDefaultTypeConverters.cs
  42. 1
      src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaMemberAttributeProvider.cs
  43. 1
      src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaTypeAttributeProvider.cs
  44. 1
      src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlObjectWriter.cs
  45. 1
      src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlSchemaContext.cs
  46. 1
      src/Markup/Avalonia.Markup.Xaml/PortableXaml/TypeDescriptorExtensions.cs
  47. 1
      src/Markup/Avalonia.Markup.Xaml/PortableXaml/XamlBinding.cs
  48. 1
      src/Markup/Avalonia.Markup.Xaml/Templates/TemplateLoader.cs
  49. 1
      src/Markup/Portable.Xaml
  50. 2
      src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj
  51. 2
      src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
  52. 2
      src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj
  53. 2
      src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
  54. 1
      tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj

6
.gitmodules
View File

@ -10,8 +10,4 @@
url = https://github.com/AvaloniaUI/OmniXAML.git
[submodule "src/Markup/Avalonia.Markup.Xaml/glass"]
path = src/Markup/Avalonia.Markup.Xaml/glass
url = https://github.com/SuperJMN/glass
[submodule "src/Markup/Portable.Xaml"]
path = src/Markup/Portable.Xaml
url = https://github.com/cwensley/Portable.Xaml.git
branch = develop
url = https://github.com/SuperJMN/glass

203
Avalonia.sln
View File

@ -1,12 +1,12 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26403.7
VisualStudioVersion = 15.0.26510.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Base", "src\Avalonia.Base\Avalonia.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Base", "src\Avalonia.Base\Avalonia.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Visuals", "src\Avalonia.Visuals\Avalonia.Visuals.csproj", "{EB582467-6ABB-43A1-B052-E981BA910E3A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Visuals", "src\Avalonia.Visuals\Avalonia.Visuals.csproj", "{EB582467-6ABB-43A1-B052-E981BA910E3A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Layout", "src\Avalonia.Layout\Avalonia.Layout.csproj", "{42472427-4774-4C81-8AFF-9F27B8E31721}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Layout", "src\Avalonia.Layout\Avalonia.Layout.csproj", "{42472427-4774-4C81-8AFF-9F27B8E31721}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Windows", "Windows", "{B39A8919-9F95-48FE-AD7B-76E08B509888}"
EndProject
@ -16,47 +16,47 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Direct2D1", "src\W
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Designer", "src\Windows\Avalonia.Designer\Avalonia.Designer.csproj", "{EC42600F-049B-43FF-AED1-8314D61B2749}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Input", "src\Avalonia.Input\Avalonia.Input.csproj", "{62024B2D-53EB-4638-B26B-85EEAA54866E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Input", "src\Avalonia.Input\Avalonia.Input.csproj", "{62024B2D-53EB-4638-B26B-85EEAA54866E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Interactivity", "src\Avalonia.Interactivity\Avalonia.Interactivity.csproj", "{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Interactivity", "src\Avalonia.Interactivity\Avalonia.Interactivity.csproj", "{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Controls", "src\Avalonia.Controls\Avalonia.Controls.csproj", "{D2221C82-4A25-4583-9B43-D791E3F6820C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Controls", "src\Avalonia.Controls\Avalonia.Controls.csproj", "{D2221C82-4A25-4583-9B43-D791E3F6820C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Styling", "src\Avalonia.Styling\Avalonia.Styling.csproj", "{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Styling", "src\Avalonia.Styling\Avalonia.Styling.csproj", "{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Themes.Default", "src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj", "{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Themes.Default", "src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj", "{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Diagnostics", "src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj", "{7062AE20-5DCC-4442-9645-8195BDECE63E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Diagnostics", "src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj", "{7062AE20-5DCC-4442-9645-8195BDECE63E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Animation", "src\Avalonia.Animation\Avalonia.Animation.csproj", "{D211E587-D8BC-45B9-95A4-F297C8FA5200}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Animation", "src\Avalonia.Animation\Avalonia.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}") = "Avalonia.Styling.UnitTests", "tests\Avalonia.Styling.UnitTests\Avalonia.Styling.UnitTests.csproj", "{47ECDF59-DEF8-4C53-87B1-2098A3429059}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Styling.UnitTests", "tests\Avalonia.Styling.UnitTests\Avalonia.Styling.UnitTests.csproj", "{47ECDF59-DEF8-4C53-87B1-2098A3429059}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Controls.UnitTests", "tests\Avalonia.Controls.UnitTests\Avalonia.Controls.UnitTests.csproj", "{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Controls.UnitTests", "tests\Avalonia.Controls.UnitTests\Avalonia.Controls.UnitTests.csproj", "{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Visuals.UnitTests", "tests\Avalonia.Visuals.UnitTests\Avalonia.Visuals.UnitTests.csproj", "{76716382-3159-460E-BDA6-C5715CF606D7}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Visuals.UnitTests", "tests\Avalonia.Visuals.UnitTests\Avalonia.Visuals.UnitTests.csproj", "{76716382-3159-460E-BDA6-C5715CF606D7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Base.UnitTests", "tests\Avalonia.Base.UnitTests\Avalonia.Base.UnitTests.csproj", "{2905FF23-53FB-45E6-AA49-6AF47A172056}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Base.UnitTests", "tests\Avalonia.Base.UnitTests\Avalonia.Base.UnitTests.csproj", "{2905FF23-53FB-45E6-AA49-6AF47A172056}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Layout.UnitTests", "tests\Avalonia.Layout.UnitTests\Avalonia.Layout.UnitTests.csproj", "{DB070A10-BF39-4752-8456-86E9D5928478}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Layout.UnitTests", "tests\Avalonia.Layout.UnitTests\Avalonia.Layout.UnitTests.csproj", "{DB070A10-BF39-4752-8456-86E9D5928478}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Interactivity.UnitTests", "tests\Avalonia.Interactivity.UnitTests\Avalonia.Interactivity.UnitTests.csproj", "{08478EF5-44E8-42E9-92D6-15E00EC038D8}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Interactivity.UnitTests", "tests\Avalonia.Interactivity.UnitTests\Avalonia.Interactivity.UnitTests.csproj", "{08478EF5-44E8-42E9-92D6-15E00EC038D8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Direct2D1.RenderTests", "tests\Avalonia.RenderTests\Avalonia.Direct2D1.RenderTests.csproj", "{DABFD304-D6A4-4752-8123-C2CCF7AC7831}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Input.UnitTests", "tests\Avalonia.Input.UnitTests\Avalonia.Input.UnitTests.csproj", "{AC18926A-E784-40FE-B09D-BB0FE2B599F0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Input.UnitTests", "tests\Avalonia.Input.UnitTests\Avalonia.Input.UnitTests.csproj", "{AC18926A-E784-40FE-B09D-BB0FE2B599F0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Direct2D1.UnitTests", "tests\Avalonia.Direct2D1.UnitTests\Avalonia.Direct2D1.UnitTests.csproj", "{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Cairo.RenderTests", "tests\Avalonia.RenderTests\Avalonia.Cairo.RenderTests.csproj", "{E106CF37-4066-4615-B684-172A6D30B058}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Markup.Xaml.UnitTests", "tests\Avalonia.Markup.Xaml.UnitTests\Avalonia.Markup.Xaml.UnitTests.csproj", "{99135EAB-653D-47E4-A378-C96E1278CA44}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Markup.Xaml.UnitTests", "tests\Avalonia.Markup.Xaml.UnitTests\Avalonia.Markup.Xaml.UnitTests.csproj", "{99135EAB-653D-47E4-A378-C96E1278CA44}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Markup", "Markup", "{8B6A8209-894F-4BA1-B880-965FD453982C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Markup.Xaml", "src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj", "{3E53A01A-B331-47F3-B828-4A5717E77A24}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Markup.Xaml", "src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj", "{3E53A01A-B331-47F3-B828-4A5717E77A24}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{9B9E3891-2366-4253-A952-D08BCEB71098}"
EndProject
@ -71,15 +71,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Gtk", "src\Gtk\Ava
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Cairo", "src\Gtk\Avalonia.Cairo\Avalonia.Cairo.csproj", "{FB05AC90-89BA-4F2F-A924-F37875FB547C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.ReactiveUI", "src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj", "{6417B24E-49C2-4985-8DB2-3AB9D898EC91}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.ReactiveUI", "src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj", "{6417B24E-49C2-4985-8DB2-3AB9D898EC91}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.HtmlRenderer", "src\Avalonia.HtmlRenderer\Avalonia.HtmlRenderer.csproj", "{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.HtmlRenderer", "src\Avalonia.HtmlRenderer\Avalonia.HtmlRenderer.csproj", "{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PlatformSupport", "src\Shared\PlatformSupport\PlatformSupport.shproj", "{E4D9629C-F168-4224-3F51-A5E482FFBC42}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Markup", "src\Markup\Avalonia.Markup\Avalonia.Markup.csproj", "{6417E941-21BC-467B-A771-0DE389353CE6}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Markup", "src\Markup\Avalonia.Markup\Avalonia.Markup.csproj", "{6417E941-21BC-467B-A771-0DE389353CE6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Markup.UnitTests", "tests\Avalonia.Markup.UnitTests\Avalonia.Markup.UnitTests.csproj", "{8EF392D5-1416-45AA-9956-7CBBC3229E8A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Markup.UnitTests", "tests\Avalonia.Markup.UnitTests\Avalonia.Markup.UnitTests.csproj", "{8EF392D5-1416-45AA-9956-7CBBC3229E8A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BindingTest", "samples\BindingTest\BindingTest.csproj", "{08B3E6B9-1CD5-443C-9F61-6D49D1C5F162}"
EndProject
@ -109,15 +109,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.iOSTestApplication
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.LeakTests", "tests\Avalonia.LeakTests\Avalonia.LeakTests.csproj", "{E1AA3DBF-9056-4530-9376-18119A7A3FFE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.UnitTests", "tests\Avalonia.UnitTests\Avalonia.UnitTests.csproj", "{88060192-33D5-4932-B0F9-8BD2763E857D}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.UnitTests", "tests\Avalonia.UnitTests\Avalonia.UnitTests.csproj", "{88060192-33D5-4932-B0F9-8BD2763E857D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Benchmarks", "tests\Avalonia.Benchmarks\Avalonia.Benchmarks.csproj", "{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Logging.Serilog", "src\Avalonia.Logging.Serilog\Avalonia.Logging.Serilog.csproj", "{B61B66A3-B82D-4875-8001-89D3394FE0C9}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Logging.Serilog", "src\Avalonia.Logging.Serilog\Avalonia.Logging.Serilog.csproj", "{B61B66A3-B82D-4875-8001-89D3394FE0C9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.DesignerSupport", "src\Avalonia.DesignerSupport\Avalonia.DesignerSupport.csproj", "{799A7BB5-3C2C-48B6-85A7-406A12C420DA}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.DesignerSupport", "src\Avalonia.DesignerSupport\Avalonia.DesignerSupport.csproj", "{799A7BB5-3C2C-48B6-85A7-406A12C420DA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog", "samples\ControlCatalog\ControlCatalog.csproj", "{D0A739B9-3C68-4BA6-A328-41606954B6BD}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog", "samples\ControlCatalog\ControlCatalog.csproj", "{D0A739B9-3C68-4BA6-A328-41606954B6BD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.Desktop", "samples\ControlCatalog.Desktop\ControlCatalog.Desktop.csproj", "{2B888490-D14A-4BCA-AB4B-48676FA93C9B}"
EndProject
@ -147,17 +147,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.Android", "s
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Avalonia.Win32.Shared", "src\Windows\Avalonia.Win32\Avalonia.Win32.Shared.shproj", "{9DEFC6B7-845B-4D8F-AFC0-D32BF0032B8C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Win32.NetStandard", "src\Windows\Avalonia.Win32.NetStandard\Avalonia.Win32.NetStandard.csproj", "{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Win32.NetStandard", "src\Windows\Avalonia.Win32.NetStandard\Avalonia.Win32.NetStandard.csproj", "{40759A76-D0F2-464E-8000-6FF0F5C4BD7C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.DotNetCoreRuntime", "src\Avalonia.DotNetCoreRuntime\Avalonia.DotNetCoreRuntime.csproj", "{7863EA94-F0FB-4386-BF8C-E5BFA761560A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.DotNetCoreRuntime", "src\Avalonia.DotNetCoreRuntime\Avalonia.DotNetCoreRuntime.csproj", "{7863EA94-F0FB-4386-BF8C-E5BFA761560A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Skia.Desktop.NetStandard", "src\Skia\Avalonia.Skia.Desktop.NetStandard\Avalonia.Skia.Desktop.NetStandard.csproj", "{7D2D3083-71DD-4CC9-8907-39A0D86FB322}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Skia.Desktop.NetStandard", "src\Skia\Avalonia.Skia.Desktop.NetStandard\Avalonia.Skia.Desktop.NetStandard.csproj", "{7D2D3083-71DD-4CC9-8907-39A0D86FB322}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Gtk3", "src\Gtk\Avalonia.Gtk3\Avalonia.Gtk3.csproj", "{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Gtk3", "src\Gtk\Avalonia.Gtk3\Avalonia.Gtk3.csproj", "{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Portable.Xaml-pcl259", "src\Markup\Portable.Xaml\src\Portable.Xaml\Portable.Xaml-pcl259.csproj", "{179484EC-DB00-451A-AD2D-2E2AB20DE519}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.NetCore", "samples\ControlCatalog.NetCore\ControlCatalog.NetCore.csproj", "{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog.NetCore", "samples\ControlCatalog.NetCore\ControlCatalog.NetCore.csproj", "{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{74487168-7D91-487E-BF93-055F2251461E}"
EndProject
@ -189,9 +187,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Targets", "Targets", "{4D6F
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Linux", "Linux", "{86C53C40-57AA-45B8-AD42-FAE0EFDF0F2B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.LinuxFramebuffer", "src\Linux\Avalonia.LinuxFramebuffer\Avalonia.LinuxFramebuffer.csproj", "{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.LinuxFramebuffer", "src\Linux\Avalonia.LinuxFramebuffer\Avalonia.LinuxFramebuffer.csproj", "{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Direct3DInteropSample", "samples\interop\Direct3DInteropSample\Direct3DInteropSample.csproj", "{638580B0-7910-40EF-B674-DCB34DA308CD}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Direct3DInteropSample", "samples\interop\Direct3DInteropSample\Direct3DInteropSample.csproj", "{638580B0-7910-40EF-B674-DCB34DA308CD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Win32.Interop", "src\Windows\Avalonia.Win32.Interop\Avalonia.Win32.Interop.csproj", "{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}"
EndProject
@ -1368,16 +1366,16 @@ Global
{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|Mono.Build.0 = Debug|Any CPU
{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|x86.ActiveCfg = Debug|Any CPU
{99135EAB-653D-47E4-A378-C96E1278CA44}.Debug|x86.Build.0 = Debug|Any CPU
{99135EAB-653D-47E4-A378-C96E1278CA44}.DebugOmniXaml|Any CPU.ActiveCfg = DebugOmniXaml|Any CPU
{99135EAB-653D-47E4-A378-C96E1278CA44}.DebugOmniXaml|Any CPU.Build.0 = DebugOmniXaml|Any CPU
{99135EAB-653D-47E4-A378-C96E1278CA44}.DebugOmniXaml|iPhone.ActiveCfg = DebugOmniXaml|Any CPU
{99135EAB-653D-47E4-A378-C96E1278CA44}.DebugOmniXaml|iPhone.Build.0 = DebugOmniXaml|Any CPU
{99135EAB-653D-47E4-A378-C96E1278CA44}.DebugOmniXaml|iPhoneSimulator.ActiveCfg = DebugOmniXaml|Any CPU
{99135EAB-653D-47E4-A378-C96E1278CA44}.DebugOmniXaml|iPhoneSimulator.Build.0 = DebugOmniXaml|Any CPU
{99135EAB-653D-47E4-A378-C96E1278CA44}.DebugOmniXaml|Mono.ActiveCfg = DebugOmniXaml|Any CPU
{99135EAB-653D-47E4-A378-C96E1278CA44}.DebugOmniXaml|Mono.Build.0 = DebugOmniXaml|Any CPU
{99135EAB-653D-47E4-A378-C96E1278CA44}.DebugOmniXaml|x86.ActiveCfg = DebugOmniXaml|Any CPU
{99135EAB-653D-47E4-A378-C96E1278CA44}.DebugOmniXaml|x86.Build.0 = DebugOmniXaml|Any CPU
{99135EAB-653D-47E4-A378-C96E1278CA44}.DebugOmniXaml|Any CPU.ActiveCfg = Debug|Any CPU
{99135EAB-653D-47E4-A378-C96E1278CA44}.DebugOmniXaml|Any CPU.Build.0 = Debug|Any CPU
{99135EAB-653D-47E4-A378-C96E1278CA44}.DebugOmniXaml|iPhone.ActiveCfg = Debug|Any CPU
{99135EAB-653D-47E4-A378-C96E1278CA44}.DebugOmniXaml|iPhone.Build.0 = Debug|Any CPU
{99135EAB-653D-47E4-A378-C96E1278CA44}.DebugOmniXaml|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{99135EAB-653D-47E4-A378-C96E1278CA44}.DebugOmniXaml|iPhoneSimulator.Build.0 = Debug|Any CPU
{99135EAB-653D-47E4-A378-C96E1278CA44}.DebugOmniXaml|Mono.ActiveCfg = Debug|Any CPU
{99135EAB-653D-47E4-A378-C96E1278CA44}.DebugOmniXaml|Mono.Build.0 = Debug|Any CPU
{99135EAB-653D-47E4-A378-C96E1278CA44}.DebugOmniXaml|x86.ActiveCfg = Debug|Any CPU
{99135EAB-653D-47E4-A378-C96E1278CA44}.DebugOmniXaml|x86.Build.0 = Debug|Any CPU
{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|Any CPU.ActiveCfg = Release|Any CPU
{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|Any CPU.Build.0 = Release|Any CPU
{99135EAB-653D-47E4-A378-C96E1278CA44}.Release|iPhone.ActiveCfg = Release|Any CPU
@ -1416,16 +1414,16 @@ Global
{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|Mono.Build.0 = Debug|Any CPU
{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|x86.ActiveCfg = Debug|Any CPU
{3E53A01A-B331-47F3-B828-4A5717E77A24}.Debug|x86.Build.0 = Debug|Any CPU
{3E53A01A-B331-47F3-B828-4A5717E77A24}.DebugOmniXaml|Any CPU.ActiveCfg = DebugOmniXaml|Any CPU
{3E53A01A-B331-47F3-B828-4A5717E77A24}.DebugOmniXaml|Any CPU.Build.0 = DebugOmniXaml|Any CPU
{3E53A01A-B331-47F3-B828-4A5717E77A24}.DebugOmniXaml|iPhone.ActiveCfg = DebugOmniXaml|Any CPU
{3E53A01A-B331-47F3-B828-4A5717E77A24}.DebugOmniXaml|iPhone.Build.0 = DebugOmniXaml|Any CPU
{3E53A01A-B331-47F3-B828-4A5717E77A24}.DebugOmniXaml|iPhoneSimulator.ActiveCfg = DebugOmniXaml|Any CPU
{3E53A01A-B331-47F3-B828-4A5717E77A24}.DebugOmniXaml|iPhoneSimulator.Build.0 = DebugOmniXaml|Any CPU
{3E53A01A-B331-47F3-B828-4A5717E77A24}.DebugOmniXaml|Mono.ActiveCfg = DebugOmniXaml|Any CPU
{3E53A01A-B331-47F3-B828-4A5717E77A24}.DebugOmniXaml|Mono.Build.0 = DebugOmniXaml|Any CPU
{3E53A01A-B331-47F3-B828-4A5717E77A24}.DebugOmniXaml|x86.ActiveCfg = DebugOmniXaml|Any CPU
{3E53A01A-B331-47F3-B828-4A5717E77A24}.DebugOmniXaml|x86.Build.0 = DebugOmniXaml|Any CPU
{3E53A01A-B331-47F3-B828-4A5717E77A24}.DebugOmniXaml|Any CPU.ActiveCfg = Debug|Any CPU
{3E53A01A-B331-47F3-B828-4A5717E77A24}.DebugOmniXaml|Any CPU.Build.0 = Debug|Any CPU
{3E53A01A-B331-47F3-B828-4A5717E77A24}.DebugOmniXaml|iPhone.ActiveCfg = Debug|Any CPU
{3E53A01A-B331-47F3-B828-4A5717E77A24}.DebugOmniXaml|iPhone.Build.0 = Debug|Any CPU
{3E53A01A-B331-47F3-B828-4A5717E77A24}.DebugOmniXaml|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{3E53A01A-B331-47F3-B828-4A5717E77A24}.DebugOmniXaml|iPhoneSimulator.Build.0 = Debug|Any CPU
{3E53A01A-B331-47F3-B828-4A5717E77A24}.DebugOmniXaml|Mono.ActiveCfg = Debug|Any CPU
{3E53A01A-B331-47F3-B828-4A5717E77A24}.DebugOmniXaml|Mono.Build.0 = Debug|Any CPU
{3E53A01A-B331-47F3-B828-4A5717E77A24}.DebugOmniXaml|x86.ActiveCfg = Debug|Any CPU
{3E53A01A-B331-47F3-B828-4A5717E77A24}.DebugOmniXaml|x86.Build.0 = Debug|Any CPU
{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|Any CPU.Build.0 = Release|Any CPU
{3E53A01A-B331-47F3-B828-4A5717E77A24}.Release|iPhone.ActiveCfg = Release|Any CPU
@ -3023,56 +3021,6 @@ Global
{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Release|Mono.Build.0 = Release|Any CPU
{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Release|x86.ActiveCfg = Release|Any CPU
{BB1F7BB5-6AD4-4776-94D9-C09D0A972658}.Release|x86.Build.0 = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Ad-Hoc|Mono.ActiveCfg = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Ad-Hoc|Mono.Build.0 = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Ad-Hoc|x86.Build.0 = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.AppStore|Any CPU.Build.0 = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.AppStore|iPhone.ActiveCfg = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.AppStore|iPhone.Build.0 = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.AppStore|Mono.ActiveCfg = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.AppStore|Mono.Build.0 = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.AppStore|x86.ActiveCfg = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.AppStore|x86.Build.0 = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Debug|Any CPU.Build.0 = Debug|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Debug|iPhone.Build.0 = Debug|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Debug|Mono.ActiveCfg = Debug|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Debug|Mono.Build.0 = Debug|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Debug|x86.ActiveCfg = Debug|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Debug|x86.Build.0 = Debug|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.DebugOmniXaml|Any CPU.ActiveCfg = Debug|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.DebugOmniXaml|Any CPU.Build.0 = Debug|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.DebugOmniXaml|iPhone.ActiveCfg = Debug|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.DebugOmniXaml|iPhone.Build.0 = Debug|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.DebugOmniXaml|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.DebugOmniXaml|iPhoneSimulator.Build.0 = Debug|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.DebugOmniXaml|Mono.ActiveCfg = Debug|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.DebugOmniXaml|Mono.Build.0 = Debug|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.DebugOmniXaml|x86.ActiveCfg = Debug|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.DebugOmniXaml|x86.Build.0 = Debug|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Release|Any CPU.ActiveCfg = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Release|Any CPU.Build.0 = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Release|iPhone.ActiveCfg = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Release|iPhone.Build.0 = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Release|Mono.ActiveCfg = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Release|Mono.Build.0 = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Release|x86.ActiveCfg = Release|Any CPU
{179484EC-DB00-451A-AD2D-2E2AB20DE519}.Release|x86.Build.0 = Release|Any CPU
{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
@ -3103,6 +3051,16 @@ Global
{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|Mono.Build.0 = Debug|Any CPU
{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|x86.ActiveCfg = Debug|Any CPU
{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Debug|x86.Build.0 = Debug|Any CPU
{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.DebugOmniXaml|Any CPU.ActiveCfg = Debug|Any CPU
{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.DebugOmniXaml|Any CPU.Build.0 = Debug|Any CPU
{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.DebugOmniXaml|iPhone.ActiveCfg = Debug|Any CPU
{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.DebugOmniXaml|iPhone.Build.0 = Debug|Any CPU
{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.DebugOmniXaml|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.DebugOmniXaml|iPhoneSimulator.Build.0 = Debug|Any CPU
{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.DebugOmniXaml|Mono.ActiveCfg = Debug|Any CPU
{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.DebugOmniXaml|Mono.Build.0 = Debug|Any CPU
{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.DebugOmniXaml|x86.ActiveCfg = Debug|Any CPU
{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.DebugOmniXaml|x86.Build.0 = Debug|Any CPU
{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|Any CPU.Build.0 = Release|Any CPU
{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}.Release|iPhone.ActiveCfg = Release|Any CPU
@ -3143,6 +3101,16 @@ Global
{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Debug|Mono.Build.0 = Debug|Any CPU
{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Debug|x86.ActiveCfg = Debug|Any CPU
{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Debug|x86.Build.0 = Debug|Any CPU
{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.DebugOmniXaml|Any CPU.ActiveCfg = Debug|Any CPU
{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.DebugOmniXaml|Any CPU.Build.0 = Debug|Any CPU
{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.DebugOmniXaml|iPhone.ActiveCfg = Debug|Any CPU
{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.DebugOmniXaml|iPhone.Build.0 = Debug|Any CPU
{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.DebugOmniXaml|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.DebugOmniXaml|iPhoneSimulator.Build.0 = Debug|Any CPU
{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.DebugOmniXaml|Mono.ActiveCfg = Debug|Any CPU
{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.DebugOmniXaml|Mono.Build.0 = Debug|Any CPU
{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.DebugOmniXaml|x86.ActiveCfg = Debug|Any CPU
{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.DebugOmniXaml|x86.Build.0 = Debug|Any CPU
{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Release|Any CPU.Build.0 = Release|Any CPU
{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}.Release|iPhone.ActiveCfg = Release|Any CPU
@ -3183,6 +3151,16 @@ Global
{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|Mono.Build.0 = Debug|Any CPU
{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|x86.ActiveCfg = Debug|Any CPU
{638580B0-7910-40EF-B674-DCB34DA308CD}.Debug|x86.Build.0 = Debug|Any CPU
{638580B0-7910-40EF-B674-DCB34DA308CD}.DebugOmniXaml|Any CPU.ActiveCfg = Debug|Any CPU
{638580B0-7910-40EF-B674-DCB34DA308CD}.DebugOmniXaml|Any CPU.Build.0 = Debug|Any CPU
{638580B0-7910-40EF-B674-DCB34DA308CD}.DebugOmniXaml|iPhone.ActiveCfg = Debug|Any CPU
{638580B0-7910-40EF-B674-DCB34DA308CD}.DebugOmniXaml|iPhone.Build.0 = Debug|Any CPU
{638580B0-7910-40EF-B674-DCB34DA308CD}.DebugOmniXaml|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{638580B0-7910-40EF-B674-DCB34DA308CD}.DebugOmniXaml|iPhoneSimulator.Build.0 = Debug|Any CPU
{638580B0-7910-40EF-B674-DCB34DA308CD}.DebugOmniXaml|Mono.ActiveCfg = Debug|Any CPU
{638580B0-7910-40EF-B674-DCB34DA308CD}.DebugOmniXaml|Mono.Build.0 = Debug|Any CPU
{638580B0-7910-40EF-B674-DCB34DA308CD}.DebugOmniXaml|x86.ActiveCfg = Debug|Any CPU
{638580B0-7910-40EF-B674-DCB34DA308CD}.DebugOmniXaml|x86.Build.0 = Debug|Any CPU
{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|Any CPU.Build.0 = Release|Any CPU
{638580B0-7910-40EF-B674-DCB34DA308CD}.Release|iPhone.ActiveCfg = Release|Any CPU
@ -3223,6 +3201,16 @@ Global
{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|Mono.Build.0 = Debug|Any CPU
{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|x86.ActiveCfg = Debug|Any CPU
{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Debug|x86.Build.0 = Debug|Any CPU
{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.DebugOmniXaml|Any CPU.ActiveCfg = Debug|Any CPU
{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.DebugOmniXaml|Any CPU.Build.0 = Debug|Any CPU
{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.DebugOmniXaml|iPhone.ActiveCfg = Debug|Any CPU
{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.DebugOmniXaml|iPhone.Build.0 = Debug|Any CPU
{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.DebugOmniXaml|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.DebugOmniXaml|iPhoneSimulator.Build.0 = Debug|Any CPU
{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.DebugOmniXaml|Mono.ActiveCfg = Debug|Any CPU
{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.DebugOmniXaml|Mono.Build.0 = Debug|Any CPU
{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.DebugOmniXaml|x86.ActiveCfg = Debug|Any CPU
{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.DebugOmniXaml|x86.Build.0 = Debug|Any CPU
{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|Any CPU.Build.0 = Release|Any CPU
{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}.Release|iPhone.ActiveCfg = Release|Any CPU
@ -3288,7 +3276,6 @@ Global
{40759A76-D0F2-464E-8000-6FF0F5C4BD7C} = {B39A8919-9F95-48FE-AD7B-76E08B509888}
{7D2D3083-71DD-4CC9-8907-39A0D86FB322} = {3743B0F2-CC41-4F14-A8C8-267F579BF91E}
{BB1F7BB5-6AD4-4776-94D9-C09D0A972658} = {B9894058-278A-46B5-B6ED-AD613FCC03B3}
{179484EC-DB00-451A-AD2D-2E2AB20DE519} = {8B6A8209-894F-4BA1-B880-965FD453982C}
{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3} = {9B9E3891-2366-4253-A952-D08BCEB71098}
{F3AC8BC1-27F5-4255-9AFC-04ABFD11683A} = {74487168-7D91-487E-BF93-055F2251461E}
{4D6FAF79-58B4-482F-9122-0668C346364C} = {74487168-7D91-487E-BF93-055F2251461E}

2
samples/BindingTest/BindingTest.csproj
View File

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BindingTest</RootNamespace>
<AssemblyName>BindingTest</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />

2
samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj
View File

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ControlCatalog.Desktop</RootNamespace>
<AssemblyName>ControlCatalog.Desktop</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />

2
samples/ControlCatalog/ControlCatalog.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard1.1</TargetFramework>
<TargetFramework>netstandard1.3</TargetFramework>
<EnableDefaultCompileItems>False</EnableDefaultCompileItems>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>

2
samples/RenderTest/RenderTest.csproj
View File

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>RenderTest</RootNamespace>
<AssemblyName>RenderTest</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />

2
samples/VirtualizationTest/VirtualizationTest.csproj
View File

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>VirtualizationTest</RootNamespace>
<AssemblyName>VirtualizationTest</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />

2
samples/interop/GtkInteropDemo/GtkInteropDemo.csproj
View File

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>GtkInteropDemo</RootNamespace>
<AssemblyName>GtkInteropDemo</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>

2
samples/interop/WindowsInteropTest/WindowsInteropTest.csproj
View File

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>WindowsInteropTest</RootNamespace>
<AssemblyName>WindowsInteropTest</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>

2
src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard1.1</TargetFramework>
<TargetFramework>netstandard1.3</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

2
src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard1.1</TargetFramework>
<TargetFramework>netstandard1.3</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

2
src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj
View File

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Avalonia.DotNetFrameworkRuntime</RootNamespace>
<AssemblyName>Avalonia.DotNetFrameworkRuntime</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>

2
src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard1.1</TargetFramework>
<TargetFramework>netstandard1.3</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

2
src/Gtk/Avalonia.Cairo/Avalonia.Cairo.csproj
View File

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Avalonia.Cairo</RootNamespace>
<AssemblyName>Avalonia.Cairo</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>

2
src/Gtk/Avalonia.Gtk/Avalonia.Gtk.csproj
View File

@ -7,7 +7,7 @@
<OutputType>Library</OutputType>
<RootNamespace>Avalonia.Gtk</RootNamespace>
<AssemblyName>Avalonia.Gtk</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>

4
src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard1.1</TargetFramework>
<TargetFramework>netstandard1.3</TargetFramework>
<EnableDefaultCompileItems>False</EnableDefaultCompileItems>
<EnableDefaultItems>false</EnableDefaultItems>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@ -304,7 +304,7 @@
<ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
<ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj" />
<ProjectReference Include="..\Avalonia.Markup\Avalonia.Markup.csproj" />
<ProjectReference Include="..\Portable.Xaml\src\Portable.Xaml\Portable.Xaml-pcl259.csproj" />
<PackageReference Include="Portable.Xaml" Version="0.16.0" />
</ItemGroup>
<ItemGroup>
<Content Include="glass\Glass.Core\Glass.Core.csproj" />

1
src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaListTypeConverter.cs
View File

@ -11,6 +11,7 @@ namespace Avalonia.Markup.Xaml.Converters
#if !OMNIXAML
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
public class AvaloniaListTypeConverter<T> : TypeConverter
{

2
src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs
View File

@ -10,8 +10,8 @@ namespace Avalonia.Markup.Xaml.Converters
using Avalonia.Styling;
using Portable.Xaml;
#if !OMNIXAML
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
using Portable.Xaml.Markup;
public class AvaloniaPropertyTypeConverter : TypeConverter

1
src/Markup/Avalonia.Markup.Xaml/Converters/BitmapTypeConverter.cs
View File

@ -11,6 +11,7 @@ namespace Avalonia.Markup.Xaml.Converters
#if !OMNIXAML
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
public class BitmapTypeConverter : TypeConverter
{

1
src/Markup/Avalonia.Markup.Xaml/Converters/BrushTypeConverter.cs
View File

@ -11,6 +11,7 @@ namespace Avalonia.Markup.Xaml.Converters
#if !OMNIXAML
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
public class BrushTypeConverter : TypeConverter
{

1
src/Markup/Avalonia.Markup.Xaml/Converters/ClassesTypeConverter.cs
View File

@ -10,6 +10,7 @@ namespace Avalonia.Markup.Xaml.Converters
#if !OMNIXAML
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
public class ClassesTypeConverter : TypeConverter
{

1
src/Markup/Avalonia.Markup.Xaml/Converters/ColorTypeConverter.cs
View File

@ -10,6 +10,7 @@ namespace Avalonia.Markup.Xaml.Converters
#if !OMNIXAML
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
public class ColorTypeConverter : TypeConverter
{

1
src/Markup/Avalonia.Markup.Xaml/Converters/ColumnDefinitionsTypeConverter.cs
View File

@ -10,6 +10,7 @@ namespace Avalonia.Markup.Xaml.Converters
#if !OMNIXAML
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
public class ColumnDefinitionsTypeConverter : TypeConverter
{

1
src/Markup/Avalonia.Markup.Xaml/Converters/CursorTypeConverter.cs
View File

@ -10,6 +10,7 @@ namespace Avalonia.Markup.Xaml.Converters
#if !OMNIXAML
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
public class CursorTypeConverter : TypeConverter
{

1
src/Markup/Avalonia.Markup.Xaml/Converters/GeometryTypeConverter.cs
View File

@ -10,6 +10,7 @@ namespace Avalonia.Markup.Xaml.Converters
#if !OMNIXAML
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
public class GeometryTypeConverter : TypeConverter
{

1
src/Markup/Avalonia.Markup.Xaml/Converters/GridLengthTypeConverter.cs
View File

@ -10,6 +10,7 @@ namespace Avalonia.Markup.Xaml.Converters
#if !OMNIXAML
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
public class GridLengthTypeConverter : TypeConverter
{

1
src/Markup/Avalonia.Markup.Xaml/Converters/IconTypeConverter.cs
View File

@ -12,6 +12,7 @@ namespace Avalonia.Markup.Xaml.Converters
#if !OMNIXAML
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
public class IconTypeConverter : TypeConverter
{

1
src/Markup/Avalonia.Markup.Xaml/Converters/KeyGestureConverter.cs
View File

@ -10,6 +10,7 @@ namespace Avalonia.Markup.Xaml.Converters
#if !OMNIXAML
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
public class KeyGestureConverter : TypeConverter
{

1
src/Markup/Avalonia.Markup.Xaml/Converters/MemberSelectorTypeConverter.cs
View File

@ -10,6 +10,7 @@ namespace Avalonia.Markup.Xaml.Converters
#if !OMNIXAML
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
public class MemberSelectorTypeConverter : TypeConverter
{

1
src/Markup/Avalonia.Markup.Xaml/Converters/PointTypeConverter.cs
View File

@ -9,6 +9,7 @@ namespace Avalonia.Markup.Xaml.Converters
#if !OMNIXAML
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
public class PointTypeConverter : TypeConverter
{

1
src/Markup/Avalonia.Markup.Xaml/Converters/PointsListTypeConverter.cs
View File

@ -10,6 +10,7 @@ namespace Avalonia.Markup.Xaml.Converters
#if !OMNIXAML
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
public class PointsListTypeConverter : TypeConverter
{

1
src/Markup/Avalonia.Markup.Xaml/Converters/RelativePointTypeConverter.cs
View File

@ -9,6 +9,7 @@ namespace Avalonia.Markup.Xaml.Converters
#if !OMNIXAML
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
public class RelativePointTypeConverter : TypeConverter
{

1
src/Markup/Avalonia.Markup.Xaml/Converters/RelativeRectTypeConverter.cs
View File

@ -9,6 +9,7 @@ namespace Avalonia.Markup.Xaml.Converters
#if !OMNIXAML
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
public class RelativeRectTypeConverter : TypeConverter
{

1
src/Markup/Avalonia.Markup.Xaml/Converters/RowDefinitionsTypeConverter.cs
View File

@ -10,6 +10,7 @@ namespace Avalonia.Markup.Xaml.Converters
#if !OMNIXAML
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
public class RowDefinitionsTypeConverter : TypeConverter
{

1
src/Markup/Avalonia.Markup.Xaml/Converters/SelectorTypeConverter.cs
View File

@ -10,6 +10,7 @@ namespace Avalonia.Markup.Xaml.Converters
#if !OMNIXAML
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
public class SelectorTypeConverter : TypeConverter
{

1
src/Markup/Avalonia.Markup.Xaml/Converters/SetterValueTypeConverter.cs
View File

@ -4,6 +4,7 @@
using Avalonia.Styling;
using Portable.Xaml;
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
using Portable.Xaml.Markup;
using System;
using System.Globalization;

1
src/Markup/Avalonia.Markup.Xaml/Converters/SizeTypeConverter.cs
View File

@ -9,6 +9,7 @@ namespace Avalonia.Markup.Xaml.Converters
#if !OMNIXAML
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
public class SizeTypeConverter : TypeConverter
{

1
src/Markup/Avalonia.Markup.Xaml/Converters/ThicknessTypeConverter.cs
View File

@ -9,6 +9,7 @@ namespace Avalonia.Markup.Xaml.Converters
#if !OMNIXAML
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
public class ThicknessTypeConverter : TypeConverter
{

3
src/Markup/Avalonia.Markup.Xaml/Converters/TimeSpanTypeConverter.cs
View File

@ -9,8 +9,9 @@ namespace Avalonia.Markup.Xaml.Converters
#if !OMNIXAML
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
public class TimeSpanTypeConverter : Portable.Xaml.ComponentModel.TimeSpanConverter
public class TimeSpanTypeConverter : System.ComponentModel.TimeSpanConverter
{
public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
{

1
src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StyleIncludeExtension.cs
View File

@ -5,6 +5,7 @@ using Avalonia.Markup.Xaml.Styling;
using Avalonia.Styling;
using Portable.Xaml;
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
using Portable.Xaml.Markup;
using System;

1
src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaDefaultTypeConverters.cs
View File

@ -7,6 +7,7 @@ using Avalonia.Media;
using Avalonia.Media.Imaging;
using Avalonia.Styling;
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Collections;

1
src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaMemberAttributeProvider.cs
View File

@ -1,6 +1,7 @@
using Avalonia.Markup.Xaml.Converters;
using Avalonia.Styling;
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
using System;
using System.Linq;
using System.Reflection;

1
src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaTypeAttributeProvider.cs
View File

@ -2,6 +2,7 @@
// Licensed under the MIT license. See licence.md file in the project root for full license information.
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
using System;
using System.Linq;
using System.Reflection;

1
src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlObjectWriter.cs
View File

@ -1,6 +1,7 @@
using Avalonia.Data;
using Portable.Xaml;
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
using System.Collections.Generic;
using System.Linq;

1
src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlSchemaContext.cs
View File

@ -5,6 +5,7 @@ using Avalonia.Markup.Xaml.MarkupExtensions;
using Avalonia.Markup.Xaml.Styling;
using Portable.Xaml;
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
using System;
using System.Collections.Generic;
using System.Linq;

1
src/Markup/Avalonia.Markup.Xaml/PortableXaml/TypeDescriptorExtensions.cs
View File

@ -4,6 +4,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.ComponentModel;
namespace Portable.Xaml.ComponentModel
{

1
src/Markup/Avalonia.Markup.Xaml/PortableXaml/XamlBinding.cs
View File

@ -3,6 +3,7 @@ using Avalonia.Data;
using Avalonia.Styling;
using Portable.Xaml;
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
using Portable.Xaml.Markup;
using System;

1
src/Markup/Avalonia.Markup.Xaml/Templates/TemplateLoader.cs
View File

@ -7,6 +7,7 @@ namespace Avalonia.Markup.Xaml.Templates
using Portable.Xaml;
using Portable.Xaml.ComponentModel;
using System.ComponentModel;
using System;
public class TemplateLoader : XamlDeferringLoader

1
src/Markup/Portable.Xaml

@ -1 +0,0 @@
Subproject commit ae819edcd3b8930cca367888c19dd1ab19c263e9

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

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Avalonia.Skia.Desktop</RootNamespace>
<AssemblyName>Avalonia.Skia.Desktop</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<ShouldIncludeNativeSkiaSharp>false</ShouldIncludeNativeSkiaSharp>

2
src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
View File

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Avalonia.Direct2D1</RootNamespace>
<AssemblyName>Avalonia.Direct2D1</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>

2
src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj
View File

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Avalonia.Win32.Interop</RootNamespace>
<AssemblyName>Avalonia.Win32.Interop</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

2
src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
View File

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Avalonia.Win32</RootNamespace>
<AssemblyName>Avalonia.Win32</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>

1
tests/Avalonia.Markup.Xaml.UnitTests/Avalonia.Markup.Xaml.UnitTests.csproj
View File

@ -31,7 +31,6 @@
<ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj" />
<ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
<ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
<ProjectReference Include="..\..\src\Markup\Portable.Xaml\src\Portable.Xaml\Portable.Xaml-pcl259.csproj" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Xaml\Style1.xaml">

Write Preview
Loading…
Cancel
Save