Fixing projects. Upgraded WPF Extended Toolkit.
José Manuel Nieto Sánchez
|
|
@ -17,7 +17,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xaml.Tests.Resources", "..\
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OmniXaml.Tests.Wpf", "Tests\OmniXaml.Tests.Wpf\OmniXaml.Tests.Wpf.csproj", "{952C2CB6-BB38-471A-AD55-D68FCAC4A5CF}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OmniXaml.Tests.Wpf", "Tests\OmniXaml.Tests.Wpf\OmniXaml.Tests.Wpf.csproj", "{952C2CB6-BB38-471A-AD55-D68FCAC4A5CF}"
|
||||||
EndProject
|
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
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OmniXaml.Wpf", "OmniXaml.Wpf\OmniXaml.Wpf.csproj", "{3F5DEBE4-D1D2-4190-9AEA-FDD4065FDED7}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OmniXaml.Wpf", "OmniXaml.Wpf\OmniXaml.Wpf.csproj", "{3F5DEBE4-D1D2-4190-9AEA-FDD4065FDED7}"
|
||||||
EndProject
|
EndProject
|
||||||
|
|
@ -29,7 +29,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OmniXaml.AppServices.NetCor
|
||||||
EndProject
|
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}"
|
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
|
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
|
EndProject
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestApplications", "TestApplications", "{2128C3CA-2925-494C-949B-93FDFF746516}"
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestApplications", "TestApplications", "{2128C3CA-2925-494C-949B-93FDFF746516}"
|
||||||
EndProject
|
EndProject
|
||||||
|
|
|
||||||
|
|
@ -98,20 +98,16 @@
|
||||||
<None Include="App.config" />
|
<None Include="App.config" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="D:\Source\Repos\GitHub\OmniXAML\OmniXaml\OmniXaml.AppServices.NetCore\OmniXaml.AppServices.NetCore.csproj">
|
<ProjectReference Include="..\..\OmniXaml.AppServices\OmniXaml.AppServices.csproj">
|
||||||
<Project>{e4fb7d33-20f4-46f8-b7c6-fc11eff34cfb}</Project>
|
<Project>{B207C0CB-2BDF-4105-9E1D-1C5B98E98381}</Project>
|
||||||
<Name>OmniXaml.AppServices.NetCore</Name>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="D:\Source\Repos\GitHub\OmniXAML\OmniXaml\OmniXaml.AppServices\OmniXaml.AppServices.csproj">
|
|
||||||
<Project>{b207c0cb-2bdf-4105-9e1d-1c5b98e98381}</Project>
|
|
||||||
<Name>OmniXaml.AppServices</Name>
|
<Name>OmniXaml.AppServices</Name>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
<ProjectReference Include="D:\Source\Repos\GitHub\OmniXAML\OmniXaml\OmniXaml.Wpf\OmniXaml.Wpf.csproj">
|
<ProjectReference Include="..\..\OmniXaml.Wpf\OmniXaml.Wpf.csproj">
|
||||||
<Project>{3f5debe4-d1d2-4190-9aea-fdd4065fded7}</Project>
|
<Project>{3F5DEBE4-D1D2-4190-9AEA-FDD4065FDED7}</Project>
|
||||||
<Name>OmniXaml.Wpf</Name>
|
<Name>OmniXaml.Wpf</Name>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
<ProjectReference Include="D:\Source\Repos\GitHub\OmniXAML\OmniXaml\OmniXaml\OmniXaml.csproj">
|
<ProjectReference Include="..\..\OmniXaml\OmniXaml.csproj">
|
||||||
<Project>{0d9cc1de-84c3-40d7-9cc5-b7751e0b25d1}</Project>
|
<Project>{0D9CC1DE-84C3-40D7-9CC5-B7751E0B25D1}</Project>
|
||||||
<Name>OmniXaml</Name>
|
<Name>OmniXaml</Name>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
До Ширина: | Высота: | Размер: 19 KiB После Ширина: | Высота: | Размер: 19 KiB |
|
До Ширина: | Высота: | Размер: 85 KiB После Ширина: | Высота: | Размер: 85 KiB |
|
До Ширина: | Высота: | Размер: 10 KiB После Ширина: | Высота: | Размер: 10 KiB |
|
До Ширина: | Высота: | Размер: 7.5 KiB После Ширина: | Высота: | Размер: 7.5 KiB |
|
До Ширина: | Высота: | Размер: 17 KiB После Ширина: | Высота: | Размер: 17 KiB |
|
До Ширина: | Высота: | Размер: 8.6 KiB После Ширина: | Высота: | Размер: 8.6 KiB |
|
До Ширина: | Высота: | Размер: 53 KiB После Ширина: | Высота: | Размер: 53 KiB |
|
До Ширина: | Высота: | Размер: 47 KiB После Ширина: | Высота: | Размер: 47 KiB |
|
До Ширина: | Высота: | Размер: 289 B После Ширина: | Высота: | Размер: 288 B |
|
До Ширина: | Высота: | Размер: 2.9 KiB После Ширина: | Высота: | Размер: 2.8 KiB |
|
До Ширина: | Высота: | Размер: 37 KiB После Ширина: | Высота: | Размер: 37 KiB |
|
|
@ -2,9 +2,7 @@ namespace TestApplication
|
||||||
{
|
{
|
||||||
using System;
|
using System;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.Windows;
|
|
||||||
using System.Windows.Data;
|
using System.Windows.Data;
|
||||||
using OmniXaml.Tests;
|
|
||||||
using OmniXaml.Visualization;
|
using OmniXaml.Visualization;
|
||||||
|
|
||||||
public class NodeTypeToUriConverter : IValueConverter
|
public class NodeTypeToUriConverter : IValueConverter
|
||||||
|
|
@ -64,28 +64,28 @@
|
||||||
<Reference Include="WindowsBase" />
|
<Reference Include="WindowsBase" />
|
||||||
<Reference Include="PresentationCore" />
|
<Reference Include="PresentationCore" />
|
||||||
<Reference Include="PresentationFramework" />
|
<Reference Include="PresentationFramework" />
|
||||||
<Reference Include="Xceed.Wpf.AvalonDock, Version=2.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
|
<Reference Include="Xceed.Wpf.AvalonDock, Version=2.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Extended.Wpf.Toolkit.2.4\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
|
<HintPath>..\..\packages\Extended.Wpf.Toolkit.2.5\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
|
||||||
<Private>True</Private>
|
<Private>True</Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=2.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
|
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=2.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Extended.Wpf.Toolkit.2.4\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
|
<HintPath>..\..\packages\Extended.Wpf.Toolkit.2.5\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
|
||||||
<Private>True</Private>
|
<Private>True</Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=2.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
|
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=2.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Extended.Wpf.Toolkit.2.4\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
|
<HintPath>..\..\packages\Extended.Wpf.Toolkit.2.5\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
|
||||||
<Private>True</Private>
|
<Private>True</Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=2.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
|
<Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=2.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Extended.Wpf.Toolkit.2.4\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
|
<HintPath>..\..\packages\Extended.Wpf.Toolkit.2.5\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
|
||||||
<Private>True</Private>
|
<Private>True</Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Xceed.Wpf.DataGrid, Version=2.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
|
<Reference Include="Xceed.Wpf.DataGrid, Version=2.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Extended.Wpf.Toolkit.2.4\lib\net40\Xceed.Wpf.DataGrid.dll</HintPath>
|
<HintPath>..\..\packages\Extended.Wpf.Toolkit.2.5\lib\net40\Xceed.Wpf.DataGrid.dll</HintPath>
|
||||||
<Private>True</Private>
|
<Private>True</Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Xceed.Wpf.Toolkit, Version=2.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
|
<Reference Include="Xceed.Wpf.Toolkit, Version=2.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\Extended.Wpf.Toolkit.2.4\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
|
<HintPath>..\..\packages\Extended.Wpf.Toolkit.2.5\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
|
||||||
<Private>True</Private>
|
<Private>True</Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
@ -192,23 +192,23 @@
|
||||||
<None Include="App.config" />
|
<None Include="App.config" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\..\Xaml.Tests.Resources\Xaml.Tests.Resources.csproj">
|
<ProjectReference Include="..\..\..\Xaml.Tests.Resources\Xaml.Tests.Resources.csproj">
|
||||||
<Project>{9b517520-4d99-4bf5-8219-a643f718f6dd}</Project>
|
<Project>{9b517520-4d99-4bf5-8219-a643f718f6dd}</Project>
|
||||||
<Name>Xaml.Tests.Resources</Name>
|
<Name>Xaml.Tests.Resources</Name>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
<ProjectReference Include="..\OmniXaml.Wpf\OmniXaml.Wpf.csproj">
|
<ProjectReference Include="..\..\OmniXaml.Wpf\OmniXaml.Wpf.csproj">
|
||||||
<Project>{3F5DEBE4-D1D2-4190-9AEA-FDD4065FDED7}</Project>
|
<Project>{3F5DEBE4-D1D2-4190-9AEA-FDD4065FDED7}</Project>
|
||||||
<Name>OmniXaml.Wpf</Name>
|
<Name>OmniXaml.Wpf</Name>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
<ProjectReference Include="..\OmniXaml\OmniXaml.csproj">
|
<ProjectReference Include="..\..\OmniXaml\OmniXaml.csproj">
|
||||||
<Project>{0D9CC1DE-84C3-40D7-9CC5-B7751E0B25D1}</Project>
|
<Project>{0D9CC1DE-84C3-40D7-9CC5-B7751E0B25D1}</Project>
|
||||||
<Name>OmniXaml</Name>
|
<Name>OmniXaml</Name>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
<ProjectReference Include="..\Tests\OmniXaml.Tests.Classes\OmniXaml.Tests.Classes.csproj">
|
<ProjectReference Include="..\..\Tests\OmniXaml.Tests.Classes\OmniXaml.Tests.Classes.csproj">
|
||||||
<Project>{E6FDA529-90C2-4DDA-9080-7E7EEF64B2CA}</Project>
|
<Project>{E6FDA529-90C2-4DDA-9080-7E7EEF64B2CA}</Project>
|
||||||
<Name>OmniXaml.Tests.Classes</Name>
|
<Name>OmniXaml.Tests.Classes</Name>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
<ProjectReference Include="..\Tests\OmniXaml.Tests\OmniXaml.Tests.csproj">
|
<ProjectReference Include="..\..\Tests\OmniXaml.Tests\OmniXaml.Tests.csproj">
|
||||||
<Project>{4A7491E9-E218-45F5-BF42-430247765630}</Project>
|
<Project>{4A7491E9-E218-45F5-BF42-430247765630}</Project>
|
||||||
<Name>OmniXaml.Tests</Name>
|
<Name>OmniXaml.Tests</Name>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
|
До Ширина: | Высота: | Размер: 17 KiB После Ширина: | Высота: | Размер: 17 KiB |
|
|
@ -1,4 +1,4 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
<package id="Extended.Wpf.Toolkit" version="2.4.0" targetFramework="net46" userInstalled="true" />
|
<package id="Extended.Wpf.Toolkit" version="2.5.0" targetFramework="net46" userInstalled="true" />
|
||||||
</packages>
|
</packages>
|
||||||