pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

WpfDesigner tests: Change WPF namespace from winfx/2006/xaml/presentation to netfx/2007/xaml/presentation 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2626 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 18 years ago
parent
374929cef6
commit
65c82c0ab6
5 changed files with 29 additions and 29 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. 4
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/ModelTestHelper.cs
  2. 12
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs
  3. 22
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SimpleLoadTests.cs
  4. 16
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/WhitespaceTests.cs
  5. 4
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlConstants.cs

4
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/ModelTestHelper.cs
Unescape View File

@ -43,7 +43,7 @@ namespace ICSharpCode.WpfDesign.Tests.Designer @@ -43,7 +43,7 @@ namespace ICSharpCode.WpfDesign.Tests.Designer
protected DesignItem CreateCanvasContext(string xaml)
{
XamlDesignContext context = CreateContext(@"<Canvas
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
" + xaml + "</Canvas>");
Canvas canvas = (Canvas)context.RootItem.Component;
@ -57,7 +57,7 @@ namespace ICSharpCode.WpfDesign.Tests.Designer @@ -57,7 +57,7 @@ namespace ICSharpCode.WpfDesign.Tests.Designer
{
expectedXaml =
"<?xml version=\"1.0\" encoding=\"utf-16\"?>\n" +
("<Canvas xmlns=\"http://schemas.microsoft.com/winfx/2006/xaml/presentation\" " +
("<Canvas xmlns=\"http://schemas.microsoft.com/netfx/2007/xaml/presentation\" " +
"xmlns:x=\"http://schemas.microsoft.com/winfx/2006/xaml\">\n" + expectedXaml.Trim())
.Replace("\r", "").Replace("\n", "\n ")
+ "\n</Canvas>";

12
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs
Unescape View File

@ -21,11 +21,11 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom @@ -21,11 +21,11 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
TestLoading(@"
<Page
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
>
<StackPanel
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
<TextBlock>
Hello, World!
@ -43,7 +43,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom @@ -43,7 +43,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
TestLoading(@"
<!--<SnippetSimpleLayout>-->
<StackPanel
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
<Button HorizontalAlignment=""Left""
Width=""100""
@ -66,10 +66,10 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom @@ -66,10 +66,10 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
TestLoading(@"
<Page
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
<DockPanel
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
<TextBlock Background=""LightBlue""
DockPanel.Dock=""Top"">Some Text</TextBlock>
@ -103,7 +103,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom @@ -103,7 +103,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
TestLoading(@"
<Page
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
<StackPanel Background=""LightBlue"">
<TextBlock Margin=""10,10,10,10"">Start Page</TextBlock>

22
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SimpleLoadTests.cs
Unescape View File

@ -18,7 +18,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom @@ -18,7 +18,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
TestLoading(@"
<Window
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
</Window>
");
@ -29,7 +29,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom @@ -29,7 +29,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
TestLoading(@"
<Window
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
Width=""300"" Height=""400"">
</Window>
@ -41,7 +41,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom @@ -41,7 +41,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
TestLoading(@"
<Window
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
<Window.Height>100</Window.Height>
</Window>
@ -53,7 +53,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom @@ -53,7 +53,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
</t:ExampleClass>
@ -65,7 +65,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom @@ -65,7 +65,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
StringProp=""a test string"">
@ -78,7 +78,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom @@ -78,7 +78,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
a test string
@ -91,7 +91,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom @@ -91,7 +91,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
<t:ExampleClass.StringProp>
@ -106,7 +106,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom @@ -106,7 +106,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
a test string
@ -122,7 +122,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom @@ -122,7 +122,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
<t:ExampleClass.OtherProp>
@ -138,7 +138,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom @@ -138,7 +138,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
<t:ExampleClass.OtherProp>
@ -186,7 +186,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom @@ -186,7 +186,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
TestLoading(@"
<t:ExampleDependencyObject
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
t:ExampleService.Example=""attached value"">

16
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/WhitespaceTests.cs
Unescape View File

@ -18,7 +18,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom @@ -18,7 +18,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
@ -33,7 +33,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom @@ -33,7 +33,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
a test string
@ -46,7 +46,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom @@ -46,7 +46,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
a test
@ -60,7 +60,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom @@ -60,7 +60,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"" xml:space=""preserve"">
@ -75,7 +75,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom @@ -75,7 +75,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"" xml:space=""preserve"">
a test string
@ -88,7 +88,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom @@ -88,7 +88,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"" xml:space=""preserve"">
a test
@ -102,7 +102,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom @@ -102,7 +102,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
{
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"" xml:space=""preserve""> <![CDATA[
This is text inside the CData section.
@ -119,7 +119,7 @@ And that was an empty line. @@ -119,7 +119,7 @@ And that was an empty line.
{
TestLoading(@"
<t:ExampleClass
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns=""http://schemas.microsoft.com/netfx/2007/xaml/presentation""
xmlns:t=""" + XamlTypeFinderTests.XamlDomTestsNamespace + @"""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
some text

4
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlConstants.cs
Unescape View File

@ -28,8 +28,8 @@ namespace ICSharpCode.WpfDesign.XamlDom @@ -28,8 +28,8 @@ namespace ICSharpCode.WpfDesign.XamlDom
/// <summary>
/// The namespace used for the WPF schema.
/// Value: "http://schemas.microsoft.com/winfx/2006/xaml/presentation"
/// Value: "http://schemas.microsoft.com/netfx/2007/xaml/presentation"
/// </summary>
public const string PresentationNamespace = "http://schemas.microsoft.com/winfx/2006/xaml/presentation";
public const string PresentationNamespace = "http://schemas.microsoft.com/netfx/2007/xaml/presentation";
}
}

Write Preview
Loading…
Cancel
Save