diff --git a/samples/BindingTest/App.xaml b/samples/BindingTest/App.xaml index ce82a95bd6..b416385619 100644 --- a/samples/BindingTest/App.xaml +++ b/samples/BindingTest/App.xaml @@ -1,6 +1,6 @@  - - + + \ No newline at end of file diff --git a/samples/BindingTest/BindingTest.csproj b/samples/BindingTest/BindingTest.csproj index 02a7e0e728..406c5b1cfb 100644 --- a/samples/BindingTest/BindingTest.csproj +++ b/samples/BindingTest/BindingTest.csproj @@ -74,29 +74,29 @@ - + Designer - - App.paml + + App.xaml - - MainWindow.paml + + MainWindow.xaml - - TestItemView.paml + + TestItemView.xaml - + Designer - + diff --git a/samples/ControlCatalog/App.xaml b/samples/ControlCatalog/App.xaml index 439c61688f..d01ab6f126 100644 --- a/samples/ControlCatalog/App.xaml +++ b/samples/ControlCatalog/App.xaml @@ -1,7 +1,7 @@  - - + + - + \ No newline at end of file diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj index dcadaaab40..be2b312204 100644 --- a/samples/ControlCatalog/ControlCatalog.csproj +++ b/samples/ControlCatalog/ControlCatalog.csproj @@ -54,64 +54,64 @@ - - App.paml + + App.xaml - - MainWindow.paml + + MainWindow.xaml - - CheckBoxPage.paml + + CheckBoxPage.xaml - - BorderPage.paml + + BorderPage.xaml - - CarouselPage.paml + + CarouselPage.xaml - - CanvasPage.paml + + CanvasPage.xaml - - ButtonPage.paml + + ButtonPage.xaml - - DropDownPage.paml + + DropDownPage.xaml - - SliderPage.paml + + SliderPage.xaml - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer - + - + Designer - + Designer diff --git a/samples/TestApplicationShared/App.cs b/samples/TestApplicationShared/App.cs index f8f8996dcb..e4211ffb82 100644 --- a/samples/TestApplicationShared/App.cs +++ b/samples/TestApplicationShared/App.cs @@ -21,7 +21,7 @@ namespace TestApplication var loader = new PerspexXamlLoader(); var baseLight = (IStyle)loader.Load( - new Uri("resm:Perspex.Themes.Default.Accents.BaseLight.paml?assembly=Perspex.Themes.Default")); + new Uri("resm:Perspex.Themes.Default.Accents.BaseLight.xaml?assembly=Perspex.Themes.Default")); Styles.Add(baseLight); Styles.Add(new SampleTabStyle()); diff --git a/samples/XamlTestApplicationPcl/XamlTestApp.xaml b/samples/XamlTestApplicationPcl/XamlTestApp.xaml index af67591349..c13fac8538 100644 --- a/samples/XamlTestApplicationPcl/XamlTestApp.xaml +++ b/samples/XamlTestApplicationPcl/XamlTestApp.xaml @@ -2,7 +2,7 @@ xmlns="https://github.com/perspex" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> - - + + \ No newline at end of file diff --git a/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj b/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj index c7fb0e8484..f027c763e8 100644 --- a/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj +++ b/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj @@ -35,7 +35,7 @@ - + Designer @@ -141,7 +141,7 @@ - + Designer diff --git a/src/Markup/Perspex.Markup.Xaml/PerspexXamlLoader.cs b/src/Markup/Perspex.Markup.Xaml/PerspexXamlLoader.cs index 51d9be0e24..a3221b3f74 100644 --- a/src/Markup/Perspex.Markup.Xaml/PerspexXamlLoader.cs +++ b/src/Markup/Perspex.Markup.Xaml/PerspexXamlLoader.cs @@ -66,7 +66,7 @@ namespace Perspex.Markup.Xaml Contract.Requires(type != null); // HACK: Currently Visual Studio is forcing us to change the extension of xaml files - // in certain situations, so we try to load .xaml and if that's not found we try .paml. + // in certain situations, so we try to load .xaml and if that's not found we try .xaml. // Ideally we'd be able to use .xaml everywhere var assetLocator = PerspexLocator.Current.GetService(); @@ -156,7 +156,7 @@ namespace Perspex.Markup.Xaml var asm = type.GetTypeInfo().Assembly.GetName().Name; var typeName = type.FullName; yield return new Uri("resm:" + typeName + ".xaml?assembly=" + asm); - yield return new Uri("resm:" + typeName + ".paml?assembly=" + asm); + yield return new Uri("resm:" + typeName + ".xaml?assembly=" + asm); } diff --git a/src/Perspex.Application/Designer/DesignerAssist.cs b/src/Perspex.Application/Designer/DesignerAssist.cs index 8ebd04e3f0..98a1bcbe8f 100644 --- a/src/Perspex.Application/Designer/DesignerAssist.cs +++ b/src/Perspex.Application/Designer/DesignerAssist.cs @@ -28,7 +28,7 @@ namespace Perspex.DesignerSupport var loader = new PerspexXamlLoader(); var baseLight = (IStyle)loader.Load( - new Uri("resm:Perspex.Themes.Default.Accents.BaseLight.paml?assembly=Perspex.Themes.Default")); + new Uri("resm:Perspex.Themes.Default.Accents.BaseLight.xaml?assembly=Perspex.Themes.Default")); Styles.Add(baseLight); } } diff --git a/src/Perspex.Diagnostics/Perspex.Diagnostics.csproj b/src/Perspex.Diagnostics/Perspex.Diagnostics.csproj index be4cdaccac..0eadadd30e 100644 --- a/src/Perspex.Diagnostics/Perspex.Diagnostics.csproj +++ b/src/Perspex.Diagnostics/Perspex.Diagnostics.csproj @@ -105,11 +105,11 @@ - - TreePageView.paml + + TreePageView.xaml - - DevTools.paml + + DevTools.xaml @@ -134,10 +134,10 @@ - + Designer - + Designer diff --git a/src/Perspex.Themes.Default/DefaultTheme.xaml b/src/Perspex.Themes.Default/DefaultTheme.xaml index 78f80308ea..b25c85bbd1 100644 --- a/src/Perspex.Themes.Default/DefaultTheme.xaml +++ b/src/Perspex.Themes.Default/DefaultTheme.xaml @@ -1,34 +1,34 @@  - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + diff --git a/src/Perspex.Themes.Default/Perspex.Themes.Default.csproj b/src/Perspex.Themes.Default/Perspex.Themes.Default.csproj index 171a3a17c1..e954fd0419 100644 --- a/src/Perspex.Themes.Default/Perspex.Themes.Default.csproj +++ b/src/Perspex.Themes.Default/Perspex.Themes.Default.csproj @@ -80,8 +80,8 @@ Properties\SharedAssemblyInfo.cs - - DefaultTheme.paml + + DefaultTheme.xaml @@ -100,103 +100,103 @@ - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer - - + + Designer - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer - + Designer diff --git a/tests/Perspex.UnitTests/TestServices.cs b/tests/Perspex.UnitTests/TestServices.cs index 81d76d0af3..7ad4b4b69d 100644 --- a/tests/Perspex.UnitTests/TestServices.cs +++ b/tests/Perspex.UnitTests/TestServices.cs @@ -117,7 +117,7 @@ namespace Perspex.UnitTests var loader = new PerspexXamlLoader(); var baseLight = (IStyle)loader.Load( - new Uri("resm:Perspex.Themes.Default.Accents.BaseLight.paml?assembly=Perspex.Themes.Default")); + new Uri("resm:Perspex.Themes.Default.Accents.BaseLight.xaml?assembly=Perspex.Themes.Default")); result.Add(baseLight); return result;