Browse Source

Merge unit tests for WpfDesign.Designer and WpfDesign.XamlDom.

Keep the Z-Order when moving multiple elements between containers.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2421 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 19 years ago
parent
commit
0b013d8405
  1. 2
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/DesignPanel.cs
  2. 45
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/ModelTools.cs
  3. 3
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Services/DragMoveMouseGesture.cs
  4. 14
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Services/SelectionService.cs
  5. 1
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj
  6. 14
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Xaml/XamlDesignItem.cs
  7. 3
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/ModelTestHelper.cs
  8. 3
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/ModelTests.cs
  9. 23
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj
  10. 2
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/ExampleClass.cs
  11. 3
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/ExampleClassContainer.cs
  12. 2
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/ExampleService.cs
  13. 2
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs
  14. 24
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SimpleLoadTests.cs
  15. 2
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SystemTypesLoadTest.cs
  16. 8
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/TestHelper.cs
  17. 16
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/WhitespaceTests.cs
  18. 13
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/XamlTypeFinderTests.cs
  19. 15
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Tests/AssemblyInfo.cs
  20. 76
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Tests/WpfDesign.XamlDom.Tests.csproj
  21. 15
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Tests/app.config
  22. 4
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.sln
  23. 7
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/DesignItem.cs
  24. 14
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/DesignItemProperty.cs
  25. 6
      src/Libraries/ICSharpCode.TextEditor/Project/Src/Undo/UndoStack.cs
  26. 11
      src/Main/Base/Project/Src/TextEditor/Gui/Editor/CompletionWindow/OverrideCompletionDataProvider.cs
  27. 24
      src/SharpDevelop.Tests.sln

2
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/DesignPanel.cs

@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Windows;
using System.Windows.Controls;
@ -144,6 +145,7 @@ namespace ICSharpCode.WpfDesign.Designer @@ -144,6 +145,7 @@ namespace ICSharpCode.WpfDesign.Designer
this.Focusable = true;
this.VerticalAlignment = VerticalAlignment.Top;
this.HorizontalAlignment = HorizontalAlignment.Left;
DesignerProperties.SetIsInDesignMode(this, true);
_eatAllHitTestRequests = new EatAllHitTestRequests();
_adornerLayer = new AdornerLayer(this);

45
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/ModelTools.cs

@ -0,0 +1,45 @@ @@ -0,0 +1,45 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
// <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>
// <version>$Revision$</version>
// </file>
using System;
namespace ICSharpCode.WpfDesign.Designer
{
/// <summary>
/// Static helper methods for working with the designer DOM.
/// </summary>
public static class ModelTools
{
/// <summary>
/// Compares the positions of a and b in the model file.
/// </summary>
public static int ComparePositionInModelFile(DesignItem a, DesignItem b)
{
// first remember all parent properties of a
HashSet<DesignItemProperty> aProps = new HashSet<DesignItemProperty>();
DesignItem tmp = a;
while (tmp != null) {
aProps.Add(tmp.ParentProperty);
tmp = tmp.Parent;
}
// now walk up b's parent tree until a matching property is found
tmp = b;
while (tmp != null) {
DesignItemProperty prop = tmp.ParentProperty;
if (aProps.Contains(prop)) {
if (prop.IsCollection) {
return prop.CollectionElements.IndexOf(a).CompareTo(prop.CollectionElements.IndexOf(b));
} else {
return 0;
}
}
}
return 0;
}
}
}

3
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Services/DragMoveMouseGesture.cs

@ -43,6 +43,9 @@ namespace ICSharpCode.WpfDesign.Designer.Services @@ -43,6 +43,9 @@ namespace ICSharpCode.WpfDesign.Designer.Services
{
IPlacementBehavior b = PlacementOperation.GetPlacementBehavior(selectedItems);
if (b != null && b.CanPlace(selectedItems, PlacementType.Move, PlacementAlignments.TopLeft)) {
List<DesignItem> sortedSelectedItems = new List<DesignItem>(selectedItems);
sortedSelectedItems.Sort(ModelTools.ComparePositionInModelFile);
selectedItems = sortedSelectedItems;
operation = PlacementOperation.Start(selectedItems, PlacementType.Move);
}
}

14
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Services/SelectionService.cs

