From 0c0cda150d10f70e075398f8ba176bc7b27a55a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Nieto=20S=C3=A1nchez?= Date: Sun, 19 Jul 2015 17:48:08 +0200 Subject: [PATCH] Fixing projects. Upgraded WPF Extended Toolkit. --- OmniXaml/OmniXaml.sln | 4 +-- .../TestApplication}/App.config | 0 .../TestApplication}/App.xaml | 0 .../TestApplication}/App.xaml.cs | 0 .../TestApplication}/MainWindow.xaml | 0 .../TestApplication}/MainWindow.xaml.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../Properties/Resources.Designer.cs | 0 .../Properties/Resources.resx | 0 .../Properties/Settings.Designer.cs | 0 .../Properties/Settings.settings | 0 .../TestApplication}/TestApplication.csproj | 16 ++++----- .../XamlViewer}/App.config | 0 .../XamlViewer}/App.cs | 0 .../XamlViewer}/App.xaml | 0 .../XamlViewer}/Execute.cs | 0 .../XamlViewer}/GridExpanderSizeBehavior.cs | 0 .../XamlViewer}/IXamlSnippetProvider.cs | 0 .../XamlViewer}/Images/collection.png | Bin 19800 -> 19796 bytes .../XamlViewer}/Images/dummy.png | Bin 86929 -> 86927 bytes .../XamlViewer}/Images/indents.png | Bin 10560 -> 10559 bytes .../XamlViewer}/Images/load.png | Bin 7691 -> 7690 bytes .../XamlViewer}/Images/member.png | Bin 17641 -> 17640 bytes .../XamlViewer}/Images/namespace.png | Bin 8764 -> 8763 bytes .../XamlViewer}/Images/object.png | Bin 54318 -> 54317 bytes .../XamlViewer}/Images/root.png | Bin 48288 -> 48287 bytes .../XamlViewer}/Images/tree.png | Bin 289 -> 288 bytes .../XamlViewer}/Images/value.png | Bin 2919 -> 2918 bytes .../XamlViewer}/Images/wpf.png | Bin 38301 -> 38300 bytes .../XamlViewer}/InstanceNodeViewModel.cs | 0 .../XamlViewer}/LevelConverter.cs | 0 .../XamlViewer}/MainWindow.cs | 0 .../XamlViewer}/MainWindow.xaml | 0 .../XamlViewer}/NodeTypeToUriConverter.cs | 2 -- .../XamlViewer}/Properties/Annotations.cs | 0 .../XamlViewer}/Properties/AssemblyInfo.cs | 0 .../XamlViewer}/Properties/Resources.resx | 0 .../Properties/Settings.Designer.cs | 0 .../XamlViewer}/Properties/Settings.settings | 0 .../XamlViewer}/RelayCommand.cs | 0 .../XamlViewer}/Snippet.cs | 0 .../XamlViewer}/TestViewModel.cs | 0 .../XamlViewer}/ViewModel.cs | 0 .../ViewModels/DummyLoaderViewModel.cs | 0 .../ViewModels/StringExtensions.cs | 0 .../ViewModels/TagVisualizerViewModel.cs | 0 .../ViewModels/TreeVisualizerViewModel.cs | 0 .../ViewModels/VisualizerNodeViewModel.cs | 0 .../ViewModels/WpfLoaderViewModel.cs | 0 .../ViewModels/XamlVisualizerViewModel.cs | 0 .../XamlViewer}/Views/DummyLoaderControl.cs | 0 .../XamlViewer}/Views/DummyLoaderControl.xaml | 0 .../XamlViewer}/Views/TagVisualizerWindow.cs | 0 .../Views/TagVisualizerWindow.xaml | 0 .../XamlViewer}/Views/TreeVisualizerWindow.cs | 0 .../Views/TreeVisualizerWindow.xaml | 0 .../XamlViewer}/Views/WpfLoaderControl.cs | 0 .../XamlViewer}/Views/WpfLoaderControl.xaml | 0 .../XamlViewer}/Views/XamlTextBox.cs | 0 .../XamlViewer}/Views/XamlTextBox.xaml | 0 .../XamlViewer}/XamlSnippetProvider.cs | 0 .../XamlViewer}/XamlToolsControl.cs | 0 .../XamlViewer}/XamlToolsControl.xaml | 0 .../XamlViewer}/XamlViewer.csproj | 34 +++++++++--------- .../XamlViewer}/github_icon.png | Bin 17223 -> 17222 bytes .../XamlViewer}/packages.config | 2 +- 66 files changed, 26 insertions(+), 32 deletions(-) rename OmniXaml/{TestApplication2 => TestApplications/TestApplication}/App.config (100%) rename OmniXaml/{TestApplication2 => TestApplications/TestApplication}/App.xaml (100%) rename OmniXaml/{TestApplication2 => TestApplications/TestApplication}/App.xaml.cs (100%) rename OmniXaml/{TestApplication2 => TestApplications/TestApplication}/MainWindow.xaml (100%) rename OmniXaml/{TestApplication2 => TestApplications/TestApplication}/MainWindow.xaml.cs (100%) rename OmniXaml/{TestApplication2 => TestApplications/TestApplication}/Properties/AssemblyInfo.cs (100%) rename OmniXaml/{TestApplication2 => TestApplications/TestApplication}/Properties/Resources.Designer.cs (100%) rename OmniXaml/{TestApplication2 => TestApplications/TestApplication}/Properties/Resources.resx (100%) rename OmniXaml/{TestApplication2 => TestApplications/TestApplication}/Properties/Settings.Designer.cs (100%) rename OmniXaml/{ => TestApplications}/TestApplication/Properties/Settings.settings (100%) rename OmniXaml/{TestApplication2 => TestApplications/TestApplication}/TestApplication.csproj (85%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/App.config (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/App.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/App.xaml (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Execute.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/GridExpanderSizeBehavior.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/IXamlSnippetProvider.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Images/collection.png (99%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Images/dummy.png (99%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Images/indents.png (99%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Images/load.png (99%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Images/member.png (99%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Images/namespace.png (99%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Images/object.png (99%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Images/root.png (99%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Images/tree.png (89%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Images/value.png (98%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Images/wpf.png (99%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/InstanceNodeViewModel.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/LevelConverter.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/MainWindow.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/MainWindow.xaml (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/NodeTypeToUriConverter.cs (97%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Properties/Annotations.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Properties/AssemblyInfo.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Properties/Resources.resx (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Properties/Settings.Designer.cs (100%) rename OmniXaml/{TestApplication2 => TestApplications/XamlViewer}/Properties/Settings.settings (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/RelayCommand.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Snippet.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/TestViewModel.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/ViewModel.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/ViewModels/DummyLoaderViewModel.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/ViewModels/StringExtensions.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/ViewModels/TagVisualizerViewModel.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/ViewModels/TreeVisualizerViewModel.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/ViewModels/VisualizerNodeViewModel.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/ViewModels/WpfLoaderViewModel.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/ViewModels/XamlVisualizerViewModel.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Views/DummyLoaderControl.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Views/DummyLoaderControl.xaml (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Views/TagVisualizerWindow.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Views/TagVisualizerWindow.xaml (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Views/TreeVisualizerWindow.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Views/TreeVisualizerWindow.xaml (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Views/WpfLoaderControl.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Views/WpfLoaderControl.xaml (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Views/XamlTextBox.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/Views/XamlTextBox.xaml (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/XamlSnippetProvider.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/XamlToolsControl.cs (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/XamlToolsControl.xaml (100%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/XamlViewer.csproj (87%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/github_icon.png (99%) rename OmniXaml/{TestApplication => TestApplications/XamlViewer}/packages.config (54%) diff --git a/OmniXaml/OmniXaml.sln b/OmniXaml/OmniXaml.sln index 1900a0d..440d3e0 100644 --- a/OmniXaml/OmniXaml.sln +++ b/OmniXaml/OmniXaml.sln @@ -17,7 +17,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xaml.Tests.Resources", "..\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OmniXaml.Tests.Wpf", "Tests\OmniXaml.Tests.Wpf\OmniXaml.Tests.Wpf.csproj", "{952C2CB6-BB38-471A-AD55-D68FCAC4A5CF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlViewer", "TestApplication\XamlViewer.csproj", "{A49A57C4-6DB5-44A0-869B-39EED7884A0B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlViewer", "TestApplications\XamlViewer\XamlViewer.csproj", "{A49A57C4-6DB5-44A0-869B-39EED7884A0B}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OmniXaml.Wpf", "OmniXaml.Wpf\OmniXaml.Wpf.csproj", "{3F5DEBE4-D1D2-4190-9AEA-FDD4065FDED7}" EndProject @@ -29,7 +29,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OmniXaml.AppServices.NetCor EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OmniXaml.AppServices.NetCore.Tests", "OmniXaml.AppServices.NetCore.Tests\OmniXaml.AppServices.NetCore.Tests.csproj", "{BB3EEE9D-9962-4ADB-954A-E070B0C03CC8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApplication", "TestApplication2\TestApplication.csproj", "{70FEDBBC-AD3D-4AB9-8EC0-3306BE2E266D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApplication", "TestApplications\TestApplication\TestApplication.csproj", "{70FEDBBC-AD3D-4AB9-8EC0-3306BE2E266D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestApplications", "TestApplications", "{2128C3CA-2925-494C-949B-93FDFF746516}" EndProject diff --git a/OmniXaml/TestApplication2/App.config b/OmniXaml/TestApplications/TestApplication/App.config similarity index 100% rename from OmniXaml/TestApplication2/App.config rename to OmniXaml/TestApplications/TestApplication/App.config diff --git a/OmniXaml/TestApplication2/App.xaml b/OmniXaml/TestApplications/TestApplication/App.xaml similarity index 100% rename from OmniXaml/TestApplication2/App.xaml rename to OmniXaml/TestApplications/TestApplication/App.xaml diff --git a/OmniXaml/TestApplication2/App.xaml.cs b/OmniXaml/TestApplications/TestApplication/App.xaml.cs similarity index 100% rename from OmniXaml/TestApplication2/App.xaml.cs rename to OmniXaml/TestApplications/TestApplication/App.xaml.cs diff --git a/OmniXaml/TestApplication2/MainWindow.xaml b/OmniXaml/TestApplications/TestApplication/MainWindow.xaml similarity index 100% rename from OmniXaml/TestApplication2/MainWindow.xaml rename to OmniXaml/TestApplications/TestApplication/MainWindow.xaml diff --git a/OmniXaml/TestApplication2/MainWindow.xaml.cs b/OmniXaml/TestApplications/TestApplication/MainWindow.xaml.cs similarity index 100% rename from OmniXaml/TestApplication2/MainWindow.xaml.cs rename to OmniXaml/TestApplications/TestApplication/MainWindow.xaml.cs diff --git a/OmniXaml/TestApplication2/Properties/AssemblyInfo.cs b/OmniXaml/TestApplications/TestApplication/Properties/AssemblyInfo.cs similarity index 100% rename from OmniXaml/TestApplication2/Properties/AssemblyInfo.cs rename to OmniXaml/TestApplications/TestApplication/Properties/AssemblyInfo.cs diff --git a/OmniXaml/TestApplication2/Properties/Resources.Designer.cs b/OmniXaml/TestApplications/TestApplication/Properties/Resources.Designer.cs similarity index 100% rename from OmniXaml/TestApplication2/Properties/Resources.Designer.cs rename to OmniXaml/TestApplications/TestApplication/Properties/Resources.Designer.cs diff --git a/OmniXaml/TestApplication2/Properties/Resources.resx b/OmniXaml/TestApplications/TestApplication/Properties/Resources.resx similarity index 100% rename from OmniXaml/TestApplication2/Properties/Resources.resx rename to OmniXaml/TestApplications/TestApplication/Properties/Resources.resx diff --git a/OmniXaml/TestApplication2/Properties/Settings.Designer.cs b/OmniXaml/TestApplications/TestApplication/Properties/Settings.Designer.cs similarity index 100% rename from OmniXaml/TestApplication2/Properties/Settings.Designer.cs rename to OmniXaml/TestApplications/TestApplication/Properties/Settings.Designer.cs diff --git a/OmniXaml/TestApplication/Properties/Settings.settings b/OmniXaml/TestApplications/TestApplication/Properties/Settings.settings similarity index 100% rename from OmniXaml/TestApplication/Properties/Settings.settings rename to OmniXaml/TestApplications/TestApplication/Properties/Settings.settings diff --git a/OmniXaml/TestApplication2/TestApplication.csproj b/OmniXaml/TestApplications/TestApplication/TestApplication.csproj similarity index 85% rename from OmniXaml/TestApplication2/TestApplication.csproj rename to OmniXaml/TestApplications/TestApplication/TestApplication.csproj index 71cefd9..cfc9afc 100644 --- a/OmniXaml/TestApplication2/TestApplication.csproj +++ b/OmniXaml/TestApplications/TestApplication/TestApplication.csproj @@ -98,20 +98,16 @@ - - {e4fb7d33-20f4-46f8-b7c6-fc11eff34cfb} - OmniXaml.AppServices.NetCore - - - {b207c0cb-2bdf-4105-9e1d-1c5b98e98381} + + {B207C0CB-2BDF-4105-9E1D-1C5B98E98381} OmniXaml.AppServices - - {3f5debe4-d1d2-4190-9aea-fdd4065fded7} + + {3F5DEBE4-D1D2-4190-9AEA-FDD4065FDED7} OmniXaml.Wpf - - {0d9cc1de-84c3-40d7-9cc5-b7751e0b25d1} + + {0D9CC1DE-84C3-40D7-9CC5-B7751E0B25D1} OmniXaml diff --git a/OmniXaml/TestApplication/App.config b/OmniXaml/TestApplications/XamlViewer/App.config similarity index 100% rename from OmniXaml/TestApplication/App.config rename to OmniXaml/TestApplications/XamlViewer/App.config diff --git a/OmniXaml/TestApplication/App.cs b/OmniXaml/TestApplications/XamlViewer/App.cs similarity index 100% rename from OmniXaml/TestApplication/App.cs rename to OmniXaml/TestApplications/XamlViewer/App.cs diff --git a/OmniXaml/TestApplication/App.xaml b/OmniXaml/TestApplications/XamlViewer/App.xaml similarity index 100% rename from OmniXaml/TestApplication/App.xaml rename to OmniXaml/TestApplications/XamlViewer/App.xaml diff --git a/OmniXaml/TestApplication/Execute.cs b/OmniXaml/TestApplications/XamlViewer/Execute.cs similarity index 100% rename from OmniXaml/TestApplication/Execute.cs rename to OmniXaml/TestApplications/XamlViewer/Execute.cs diff --git a/OmniXaml/TestApplication/GridExpanderSizeBehavior.cs b/OmniXaml/TestApplications/XamlViewer/GridExpanderSizeBehavior.cs similarity index 100% rename from OmniXaml/TestApplication/GridExpanderSizeBehavior.cs rename to OmniXaml/TestApplications/XamlViewer/GridExpanderSizeBehavior.cs diff --git a/OmniXaml/TestApplication/IXamlSnippetProvider.cs b/OmniXaml/TestApplications/XamlViewer/IXamlSnippetProvider.cs similarity index 100% rename from OmniXaml/TestApplication/IXamlSnippetProvider.cs rename to OmniXaml/TestApplications/XamlViewer/IXamlSnippetProvider.cs diff --git a/OmniXaml/TestApplication/Images/collection.png b/OmniXaml/TestApplications/XamlViewer/Images/collection.png similarity index 99% rename from OmniXaml/TestApplication/Images/collection.png rename to OmniXaml/TestApplications/XamlViewer/Images/collection.png index 2313ecb69f6c4947d4c3c845dbc84abe4e5017d1..5724a517450ecec6ba6d0dd43e9d17744a886a51 100644 GIT binary patch delta 30 mcmcaHi}A`VMwZS1KlhESe{451+3_=N7INTW-YoBI$prwgZV9vi delta 36 qcmcaIi}A)RM%K;%KX=}ZEPrenc{kbdGcodR=6B#>22#?_mRtbbj0xcY diff --git a/OmniXaml/TestApplication/Images/dummy.png b/OmniXaml/TestApplications/XamlViewer/Images/dummy.png similarity index 99% rename from OmniXaml/TestApplication/Images/dummy.png rename to OmniXaml/TestApplications/XamlViewer/Images/dummy.png index 6a2cd41962bb6b9a551370e491a4064f8d1aa019..5b59af00cded9383a059040a8a880284b111da74 100644 GIT binary patch delta 24 fcmbQZoV9;BD@$j9pZiAEET85ApX~)cjEd|4Z~h1} delta 27 icmeBQ&N^{9D{E(fpF8hHmMkAe-sU`??Rh?oitGS?+XzVj diff --git a/OmniXaml/TestApplication/Images/indents.png b/OmniXaml/TestApplications/XamlViewer/Images/indents.png similarity index 99% rename from OmniXaml/TestApplication/Images/indents.png rename to OmniXaml/TestApplications/XamlViewer/Images/indents.png index 02b225c99c853af1d655e6e53952c4c18251c502..8fa3c99cc966391e199c0aa9893a787bd27ebe93 100644 GIT binary patch delta 13 UcmX>Qv_FWYGr-S%BdfJ0047reumAu6 delta 14 VcmdlVbRdYeGr-TCcO#3nCIBig1ib(N diff --git a/OmniXaml/TestApplication/Images/load.png b/OmniXaml/TestApplications/XamlViewer/Images/load.png similarity index 99% rename from OmniXaml/TestApplication/Images/load.png rename to OmniXaml/TestApplications/XamlViewer/Images/load.png index 27d8c7a85717ce52ccf14522b671afb409937b96..c714fb5d773f9f0843d9e83614fd123515a4791a 100644 GIT binary patch delta 13 UcmeCS>9S$z4DfT`$jT-M03QMa+5i9m delta 14 VcmeCO>9%3*4DfU3-N?cw2LK{S1Lpt$ diff --git a/OmniXaml/TestApplication/Images/member.png b/OmniXaml/TestApplications/XamlViewer/Images/member.png similarity index 99% rename from OmniXaml/TestApplication/Images/member.png rename to OmniXaml/TestApplications/XamlViewer/Images/member.png index b20a0226a31a44e8c494b701c0d941d74d11604e..311e11a5f0dc99048aacac686f676beb7998ca6d 100644 GIT binary patch delta 15 WcmaFa$@rp^k)<=h&wV576Bht9zy>w| delta 16 XcmaFS$@sF9k+n0x&z*N8%M%v>Ib8-r diff --git a/OmniXaml/TestApplication/Images/namespace.png b/OmniXaml/TestApplications/XamlViewer/Images/namespace.png similarity index 99% rename from OmniXaml/TestApplication/Images/namespace.png rename to OmniXaml/TestApplications/XamlViewer/Images/namespace.png index 1c2ca361bbe290535ffbb19784f3c9454ae6ee6a..898f4a1c6afdcfbbacc2b29e9f0d52644bba7757 100644 GIT binary patch delta 13 UcmdnvvfG8FGr-S%BdfU*03@&kfdBvi delta 14 Vcmdn(vd4wBGr-TCcO#3r5&$S@1dadz diff --git a/OmniXaml/TestApplication/Images/object.png b/OmniXaml/TestApplications/XamlViewer/Images/object.png similarity index 99% rename from OmniXaml/TestApplication/Images/object.png rename to OmniXaml/TestApplications/XamlViewer/Images/object.png index ff0daf9c55afeeadbf751cbf1f2af60437180678..92ad982b989e17b3bd2e14c2d5e88adfe02cfc32 100644 GIT binary patch delta 15 WcmZ3tf_d!CYH_sKlhESv-bc1H~I#( delta 16 YcmbRLlWD diff --git a/OmniXaml/TestApplication/Images/wpf.png b/OmniXaml/TestApplications/XamlViewer/Images/wpf.png similarity index 99% rename from OmniXaml/TestApplication/Images/wpf.png rename to OmniXaml/TestApplications/XamlViewer/Images/wpf.png index b35ded9fbbb82b8d8bf31ae3a3207a94f84aba6d..2573a576910177d47a743090988184913f88ae2d 100644 GIT binary patch delta 15 XcmbQcnrY5zCYH_sKlhESGo}InFWv>| delta 16 YcmbQUnrZH8Cf3dXKX=}ZEHkD805mBD_5c6? diff --git a/OmniXaml/TestApplication/InstanceNodeViewModel.cs b/OmniXaml/TestApplications/XamlViewer/InstanceNodeViewModel.cs similarity index 100% rename from OmniXaml/TestApplication/InstanceNodeViewModel.cs rename to OmniXaml/TestApplications/XamlViewer/InstanceNodeViewModel.cs diff --git a/OmniXaml/TestApplication/LevelConverter.cs b/OmniXaml/TestApplications/XamlViewer/LevelConverter.cs similarity index 100% rename from OmniXaml/TestApplication/LevelConverter.cs rename to OmniXaml/TestApplications/XamlViewer/LevelConverter.cs diff --git a/OmniXaml/TestApplication/MainWindow.cs b/OmniXaml/TestApplications/XamlViewer/MainWindow.cs similarity index 100% rename from OmniXaml/TestApplication/MainWindow.cs rename to OmniXaml/TestApplications/XamlViewer/MainWindow.cs diff --git a/OmniXaml/TestApplication/MainWindow.xaml b/OmniXaml/TestApplications/XamlViewer/MainWindow.xaml similarity index 100% rename from OmniXaml/TestApplication/MainWindow.xaml rename to OmniXaml/TestApplications/XamlViewer/MainWindow.xaml diff --git a/OmniXaml/TestApplication/NodeTypeToUriConverter.cs b/OmniXaml/TestApplications/XamlViewer/NodeTypeToUriConverter.cs similarity index 97% rename from OmniXaml/TestApplication/NodeTypeToUriConverter.cs rename to OmniXaml/TestApplications/XamlViewer/NodeTypeToUriConverter.cs index 44076f5..c257867 100644 --- a/OmniXaml/TestApplication/NodeTypeToUriConverter.cs +++ b/OmniXaml/TestApplications/XamlViewer/NodeTypeToUriConverter.cs @@ -2,9 +2,7 @@ namespace TestApplication { using System; using System.Globalization; - using System.Windows; using System.Windows.Data; - using OmniXaml.Tests; using OmniXaml.Visualization; public class NodeTypeToUriConverter : IValueConverter diff --git a/OmniXaml/TestApplication/Properties/Annotations.cs b/OmniXaml/TestApplications/XamlViewer/Properties/Annotations.cs similarity index 100% rename from OmniXaml/TestApplication/Properties/Annotations.cs rename to OmniXaml/TestApplications/XamlViewer/Properties/Annotations.cs diff --git a/OmniXaml/TestApplication/Properties/AssemblyInfo.cs b/OmniXaml/TestApplications/XamlViewer/Properties/AssemblyInfo.cs similarity index 100% rename from OmniXaml/TestApplication/Properties/AssemblyInfo.cs rename to OmniXaml/TestApplications/XamlViewer/Properties/AssemblyInfo.cs diff --git a/OmniXaml/TestApplication/Properties/Resources.resx b/OmniXaml/TestApplications/XamlViewer/Properties/Resources.resx similarity index 100% rename from OmniXaml/TestApplication/Properties/Resources.resx rename to OmniXaml/TestApplications/XamlViewer/Properties/Resources.resx diff --git a/OmniXaml/TestApplication/Properties/Settings.Designer.cs b/OmniXaml/TestApplications/XamlViewer/Properties/Settings.Designer.cs similarity index 100% rename from OmniXaml/TestApplication/Properties/Settings.Designer.cs rename to OmniXaml/TestApplications/XamlViewer/Properties/Settings.Designer.cs diff --git a/OmniXaml/TestApplication2/Properties/Settings.settings b/OmniXaml/TestApplications/XamlViewer/Properties/Settings.settings similarity index 100% rename from OmniXaml/TestApplication2/Properties/Settings.settings rename to OmniXaml/TestApplications/XamlViewer/Properties/Settings.settings diff --git a/OmniXaml/TestApplication/RelayCommand.cs b/OmniXaml/TestApplications/XamlViewer/RelayCommand.cs similarity index 100% rename from OmniXaml/TestApplication/RelayCommand.cs rename to OmniXaml/TestApplications/XamlViewer/RelayCommand.cs diff --git a/OmniXaml/TestApplication/Snippet.cs b/OmniXaml/TestApplications/XamlViewer/Snippet.cs similarity index 100% rename from OmniXaml/TestApplication/Snippet.cs rename to OmniXaml/TestApplications/XamlViewer/Snippet.cs diff --git a/OmniXaml/TestApplication/TestViewModel.cs b/OmniXaml/TestApplications/XamlViewer/TestViewModel.cs similarity index 100% rename from OmniXaml/TestApplication/TestViewModel.cs rename to OmniXaml/TestApplications/XamlViewer/TestViewModel.cs diff --git a/OmniXaml/TestApplication/ViewModel.cs b/OmniXaml/TestApplications/XamlViewer/ViewModel.cs similarity index 100% rename from OmniXaml/TestApplication/ViewModel.cs rename to OmniXaml/TestApplications/XamlViewer/ViewModel.cs diff --git a/OmniXaml/TestApplication/ViewModels/DummyLoaderViewModel.cs b/OmniXaml/TestApplications/XamlViewer/ViewModels/DummyLoaderViewModel.cs similarity index 100% rename from OmniXaml/TestApplication/ViewModels/DummyLoaderViewModel.cs rename to OmniXaml/TestApplications/XamlViewer/ViewModels/DummyLoaderViewModel.cs diff --git a/OmniXaml/TestApplication/ViewModels/StringExtensions.cs b/OmniXaml/TestApplications/XamlViewer/ViewModels/StringExtensions.cs similarity index 100% rename from OmniXaml/TestApplication/ViewModels/StringExtensions.cs rename to OmniXaml/TestApplications/XamlViewer/ViewModels/StringExtensions.cs diff --git a/OmniXaml/TestApplication/ViewModels/TagVisualizerViewModel.cs b/OmniXaml/TestApplications/XamlViewer/ViewModels/TagVisualizerViewModel.cs similarity index 100% rename from OmniXaml/TestApplication/ViewModels/TagVisualizerViewModel.cs rename to OmniXaml/TestApplications/XamlViewer/ViewModels/TagVisualizerViewModel.cs diff --git a/OmniXaml/TestApplication/ViewModels/TreeVisualizerViewModel.cs b/OmniXaml/TestApplications/XamlViewer/ViewModels/TreeVisualizerViewModel.cs similarity index 100% rename from OmniXaml/TestApplication/ViewModels/TreeVisualizerViewModel.cs rename to OmniXaml/TestApplications/XamlViewer/ViewModels/TreeVisualizerViewModel.cs diff --git a/OmniXaml/TestApplication/ViewModels/VisualizerNodeViewModel.cs b/OmniXaml/TestApplications/XamlViewer/ViewModels/VisualizerNodeViewModel.cs similarity index 100% rename from OmniXaml/TestApplication/ViewModels/VisualizerNodeViewModel.cs rename to OmniXaml/TestApplications/XamlViewer/ViewModels/VisualizerNodeViewModel.cs diff --git a/OmniXaml/TestApplication/ViewModels/WpfLoaderViewModel.cs b/OmniXaml/TestApplications/XamlViewer/ViewModels/WpfLoaderViewModel.cs similarity index 100% rename from OmniXaml/TestApplication/ViewModels/WpfLoaderViewModel.cs rename to OmniXaml/TestApplications/XamlViewer/ViewModels/WpfLoaderViewModel.cs diff --git a/OmniXaml/TestApplication/ViewModels/XamlVisualizerViewModel.cs b/OmniXaml/TestApplications/XamlViewer/ViewModels/XamlVisualizerViewModel.cs similarity index 100% rename from OmniXaml/TestApplication/ViewModels/XamlVisualizerViewModel.cs rename to OmniXaml/TestApplications/XamlViewer/ViewModels/XamlVisualizerViewModel.cs diff --git a/OmniXaml/TestApplication/Views/DummyLoaderControl.cs b/OmniXaml/TestApplications/XamlViewer/Views/DummyLoaderControl.cs similarity index 100% rename from OmniXaml/TestApplication/Views/DummyLoaderControl.cs rename to OmniXaml/TestApplications/XamlViewer/Views/DummyLoaderControl.cs diff --git a/OmniXaml/TestApplication/Views/DummyLoaderControl.xaml b/OmniXaml/TestApplications/XamlViewer/Views/DummyLoaderControl.xaml similarity index 100% rename from OmniXaml/TestApplication/Views/DummyLoaderControl.xaml rename to OmniXaml/TestApplications/XamlViewer/Views/DummyLoaderControl.xaml diff --git a/OmniXaml/TestApplication/Views/TagVisualizerWindow.cs b/OmniXaml/TestApplications/XamlViewer/Views/TagVisualizerWindow.cs similarity index 100% rename from OmniXaml/TestApplication/Views/TagVisualizerWindow.cs rename to OmniXaml/TestApplications/XamlViewer/Views/TagVisualizerWindow.cs diff --git a/OmniXaml/TestApplication/Views/TagVisualizerWindow.xaml b/OmniXaml/TestApplications/XamlViewer/Views/TagVisualizerWindow.xaml similarity index 100% rename from OmniXaml/TestApplication/Views/TagVisualizerWindow.xaml rename to OmniXaml/TestApplications/XamlViewer/Views/TagVisualizerWindow.xaml diff --git a/OmniXaml/TestApplication/Views/TreeVisualizerWindow.cs b/OmniXaml/TestApplications/XamlViewer/Views/TreeVisualizerWindow.cs similarity index 100% rename from OmniXaml/TestApplication/Views/TreeVisualizerWindow.cs rename to OmniXaml/TestApplications/XamlViewer/Views/TreeVisualizerWindow.cs diff --git a/OmniXaml/TestApplication/Views/TreeVisualizerWindow.xaml b/OmniXaml/TestApplications/XamlViewer/Views/TreeVisualizerWindow.xaml similarity index 100% rename from OmniXaml/TestApplication/Views/TreeVisualizerWindow.xaml rename to OmniXaml/TestApplications/XamlViewer/Views/TreeVisualizerWindow.xaml diff --git a/OmniXaml/TestApplication/Views/WpfLoaderControl.cs b/OmniXaml/TestApplications/XamlViewer/Views/WpfLoaderControl.cs similarity index 100% rename from OmniXaml/TestApplication/Views/WpfLoaderControl.cs rename to OmniXaml/TestApplications/XamlViewer/Views/WpfLoaderControl.cs diff --git a/OmniXaml/TestApplication/Views/WpfLoaderControl.xaml b/OmniXaml/TestApplications/XamlViewer/Views/WpfLoaderControl.xaml similarity index 100% rename from OmniXaml/TestApplication/Views/WpfLoaderControl.xaml rename to OmniXaml/TestApplications/XamlViewer/Views/WpfLoaderControl.xaml diff --git a/OmniXaml/TestApplication/Views/XamlTextBox.cs b/OmniXaml/TestApplications/XamlViewer/Views/XamlTextBox.cs similarity index 100% rename from OmniXaml/TestApplication/Views/XamlTextBox.cs rename to OmniXaml/TestApplications/XamlViewer/Views/XamlTextBox.cs diff --git a/OmniXaml/TestApplication/Views/XamlTextBox.xaml b/OmniXaml/TestApplications/XamlViewer/Views/XamlTextBox.xaml similarity index 100% rename from OmniXaml/TestApplication/Views/XamlTextBox.xaml rename to OmniXaml/TestApplications/XamlViewer/Views/XamlTextBox.xaml diff --git a/OmniXaml/TestApplication/XamlSnippetProvider.cs b/OmniXaml/TestApplications/XamlViewer/XamlSnippetProvider.cs similarity index 100% rename from OmniXaml/TestApplication/XamlSnippetProvider.cs rename to OmniXaml/TestApplications/XamlViewer/XamlSnippetProvider.cs diff --git a/OmniXaml/TestApplication/XamlToolsControl.cs b/OmniXaml/TestApplications/XamlViewer/XamlToolsControl.cs similarity index 100% rename from OmniXaml/TestApplication/XamlToolsControl.cs rename to OmniXaml/TestApplications/XamlViewer/XamlToolsControl.cs diff --git a/OmniXaml/TestApplication/XamlToolsControl.xaml b/OmniXaml/TestApplications/XamlViewer/XamlToolsControl.xaml similarity index 100% rename from OmniXaml/TestApplication/XamlToolsControl.xaml rename to OmniXaml/TestApplications/XamlViewer/XamlToolsControl.xaml diff --git a/OmniXaml/TestApplication/XamlViewer.csproj b/OmniXaml/TestApplications/XamlViewer/XamlViewer.csproj similarity index 87% rename from OmniXaml/TestApplication/XamlViewer.csproj rename to OmniXaml/TestApplications/XamlViewer/XamlViewer.csproj index 761812d..385dde0 100644 --- a/OmniXaml/TestApplication/XamlViewer.csproj +++ b/OmniXaml/TestApplications/XamlViewer/XamlViewer.csproj @@ -64,28 +64,28 @@ - - ..\packages\Extended.Wpf.Toolkit.2.4\lib\net40\Xceed.Wpf.AvalonDock.dll + + ..\..\packages\Extended.Wpf.Toolkit.2.5\lib\net40\Xceed.Wpf.AvalonDock.dll True - - ..\packages\Extended.Wpf.Toolkit.2.4\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll + + ..\..\packages\Extended.Wpf.Toolkit.2.5\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll True - - ..\packages\Extended.Wpf.Toolkit.2.4\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll + + ..\..\packages\Extended.Wpf.Toolkit.2.5\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll True - - ..\packages\Extended.Wpf.Toolkit.2.4\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll + + ..\..\packages\Extended.Wpf.Toolkit.2.5\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll True - - ..\packages\Extended.Wpf.Toolkit.2.4\lib\net40\Xceed.Wpf.DataGrid.dll + + ..\..\packages\Extended.Wpf.Toolkit.2.5\lib\net40\Xceed.Wpf.DataGrid.dll True - - ..\packages\Extended.Wpf.Toolkit.2.4\lib\net40\Xceed.Wpf.Toolkit.dll + + ..\..\packages\Extended.Wpf.Toolkit.2.5\lib\net40\Xceed.Wpf.Toolkit.dll True @@ -192,23 +192,23 @@ - + {9b517520-4d99-4bf5-8219-a643f718f6dd} Xaml.Tests.Resources - + {3F5DEBE4-D1D2-4190-9AEA-FDD4065FDED7} OmniXaml.Wpf - + {0D9CC1DE-84C3-40D7-9CC5-B7751E0B25D1} OmniXaml - + {E6FDA529-90C2-4DDA-9080-7E7EEF64B2CA} OmniXaml.Tests.Classes - + {4A7491E9-E218-45F5-BF42-430247765630} OmniXaml.Tests diff --git a/OmniXaml/TestApplication/github_icon.png b/OmniXaml/TestApplications/XamlViewer/github_icon.png similarity index 99% rename from OmniXaml/TestApplication/github_icon.png rename to OmniXaml/TestApplications/XamlViewer/github_icon.png index ed4f82f847472e8d6f681a05a3a6a2deb401e23f..7ff29e3dfb8c49ea198288e4b81e07a065016ecf 100644 GIT binary patch delta 15 WcmX@!#(1oak)<=h&wV4SlQRG>ngvM! delta 16 XcmX@s#(2Dqk+n0x&z*N8i<2_|GwlUd diff --git a/OmniXaml/TestApplication/packages.config b/OmniXaml/TestApplications/XamlViewer/packages.config similarity index 54% rename from OmniXaml/TestApplication/packages.config rename to OmniXaml/TestApplications/XamlViewer/packages.config index f26133d..86f57a9 100644 --- a/OmniXaml/TestApplication/packages.config +++ b/OmniXaml/TestApplications/XamlViewer/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file