Browse Source

Perspex.Xaml -> Perspex.Markup.Xaml.

pull/83/head
Steven Kirk 11 years ago
parent
commit
097d87926b
  1. 2
      Perspex.sln
  2. 2
      samples/XamlTestApplication/Views/MainWindow.cs
  3. 2
      samples/XamlTestApplication/XamlTestApplication.csproj
  4. 2
      src/Markup/Perspex.Markup.Xaml/Context/PerspexObjectAssembler.cs
  5. 4
      src/Markup/Perspex.Markup.Xaml/Context/PerspexParserFactory.cs
  6. 2
      src/Markup/Perspex.Markup.Xaml/Context/PerspexTypeRepository.cs
  7. 2
      src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs
  8. 2
      src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMember.cs
  9. 2
      src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMemberValuePlugin.cs
  10. 2
      src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlType.cs
  11. 2
      src/Markup/Perspex.Markup.Xaml/Converters/BitmapConverter.cs
  12. 2
      src/Markup/Perspex.Markup.Xaml/Converters/BrushConverter.cs
  13. 2
      src/Markup/Perspex.Markup.Xaml/Converters/GridLengthTypeConverter.cs
  14. 2
      src/Markup/Perspex.Markup.Xaml/Converters/ThicknessConverter.cs
  15. 2
      src/Markup/Perspex.Markup.Xaml/DataBinding/ChangeTracking/ObservablePropertyBranch.cs
  16. 2
      src/Markup/Perspex.Markup.Xaml/DataBinding/ChangeTracking/PropertyMountPoint.cs
  17. 2
      src/Markup/Perspex.Markup.Xaml/DataBinding/ChangeTracking/PropertyPath.cs
  18. 2
      src/Markup/Perspex.Markup.Xaml/DataBinding/ChangeTracking/TargettedProperty.cs
  19. 2
      src/Markup/Perspex.Markup.Xaml/DataBinding/DataContextChangeSynchronizer.cs
  20. 2
      src/Markup/Perspex.Markup.Xaml/DataBinding/IPerspexPropertyBinder.cs
  21. 2
      src/Markup/Perspex.Markup.Xaml/DataBinding/PerspexPropertyBinder.cs
  22. 2
      src/Markup/Perspex.Markup.Xaml/DataBinding/SourceBindingEndpoint.cs
  23. 2
      src/Markup/Perspex.Markup.Xaml/DataBinding/TargetBindingEndpoint.cs
  24. 2
      src/Markup/Perspex.Markup.Xaml/DataBinding/XamlBinding.cs
  25. 2
      src/Markup/Perspex.Markup.Xaml/DataBinding/XamlBindingDefinition.cs
  26. 2
      src/Markup/Perspex.Markup.Xaml/MarkupExtensions/BindingExtension.cs
  27. 2
      src/Markup/Perspex.Markup.Xaml/MarkupExtensions/TypeExtension.cs
  28. 4
      src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
  29. 4
      src/Markup/Perspex.Markup.Xaml/PerspexXamlLoader.cs
  30. 2
      src/Markup/Perspex.Markup.Xaml/Properties/AssemblyInfo.cs
  31. 2
      src/Markup/Perspex.Markup.Xaml/Templates/Template.cs
  32. 2
      src/Markup/Perspex.Markup.Xaml/Templates/TemplateContent.cs
  33. 2
      src/Markup/Perspex.Markup.Xaml/Templates/TemplateLoader.cs
  34. 2
      src/Markup/Perspex.Markup.Xaml/Templates/XamlDataTemplate.cs
  35. 0
      src/Markup/Perspex.Markup.Xaml/app.config
  36. 0
      src/Markup/Perspex.Markup.Xaml/packages.config

2
Perspex.sln