@ -77,10 +77,16 @@ namespace ICSharpCode.WpfDesign.Designer.Services @@ -77,10 +77,16 @@ namespace ICSharpCode.WpfDesign.Designer.Services
}
selectionType &= ~SelectionTypes.Primary;
// if selectionType was only Primary, keep current selection; but if new primary selection
// is not yet selected, replace existing selection with new
if (selectionType == 0 && IsComponentSelected(newPrimarySelection) == false) {
selectionType = SelectionTypes.Replace;
if (selectionType == 0) {
// if selectionType was only Primary, and components has only one item that
// changes the primary selection was changed to an already-selected item,
// then we keep the current selection.
// otherwise, we replace it
if (components.Count == 1 && IsComponentSelected(newPrimarySelection)) {
// keep selectionType = 0 -> don't change the selection
} else {
selectionType = SelectionTypes.Replace;
}
}
}

1
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj

@ -71,6 +71,7 @@ @@ -71,6 +71,7 @@
<Compile Include="Controls\TypeEditors\BrushEditor.cs" />
<Compile Include="Controls\WindowClone.cs" />
<Compile Include="DesignPanel.cs" />
<Compile Include="ModelTools.cs" />
<Compile Include="Extensions\CanvasChildResizeSupport.cs" />
<Compile Include="Extensions\PanelInstanceFactory.cs" />
<Compile Include="Extensions\PanelSelectionHandler.cs" />

14
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Xaml/XamlDesignItem.cs

@ -86,6 +86,20 @@ namespace ICSharpCode.WpfDesign.Designer.Xaml @@ -86,6 +86,20 @@ namespace ICSharpCode.WpfDesign.Designer.Xaml
}
}
public override DesignItemProperty ParentProperty {
get {
DesignItem parent = this.Parent;
if (parent == null)
return null;
XamlProperty prop = _xamlObject.ParentProperty;
if (prop.IsAttached) {
return parent.Properties.GetAttachedProperty(prop.PropertyTargetType, prop.PropertyName);
} else {
return parent.Properties.GetProperty(prop.PropertyName);
}
}
}
public override UIElement View {
get {
if (_view != null)

3
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/ModelTestHelper.cs → src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/ModelTestHelper.cs

@ -15,9 +15,10 @@ using System.Windows.Media; @@ -15,9 +15,10 @@ using System.Windows.Media;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using NUnit.Framework;
using ICSharpCode.WpfDesign.Designer;
using ICSharpCode.WpfDesign.Designer.Xaml;
namespace ICSharpCode.WpfDesign.Designer.Tests
namespace ICSharpCode.WpfDesign.Tests.Designer
{
/// <summary>
/// Base class for model tests.

3
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/ModelTests.cs → src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/ModelTests.cs

@ -13,10 +13,11 @@ using System.Diagnostics; @@ -13,10 +13,11 @@ using System.Diagnostics;
using System.Windows;
using System.Windows.Controls;
using NUnit.Framework;
using ICSharpCode.WpfDesign.Designer;
using ICSharpCode.WpfDesign.Designer.Xaml;
using ICSharpCode.WpfDesign.Designer.Services;
namespace ICSharpCode.WpfDesign.Designer.Tests
namespace ICSharpCode.WpfDesign.Tests.Designer
{
[TestFixture]
public class ModelTests : ModelTestHelper

23
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Designer.Tests.csproj → src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj

@ -4,8 +4,8 @@ @@ -4,8 +4,8 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<OutputType>Library</OutputType>
<RootNamespace>ICSharpCode.WpfDesign.Designer.Tests</RootNamespace>
<AssemblyName>ICSharpCode.WpfDesign.Designer.Tests</AssemblyName>
<RootNamespace>ICSharpCode.WpfDesign.Tests</RootNamespace>
<AssemblyName>ICSharpCode.WpfDesign.Tests</AssemblyName>
<OutputPath>..\..\..\..\..\..\bin\UnitTests\</OutputPath>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<NoStdLib>False</NoStdLib>
@ -49,11 +49,24 @@ @@ -49,11 +49,24 @@
<Link>GlobalAssemblyInfo.cs</Link>
</Compile>
<Compile Include="AssemblyInfo.cs" />
<Compile Include="ModelTestHelper.cs" />
<Compile Include="ModelTests.cs" />
<Compile Include="Designer\ModelTestHelper.cs" />
<Compile Include="Designer\ModelTests.cs" />
<Compile Include="XamlDom\ExampleClass.cs" />
<Compile Include="XamlDom\ExampleClassContainer.cs" />
<Compile Include="XamlDom\ExampleService.cs" />
<Compile Include="XamlDom\SamplesTests.cs" />
<Compile Include="XamlDom\SimpleLoadTests.cs" />
<Compile Include="XamlDom\SystemTypesLoadTest.cs" />
<Compile Include="XamlDom\TestHelper.cs" />
<Compile Include="XamlDom\WhitespaceTests.cs" />
<Compile Include="XamlDom\XamlTypeFinderTests.cs" />
<None Include="app.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj">
<Project>{88DA149F-21B2-48AB-82C4-28FB6BDFD783}</Project>
<Name>WpfDesign.XamlDom</Name>
</ProjectReference>
<ProjectReference Include="..\..\WpfDesign\Project\WpfDesign.csproj">
<Project>{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}</Project>
<Name>WpfDesign</Name>
@ -62,5 +75,7 @@ @@ -62,5 +75,7 @@
<Project>{78CC29AC-CC79-4355-B1F2-97936DF198AC}</Project>
<Name>WpfDesign.Designer</Name>
</ProjectReference>
<Folder Include="Designer" />
<Folder Include="XamlDom" />
</ItemGroup>
</Project>

2
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Tests/ExampleClass.cs → src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/ExampleClass.cs

@ -9,7 +9,7 @@ using System; @@ -9,7 +9,7 @@ using System;
using System.ComponentModel;
using System.Windows.Markup;
namespace ICSharpCode.WpfDesign.XamlDom.Tests
namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
[ContentProperty("StringProp")]
public class ExampleClass : ISupportInitialize

3
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Tests/ExampleClassContainer.cs → src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/ExampleClassContainer.cs

@ -7,10 +7,9 @@ @@ -7,10 +7,9 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Windows.Markup;
namespace ICSharpCode.WpfDesign.XamlDom.Tests
namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
[ContentProperty("List")]
public class ExampleClassContainer : ExampleClass

2
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Tests/ExampleService.cs → src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/ExampleService.cs

@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
using System;
using System.Windows;
namespace ICSharpCode.WpfDesign.XamlDom.Tests
namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
/// <summary>
/// Provides an example attached property.

2
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Tests/SamplesTests.cs → src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs

@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
using System;
using NUnit.Framework;
namespace ICSharpCode.WpfDesign.XamlDom.Tests
namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
[TestFixture]
public class SamplesTests : TestHelper

24
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Tests/SimpleLoadTests.cs → src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SimpleLoadTests.cs

@ -5,10 +5,10 @@ @@ -5,10 +5,10 @@
// <version>$Revision$</version>
// </file>
using NUnit.Framework;
using System;
using NUnit.Framework;
namespace ICSharpCode.WpfDesign.XamlDom.Tests
namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
[TestFixture]
public class SimpleLoadTests : TestHelper
@ -54,7 +54,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests @@ -54,7 +54,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:t=""clr-namespace:ICSharpCode.WpfDesign.XamlDom.Tests;assembly=ICSharpCode.WpfDesign.XamlDom.Tests""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
</t:ExampleClass>
");
@ -66,7 +66,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests @@ -66,7 +66,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:t=""clr-namespace:ICSharpCode.WpfDesign.XamlDom.Tests;assembly=ICSharpCode.WpfDesign.XamlDom.Tests""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
StringProp=""a test string"">
</t:ExampleClass>
@ -79,7 +79,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests @@ -79,7 +79,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:t=""clr-namespace:ICSharpCode.WpfDesign.XamlDom.Tests;assembly=ICSharpCode.WpfDesign.XamlDom.Tests""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
a test string
</t:ExampleClass>
@ -92,7 +92,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests @@ -92,7 +92,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:t=""clr-namespace:ICSharpCode.WpfDesign.XamlDom.Tests;assembly=ICSharpCode.WpfDesign.XamlDom.Tests""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
<t:ExampleClass.StringProp>
a test string
@ -107,7 +107,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests @@ -107,7 +107,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:t=""clr-namespace:ICSharpCode.WpfDesign.XamlDom.Tests;assembly=ICSharpCode.WpfDesign.XamlDom.Tests""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
a test string
<t:ExampleClass.OtherProp>
@ -123,7 +123,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests @@ -123,7 +123,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:t=""clr-namespace:ICSharpCode.WpfDesign.XamlDom.Tests;assembly=ICSharpCode.WpfDesign.XamlDom.Tests""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
<t:ExampleClass.OtherProp>
otherValue
@ -139,7 +139,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests @@ -139,7 +139,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:t=""clr-namespace:ICSharpCode.WpfDesign.XamlDom.Tests;assembly=ICSharpCode.WpfDesign.XamlDom.Tests""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
<t:ExampleClass.OtherProp>
otherValue
@ -157,7 +157,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests @@ -157,7 +157,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests
{
TestLoading(@"
<ExampleClassContainer
xmlns=""clr-namespace:ICSharpCode.WpfDesign.XamlDom.Tests;assembly=ICSharpCode.WpfDesign.XamlDom.Tests""
xmlns=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
<ExampleClassContainer.List>
<ExampleClass OtherProp=""a""> </ExampleClass>
@ -173,7 +173,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests @@ -173,7 +173,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests
{
TestLoading(@"
<ExampleClassContainer
xmlns=""clr-namespace:ICSharpCode.WpfDesign.XamlDom.Tests;assembly=ICSharpCode.WpfDesign.XamlDom.Tests""
xmlns=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
<ExampleClass OtherProp=""a"" />
<ExampleClass OtherProp=""b"" />
@ -187,7 +187,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests @@ -187,7 +187,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests
TestLoading(@"
<t:ExampleDependencyObject
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:t=""clr-namespace:ICSharpCode.WpfDesign.XamlDom.Tests;assembly=ICSharpCode.WpfDesign.XamlDom.Tests""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
t:ExampleService.Example=""attached value"">
</t:ExampleDependencyObject>

2
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Tests/SystemTypesLoadTest.cs → src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SystemTypesLoadTest.cs

@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
using System;
using NUnit.Framework;
namespace ICSharpCode.WpfDesign.XamlDom.Tests
namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
[TestFixture]
public class SystemTypesLoadTest : TestHelper

8
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Tests/TestHelper.cs → src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/TestHelper.cs

@ -6,15 +6,17 @@ @@ -6,15 +6,17 @@
// </file>
using System;
using System.Diagnostics;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Text;
using System.Windows.Markup;
using System.Xml;
using System.IO;
using ICSharpCode.WpfDesign.XamlDom;
using NUnit.Framework;
namespace ICSharpCode.WpfDesign.XamlDom.Tests
namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
public class TestHelper
{

16
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Tests/WhitespaceTests.cs → src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/WhitespaceTests.cs

@ -5,10 +5,10 @@ @@ -5,10 +5,10 @@
// <version>$Revision$</version>
// </file>
using NUnit.Framework;
using System;
using NUnit.Framework;
namespace ICSharpCode.WpfDesign.XamlDom.Tests
namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
[TestFixture]
public class WhitespaceTests : TestHelper
@ -19,7 +19,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests @@ -19,7 +19,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:t=""clr-namespace:ICSharpCode.WpfDesign.XamlDom.Tests;assembly=ICSharpCode.WpfDesign.XamlDom.Tests""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
a test string
@ -34,7 +34,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests @@ -34,7 +34,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:t=""clr-namespace:ICSharpCode.WpfDesign.XamlDom.Tests;assembly=ICSharpCode.WpfDesign.XamlDom.Tests""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
a test string
</t:ExampleClass>
@ -47,7 +47,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests @@ -47,7 +47,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:t=""clr-namespace:ICSharpCode.WpfDesign.XamlDom.Tests;assembly=ICSharpCode.WpfDesign.XamlDom.Tests""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
a test
string
@ -61,7 +61,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests @@ -61,7 +61,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:t=""clr-namespace:ICSharpCode.WpfDesign.XamlDom.Tests;assembly=ICSharpCode.WpfDesign.XamlDom.Tests""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"" xml:space=""preserve"">
a test string
@ -76,7 +76,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests @@ -76,7 +76,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:t=""clr-namespace:ICSharpCode.WpfDesign.XamlDom.Tests;assembly=ICSharpCode.WpfDesign.XamlDom.Tests""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"" xml:space=""preserve"">
a test string
</t:ExampleClass>
@ -89,7 +89,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests @@ -89,7 +89,7 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:t=""clr-namespace:ICSharpCode.WpfDesign.XamlDom.Tests;assembly=ICSharpCode.WpfDesign.XamlDom.Tests""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"" xml:space=""preserve"">
a test
string

13
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Tests/XamlTypeFinderTests.cs → src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/XamlTypeFinderTests.cs

@ -5,14 +5,15 @@ @@ -5,14 +5,15 @@
// <version>$Revision$</version>
// </file>
using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.Windows.Markup;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Markup;
namespace ICSharpCode.WpfDesign.XamlDom.Tests
using ICSharpCode.WpfDesign.XamlDom;
using NUnit.Framework;
namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
[TestFixture]
public class XamlTypeFinderTests : TestHelper
@ -53,11 +54,13 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests @@ -53,11 +54,13 @@ namespace ICSharpCode.WpfDesign.XamlDom.Tests
typeFinder.GetType(XamlConstants.XamlNamespace, "NullExtension"));
}
public const string XamlDomTestsNamespace = "clr-namespace:ICSharpCode.WpfDesign.Tests.XamlDom;assembly=ICSharpCode.WpfDesign.Tests";
[Test]
public void FindExampleClass()
{
Assert.AreEqual(typeof(ExampleClass),
typeFinder.GetType("clr-namespace:ICSharpCode.WpfDesign.XamlDom.Tests;assembly=ICSharpCode.WpfDesign.XamlDom.Tests",
typeFinder.GetType(XamlDomTestsNamespace,
"ExampleClass"));
}
}

15
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Tests/AssemblyInfo.cs

@ -1,15 +0,0 @@ @@ -1,15 +0,0 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// Information about this assembly is defined by the following
// attributes.
//
// change them to the information which is associated with the assembly
// you compile.
[assembly: AssemblyTitle("WpfDesign.XamlDom.Tests")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

76
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Tests/WpfDesign.XamlDom.Tests.csproj

@ -1,76 +0,0 @@ @@ -1,76 +0,0 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{BD62F5BC-115F-4339-8B5B-96C7A21DC67E}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<OutputType>Library</OutputType>
<RootNamespace>ICSharpCode.WpfDesign.XamlDom.Tests</RootNamespace>
<AssemblyName>ICSharpCode.WpfDesign.XamlDom.Tests</AssemblyName>
<OutputPath>..\..\..\..\..\..\bin\UnitTests\</OutputPath>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<NoStdLib>False</NoStdLib>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>Full</DebugType>
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<Optimize>False</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DebugSymbols>False</DebugSymbols>
<DebugType>None</DebugType>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
<RegisterForComInterop>False</RegisterForComInterop>
<GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
<BaseAddress>4194304</BaseAddress>
<PlatformTarget>AnyCPU</PlatformTarget>
<FileAlignment>4096</FileAlignment>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
<ItemGroup>
<Reference Include="nunit.framework">
<HintPath>..\..\..\..\..\Tools\NUnit\nunit.framework.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
<Private>True</Private>
</Reference>
<Reference Include="PresentationCore">
<Private>False</Private>
</Reference>
<Reference Include="PresentationFramework">
<Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase">
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\..\..\..\Main\GlobalAssemblyInfo.cs">
<Link>GlobalAssemblyInfo.cs</Link>
</Compile>
<Compile Include="AssemblyInfo.cs" />
<Compile Include="ExampleClass.cs" />
<Compile Include="ExampleClassContainer.cs" />
<Compile Include="ExampleService.cs" />
<Compile Include="SamplesTests.cs" />
<Compile Include="SimpleLoadTests.cs" />
<Compile Include="SystemTypesLoadTest.cs" />
<Compile Include="TestHelper.cs" />
<Compile Include="WhitespaceTests.cs" />
<Compile Include="XamlTypeFinderTests.cs" />
<None Include="app.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Project\WpfDesign.XamlDom.csproj">
<Project>{88DA149F-21B2-48AB-82C4-28FB6BDFD783}</Project>
<Name>WpfDesign.XamlDom</Name>
</ProjectReference>
</ItemGroup>
</Project>

15
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Tests/app.config

@ -1,15 +0,0 @@ @@ -1,15 +0,0 @@
<?xml version="1.0"?>
<configuration>
<configSections>
<sectionGroup name="NUnit">
<section name="TestRunner"
type="System.Configuration.NameValueSectionHandler" />
</sectionGroup>
</configSections>
<NUnit>
<TestRunner>
<!-- Valid values are STA,MTA. Others ignored. -->
<add key="ApartmentState" value="STA" />
</TestRunner>
</NUnit>
</configuration>

4
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.sln

@ -4,15 +4,13 @@ Microsoft Visual Studio Solution File, Format Version 9.00 @@ -4,15 +4,13 @@ Microsoft Visual Studio Solution File, Format Version 9.00
# SharpDevelop 2.1.0.2382
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom", "WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj", "{88DA149F-21B2-48AB-82C4-28FB6BDFD783}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom.Tests", "WpfDesign.XamlDom\Tests\WpfDesign.XamlDom.Tests.csproj", "{BD62F5BC-115F-4339-8B5B-96C7A21DC67E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Designer", "WpfDesign.Designer\Project\WpfDesign.Designer.csproj", "{78CC29AC-CC79-4355-B1F2-97936DF198AC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StandaloneDesigner", "StandaloneDesigner\StandaloneDesigner.csproj", "{84D65E9C-B66C-44C3-95FD-445EFE3ED322}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign", "WpfDesign\Project\WpfDesign.csproj", "{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Designer.Tests", "WpfDesign.Designer\Tests\WpfDesign.Designer.Tests.csproj", "{943DBBB3-E84E-4CF4-917C-C05AFA8743C1}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Tests", "WpfDesign.Designer\Tests\WpfDesign.Tests.csproj", "{943DBBB3-E84E-4CF4-917C-C05AFA8743C1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

7
src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/DesignItem.cs

@ -29,7 +29,7 @@ namespace ICSharpCode.WpfDesign @@ -29,7 +29,7 @@ namespace ICSharpCode.WpfDesign
/// <summary>
/// Gets the component type of this design site.
/// This value may be different from Component.GetType() if a CustomInstanceFactory created
/// an object using a different type.
/// an object using a different type (e.g. ComponentType=Window but Component.GetType()=WindowClone).
/// </summary>
public abstract Type ComponentType { get; }
@ -48,6 +48,11 @@ namespace ICSharpCode.WpfDesign @@ -48,6 +48,11 @@ namespace ICSharpCode.WpfDesign
/// </summary>
public abstract DesignItem Parent { get; }
/// <summary>
/// Gets the property where this DesignItem is used as a value.
/// </summary>
public abstract DesignItemProperty ParentProperty { get; }
/// <summary>
/// Gets properties set on the design item.
/// </summary>

14
src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/DesignItemProperty.cs

@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Windows;
namespace ICSharpCode.WpfDesign
@ -15,8 +16,9 @@ namespace ICSharpCode.WpfDesign @@ -15,8 +16,9 @@ namespace ICSharpCode.WpfDesign
/// <summary>
/// Represents a property of a DesignItem.
/// All changes done via the DesignItemProperty class are represented in the underlying model (e.g. XAML).
/// This also ensures that
/// Changes directly done to control instances might not be reflected in the model.
/// All such changes are recorded in the currently running designer transaction (<see cref="ChangeGroup"/>),
/// enabling Undo/Redo support.
/// Warning: Changes directly done to control instances might not be reflected in the model.
/// </summary>
public abstract class DesignItemProperty
{
@ -109,10 +111,14 @@ namespace ICSharpCode.WpfDesign @@ -109,10 +111,14 @@ namespace ICSharpCode.WpfDesign
}
/// <summary>
/// Gets the property with the specified name.
/// Gets the design item property representing the specified dependency property.
/// The property must not be an attached property.
/// </summary>
public DesignItemProperty this[DependencyProperty dependencyProperty] {
get { return GetProperty(dependencyProperty); }
get {
Debug.Assert(DependencyPropertyDescriptor.FromProperty(dependencyProperty, dependencyProperty.OwnerType).IsAttached == false);
return GetProperty(dependencyProperty);
}
}
/// <summary>

6
src/Libraries/ICSharpCode.TextEditor/Project/Src/Undo/UndoStack.cs

@ -79,12 +79,6 @@ namespace ICSharpCode.TextEditor.Undo @@ -79,12 +79,6 @@ namespace ICSharpCode.TextEditor.Undo
undostack.Push(new UndoQueue(undostack, actionCount));
}
[Obsolete("Use CombineLast(int x) instead!")]
public void UndoLast(int x)
{
CombineLast(x);
}
/// <summary>
/// Call this method to undo the last operation on the stack
/// </summary>

11
src/Main/Base/Project/Src/TextEditor/Gui/Editor/CompletionWindow/OverrideCompletionDataProvider.cs

@ -59,6 +59,14 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor @@ -59,6 +59,14 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
return properties.ToArray();
}
public override CompletionDataProviderKeyResult ProcessKey(char key)
{
if (key == '(')
return CompletionDataProviderKeyResult.NormalKey;
else
return base.ProcessKey(key);
}
public override ICompletionData[] GenerateCompletionData(string fileName, TextArea textArea, char charTyped)
{
ParseInformation parseInfo = ParserService.GetParseInformation(fileName);
@ -87,8 +95,9 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor @@ -87,8 +95,9 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
}
public OverrideCompletionData(IMethod method)
: base(GetName(method, ConversionFlags.None),
: base(GetName(method, ConversionFlags.ShowParameterList),
"override " + GetName(method, ConversionFlags.ShowReturnType
| ConversionFlags.ShowParameterList
| ConversionFlags.ShowAccessibility)
+ "\n\n" + method.Documentation,
ClassBrowserIconService.GetIcon(method))

24
src/SharpDevelop.Tests.sln

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
# SharpDevelop 2.1.0.2192
# SharpDevelop 2.1.0.2382
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
@ -10,7 +10,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WpfDesign", "WpfDesign", "{ @@ -10,7 +10,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WpfDesign", "WpfDesign", "{
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom.Tests", "AddIns\DisplayBindings\WpfDesign\WpfDesign.XamlDom\Tests\WpfDesign.XamlDom.Tests.csproj", "{BD62F5BC-115F-4339-8B5B-96C7A21DC67E}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign", "AddIns\DisplayBindings\WpfDesign\WpfDesign\Project\WpfDesign.csproj", "{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Designer", "AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Project\WpfDesign.Designer.csproj", "{78CC29AC-CC79-4355-B1F2-97936DF198AC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Tests", "AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Tests\WpfDesign.Tests.csproj", "{943DBBB3-E84E-4CF4-917C-C05AFA8743C1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom", "AddIns\DisplayBindings\WpfDesign\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj", "{88DA149F-21B2-48AB-82C4-28FB6BDFD783}"
EndProject
@ -296,6 +300,18 @@ Global @@ -296,6 +300,18 @@ Global
{E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Any CPU.Build.0 = Release|Any CPU
{E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{943DBBB3-E84E-4CF4-917C-C05AFA8743C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{943DBBB3-E84E-4CF4-917C-C05AFA8743C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{943DBBB3-E84E-4CF4-917C-C05AFA8743C1}.Release|Any CPU.Build.0 = Release|Any CPU
{943DBBB3-E84E-4CF4-917C-C05AFA8743C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{78CC29AC-CC79-4355-B1F2-97936DF198AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{78CC29AC-CC79-4355-B1F2-97936DF198AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{78CC29AC-CC79-4355-B1F2-97936DF198AC}.Release|Any CPU.Build.0 = Release|Any CPU
{78CC29AC-CC79-4355-B1F2-97936DF198AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}.Release|Any CPU.Build.0 = Release|Any CPU
{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}.Release|Any CPU.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -321,7 +337,9 @@ Global @@ -321,7 +337,9 @@ Global
{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
{C12B6EA7-2EFC-4368-B585-EC69EFCC3F97} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
{88DA149F-21B2-48AB-82C4-28FB6BDFD783} = {C12B6EA7-2EFC-4368-B585-EC69EFCC3F97}
{BD62F5BC-115F-4339-8B5B-96C7A21DC67E} = {C12B6EA7-2EFC-4368-B585-EC69EFCC3F97}
{943DBBB3-E84E-4CF4-917C-C05AFA8743C1} = {C12B6EA7-2EFC-4368-B585-EC69EFCC3F97}
{78CC29AC-CC79-4355-B1F2-97936DF198AC} = {C12B6EA7-2EFC-4368-B585-EC69EFCC3F97}
{66A378A1-E9F4-4AD5-8946-D0EC06C2902F} = {C12B6EA7-2EFC-4368-B585-EC69EFCC3F97}
{B08385CD-F0CC-488C-B4F4-EEB34B6D2688} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D}
{1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D}
{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D}

Loading…
Cancel
Save