@ -57,7 +57,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Input.UnitTests", "
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Direct2D1.UnitTests", "tests\Perspex.Direct2D1.UnitTests\Perspex.Direct2D1.UnitTests.csproj", "{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Xaml", "src\Markup\Perspex.Xaml\Perspex.Xaml.csproj", "{3E53A01A-B331-47F3-B828-4A5717E77A24}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Markup.Xaml", "src\Markup\Perspex.Markup.Xaml\Perspex.Markup.Xaml.csproj", "{3E53A01A-B331-47F3-B828-4A5717E77A24}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlTestApplication", "samples\XamlTestApplication\XamlTestApplication.csproj", "{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}"
EndProject

2
samples/XamlTestApplication/Views/MainWindow.cs

@ -8,7 +8,7 @@
using OmniXaml;
using Perspex.Controls;
using Perspex.Diagnostics;
using Perspex.Xaml;
using Perspex.Markup.Xaml;
public class MainWindow : Window
{

2
samples/XamlTestApplication/XamlTestApplication.csproj

@ -177,7 +177,7 @@
<Project>{3e10a5fa-e8da-48b1-ad44-6a5b6cb7750f}</Project>
<Name>Perspex.Themes.Default</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\Markup\Perspex.Xaml\Perspex.Xaml.csproj">
<ProjectReference Include="..\..\src\Markup\Perspex.Markup.Xaml\Perspex.Markup.Xaml.csproj">
<Project>{3e53a01a-b331-47f3-b828-4a5717e77a24}</Project>
<Name>Perspex.Xaml</Name>
</ProjectReference>

2
src/Markup/Perspex.Xaml/Context/PerspexObjectAssembler.cs → src/Markup/Perspex.Markup.Xaml/Context/PerspexObjectAssembler.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.Context
namespace Perspex.Markup.Xaml.Context
{
using System;
using OmniXaml;

4
src/Markup/Perspex.Xaml/Context/PerspexParserFactory.cs → src/Markup/Perspex.Markup.Xaml/Context/PerspexParserFactory.cs

@ -1,10 +1,10 @@
namespace Perspex.Xaml.Context
namespace Perspex.Markup.Xaml.Context
{
using OmniXaml;
using OmniXaml.ObjectAssembler;
using OmniXaml.Parsers.ProtoParser;
using OmniXaml.Parsers.XamlNodes;
using Perspex.Xaml.Context;
using Perspex.Markup.Xaml.Context;
public class PerspexParserFactory : IXamlParserFactory
{

2
src/Markup/Perspex.Xaml/Context/PerspexTypeRepository.cs → src/Markup/Perspex.Markup.Xaml/Context/PerspexTypeRepository.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.Context
namespace Perspex.Markup.Xaml.Context
{
using System;
using DataBinding;

2
src/Markup/Perspex.Xaml/Context/PerspexWiringContext.cs → src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.Context
namespace Perspex.Markup.Xaml.Context
{
using System.Collections.Generic;
using System.Collections.ObjectModel;

2
src/Markup/Perspex.Xaml/Context/PerspexXamlMember.cs → src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMember.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.Context
namespace Perspex.Markup.Xaml.Context
{
using DataBinding;
using OmniXaml;

2
src/Markup/Perspex.Xaml/Context/PerspexXamlMemberValuePlugin.cs → src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMemberValuePlugin.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.Context
namespace Perspex.Markup.Xaml.Context
{
using System;
using System.Reactive.Linq;

2
src/Markup/Perspex.Xaml/Context/PerspexXamlType.cs → src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlType.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.Context
namespace Perspex.Markup.Xaml.Context
{
using System;
using DataBinding;

2
src/Markup/Perspex.Xaml/Converters/BitmapConverter.cs → src/Markup/Perspex.Markup.Xaml/Converters/BitmapConverter.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.Converters
namespace Perspex.Markup.Xaml.Converters
{
using System;
using System.Globalization;

2
src/Markup/Perspex.Xaml/Converters/BrushConverter.cs → src/Markup/Perspex.Markup.Xaml/Converters/BrushConverter.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.Converters
namespace Perspex.Markup.Xaml.Converters
{
using System;
using System.Globalization;

2
src/Markup/Perspex.Xaml/Converters/GridLengthTypeConverter.cs → src/Markup/Perspex.Markup.Xaml/Converters/GridLengthTypeConverter.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.Converters
namespace Perspex.Markup.Xaml.Converters
{
using System;
using System.Globalization;

2
src/Markup/Perspex.Xaml/Converters/ThicknessConverter.cs → src/Markup/Perspex.Markup.Xaml/Converters/ThicknessConverter.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.Converters
namespace Perspex.Markup.Xaml.Converters
{
using System;
using System.Collections.Generic;

2
src/Markup/Perspex.Xaml/DataBinding/ChangeTracking/ObservablePropertyBranch.cs → src/Markup/Perspex.Markup.Xaml/DataBinding/ChangeTracking/ObservablePropertyBranch.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.DataBinding.ChangeTracking
namespace Perspex.Markup.Xaml.DataBinding.ChangeTracking
{
using System;
using System.Collections.Generic;

2
src/Markup/Perspex.Xaml/DataBinding/ChangeTracking/PropertyMountPoint.cs → src/Markup/Perspex.Markup.Xaml/DataBinding/ChangeTracking/PropertyMountPoint.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.DataBinding.ChangeTracking
namespace Perspex.Markup.Xaml.DataBinding.ChangeTracking
{
using System;
using System.Reflection;

2
src/Markup/Perspex.Xaml/DataBinding/ChangeTracking/PropertyPath.cs → src/Markup/Perspex.Markup.Xaml/DataBinding/ChangeTracking/PropertyPath.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.DataBinding.ChangeTracking
namespace Perspex.Markup.Xaml.DataBinding.ChangeTracking
{
public class PropertyPath
{

2
src/Markup/Perspex.Xaml/DataBinding/ChangeTracking/TargettedProperty.cs → src/Markup/Perspex.Markup.Xaml/DataBinding/ChangeTracking/TargettedProperty.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.DataBinding.ChangeTracking
namespace Perspex.Markup.Xaml.DataBinding.ChangeTracking
{
using System;
using System.Reflection;

2
src/Markup/Perspex.Xaml/DataBinding/DataContextChangeSynchronizer.cs → src/Markup/Perspex.Markup.Xaml/DataBinding/DataContextChangeSynchronizer.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.DataBinding
namespace Perspex.Markup.Xaml.DataBinding
{
using System;
using System.Diagnostics;

2
src/Markup/Perspex.Xaml/DataBinding/IPerspexPropertyBinder.cs → src/Markup/Perspex.Markup.Xaml/DataBinding/IPerspexPropertyBinder.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.DataBinding
namespace Perspex.Markup.Xaml.DataBinding
{
using System.Collections.Generic;

2
src/Markup/Perspex.Xaml/DataBinding/PerspexPropertyBinder.cs → src/Markup/Perspex.Markup.Xaml/DataBinding/PerspexPropertyBinder.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.DataBinding
namespace Perspex.Markup.Xaml.DataBinding
{
using System;
using System.Collections.Generic;

2
src/Markup/Perspex.Xaml/DataBinding/SourceBindingEndpoint.cs → src/Markup/Perspex.Markup.Xaml/DataBinding/SourceBindingEndpoint.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.DataBinding
namespace Perspex.Markup.Xaml.DataBinding
{
using System;
using System.ComponentModel;

2
src/Markup/Perspex.Xaml/DataBinding/TargetBindingEndpoint.cs → src/Markup/Perspex.Markup.Xaml/DataBinding/TargetBindingEndpoint.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.DataBinding
namespace Perspex.Markup.Xaml.DataBinding
{
public class TargetBindingEndpoint
{

2
src/Markup/Perspex.Xaml/DataBinding/XamlBinding.cs → src/Markup/Perspex.Markup.Xaml/DataBinding/XamlBinding.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.DataBinding
namespace Perspex.Markup.Xaml.DataBinding
{
using System;
using System.Diagnostics;

2
src/Markup/Perspex.Xaml/DataBinding/XamlBindingDefinition.cs → src/Markup/Perspex.Markup.Xaml/DataBinding/XamlBindingDefinition.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.DataBinding
namespace Perspex.Markup.Xaml.DataBinding
{
using ChangeTracking;
using Controls;

2
src/Markup/Perspex.Xaml/MarkupExtensions/BindingExtension.cs → src/Markup/Perspex.Markup.Xaml/MarkupExtensions/BindingExtension.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.MarkupExtensions
namespace Perspex.Markup.Xaml.MarkupExtensions
{
using System.Linq;
using Controls;

2
src/Markup/Perspex.Xaml/MarkupExtensions/TypeExtension.cs → src/Markup/Perspex.Markup.Xaml/MarkupExtensions/TypeExtension.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.MarkupExtensions
namespace Perspex.Markup.Xaml.MarkupExtensions
{
using System;
using Glass;

4
src/Markup/Perspex.Xaml/Perspex.Xaml.csproj → src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj

@ -8,8 +8,8 @@
<ProjectGuid>{3E53A01A-B331-47F3-B828-4A5717E77A24}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Perspex.Xaml</RootNamespace>
<AssemblyName>Perspex.Xaml</AssemblyName>
<RootNamespace>Perspex.Markup.Xaml</RootNamespace>
<AssemblyName>Perspex.Markup.Xaml</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

4
src/Markup/Perspex.Xaml/PerspexXamlLoader.cs → src/Markup/Perspex.Markup.Xaml/PerspexXamlLoader.cs

@ -4,12 +4,12 @@
// </copyright>
// -----------------------------------------------------------------------
namespace Perspex.Xaml
namespace Perspex.Markup.Xaml
{
using System;
using System.Reflection;
using OmniXaml;
using Perspex.Xaml.Context;
using Perspex.Markup.Xaml.Context;
using Platform;
using Splat;

2
src/Markup/Perspex.Xaml/Properties/AssemblyInfo.cs → src/Markup/Perspex.Markup.Xaml/Properties/AssemblyInfo.cs

@ -6,4 +6,4 @@
using System.Reflection;
[assembly: AssemblyTitle("Perspex.Xaml")]
[assembly: AssemblyTitle("Perspex.Markup.Xaml")]

2
src/Markup/Perspex.Xaml/Templates/Template.cs → src/Markup/Perspex.Markup.Xaml/Templates/Template.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.Templates
namespace Perspex.Markup.Xaml.Templates
{
public class Template
{

2
src/Markup/Perspex.Xaml/Templates/TemplateContent.cs → src/Markup/Perspex.Markup.Xaml/Templates/TemplateContent.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.Templates
namespace Perspex.Markup.Xaml.Templates
{
using System.Collections.Generic;
using Context;

2
src/Markup/Perspex.Xaml/Templates/TemplateLoader.cs → src/Markup/Perspex.Markup.Xaml/Templates/TemplateLoader.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.Templates
namespace Perspex.Markup.Xaml.Templates
{
using System.Collections.Generic;
using OmniXaml;

2
src/Markup/Perspex.Xaml/Templates/XamlDataTemplate.cs → src/Markup/Perspex.Markup.Xaml/Templates/XamlDataTemplate.cs

@ -1,4 +1,4 @@
namespace Perspex.Xaml.Templates
namespace Perspex.Markup.Xaml.Templates
{
using System;
using Controls.Templates;

0
src/Markup/Perspex.Xaml/app.config → src/Markup/Perspex.Markup.Xaml/app.config

0
src/Markup/Perspex.Xaml/packages.config → src/Markup/Perspex.Markup.Xaml/packages.config

Loading…
Cancel
Save