From a07a1edac2e35837ec65bbebbec1e08f09a11b7f Mon Sep 17 00:00:00 2001 From: Bret Johnson Date: Sun, 4 Apr 2021 03:24:47 -0400 Subject: [PATCH] Rename System.StandardUI -> Microsoft.StandardUI --- samples/GraphicsControls | 1 + samples/Microcharts/ChartEntry.cs | 2 +- samples/Microcharts/Charts/BarChart.cs | 10 +- samples/Microcharts/Charts/Chart.cs | 10 +- samples/Microcharts/Charts/LineChart.cs | 4 +- samples/Microcharts/Charts/PointChart.cs | 8 +- samples/Microcharts/Charts/RadarChart.cs | 10 +- .../Extensions/CanvasExtensions.cs | 12 +- samples/SimpleControls/RadialGauge.cs | 10 +- .../Controls/ProgressBar/ProgressBar.cs | 144 ++++++++++++++++++ samples/TemplateUI/TemplateUI.csproj | 11 ++ samples/WpfSamplesHost/MainWindow.xaml.cs | 8 +- src/StandardUI.CodeGenerator/Context.cs | 6 +- src/StandardUI.CodeGenerator/Interface.cs | 10 +- src/StandardUI.CodeGenerator/OutputType.cs | 31 ++-- .../SkiaVisual.cs | 2 +- .../SkiaVisualEnvironment.cs | 2 +- .../SkiaVisualizer.cs | 8 +- .../WpfNativeVisual.cs | 2 +- .../WpfNativeVisualEnvironment.cs | 2 +- .../WpfNativeVisualizer.cs | 15 +- src/StandardUI.WPF/Canvas.nongenerated.cs | 19 ++- src/StandardUI.WPF/ColorWpf.cs | 6 +- .../Controls/ControlTemplateWpf.cs | 10 +- .../Controls/UIElementCollection.cs | 23 ++- .../Converters/BrushTypeConverter.cs | 6 +- .../Converters/ColorTypeConverter.cs | 4 +- .../Converters/GeometryTypeConverter.cs | 2 +- .../Converters/PointTypeConverter.cs | 4 +- .../Converters/PointsTypeConverter.cs | 4 +- .../Converters/SizeTypeConverter.cs | 4 +- .../Converters/TypeConverterBase.cs | 2 +- src/StandardUI.WPF/PointWpf.cs | 4 +- src/StandardUI.WPF/PointsWpf.cs | 4 +- src/StandardUI.WPF/PropertyUtils.cs | 6 +- src/StandardUI.WPF/RectExtensions.cs | 2 +- src/StandardUI.WPF/SizeExtensions.cs | 6 +- src/StandardUI.WPF/SizeWpf.cs | 4 +- src/StandardUI.WPF/StandardUIControlWpf.cs | 20 +-- .../StandardUIDependencyObject.cs | 2 +- src/StandardUI.WPF/StandardUIFactory.cs | 17 ++- .../StandardUIFrameworkElement.cs | 3 +- .../StandardUIFrameworkElementHelper.cs | 4 +- .../StandardUIUserControlWpf.cs | 7 +- src/StandardUI.WPF/Text/FontWeightWpf.cs | 4 +- src/StandardUI.WPF/UIProperty.cs | 2 +- .../WpfStandardUIEnvironment.cs | 4 +- .../generated/Controls/Border.cs | 22 +-- .../generated/Controls/Canvas.cs | 16 +- .../generated/Controls/CanvasAttached.cs | 12 +- .../generated/Controls/ControlTemplate.cs | 4 +- src/StandardUI.WPF/generated/Controls/Grid.cs | 4 +- .../generated/Controls/Panel.cs | 8 +- .../generated/Controls/StackPanel.cs | 4 +- .../generated/Controls/TextBlock.cs | 24 +-- .../generated/Media/ArcSegment.cs | 14 +- .../generated/Media/BezierSegment.cs | 10 +- src/StandardUI.WPF/generated/Media/Brush.cs | 6 +- .../generated/Media/Geometry.cs | 10 +- .../generated/Media/GradientBrush.cs | 10 +- .../generated/Media/GradientStop.cs | 8 +- .../generated/Media/LineSegment.cs | 6 +- .../generated/Media/LinearGradientBrush.cs | 8 +- .../generated/Media/PathFigure.cs | 12 +- .../generated/Media/PathGeometry.cs | 8 +- .../generated/Media/PathSegment.cs | 4 +- .../generated/Media/PolyBezierSegment.cs | 6 +- .../generated/Media/PolyLineSegment.cs | 6 +- .../Media/PolyQuadraticBezierSegment.cs | 6 +- .../generated/Media/QuadraticBezierSegment.cs | 8 +- .../generated/Media/RadialGradientBrush.cs | 10 +- .../generated/Media/RotateTransform.cs | 10 +- .../generated/Media/ScaleTransform.cs | 12 +- .../generated/Media/SolidColorBrush.cs | 6 +- .../generated/Media/Transform.cs | 4 +- .../generated/Media/TransformGroup.cs | 6 +- .../generated/Media/TranslateTransform.cs | 8 +- src/StandardUI.WPF/generated/PropertyPath.cs | 6 +- src/StandardUI.WPF/generated/Setter.cs | 10 +- .../generated/SetterCollection.cs | 4 +- .../generated/Shapes/Ellipse.cs | 4 +- src/StandardUI.WPF/generated/Shapes/Line.cs | 12 +- src/StandardUI.WPF/generated/Shapes/Path.cs | 10 +- .../generated/Shapes/Polygon.cs | 12 +- .../generated/Shapes/Polyline.cs | 12 +- .../generated/Shapes/Rectangle.cs | 8 +- src/StandardUI.WPF/generated/Shapes/Shape.cs | 20 +-- .../generated/TargetPropertyPath.cs | 8 +- .../generated/UIPropertyChangedEventArgs.cs | 4 +- .../generated/UIPropertyMetadata.cs | 4 +- .../generated/UIPropertyObject.cs | 4 +- src/StandardUI.WPF/generated/VisualState.cs | 8 +- .../generated/VisualStateCollection.cs | 4 +- .../generated/VisualStateGroup.cs | 10 +- .../generated/VisualStateGroupCollection.cs | 4 +- .../generated/VisualStateManager.cs | 4 +- src/StandardUI/Color.cs | 2 +- src/StandardUI/Colors.cs | 2 +- src/StandardUI/Controls/BackgroundSizing.cs | 2 +- .../Controls/CanvasAttachedExtensions.cs | 2 +- src/StandardUI/Controls/CanvasExtensions.cs | 2 +- .../Controls/CanvasImplExtensions.cs | 2 +- src/StandardUI/Controls/IBorder.cs | 4 +- src/StandardUI/Controls/ICanvas.cs | 2 +- src/StandardUI/Controls/ICanvasAttached.cs | 2 +- src/StandardUI/Controls/IControl.cs | 2 +- src/StandardUI/Controls/IControlTemplate.cs | 2 +- src/StandardUI/Controls/IGrid.cs | 2 +- src/StandardUI/Controls/IPanel.cs | 2 +- src/StandardUI/Controls/IStackPanel.cs | 2 +- .../Controls/IStandardUICollection.cs | 2 +- .../IStandardUIControlEnvironmentPeer.cs | 2 +- src/StandardUI/Controls/ITextBlock.cs | 6 +- .../Controls/IUIElementCollection.cs | 2 +- src/StandardUI/Controls/IUserControl.cs | 2 +- src/StandardUI/Controls/StandardUIControl.cs | 5 +- .../Controls/StandardUIUserControl.cs | 2 +- src/StandardUI/Converters/ColorConverter.cs | 2 +- src/StandardUI/Converters/PointConverter.cs | 2 +- src/StandardUI/Converters/PointsConverter.cs | 2 +- src/StandardUI/Converters/SizeConverter.cs | 2 +- src/StandardUI/Converters/TokenizerHelper.cs | 2 +- src/StandardUI/CornerRadius.cs | 2 +- src/StandardUI/DefaultValueAttribute.cs | 2 +- src/StandardUI/FactoryStatics.cs | 9 +- .../IDependencyObjectEnvironmentPeer.cs | 2 +- .../INotifyObjectOrSubobjectChanged.cs | 2 +- src/StandardUI/IPropertyPath.cs | 2 +- src/StandardUI/ISetter.cs | 2 +- src/StandardUI/ISetterCollection.cs | 2 +- src/StandardUI/IStandardUIEnvironment.cs | 2 +- src/StandardUI/IStandardUIFactory.cs | 11 +- src/StandardUI/ITargetPropertyPath.cs | 2 +- src/StandardUI/IUIElement.cs | 2 +- src/StandardUI/IUIProperty.cs | 2 +- src/StandardUI/IUIPropertyChangedEventArgs.cs | 2 +- src/StandardUI/IUIPropertyMetadata.cs | 2 +- src/StandardUI/IUIPropertyObject.cs | 2 +- src/StandardUI/IVisualState.cs | 2 +- src/StandardUI/IVisualStateCollection.cs | 2 +- src/StandardUI/IVisualStateGroup.cs | 2 +- src/StandardUI/IVisualStateGroupCollection.cs | 2 +- src/StandardUI/IVisualStateManager.cs | 2 +- src/StandardUI/Media/BrushMappingMode.cs | 2 +- src/StandardUI/Media/FillRule.cs | 2 +- src/StandardUI/Media/GradientSpreadMethod.cs | 2 +- src/StandardUI/Media/IArcSegment.cs | 2 +- src/StandardUI/Media/IBezierSegment.cs | 2 +- src/StandardUI/Media/IBrush.cs | 2 +- src/StandardUI/Media/IGeometry.cs | 2 +- src/StandardUI/Media/IGradientBrush.cs | 2 +- src/StandardUI/Media/IGradientStop.cs | 2 +- src/StandardUI/Media/ILineSegment.cs | 2 +- src/StandardUI/Media/ILinearGradientBrush.cs | 2 +- src/StandardUI/Media/IPathFigure.cs | 2 +- src/StandardUI/Media/IPathGeometry.cs | 2 +- src/StandardUI/Media/IPathSegment.cs | 2 +- src/StandardUI/Media/IPolyBezierSegment.cs | 2 +- src/StandardUI/Media/IPolyLineSegment.cs | 2 +- .../Media/IPolyQuadraticBezierSegment.cs | 2 +- .../Media/IQuadraticBezierSegment.cs | 2 +- src/StandardUI/Media/IRadialGradientBrush.cs | 2 +- src/StandardUI/Media/IRotateTransform.cs | 2 +- src/StandardUI/Media/IScaleTransform.cs | 2 +- src/StandardUI/Media/ISolidColorBrush.cs | 2 +- src/StandardUI/Media/ITransform.cs | 2 +- src/StandardUI/Media/ITransformGroup.cs | 2 +- src/StandardUI/Media/ITranslateTransform.cs | 2 +- src/StandardUI/Media/PenLineCap.cs | 2 +- src/StandardUI/Media/PenLineJoin.cs | 2 +- src/StandardUI/Media/SweepDirection.cs | 2 +- src/StandardUI/Point.cs | 2 +- src/StandardUI/Points.cs | 2 +- src/StandardUI/Rect.cs | 4 +- src/StandardUI/Shapes/IEllipse.cs | 2 +- src/StandardUI/Shapes/ILine.cs | 2 +- src/StandardUI/Shapes/IPath.cs | 4 +- src/StandardUI/Shapes/IPolygon.cs | 4 +- src/StandardUI/Shapes/IPolyline.cs | 4 +- src/StandardUI/Shapes/IRectangle.cs | 2 +- src/StandardUI/Shapes/IShape.cs | 4 +- src/StandardUI/Size.cs | 2 +- src/StandardUI/StandardUICollection.cs | 2 +- src/StandardUI/StandardUIEnvironment.cs | 4 +- src/StandardUI/Text/FontStyle.cs | 2 +- src/StandardUI/Text/FontWeight.cs | 2 +- src/StandardUI/Text/FontWeights.cs | 2 +- src/StandardUI/TextAlignment.cs | 2 +- src/StandardUI/Thickness.cs | 2 +- src/StandardUI/UIModelObjectAttribute.cs | 2 +- src/StandardUI/UIPropertyChangedCallback.cs | 2 +- .../UnintializedStandardUIEnvironment.cs | 4 +- .../UnintializedStandardUIFactory.cs | 8 +- src/StandardUI/Visual/IVisual.cs | 2 +- src/StandardUI/Visual/IVisualEnvironment.cs | 2 +- src/StandardUI/Visual/IVisualHostControl.cs | 2 +- src/StandardUI/Visual/IVisualizer.cs | 6 +- .../generated/Controls/BorderExtensions.cs | 4 +- .../generated/Controls/TextBlockExtensions.cs | 6 +- .../generated/Media/ArcSegmentExtensions.cs | 2 +- .../Media/BezierSegmentExtensions.cs | 2 +- .../generated/Media/GeometryExtensions.cs | 2 +- .../Media/GradientBrushExtensions.cs | 2 +- .../generated/Media/GradientStopExtensions.cs | 2 +- .../generated/Media/LineSegmentExtensions.cs | 2 +- .../Media/LinearGradientBrushExtensions.cs | 2 +- .../generated/Media/PathFigureExtensions.cs | 2 +- .../generated/Media/PathGeometryExtensions.cs | 2 +- .../Media/PolyBezierSegmentExtensions.cs | 2 +- .../Media/PolyLineSegmentExtensions.cs | 2 +- .../PolyQuadraticBezierSegmentExtensions.cs | 2 +- .../Media/QuadraticBezierSegmentExtensions.cs | 2 +- .../Media/RadialGradientBrushExtensions.cs | 2 +- .../Media/RotateTransformExtensions.cs | 2 +- .../Media/ScaleTransformExtensions.cs | 2 +- .../Media/SolidColorBrushExtensions.cs | 2 +- .../Media/TranslateTransformExtensions.cs | 2 +- src/StandardUI/generated/SetterExtensions.cs | 2 +- .../generated/Shapes/LineExtensions.cs | 2 +- .../generated/Shapes/PathExtensions.cs | 4 +- .../generated/Shapes/PolygonExtensions.cs | 4 +- .../generated/Shapes/PolylineExtensions.cs | 4 +- .../generated/Shapes/RectangleExtensions.cs | 2 +- .../generated/Shapes/ShapeExtensions.cs | 4 +- .../generated/TargetPropertyPathExtensions.cs | 2 +- .../generated/UIElementExtensions.cs | 2 +- 226 files changed, 695 insertions(+), 529 deletions(-) create mode 160000 samples/GraphicsControls create mode 100644 samples/TemplateUI/Controls/ProgressBar/ProgressBar.cs create mode 100644 samples/TemplateUI/TemplateUI.csproj diff --git a/samples/GraphicsControls b/samples/GraphicsControls new file mode 160000 index 0000000..66397d2 --- /dev/null +++ b/samples/GraphicsControls @@ -0,0 +1 @@ +Subproject commit 66397d2b2fa4222433beb4cb1ffba9a53b01936c diff --git a/samples/Microcharts/ChartEntry.cs b/samples/Microcharts/ChartEntry.cs index d4a7377..792a75f 100755 --- a/samples/Microcharts/ChartEntry.cs +++ b/samples/Microcharts/ChartEntry.cs @@ -3,7 +3,7 @@ namespace Microcharts { - using System.StandardUI; + using Microsoft.StandardUI; /// /// A data entry for a chart. diff --git a/samples/Microcharts/Charts/BarChart.cs b/samples/Microcharts/Charts/BarChart.cs index 7243a21..18239b0 100755 --- a/samples/Microcharts/Charts/BarChart.cs +++ b/samples/Microcharts/Charts/BarChart.cs @@ -3,11 +3,11 @@ using System; using System.Linq; -using System.StandardUI; -using System.StandardUI.Controls; -using System.StandardUI.Media; -using System.StandardUI.Shapes; -using static System.StandardUI.FactoryStatics; +using Microsoft.StandardUI; +using Microsoft.StandardUI.Controls; +using Microsoft.StandardUI.Media; +using Microsoft.StandardUI.Shapes; +using static Microsoft.StandardUI.FactoryStatics; namespace Microcharts { diff --git a/samples/Microcharts/Charts/Chart.cs b/samples/Microcharts/Charts/Chart.cs index 704b1c7..1877639 100755 --- a/samples/Microcharts/Charts/Chart.cs +++ b/samples/Microcharts/Charts/Chart.cs @@ -9,12 +9,12 @@ using System.Linq; using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Tasks; -using System.StandardUI; -using System.StandardUI.Controls; +using Microsoft.StandardUI; +using Microsoft.StandardUI.Controls; using SkiaSharp; -using static System.StandardUI.FactoryStatics; -using System.StandardUI.Shapes; -using System.StandardUI.Media; +using static Microsoft.StandardUI.FactoryStatics; +using Microsoft.StandardUI.Shapes; +using Microsoft.StandardUI.Media; namespace Microcharts { diff --git a/samples/Microcharts/Charts/LineChart.cs b/samples/Microcharts/Charts/LineChart.cs index c6a6c11..9359358 100755 --- a/samples/Microcharts/Charts/LineChart.cs +++ b/samples/Microcharts/Charts/LineChart.cs @@ -4,8 +4,8 @@ #if LATER using System.Linq; -using System.StandardUI; -using System.StandardUI.Controls; +using Microsoft.StandardUI; +using Microsoft.StandardUI.Controls; using SkiaSharp; namespace Microcharts diff --git a/samples/Microcharts/Charts/PointChart.cs b/samples/Microcharts/Charts/PointChart.cs index bb002fc..98b83d5 100755 --- a/samples/Microcharts/Charts/PointChart.cs +++ b/samples/Microcharts/Charts/PointChart.cs @@ -5,12 +5,12 @@ using System; using System.Collections.Generic; using System.Globalization; using System.Linq; -using System.StandardUI; -using System.StandardUI.Controls; -using static System.StandardUI.FactoryStatics; +using Microsoft.StandardUI; +using Microsoft.StandardUI.Controls; +using static Microsoft.StandardUI.FactoryStatics; using SkiaSharp; using SkiaSharp.HarfBuzz; -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; namespace Microcharts { diff --git a/samples/Microcharts/Charts/RadarChart.cs b/samples/Microcharts/Charts/RadarChart.cs index fcb2635..a32fc9c 100644 --- a/samples/Microcharts/Charts/RadarChart.cs +++ b/samples/Microcharts/Charts/RadarChart.cs @@ -3,12 +3,12 @@ using System; using System.Linq; -using System.StandardUI; -using System.StandardUI.Controls; -using System.StandardUI.Shapes; -using static System.StandardUI.FactoryStatics; +using Microsoft.StandardUI; +using Microsoft.StandardUI.Controls; +using Microsoft.StandardUI.Shapes; +using static Microsoft.StandardUI.FactoryStatics; using SkiaSharp; -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; namespace Microcharts { diff --git a/samples/Microcharts/Extensions/CanvasExtensions.cs b/samples/Microcharts/Extensions/CanvasExtensions.cs index 8783cce..649f611 100755 --- a/samples/Microcharts/Extensions/CanvasExtensions.cs +++ b/samples/Microcharts/Extensions/CanvasExtensions.cs @@ -1,14 +1,14 @@ // Copyright (c) Aloïs DENIEL. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. -using System.StandardUI; -using System.StandardUI.Controls; -using System.StandardUI.Media; -using System.StandardUI.Shapes; -using System.StandardUI.Text; +using Microsoft.StandardUI; +using Microsoft.StandardUI.Controls; +using Microsoft.StandardUI.Media; +using Microsoft.StandardUI.Shapes; +using Microsoft.StandardUI.Text; using SkiaSharp; using SkiaSharp.HarfBuzz; -using static System.StandardUI.FactoryStatics; +using static Microsoft.StandardUI.FactoryStatics; namespace Microcharts { diff --git a/samples/SimpleControls/RadialGauge.cs b/samples/SimpleControls/RadialGauge.cs index 471a12e..9b085b9 100755 --- a/samples/SimpleControls/RadialGauge.cs +++ b/samples/SimpleControls/RadialGauge.cs @@ -1,8 +1,8 @@ -using System.StandardUI; -using System.StandardUI.Controls; -using System.StandardUI.Media; -using System.StandardUI.Shapes; -using static System.StandardUI.FactoryStatics; +using Microsoft.StandardUI; +using Microsoft.StandardUI.Controls; +using Microsoft.StandardUI.Media; +using Microsoft.StandardUI.Shapes; +using static Microsoft.StandardUI.FactoryStatics; namespace SimpleControls { diff --git a/samples/TemplateUI/Controls/ProgressBar/ProgressBar.cs b/samples/TemplateUI/Controls/ProgressBar/ProgressBar.cs new file mode 100644 index 0000000..8a4127c --- /dev/null +++ b/samples/TemplateUI/Controls/ProgressBar/ProgressBar.cs @@ -0,0 +1,144 @@ +using Microsoft.StandardUI; +using Microsoft.StandardUI.Controls; +using Microsoft.StandardUI.Media; +using static Microsoft.StandardUI.FactoryStatics; + +namespace TemplateStandardUI.Controls +{ + // TODO: Add Indeterminate State + public class ProgressBar : StandardUIControl + { + const string ElementBackground = "PART_Background"; + const string ElementProgress = "PART_Progress"; + const string ElementText = "PART_Text"; + + IBorder _background; + IBorder _progress; + ITextBlock _text; + + public ProgressBar() + { + + } + + public static readonly IUIProperty ProgressProperty = + RegisterUIProperty(nameof(Progress), typeof(double), typeof(ProgressBar), UIPropertyMetdata(0.0d, OnValueChanged)); + + public double Progress + { + get => (double)GetValue(ProgressProperty); + set { SetValue(ProgressProperty, value); } + } + + static void OnValueChanged(IUIPropertyObject bindable, IUIPropertyChangedEventArgs e) + { + (bindable as ProgressBar)?.UpdateProgress(); + } + + public static readonly IUIProperty BackgroundColorProperty = + RegisterUIProperty(nameof(BackgroundColor), typeof(Color), typeof(ProgressBar), UIPropertyMetdata(Color.Default)); + + public Color BackgroundColor + { + get => (Color)GetValue(BackgroundColorProperty); + set { SetValue(BackgroundColorProperty, value); } + } + + public static readonly IUIProperty ProgressColorProperty = + RegisterUIProperty(nameof(ProgressColor), typeof(Color), typeof(ProgressBar), UIPropertyMetdata(Color.Default)); + + public Color ProgressColor + { + get => (Color)GetValue(ProgressColorProperty); + set { SetValue(ProgressColorProperty, value); } + } + + public static readonly IUIProperty BorderColorProperty = + RegisterUIProperty(nameof(BorderColor), typeof(Color), typeof(ProgressBar), UIPropertyMetdata(Color.Default)); + + public Color BorderColor + { + get => (Color)GetValue(BorderColorProperty); + set { SetValue(BorderColorProperty, value); } + } + + public static readonly IUIProperty TextProperty = + RegisterUIProperty(nameof(Text), typeof(string), typeof(ProgressBar), UIPropertyMetdata(string.Empty)); + + public string Text + { + get => (string)GetValue(TextProperty); + set { SetValue(TextProperty, value); } + } + + public static readonly IUIProperty TextColorProperty = + RegisterUIProperty(nameof(TextColor), typeof(Color), typeof(ProgressBar), UIPropertyMetdata(Color.Default)); + + public Color TextColor + { + get => (Color)GetValue(TextColorProperty); + set { SetValue(TextColorProperty, value); } + } + + public static readonly IUIProperty CornerRadiusProperty = + RegisterUIProperty(nameof(CornerRadius), typeof(double), typeof(ProgressBar), UIPropertyMetdata(0.0d)); + + public double CornerRadius + { + get => (double)GetValue(CornerRadiusProperty); + set { SetValue(CornerRadiusProperty, value); } + } + + internal static readonly IUIProperty PercentagePropertyKey = + RegisterUIProperty(nameof(Percentage), typeof(double), typeof(ProgressBar), UIPropertyMetdata(0.0d)); + + public static readonly IUIProperty PercentageProperty = PercentagePropertyKey.IDependencyProperty; + + public double Percentage + { + get => (double)GetValue(PercentageProperty); + private set + { + SetValue(PercentagePropertyKey, value); + } + } + + protected override void OnApplyTemplate() + { + base.OnApplyTemplate(); + + _background = GetTemplateChild(ElementBackground) as IBorder; + _progress = GetTemplateChild(ElementProgress) as IBorder; + _text = GetTemplateChild(ElementText) as IText; + } + + protected override void OnSizeAllocated(double width, double height) + { + base.OnSizeAllocated(width, height); + + UpdateProgress(); + } + + void UpdateProgress() + { + var percentage = _progress.Width = Math.Floor(_background.Width * Progress); + + var textTranslationX = percentage / 2 - _text.ActualX / 2; + + if (textTranslationX <= 0) + { + textTranslationX = _background.ActualWidth / 2 - _text.ActualX; + _text.Foreground = SolidColorBrush().Color(TextColor); + } + else + { + textTranslationX = percentage / 2 - _text.ActualX; + _text.Foreground = SolidColorBrush().Color(BackgroundColor); + } + + _text.TranslationX = textTranslationX; + + Percentage = Math.Round(Progress * 100, 1); + } + } +} \ No newline at end of file diff --git a/samples/TemplateUI/TemplateUI.csproj b/samples/TemplateUI/TemplateUI.csproj new file mode 100644 index 0000000..7b6c9e2 --- /dev/null +++ b/samples/TemplateUI/TemplateUI.csproj @@ -0,0 +1,11 @@ + + + + netstandard2.0 + + + + + + + diff --git a/samples/WpfSamplesHost/MainWindow.xaml.cs b/samples/WpfSamplesHost/MainWindow.xaml.cs index 38c18e3..e8528b3 100755 --- a/samples/WpfSamplesHost/MainWindow.xaml.cs +++ b/samples/WpfSamplesHost/MainWindow.xaml.cs @@ -1,8 +1,8 @@ using Microcharts; -using System.StandardUI; -using System.StandardUI.SkiaVisualizer; -using System.StandardUI.VisualEnvironment.WpfNative; -using System.StandardUI.Wpf; +using Microsoft.StandardUI; +using Microsoft.StandardUI.SkiaVisualizer; +using Microsoft.StandardUI.VisualEnvironment.WpfNative; +using Microsoft.StandardUI.Wpf; using SimpleControls; using System.Windows; using System.Windows.Controls; diff --git a/src/StandardUI.CodeGenerator/Context.cs b/src/StandardUI.CodeGenerator/Context.cs index dbbad99..3fd779a 100755 --- a/src/StandardUI.CodeGenerator/Context.cs +++ b/src/StandardUI.CodeGenerator/Context.cs @@ -9,7 +9,7 @@ namespace StandardUI.CodeGenerator { public class Context { - public const string RootNamespace = "System.StandardUI"; + public const string RootNamespace = "Microsoft.StandardUI"; public int IndentSize { get; } = 4; public Workspace Workspace { get; } @@ -29,8 +29,8 @@ namespace StandardUI.CodeGenerator QualifiedNameSyntax destinationNamespace = OutputType.RootNamespace; - // Map e.g. System.StandardUI.Media source namespace => System.StandardUI.WPF.Media destination namespace - // If the source namespace is just System.StandardUI, don't change anything here + // Map e.g. Microsoft.StandardUI.Media source namespace => Microsoft.StandardUI.WPF.Media destination namespace + // If the source namespace is just Microsoft.StandardUI, don't change anything here if (childNamespaceName != null) destinationNamespace = QualifiedName(destinationNamespace, IdentifierName(childNamespaceName)); diff --git a/src/StandardUI.CodeGenerator/Interface.cs b/src/StandardUI.CodeGenerator/Interface.cs index 2dca33a..7bc7bd9 100755 --- a/src/StandardUI.CodeGenerator/Interface.cs +++ b/src/StandardUI.CodeGenerator/Interface.cs @@ -8,7 +8,7 @@ namespace StandardUI.CodeGenerator public class Interface { public static int IndentSize = 4; - public const string RootNamespace = "System.StandardUI"; + public const string RootNamespace = "Microsoft.StandardUI"; private readonly NameSyntax _sourceNamespaceName; private readonly CompilationUnitSyntax _sourceCompilationUnit; @@ -94,7 +94,7 @@ namespace StandardUI.CodeGenerator "protected override int VisualChildrenCount => _uiElementCollection.Count;"); mainClassNonstaticMethods.AddBlankLine(); mainClassNonstaticMethods.AddLine( - "protected override Windows.Media.Visual GetVisualChild(int index) => (Windows.Media.Visual) _uiElementCollection[index];"); + "protected override System.Windows.Media.Visual GetVisualChild(int index) => (System.Windows.Media.Visual) _uiElementCollection[index];"); } // If there are any attached properties, add the property descriptors and accessors for them @@ -305,14 +305,14 @@ namespace StandardUI.CodeGenerator NameSyntax sourceUsingName = sourceUsing.Name; AddUsing(usingNames, sourceUsingName); - if (sourceUsingName.ToString().StartsWith("System.StandardUI.")) + if (sourceUsingName.ToString().StartsWith("Microsoft.StandardUI.")) AddUsing(usingNames, Context.ToDestinationNamespaceName(sourceUsingName)); } AddUsing(usingNames, _sourceNamespaceName); - IEnumerable outputTypeUsings = OutputType.GetUsings(hasPropertyDescriptors, DestinationTypeHasTypeConverterAttribute()); - foreach (QualifiedNameSyntax outputTypeUsing in outputTypeUsings) + IEnumerable outputTypeUsings = OutputType.GetUsings(hasPropertyDescriptors, DestinationTypeHasTypeConverterAttribute()); + foreach (NameSyntax outputTypeUsing in outputTypeUsings) AddUsing(usingNames, outputTypeUsing); foreach (var member in Declaration.Members) diff --git a/src/StandardUI.CodeGenerator/OutputType.cs b/src/StandardUI.CodeGenerator/OutputType.cs index 4a4e694..ac13906 100755 --- a/src/StandardUI.CodeGenerator/OutputType.cs +++ b/src/StandardUI.CodeGenerator/OutputType.cs @@ -8,13 +8,13 @@ namespace StandardUI.CodeGenerator { public abstract class OutputType { - public static QualifiedNameSyntax SystemStandardUI = QualifiedName(IdentifierName("System"), IdentifierName("StandardUI")); + public static QualifiedNameSyntax MicrosoftStandardUI = QualifiedName(IdentifierName("Microsoft"), IdentifierName("StandardUI")); public abstract string ProjectBaseDirectory { get; } public abstract QualifiedNameSyntax RootNamespace { get; } public abstract TypeSyntax DestinationTypeForUIElementAttachedTarget { get; } public abstract string? DefaultBaseClassName { get; } - public abstract IEnumerable GetUsings(bool hasPropertyDescriptors, bool hasTypeConverterAttribute); + public abstract IEnumerable GetUsings(bool hasPropertyDescriptors, bool hasTypeConverterAttribute); public abstract bool EmitChangedNotifications { get; } } @@ -30,17 +30,18 @@ namespace StandardUI.CodeGenerator public class WpfXamlOutputType : XamlOutputType { public static readonly WpfXamlOutputType Instance = new WpfXamlOutputType(); + public static QualifiedNameSyntax SystemWindows = QualifiedName(IdentifierName("System"), IdentifierName("Windows")); public override string ProjectBaseDirectory => "StandardUI.Wpf"; - public override QualifiedNameSyntax RootNamespace => QualifiedName(SystemStandardUI, IdentifierName("Wpf")); - public override string DependencyPropertyClassName => "Windows.DependencyProperty"; - public override TypeSyntax DestinationTypeForUIElementAttachedTarget => QualifiedName(IdentifierName("Windows"), IdentifierName("UIElement")); + public override QualifiedNameSyntax RootNamespace => QualifiedName(MicrosoftStandardUI, IdentifierName("Wpf")); + public override string DependencyPropertyClassName => "System.Windows.DependencyProperty"; + public override TypeSyntax DestinationTypeForUIElementAttachedTarget => QualifiedName(SystemWindows, IdentifierName("UIElement")); public override string? DefaultBaseClassName => "StandardUIDependencyObject"; public override string WrapperSuffix => "Wpf"; - public override IEnumerable GetUsings(bool hasPropertyDescriptors, bool hasTypeConverterAttribute) + public override IEnumerable GetUsings(bool hasPropertyDescriptors, bool hasTypeConverterAttribute) { - var usings = new List(); + var usings = new List(); #if NOT_NEEDED if (hasPropertyDescriptors) @@ -64,12 +65,12 @@ namespace StandardUI.CodeGenerator public static readonly UwpXamlOutputType Instance = new UwpXamlOutputType(); public override string ProjectBaseDirectory => "StandardUI.UWP"; - public override QualifiedNameSyntax RootNamespace => QualifiedName(SystemStandardUI, IdentifierName("UWP")); + public override QualifiedNameSyntax RootNamespace => QualifiedName(MicrosoftStandardUI, IdentifierName("UWP")); public override string DependencyPropertyClassName => "DependencyProperty"; public override TypeSyntax DestinationTypeForUIElementAttachedTarget => IdentifierName("UIElement"); public override string? DefaultBaseClassName => "StandardUIDependencyObject"; public override string WrapperSuffix => "Uwp"; - public override IEnumerable GetUsings(bool hasPropertyDescriptors, bool hasTypeConverterAttribute) + public override IEnumerable GetUsings(bool hasPropertyDescriptors, bool hasTypeConverterAttribute) { throw new NotImplementedException(); } @@ -80,15 +81,15 @@ namespace StandardUI.CodeGenerator public static readonly XamarinFormsXamlOutputType Instance = new XamarinFormsXamlOutputType(); public override string ProjectBaseDirectory => Path.Combine("XamarinForms", "StandardUI.XamarinForms"); - public override QualifiedNameSyntax RootNamespace => QualifiedName(SystemStandardUI, IdentifierName("XamarinForms")); + public override QualifiedNameSyntax RootNamespace => QualifiedName(MicrosoftStandardUI, IdentifierName("XamarinForms")); public override string DependencyPropertyClassName => "BindableProperty"; public override TypeSyntax DestinationTypeForUIElementAttachedTarget => IdentifierName("VisualElement"); public override string? DefaultBaseClassName => "BindableObject"; public override string WrapperSuffix => "Forms"; - public override IEnumerable GetUsings(bool hasPropertyDescriptors, bool hasTypeConverterAttribute) + public override IEnumerable GetUsings(bool hasPropertyDescriptors, bool hasTypeConverterAttribute) { - var usings = new List(); + var usings = new List(); usings.Add(QualifiedName(IdentifierName("Xamarin"), IdentifierName("Forms"))); return usings; } @@ -99,13 +100,13 @@ namespace StandardUI.CodeGenerator public static readonly StandardModelOutputType Instance = new StandardModelOutputType(); public override string ProjectBaseDirectory => Path.Combine("StandardUI", "StandardModel"); - public override QualifiedNameSyntax RootNamespace => QualifiedName(SystemStandardUI, IdentifierName("StandardModel")); + public override QualifiedNameSyntax RootNamespace => QualifiedName(MicrosoftStandardUI, IdentifierName("StandardModel")); public override TypeSyntax DestinationTypeForUIElementAttachedTarget => IdentifierName("ObjectWithCascadingNotifications"); public override string? DefaultBaseClassName => "ObjectWithCascadingNotifications"; - public override IEnumerable GetUsings(bool hasPropertyDescriptors, bool hasTypeConverterAttribute) + public override IEnumerable GetUsings(bool hasPropertyDescriptors, bool hasTypeConverterAttribute) { - return new List(); + return new List(); } public override bool EmitChangedNotifications => false; diff --git a/src/StandardUI.VisualEnvironment.Skia/SkiaVisual.cs b/src/StandardUI.VisualEnvironment.Skia/SkiaVisual.cs index 940bd62..7e1e974 100755 --- a/src/StandardUI.VisualEnvironment.Skia/SkiaVisual.cs +++ b/src/StandardUI.VisualEnvironment.Skia/SkiaVisual.cs @@ -1,6 +1,6 @@ using SkiaSharp; -namespace System.StandardUI.SkiaVisualizer +namespace Microsoft.StandardUI.SkiaVisualizer { public class SkiaVisual : IVisual { diff --git a/src/StandardUI.VisualEnvironment.Skia/SkiaVisualEnvironment.cs b/src/StandardUI.VisualEnvironment.Skia/SkiaVisualEnvironment.cs index 923d3f6..980fa84 100755 --- a/src/StandardUI.VisualEnvironment.Skia/SkiaVisualEnvironment.cs +++ b/src/StandardUI.VisualEnvironment.Skia/SkiaVisualEnvironment.cs @@ -1,7 +1,7 @@ using SkiaSharp; using System; -namespace System.StandardUI.SkiaVisualizer +namespace Microsoft.StandardUI.SkiaVisualizer { public class SkiaVisualEnvironment : IVisualEnvironment { diff --git a/src/StandardUI.VisualEnvironment.Skia/SkiaVisualizer.cs b/src/StandardUI.VisualEnvironment.Skia/SkiaVisualizer.cs index be2c335..ca92a96 100755 --- a/src/StandardUI.VisualEnvironment.Skia/SkiaVisualizer.cs +++ b/src/StandardUI.VisualEnvironment.Skia/SkiaVisualizer.cs @@ -1,11 +1,11 @@ -using System.StandardUI.Media; -using System.StandardUI.Shapes; +using Microsoft.StandardUI.Media; +using Microsoft.StandardUI.Shapes; using SkiaSharp; using System; using System.Collections.Generic; -using System.StandardUI.Controls; +using Microsoft.StandardUI.Controls; -namespace System.StandardUI.SkiaVisualizer +namespace Microsoft.StandardUI.SkiaVisualizer { public class SkiaVisualizer : IVisualizer { diff --git a/src/StandardUI.VisualEnvironment.WpfNative/WpfNativeVisual.cs b/src/StandardUI.VisualEnvironment.WpfNative/WpfNativeVisual.cs index 3e785bb..07791b3 100755 --- a/src/StandardUI.VisualEnvironment.WpfNative/WpfNativeVisual.cs +++ b/src/StandardUI.VisualEnvironment.WpfNative/WpfNativeVisual.cs @@ -1,6 +1,6 @@ using System.Windows.Media; -namespace System.StandardUI.SkiaVisualizer +namespace Microsoft.StandardUI.SkiaVisualizer { public class WpfNativeVisual : IVisual { diff --git a/src/StandardUI.VisualEnvironment.WpfNative/WpfNativeVisualEnvironment.cs b/src/StandardUI.VisualEnvironment.WpfNative/WpfNativeVisualEnvironment.cs index 1d2acb1..e0e5284 100755 --- a/src/StandardUI.VisualEnvironment.WpfNative/WpfNativeVisualEnvironment.cs +++ b/src/StandardUI.VisualEnvironment.WpfNative/WpfNativeVisualEnvironment.cs @@ -1,6 +1,6 @@ using System; -namespace System.StandardUI.VisualEnvironment.WpfNative +namespace Microsoft.StandardUI.VisualEnvironment.WpfNative { public class WpfNativeVisualEnvironment : IVisualEnvironment { diff --git a/src/StandardUI.VisualEnvironment.WpfNative/WpfNativeVisualizer.cs b/src/StandardUI.VisualEnvironment.WpfNative/WpfNativeVisualizer.cs index a624382..6f4be96 100755 --- a/src/StandardUI.VisualEnvironment.WpfNative/WpfNativeVisualizer.cs +++ b/src/StandardUI.VisualEnvironment.WpfNative/WpfNativeVisualizer.cs @@ -1,12 +1,13 @@ -using System.StandardUI.Controls; -using System.StandardUI.Media; -using System.StandardUI.Shapes; -using System.StandardUI.SkiaVisualizer; +using Microsoft.StandardUI.Controls; +using Microsoft.StandardUI.Media; +using Microsoft.StandardUI.Shapes; +using Microsoft.StandardUI.SkiaVisualizer; +using System; using System.Windows.Media; -using PenLineCap = System.StandardUI.Media.PenLineCap; -using PenLineJoin = System.StandardUI.Media.PenLineJoin; +using PenLineCap = Microsoft.StandardUI.Media.PenLineCap; +using PenLineJoin = Microsoft.StandardUI.Media.PenLineJoin; -namespace System.StandardUI.VisualEnvironment.WpfNative +namespace Microsoft.StandardUI.VisualEnvironment.WpfNative { public class WpfNativeVisualizer : IVisualizer { diff --git a/src/StandardUI.WPF/Canvas.nongenerated.cs b/src/StandardUI.WPF/Canvas.nongenerated.cs index 93e97ef..32fa759 100644 --- a/src/StandardUI.WPF/Canvas.nongenerated.cs +++ b/src/StandardUI.WPF/Canvas.nongenerated.cs @@ -1,29 +1,28 @@ // This file is generated from ICanvas.cs. Update the source file to change its contents. -using System.StandardUI.Controls; -using System.Windows; +using Microsoft.StandardUI.Controls; -namespace System.StandardUI.Wpf.Controls +namespace Microsoft.StandardUI.Wpf.Controls { public partial class Canvas : Panel, ICanvas { - protected override Windows.Size MeasureOverride(Windows.Size constraint) + protected override System.Windows.Size MeasureOverride(System.Windows.Size constraint) { - var childConstraint = new Windows.Size(double.PositiveInfinity, double.PositiveInfinity); + var childConstraint = new System.Windows.Size(double.PositiveInfinity, double.PositiveInfinity); foreach (IUIElement? childInterface in Children) { - var child = (UIElement?)childInterface; + var child = (System.Windows.UIElement?)childInterface; if (child == null) continue; child.Measure(childConstraint); } - return new Windows.Size(); + return new System.Windows.Size(); } - protected override Windows.Size ArrangeOverride(Windows.Size arrangeSize) + protected override System.Windows.Size ArrangeOverride(System.Windows.Size arrangeSize) { //Canvas arranges children at their DesiredSize. //This means that Margin on children is actually respected and added @@ -32,7 +31,7 @@ namespace System.StandardUI.Wpf.Controls foreach (IUIElement childInterface in Children) { - var child = (UIElement?)childInterface; + var child = (System.Windows.UIElement?)childInterface; if (child == null) continue; @@ -52,7 +51,7 @@ namespace System.StandardUI.Wpf.Controls if (!double.IsNaN(top)) y = top; - child.Arrange(new Windows.Rect(new Windows.Point(x, y), child.DesiredSize)); + child.Arrange(new System.Windows.Rect(new System.Windows.Point(x, y), child.DesiredSize)); } return arrangeSize; } diff --git a/src/StandardUI.WPF/ColorWpf.cs b/src/StandardUI.WPF/ColorWpf.cs index 65ffc88..0b2ab40 100755 --- a/src/StandardUI.WPF/ColorWpf.cs +++ b/src/StandardUI.WPF/ColorWpf.cs @@ -1,12 +1,12 @@ using System.ComponentModel; -using System.StandardUI.Wpf.Converters; +using Microsoft.StandardUI.Wpf.Converters; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { [TypeConverter(typeof(ColorTypeConverter))] public struct ColorWpf { - public static readonly ColorWpf Default = new ColorWpf(System.StandardUI.Color.Default); + public static readonly ColorWpf Default = new ColorWpf(Microsoft.StandardUI.Color.Default); public static readonly ColorWpf Transparent = new ColorWpf(Colors.Transparent); public static ColorWpf FromColor(Color color) => new ColorWpf(color); diff --git a/src/StandardUI.WPF/Controls/ControlTemplateWpf.cs b/src/StandardUI.WPF/Controls/ControlTemplateWpf.cs index 3bd3e67..ca935a2 100644 --- a/src/StandardUI.WPF/Controls/ControlTemplateWpf.cs +++ b/src/StandardUI.WPF/Controls/ControlTemplateWpf.cs @@ -1,16 +1,16 @@ -using System.StandardUI.Controls; +using Microsoft.StandardUI.Controls; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { public class ControlTemplateWpf : IControlTemplate { - private Windows.Controls.ControlTemplate _controlTemplate; + private System.Windows.Controls.ControlTemplate _controlTemplate; - public ControlTemplateWpf(Windows.Controls.ControlTemplate controlTemplate) + public ControlTemplateWpf(System.Windows.Controls.ControlTemplate controlTemplate) { _controlTemplate = controlTemplate; } - public Windows.Controls.ControlTemplate ControlTemplate => _controlTemplate; + public System.Windows.Controls.ControlTemplate ControlTemplate => _controlTemplate; } } diff --git a/src/StandardUI.WPF/Controls/UIElementCollection.cs b/src/StandardUI.WPF/Controls/UIElementCollection.cs index bf089e0..05e0dc3 100644 --- a/src/StandardUI.WPF/Controls/UIElementCollection.cs +++ b/src/StandardUI.WPF/Controls/UIElementCollection.cs @@ -1,23 +1,22 @@ +using System; using System.Collections; using System.Collections.Generic; -using System.StandardUI; -using System.Windows; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { public class UIElementCollection : IUIElementCollection { - private Windows.Controls.UIElementCollection _collection; + private System.Windows.Controls.UIElementCollection _collection; - public UIElementCollection(FrameworkElement parent) + public UIElementCollection(System.Windows.FrameworkElement parent) { - _collection = new Windows.Controls.UIElementCollection(parent, parent); + _collection = new System.Windows.Controls.UIElementCollection(parent, parent); } public IUIElement this[int index] { get => (IUIElement)_collection[index]; - set => _collection[index] = (Windows.UIElement)value; + set => _collection[index] = (System.Windows.UIElement)value; } public int Count => _collection.Count; @@ -26,12 +25,12 @@ namespace System.StandardUI.Wpf public void Add(IUIElement item) { - _collection.Add((Windows.UIElement) item); + _collection.Add((System.Windows.UIElement) item); } public void Clear() => _collection.Clear(); - public bool Contains(IUIElement item) => _collection.Contains((Windows.UIElement)item); + public bool Contains(IUIElement item) => _collection.Contains((System.Windows.UIElement)item); public void CopyTo(IUIElement[] array, int arrayIndex) { @@ -40,13 +39,13 @@ namespace System.StandardUI.Wpf public IEnumerator GetEnumerator() => new Enumerator(_collection.GetEnumerator()); - public int IndexOf(IUIElement item) => _collection.IndexOf((Windows.UIElement)item); + public int IndexOf(IUIElement item) => _collection.IndexOf((System.Windows.UIElement)item); - public void Insert(int index, IUIElement item) => _collection.Insert(index, (Windows.UIElement)item); + public void Insert(int index, IUIElement item) => _collection.Insert(index, (System.Windows.UIElement)item); public bool Remove(IUIElement item) { - int index = _collection.IndexOf((Windows.UIElement)item); + int index = _collection.IndexOf((System.Windows.UIElement)item); if (index == -1) return false; _collection.RemoveAt(index); diff --git a/src/StandardUI.WPF/Converters/BrushTypeConverter.cs b/src/StandardUI.WPF/Converters/BrushTypeConverter.cs index f00138d..c0b2bf1 100755 --- a/src/StandardUI.WPF/Converters/BrushTypeConverter.cs +++ b/src/StandardUI.WPF/Converters/BrushTypeConverter.cs @@ -1,9 +1,9 @@ -using System.StandardUI.Converters; -using System.StandardUI.Wpf.Media; +using Microsoft.StandardUI.Converters; +using Microsoft.StandardUI.Wpf.Media; using System.ComponentModel; using System.Globalization; -namespace System.StandardUI.Wpf.Converters +namespace Microsoft.StandardUI.Wpf.Converters { public class BrushTypeConverter : TypeConverterBase { diff --git a/src/StandardUI.WPF/Converters/ColorTypeConverter.cs b/src/StandardUI.WPF/Converters/ColorTypeConverter.cs index d581e8a..ca95b1b 100755 --- a/src/StandardUI.WPF/Converters/ColorTypeConverter.cs +++ b/src/StandardUI.WPF/Converters/ColorTypeConverter.cs @@ -1,8 +1,8 @@ -using System.StandardUI.Converters; +using Microsoft.StandardUI.Converters; using System.ComponentModel; using System.Globalization; -namespace System.StandardUI.Wpf.Converters +namespace Microsoft.StandardUI.Wpf.Converters { public class ColorTypeConverter : TypeConverterBase { diff --git a/src/StandardUI.WPF/Converters/GeometryTypeConverter.cs b/src/StandardUI.WPF/Converters/GeometryTypeConverter.cs index 2798582..7ef74fc 100755 --- a/src/StandardUI.WPF/Converters/GeometryTypeConverter.cs +++ b/src/StandardUI.WPF/Converters/GeometryTypeConverter.cs @@ -1,7 +1,7 @@ using System.ComponentModel; using System.Globalization; -namespace System.StandardUI.Wpf.Converters +namespace Microsoft.StandardUI.Wpf.Converters { public class GeometryTypeConverter : TypeConverterBase { diff --git a/src/StandardUI.WPF/Converters/PointTypeConverter.cs b/src/StandardUI.WPF/Converters/PointTypeConverter.cs index acca70e..dac9281 100755 --- a/src/StandardUI.WPF/Converters/PointTypeConverter.cs +++ b/src/StandardUI.WPF/Converters/PointTypeConverter.cs @@ -1,8 +1,8 @@ -using System.StandardUI.Converters; +using Microsoft.StandardUI.Converters; using System.ComponentModel; using System.Globalization; -namespace System.StandardUI.Wpf.Converters +namespace Microsoft.StandardUI.Wpf.Converters { public class PointTypeConverter : TypeConverterBase { diff --git a/src/StandardUI.WPF/Converters/PointsTypeConverter.cs b/src/StandardUI.WPF/Converters/PointsTypeConverter.cs index e2ef245..403d006 100755 --- a/src/StandardUI.WPF/Converters/PointsTypeConverter.cs +++ b/src/StandardUI.WPF/Converters/PointsTypeConverter.cs @@ -1,8 +1,8 @@ -using System.StandardUI.Converters; +using Microsoft.StandardUI.Converters; using System.ComponentModel; using System.Globalization; -namespace System.StandardUI.Wpf.Converters +namespace Microsoft.StandardUI.Wpf.Converters { public class PointsTypeConverter : TypeConverterBase { diff --git a/src/StandardUI.WPF/Converters/SizeTypeConverter.cs b/src/StandardUI.WPF/Converters/SizeTypeConverter.cs index c3f4813..23a861b 100755 --- a/src/StandardUI.WPF/Converters/SizeTypeConverter.cs +++ b/src/StandardUI.WPF/Converters/SizeTypeConverter.cs @@ -1,8 +1,8 @@ -using System.StandardUI.Converters; +using Microsoft.StandardUI.Converters; using System.ComponentModel; using System.Globalization; -namespace System.StandardUI.Wpf.Converters +namespace Microsoft.StandardUI.Wpf.Converters { public class SizeTypeConverter : TypeConverterBase { diff --git a/src/StandardUI.WPF/Converters/TypeConverterBase.cs b/src/StandardUI.WPF/Converters/TypeConverterBase.cs index b89f350..a0dd09b 100755 --- a/src/StandardUI.WPF/Converters/TypeConverterBase.cs +++ b/src/StandardUI.WPF/Converters/TypeConverterBase.cs @@ -2,7 +2,7 @@ using System; using System.ComponentModel; using System.Globalization; -namespace System.StandardUI.Wpf.Converters +namespace Microsoft.StandardUI.Wpf.Converters { public class TypeConverterBase : TypeConverter { diff --git a/src/StandardUI.WPF/PointWpf.cs b/src/StandardUI.WPF/PointWpf.cs index cb35e79..744332c 100755 --- a/src/StandardUI.WPF/PointWpf.cs +++ b/src/StandardUI.WPF/PointWpf.cs @@ -1,7 +1,7 @@ using System.ComponentModel; -using System.StandardUI.Wpf.Converters; +using Microsoft.StandardUI.Wpf.Converters; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { [TypeConverter(typeof(PointTypeConverter))] public struct PointWpf diff --git a/src/StandardUI.WPF/PointsWpf.cs b/src/StandardUI.WPF/PointsWpf.cs index e0ecbcf..f66091d 100755 --- a/src/StandardUI.WPF/PointsWpf.cs +++ b/src/StandardUI.WPF/PointsWpf.cs @@ -1,8 +1,8 @@ -using System.StandardUI.Wpf.Converters; +using Microsoft.StandardUI.Wpf.Converters; using System.ComponentModel; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { [TypeConverter(typeof(PointsTypeConverter))] public struct PointsWpf diff --git a/src/StandardUI.WPF/PropertyUtils.cs b/src/StandardUI.WPF/PropertyUtils.cs index 594c615..985c910 100755 --- a/src/StandardUI.WPF/PropertyUtils.cs +++ b/src/StandardUI.WPF/PropertyUtils.cs @@ -1,11 +1,11 @@ -using System.StandardUI.Media; -using System.StandardUI.Wpf.Media; +using Microsoft.StandardUI.Media; +using Microsoft.StandardUI.Wpf.Media; using System; using System.Collections; using System.Linq; using System.Windows; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { public static class PropertyUtils { diff --git a/src/StandardUI.WPF/RectExtensions.cs b/src/StandardUI.WPF/RectExtensions.cs index e1c314e..5ad231e 100755 --- a/src/StandardUI.WPF/RectExtensions.cs +++ b/src/StandardUI.WPF/RectExtensions.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { public static class RectExtensions { diff --git a/src/StandardUI.WPF/SizeExtensions.cs b/src/StandardUI.WPF/SizeExtensions.cs index 0d402da..fc1bd7c 100755 --- a/src/StandardUI.WPF/SizeExtensions.cs +++ b/src/StandardUI.WPF/SizeExtensions.cs @@ -1,9 +1,9 @@ -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { public static class SizeExtensions { - public static Windows.Size ToWpfSize(this Size size) => new Windows.Size(size.Width, size.Height); + public static System.Windows.Size ToWpfSize(this Size size) => new System.Windows.Size(size.Width, size.Height); - public static Size FromWpfSize(Windows.Size size) => new Size(size.Width, size.Height); + public static Size FromWpfSize(System.Windows.Size size) => new Size(size.Width, size.Height); } } diff --git a/src/StandardUI.WPF/SizeWpf.cs b/src/StandardUI.WPF/SizeWpf.cs index 719e9d5..72715e3 100755 --- a/src/StandardUI.WPF/SizeWpf.cs +++ b/src/StandardUI.WPF/SizeWpf.cs @@ -1,7 +1,7 @@ using System.ComponentModel; -using System.StandardUI.Wpf.Converters; +using Microsoft.StandardUI.Wpf.Converters; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { [TypeConverter(typeof(SizeTypeConverter))] public struct SizeWpf diff --git a/src/StandardUI.WPF/StandardUIControlWpf.cs b/src/StandardUI.WPF/StandardUIControlWpf.cs index acb5cf0..9d1f4f5 100644 --- a/src/StandardUI.WPF/StandardUIControlWpf.cs +++ b/src/StandardUI.WPF/StandardUIControlWpf.cs @@ -1,9 +1,9 @@ -using System.StandardUI.Controls; +using Microsoft.StandardUI.Controls; using System.Windows.Media; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { - public class StandardUIControlWpf : Windows.Controls.Control, IStandardUIControlEnvironmentPeer + public class StandardUIControlWpf : System.Windows.Controls.Control, IStandardUIControlEnvironmentPeer { private StandardUIControl _standardUIControl; private ControlTemplateWpf? _controlTemplateWpf; @@ -20,13 +20,13 @@ namespace System.StandardUI.Wpf MaxHeight = standardUIControl.MaxHeight; } - protected override Windows.Size MeasureOverride(Windows.Size constraint) + protected override System.Windows.Size MeasureOverride(System.Windows.Size constraint) { _standardUIControl.Measure(new Size(constraint.Width, constraint.Height)); return _standardUIControl.DesiredSize.ToWpfSize(); } - protected override Windows.Size ArrangeOverride(Windows.Size arrangeSize) + protected override System.Windows.Size ArrangeOverride(System.Windows.Size arrangeSize) { _standardUIControl.Arrange(new Rect(0, 0, arrangeSize.Width, arrangeSize.Height)); return arrangeSize; @@ -50,19 +50,19 @@ namespace System.StandardUI.Wpf public object GetValue(IUIProperty dp) { - Windows.DependencyProperty wpfDependencyProperty = ((UIProperty)dp).DependencyProperty; + System.Windows.DependencyProperty wpfDependencyProperty = ((UIProperty)dp).DependencyProperty; return GetValue(wpfDependencyProperty); } public object ReadLocalValue(IUIProperty dp) { - Windows.DependencyProperty wpfDependencyProperty = ((UIProperty)dp).DependencyProperty; + System.Windows.DependencyProperty wpfDependencyProperty = ((UIProperty)dp).DependencyProperty; return ReadLocalValue(wpfDependencyProperty); } public void SetValue(IUIProperty dp, object value) { - Windows.DependencyProperty wpfDependencyProperty = ((UIProperty)dp).DependencyProperty; + System.Windows.DependencyProperty wpfDependencyProperty = ((UIProperty)dp).DependencyProperty; SetValue(wpfDependencyProperty, value); } @@ -70,7 +70,7 @@ namespace System.StandardUI.Wpf { get { - Windows.Controls.ControlTemplate controlTemplate = Template; + System.Windows.Controls.ControlTemplate controlTemplate = Template; if (controlTemplate == null) _controlTemplateWpf = null; else @@ -93,7 +93,7 @@ namespace System.StandardUI.Wpf IUIPropertyObject? IStandardUIControlEnvironmentPeer.GetTemplateChild(string childName) { - Windows.DependencyObject? child = this.GetTemplateChild(childName); + System.Windows.DependencyObject? child = this.GetTemplateChild(childName); if (child == null) return null; diff --git a/src/StandardUI.WPF/StandardUIDependencyObject.cs b/src/StandardUI.WPF/StandardUIDependencyObject.cs index 98164a3..688aca7 100644 --- a/src/StandardUI.WPF/StandardUIDependencyObject.cs +++ b/src/StandardUI.WPF/StandardUIDependencyObject.cs @@ -1,7 +1,7 @@ using System.Windows; using System.Windows.Media; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { /// /// This is the base for predefined dependency objects; diff --git a/src/StandardUI.WPF/StandardUIFactory.cs b/src/StandardUI.WPF/StandardUIFactory.cs index 0b619b2..a43d3bf 100644 --- a/src/StandardUI.WPF/StandardUIFactory.cs +++ b/src/StandardUI.WPF/StandardUIFactory.cs @@ -1,12 +1,13 @@ -using System.Collections.Generic; -using System.StandardUI.Controls; -using System.StandardUI.Media; -using System.StandardUI.Shapes; -using System.StandardUI.Wpf.Controls; -using System.StandardUI.Wpf.Media; -using System.StandardUI.Wpf.Shapes; +using System; +using System.Collections.Generic; +using Microsoft.StandardUI.Controls; +using Microsoft.StandardUI.Media; +using Microsoft.StandardUI.Shapes; +using Microsoft.StandardUI.Wpf.Controls; +using Microsoft.StandardUI.Wpf.Media; +using Microsoft.StandardUI.Wpf.Shapes; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { public class StandardUIFactory : IStandardUIFactory { diff --git a/src/StandardUI.WPF/StandardUIFrameworkElement.cs b/src/StandardUI.WPF/StandardUIFrameworkElement.cs index 0125f3b..a3dc143 100644 --- a/src/StandardUI.WPF/StandardUIFrameworkElement.cs +++ b/src/StandardUI.WPF/StandardUIFrameworkElement.cs @@ -1,7 +1,8 @@ +using System; using System.Windows; using System.Windows.Media; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { /// /// This is the base for predefined standard UI controls. diff --git a/src/StandardUI.WPF/StandardUIFrameworkElementHelper.cs b/src/StandardUI.WPF/StandardUIFrameworkElementHelper.cs index 2e9171d..4766734 100644 --- a/src/StandardUI.WPF/StandardUIFrameworkElementHelper.cs +++ b/src/StandardUI.WPF/StandardUIFrameworkElementHelper.cs @@ -2,7 +2,7 @@ using System.Windows; using System.Windows.Media; using System.Windows.Media.Imaging; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { internal struct SizeInPixels { @@ -63,7 +63,7 @@ namespace System.StandardUI.Wpf _bitmap.AddDirtyRect(new Int32Rect(0, 0, widthInPixels, heightInPixels)); _bitmap.Unlock(); - drawingContext.DrawImage(_bitmap, new Windows.Rect(0, 0, widthInPixels, heightInPixels)); + drawingContext.DrawImage(_bitmap, new System.Windows.Rect(0, 0, widthInPixels, heightInPixels)); //var rect = new System.Windows.Rect(0, 0, 175, 50); //drawingContext.DrawRectangle(new SolidColorBrush(System.Windows.Media.Colors.Red), null, rect); diff --git a/src/StandardUI.WPF/StandardUIUserControlWpf.cs b/src/StandardUI.WPF/StandardUIUserControlWpf.cs index 638173b..ee8d416 100644 --- a/src/StandardUI.WPF/StandardUIUserControlWpf.cs +++ b/src/StandardUI.WPF/StandardUIUserControlWpf.cs @@ -1,7 +1,8 @@ -using System.StandardUI.Controls; +using Microsoft.StandardUI.Controls; +using System; using System.Windows.Media; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { public class StandardUIUserControlWpf : StandardUIControlWpf { @@ -18,7 +19,7 @@ namespace System.StandardUI.Wpf MinHeight = userControl.MinHeight; MaxHeight = userControl.MaxHeight; - var content = (Windows.UIElement?) userControl.Content; + var content = (System.Windows.UIElement?) userControl.Content; if (content != null) AddLogicalChild(content); } diff --git a/src/StandardUI.WPF/Text/FontWeightWpf.cs b/src/StandardUI.WPF/Text/FontWeightWpf.cs index 3dbcd10..9f680d5 100644 --- a/src/StandardUI.WPF/Text/FontWeightWpf.cs +++ b/src/StandardUI.WPF/Text/FontWeightWpf.cs @@ -1,6 +1,6 @@ -using System.StandardUI.Text; +using Microsoft.StandardUI.Text; -namespace System.StandardUI.Wpf.Text +namespace Microsoft.StandardUI.Wpf.Text { public struct FontWeightWpf { diff --git a/src/StandardUI.WPF/UIProperty.cs b/src/StandardUI.WPF/UIProperty.cs index a819e64..0e1b9fc 100644 --- a/src/StandardUI.WPF/UIProperty.cs +++ b/src/StandardUI.WPF/UIProperty.cs @@ -1,6 +1,6 @@ using System.Windows; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { public class UIProperty : IUIProperty { diff --git a/src/StandardUI.WPF/WpfStandardUIEnvironment.cs b/src/StandardUI.WPF/WpfStandardUIEnvironment.cs index f1c2f5b..b25c509 100644 --- a/src/StandardUI.WPF/WpfStandardUIEnvironment.cs +++ b/src/StandardUI.WPF/WpfStandardUIEnvironment.cs @@ -1,6 +1,6 @@ -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { public class WpfStandardUIEnvironment : IStandardUIEnvironment { diff --git a/src/StandardUI.WPF/generated/Controls/Border.cs b/src/StandardUI.WPF/generated/Controls/Border.cs index 9ad555b..d3d5bf3 100644 --- a/src/StandardUI.WPF/generated/Controls/Border.cs +++ b/src/StandardUI.WPF/generated/Controls/Border.cs @@ -1,20 +1,20 @@ // This file is generated from IBorder.cs. Update the source file to change its contents. -using System.StandardUI.Media; -using System.StandardUI.Wpf.Media; -using System.StandardUI.Controls; +using Microsoft.StandardUI.Media; +using Microsoft.StandardUI.Wpf.Media; +using Microsoft.StandardUI.Controls; -namespace System.StandardUI.Wpf.Controls +namespace Microsoft.StandardUI.Wpf.Controls { public class Border : StandardUIFrameworkElement, IBorder { - public static readonly Windows.DependencyProperty BackgroundProperty = PropertyUtils.Register(nameof(Background), typeof(Brush), typeof(Border), null); - public static readonly Windows.DependencyProperty BackgroundSizingProperty = PropertyUtils.Register(nameof(BackgroundSizing), typeof(BackgroundSizing), typeof(Border), ""); - public static readonly Windows.DependencyProperty BorderBrushProperty = PropertyUtils.Register(nameof(BorderBrush), typeof(Brush), typeof(Border), null); - public static readonly Windows.DependencyProperty BorderThicknessProperty = PropertyUtils.Register(nameof(BorderThickness), typeof(Thickness), typeof(Border), Thickness.Default); - public static readonly Windows.DependencyProperty ChildProperty = PropertyUtils.Register(nameof(Child), typeof(StandardUIFrameworkElement), typeof(Border), null); - public static readonly Windows.DependencyProperty CornerRadiusProperty = PropertyUtils.Register(nameof(CornerRadius), typeof(CornerRadius), typeof(Border), CornerRadius.Default); - public static readonly Windows.DependencyProperty PaddingProperty = PropertyUtils.Register(nameof(Padding), typeof(Thickness), typeof(Border), Thickness.Default); + public static readonly System.Windows.DependencyProperty BackgroundProperty = PropertyUtils.Register(nameof(Background), typeof(Brush), typeof(Border), null); + public static readonly System.Windows.DependencyProperty BackgroundSizingProperty = PropertyUtils.Register(nameof(BackgroundSizing), typeof(BackgroundSizing), typeof(Border), ""); + public static readonly System.Windows.DependencyProperty BorderBrushProperty = PropertyUtils.Register(nameof(BorderBrush), typeof(Brush), typeof(Border), null); + public static readonly System.Windows.DependencyProperty BorderThicknessProperty = PropertyUtils.Register(nameof(BorderThickness), typeof(Thickness), typeof(Border), Thickness.Default); + public static readonly System.Windows.DependencyProperty ChildProperty = PropertyUtils.Register(nameof(Child), typeof(StandardUIFrameworkElement), typeof(Border), null); + public static readonly System.Windows.DependencyProperty CornerRadiusProperty = PropertyUtils.Register(nameof(CornerRadius), typeof(CornerRadius), typeof(Border), CornerRadius.Default); + public static readonly System.Windows.DependencyProperty PaddingProperty = PropertyUtils.Register(nameof(Padding), typeof(Thickness), typeof(Border), Thickness.Default); public Brush Background { diff --git a/src/StandardUI.WPF/generated/Controls/Canvas.cs b/src/StandardUI.WPF/generated/Controls/Canvas.cs index c8741e2..b56aff6 100755 --- a/src/StandardUI.WPF/generated/Controls/Canvas.cs +++ b/src/StandardUI.WPF/generated/Controls/Canvas.cs @@ -1,18 +1,18 @@ // This file is generated from ICanvas.cs. Update the source file to change its contents. -using System.StandardUI.Controls; +using Microsoft.StandardUI.Controls; -namespace System.StandardUI.Wpf.Controls +namespace Microsoft.StandardUI.Wpf.Controls { public partial class Canvas : Panel, ICanvas { - public static readonly Windows.DependencyProperty LeftProperty = PropertyUtils.RegisterAttached("Left", typeof(double), typeof(Windows.UIElement), 0.0); - public static readonly Windows.DependencyProperty TopProperty = PropertyUtils.RegisterAttached("Top", typeof(double), typeof(Windows.UIElement), 0.0); + public static readonly System.Windows.DependencyProperty LeftProperty = PropertyUtils.RegisterAttached("Left", typeof(double), typeof(System.Windows.UIElement), 0.0); + public static readonly System.Windows.DependencyProperty TopProperty = PropertyUtils.RegisterAttached("Top", typeof(double), typeof(System.Windows.UIElement), 0.0); - public static double GetLeft(Windows.UIElement element) => (double) element.GetValue(LeftProperty); - public static void SetLeft(Windows.UIElement element, double value) => element.SetValue(LeftProperty, value); + public static double GetLeft(System.Windows.UIElement element) => (double) element.GetValue(LeftProperty); + public static void SetLeft(System.Windows.UIElement element, double value) => element.SetValue(LeftProperty, value); - public static double GetTop(Windows.UIElement element) => (double) element.GetValue(TopProperty); - public static void SetTop(Windows.UIElement element, double value) => element.SetValue(TopProperty, value); + public static double GetTop(System.Windows.UIElement element) => (double) element.GetValue(TopProperty); + public static void SetTop(System.Windows.UIElement element, double value) => element.SetValue(TopProperty, value); } } diff --git a/src/StandardUI.WPF/generated/Controls/CanvasAttached.cs b/src/StandardUI.WPF/generated/Controls/CanvasAttached.cs index 2665fd1..ec8d7d8 100755 --- a/src/StandardUI.WPF/generated/Controls/CanvasAttached.cs +++ b/src/StandardUI.WPF/generated/Controls/CanvasAttached.cs @@ -1,17 +1,17 @@ // This file is generated from ICanvas.cs. Update the source file to change its contents. -using System.StandardUI.Controls; +using Microsoft.StandardUI.Controls; -namespace System.StandardUI.Wpf.Controls +namespace Microsoft.StandardUI.Wpf.Controls { public class CanvasAttached : ICanvasAttached { public static CanvasAttached Instance = new CanvasAttached(); - public double GetLeft(IUIElement element) => Canvas.GetLeft((Windows.UIElement) element); - public void SetLeft(IUIElement element, double value) => Canvas.SetLeft((Windows.UIElement) element, value); + public double GetLeft(IUIElement element) => Canvas.GetLeft((System.Windows.UIElement) element); + public void SetLeft(IUIElement element, double value) => Canvas.SetLeft((System.Windows.UIElement) element, value); - public double GetTop(IUIElement element) => Canvas.GetTop((Windows.UIElement) element); - public void SetTop(IUIElement element, double value) => Canvas.SetTop((Windows.UIElement) element, value); + public double GetTop(IUIElement element) => Canvas.GetTop((System.Windows.UIElement) element); + public void SetTop(IUIElement element, double value) => Canvas.SetTop((System.Windows.UIElement) element, value); } } diff --git a/src/StandardUI.WPF/generated/Controls/ControlTemplate.cs b/src/StandardUI.WPF/generated/Controls/ControlTemplate.cs index 9df7cd6..bc9de91 100644 --- a/src/StandardUI.WPF/generated/Controls/ControlTemplate.cs +++ b/src/StandardUI.WPF/generated/Controls/ControlTemplate.cs @@ -1,8 +1,8 @@ // This file is generated from IControlTemplate.cs. Update the source file to change its contents. -using System.StandardUI.Controls; +using Microsoft.StandardUI.Controls; -namespace System.StandardUI.Wpf.Controls +namespace Microsoft.StandardUI.Wpf.Controls { public class ControlTemplate : StandardUIDependencyObject, IControlTemplate { diff --git a/src/StandardUI.WPF/generated/Controls/Grid.cs b/src/StandardUI.WPF/generated/Controls/Grid.cs index 5f0a6bb..5ea1437 100755 --- a/src/StandardUI.WPF/generated/Controls/Grid.cs +++ b/src/StandardUI.WPF/generated/Controls/Grid.cs @@ -1,8 +1,8 @@ // This file is generated from IGrid.cs. Update the source file to change its contents. -using System.StandardUI.Controls; +using Microsoft.StandardUI.Controls; -namespace System.StandardUI.Wpf.Controls +namespace Microsoft.StandardUI.Wpf.Controls { public partial class Grid : Panel, IGrid { diff --git a/src/StandardUI.WPF/generated/Controls/Panel.cs b/src/StandardUI.WPF/generated/Controls/Panel.cs index d161315..004a715 100755 --- a/src/StandardUI.WPF/generated/Controls/Panel.cs +++ b/src/StandardUI.WPF/generated/Controls/Panel.cs @@ -1,12 +1,12 @@ // This file is generated from IPanel.cs. Update the source file to change its contents. -using System.StandardUI.Controls; +using Microsoft.StandardUI.Controls; -namespace System.StandardUI.Wpf.Controls +namespace Microsoft.StandardUI.Wpf.Controls { public class Panel : StandardUIFrameworkElement, IPanel { - public static readonly Windows.DependencyProperty ChildrenProperty = PropertyUtils.Register(nameof(Children), typeof(UIElementCollection), typeof(Panel), null); + public static readonly System.Windows.DependencyProperty ChildrenProperty = PropertyUtils.Register(nameof(Children), typeof(UIElementCollection), typeof(Panel), null); private UIElementCollection _uiElementCollection; @@ -21,6 +21,6 @@ namespace System.StandardUI.Wpf.Controls protected override int VisualChildrenCount => _uiElementCollection.Count; - protected override Windows.Media.Visual GetVisualChild(int index) => (Windows.Media.Visual) _uiElementCollection[index]; + protected override System.Windows.Media.Visual GetVisualChild(int index) => (System.Windows.Media.Visual) _uiElementCollection[index]; } } diff --git a/src/StandardUI.WPF/generated/Controls/StackPanel.cs b/src/StandardUI.WPF/generated/Controls/StackPanel.cs index 1fc032c..2bfc671 100755 --- a/src/StandardUI.WPF/generated/Controls/StackPanel.cs +++ b/src/StandardUI.WPF/generated/Controls/StackPanel.cs @@ -1,8 +1,8 @@ // This file is generated from IStackPanel.cs. Update the source file to change its contents. -using System.StandardUI.Controls; +using Microsoft.StandardUI.Controls; -namespace System.StandardUI.Wpf.Controls +namespace Microsoft.StandardUI.Wpf.Controls { public partial class StackPanel : Panel, IStackPanel { diff --git a/src/StandardUI.WPF/generated/Controls/TextBlock.cs b/src/StandardUI.WPF/generated/Controls/TextBlock.cs index a76edd6..1b81cec 100644 --- a/src/StandardUI.WPF/generated/Controls/TextBlock.cs +++ b/src/StandardUI.WPF/generated/Controls/TextBlock.cs @@ -1,21 +1,21 @@ // This file is generated from ITextBlock.cs. Update the source file to change its contents. -using System.StandardUI.Media; -using System.StandardUI.Wpf.Media; -using System.StandardUI.Text; -using System.StandardUI.Wpf.Text; -using System.StandardUI.Controls; +using Microsoft.StandardUI.Media; +using Microsoft.StandardUI.Wpf.Media; +using Microsoft.StandardUI.Text; +using Microsoft.StandardUI.Wpf.Text; +using Microsoft.StandardUI.Controls; -namespace System.StandardUI.Wpf.Controls +namespace Microsoft.StandardUI.Wpf.Controls { public class TextBlock : StandardUIFrameworkElement, ITextBlock { - public static readonly Windows.DependencyProperty ForegroundProperty = PropertyUtils.Register(nameof(Foreground), typeof(Brush), typeof(TextBlock), null); - public static readonly Windows.DependencyProperty TextProperty = PropertyUtils.Register(nameof(Text), typeof(string), typeof(TextBlock), ""); - public static readonly Windows.DependencyProperty FontStyleProperty = PropertyUtils.Register(nameof(FontStyle), typeof(FontStyle), typeof(TextBlock), FontStyle.Normal); - public static readonly Windows.DependencyProperty FontWeightProperty = PropertyUtils.Register(nameof(FontWeight), typeof(FontWeightWpf), typeof(TextBlock), FontWeightWpf.Default); - public static readonly Windows.DependencyProperty FontSizeProperty = PropertyUtils.Register(nameof(FontSize), typeof(double), typeof(TextBlock), 11.0); - public static readonly Windows.DependencyProperty TextAlignmentProperty = PropertyUtils.Register(nameof(TextAlignment), typeof(TextAlignment), typeof(TextBlock), TextAlignment.Left); + public static readonly System.Windows.DependencyProperty ForegroundProperty = PropertyUtils.Register(nameof(Foreground), typeof(Brush), typeof(TextBlock), null); + public static readonly System.Windows.DependencyProperty TextProperty = PropertyUtils.Register(nameof(Text), typeof(string), typeof(TextBlock), ""); + public static readonly System.Windows.DependencyProperty FontStyleProperty = PropertyUtils.Register(nameof(FontStyle), typeof(FontStyle), typeof(TextBlock), FontStyle.Normal); + public static readonly System.Windows.DependencyProperty FontWeightProperty = PropertyUtils.Register(nameof(FontWeight), typeof(FontWeightWpf), typeof(TextBlock), FontWeightWpf.Default); + public static readonly System.Windows.DependencyProperty FontSizeProperty = PropertyUtils.Register(nameof(FontSize), typeof(double), typeof(TextBlock), 11.0); + public static readonly System.Windows.DependencyProperty TextAlignmentProperty = PropertyUtils.Register(nameof(TextAlignment), typeof(TextAlignment), typeof(TextBlock), TextAlignment.Left); public Brush Foreground { diff --git a/src/StandardUI.WPF/generated/Media/ArcSegment.cs b/src/StandardUI.WPF/generated/Media/ArcSegment.cs index cfd4b40..d3bf0c6 100755 --- a/src/StandardUI.WPF/generated/Media/ArcSegment.cs +++ b/src/StandardUI.WPF/generated/Media/ArcSegment.cs @@ -1,16 +1,16 @@ // This file is generated from IArcSegment.cs. Update the source file to change its contents. -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Wpf.Media +namespace Microsoft.StandardUI.Wpf.Media { public class ArcSegment : PathSegment, IArcSegment { - public static readonly Windows.DependencyProperty PointProperty = PropertyUtils.Register(nameof(Point), typeof(PointWpf), typeof(ArcSegment), PointWpf.Default); - public static readonly Windows.DependencyProperty SizeProperty = PropertyUtils.Register(nameof(Size), typeof(SizeWpf), typeof(ArcSegment), SizeWpf.Default); - public static readonly Windows.DependencyProperty RotationAngleProperty = PropertyUtils.Register(nameof(RotationAngle), typeof(double), typeof(ArcSegment), 0.0); - public static readonly Windows.DependencyProperty IsLargeArcProperty = PropertyUtils.Register(nameof(IsLargeArc), typeof(bool), typeof(ArcSegment), false); - public static readonly Windows.DependencyProperty SweepDirectionProperty = PropertyUtils.Register(nameof(SweepDirection), typeof(SweepDirection), typeof(ArcSegment), SweepDirection.Counterclockwise); + public static readonly System.Windows.DependencyProperty PointProperty = PropertyUtils.Register(nameof(Point), typeof(PointWpf), typeof(ArcSegment), PointWpf.Default); + public static readonly System.Windows.DependencyProperty SizeProperty = PropertyUtils.Register(nameof(Size), typeof(SizeWpf), typeof(ArcSegment), SizeWpf.Default); + public static readonly System.Windows.DependencyProperty RotationAngleProperty = PropertyUtils.Register(nameof(RotationAngle), typeof(double), typeof(ArcSegment), 0.0); + public static readonly System.Windows.DependencyProperty IsLargeArcProperty = PropertyUtils.Register(nameof(IsLargeArc), typeof(bool), typeof(ArcSegment), false); + public static readonly System.Windows.DependencyProperty SweepDirectionProperty = PropertyUtils.Register(nameof(SweepDirection), typeof(SweepDirection), typeof(ArcSegment), SweepDirection.Counterclockwise); public PointWpf Point { diff --git a/src/StandardUI.WPF/generated/Media/BezierSegment.cs b/src/StandardUI.WPF/generated/Media/BezierSegment.cs index 5cd4427..37248d1 100755 --- a/src/StandardUI.WPF/generated/Media/BezierSegment.cs +++ b/src/StandardUI.WPF/generated/Media/BezierSegment.cs @@ -1,14 +1,14 @@ // This file is generated from IBezierSegment.cs. Update the source file to change its contents. -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Wpf.Media +namespace Microsoft.StandardUI.Wpf.Media { public class BezierSegment : PathSegment, IBezierSegment { - public static readonly Windows.DependencyProperty Point1Property = PropertyUtils.Register(nameof(Point1), typeof(PointWpf), typeof(BezierSegment), PointWpf.Default); - public static readonly Windows.DependencyProperty Point2Property = PropertyUtils.Register(nameof(Point2), typeof(PointWpf), typeof(BezierSegment), PointWpf.Default); - public static readonly Windows.DependencyProperty Point3Property = PropertyUtils.Register(nameof(Point3), typeof(PointWpf), typeof(BezierSegment), PointWpf.Default); + public static readonly System.Windows.DependencyProperty Point1Property = PropertyUtils.Register(nameof(Point1), typeof(PointWpf), typeof(BezierSegment), PointWpf.Default); + public static readonly System.Windows.DependencyProperty Point2Property = PropertyUtils.Register(nameof(Point2), typeof(PointWpf), typeof(BezierSegment), PointWpf.Default); + public static readonly System.Windows.DependencyProperty Point3Property = PropertyUtils.Register(nameof(Point3), typeof(PointWpf), typeof(BezierSegment), PointWpf.Default); public PointWpf Point1 { diff --git a/src/StandardUI.WPF/generated/Media/Brush.cs b/src/StandardUI.WPF/generated/Media/Brush.cs index b118ddf..34876eb 100755 --- a/src/StandardUI.WPF/generated/Media/Brush.cs +++ b/src/StandardUI.WPF/generated/Media/Brush.cs @@ -1,10 +1,10 @@ // This file is generated from IBrush.cs. Update the source file to change its contents. -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; using System.ComponentModel; -using System.StandardUI.Wpf.Converters; +using Microsoft.StandardUI.Wpf.Converters; -namespace System.StandardUI.Wpf.Media +namespace Microsoft.StandardUI.Wpf.Media { public class Brush : StandardUIDependencyObject, IBrush { diff --git a/src/StandardUI.WPF/generated/Media/Geometry.cs b/src/StandardUI.WPF/generated/Media/Geometry.cs index 6dce489..67e5d97 100755 --- a/src/StandardUI.WPF/generated/Media/Geometry.cs +++ b/src/StandardUI.WPF/generated/Media/Geometry.cs @@ -1,15 +1,15 @@ // This file is generated from IGeometry.cs. Update the source file to change its contents. -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; using System.ComponentModel; -using System.StandardUI.Wpf.Converters; +using Microsoft.StandardUI.Wpf.Converters; -namespace System.StandardUI.Wpf.Media +namespace Microsoft.StandardUI.Wpf.Media { public class Geometry : StandardUIDependencyObject, IGeometry { - public static readonly Windows.DependencyProperty StandardFlatteningToleranceProperty = PropertyUtils.Register(nameof(StandardFlatteningTolerance), typeof(double), typeof(Geometry), 0.25); - public static readonly Windows.DependencyProperty TransformProperty = PropertyUtils.Register(nameof(Transform), typeof(Transform), typeof(Geometry), null); + public static readonly System.Windows.DependencyProperty StandardFlatteningToleranceProperty = PropertyUtils.Register(nameof(StandardFlatteningTolerance), typeof(double), typeof(Geometry), 0.25); + public static readonly System.Windows.DependencyProperty TransformProperty = PropertyUtils.Register(nameof(Transform), typeof(Transform), typeof(Geometry), null); public double StandardFlatteningTolerance { diff --git a/src/StandardUI.WPF/generated/Media/GradientBrush.cs b/src/StandardUI.WPF/generated/Media/GradientBrush.cs index 53c5861..d11cd5c 100755 --- a/src/StandardUI.WPF/generated/Media/GradientBrush.cs +++ b/src/StandardUI.WPF/generated/Media/GradientBrush.cs @@ -1,15 +1,15 @@ // This file is generated from IGradientBrush.cs. Update the source file to change its contents. using System.Collections.Generic; -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Wpf.Media +namespace Microsoft.StandardUI.Wpf.Media { public class GradientBrush : Brush, IGradientBrush { - public static readonly Windows.DependencyProperty GradientStopsProperty = PropertyUtils.Register(nameof(GradientStops), typeof(IEnumerable), typeof(GradientBrush), null); - public static readonly Windows.DependencyProperty MappingModeProperty = PropertyUtils.Register(nameof(MappingMode), typeof(BrushMappingMode), typeof(GradientBrush), BrushMappingMode.RelativeToBoundingBox); - public static readonly Windows.DependencyProperty SpreadMethodProperty = PropertyUtils.Register(nameof(SpreadMethod), typeof(GradientSpreadMethod), typeof(GradientBrush), GradientSpreadMethod.Pad); + public static readonly System.Windows.DependencyProperty GradientStopsProperty = PropertyUtils.Register(nameof(GradientStops), typeof(IEnumerable), typeof(GradientBrush), null); + public static readonly System.Windows.DependencyProperty MappingModeProperty = PropertyUtils.Register(nameof(MappingMode), typeof(BrushMappingMode), typeof(GradientBrush), BrushMappingMode.RelativeToBoundingBox); + public static readonly System.Windows.DependencyProperty SpreadMethodProperty = PropertyUtils.Register(nameof(SpreadMethod), typeof(GradientSpreadMethod), typeof(GradientBrush), GradientSpreadMethod.Pad); public IEnumerable GradientStops { diff --git a/src/StandardUI.WPF/generated/Media/GradientStop.cs b/src/StandardUI.WPF/generated/Media/GradientStop.cs index 6667a39..287bd3c 100755 --- a/src/StandardUI.WPF/generated/Media/GradientStop.cs +++ b/src/StandardUI.WPF/generated/Media/GradientStop.cs @@ -1,13 +1,13 @@ // This file is generated from IGradientStop.cs. Update the source file to change its contents. -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Wpf.Media +namespace Microsoft.StandardUI.Wpf.Media { public class GradientStop : StandardUIDependencyObject, IGradientStop { - public static readonly Windows.DependencyProperty ColorProperty = PropertyUtils.Register(nameof(Color), typeof(ColorWpf), typeof(GradientStop), ColorWpf.Default); - public static readonly Windows.DependencyProperty OffsetProperty = PropertyUtils.Register(nameof(Offset), typeof(double), typeof(GradientStop), 0.0); + public static readonly System.Windows.DependencyProperty ColorProperty = PropertyUtils.Register(nameof(Color), typeof(ColorWpf), typeof(GradientStop), ColorWpf.Default); + public static readonly System.Windows.DependencyProperty OffsetProperty = PropertyUtils.Register(nameof(Offset), typeof(double), typeof(GradientStop), 0.0); public ColorWpf Color { diff --git a/src/StandardUI.WPF/generated/Media/LineSegment.cs b/src/StandardUI.WPF/generated/Media/LineSegment.cs index 4bac97a..974d63f 100755 --- a/src/StandardUI.WPF/generated/Media/LineSegment.cs +++ b/src/StandardUI.WPF/generated/Media/LineSegment.cs @@ -1,12 +1,12 @@ // This file is generated from ILineSegment.cs. Update the source file to change its contents. -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Wpf.Media +namespace Microsoft.StandardUI.Wpf.Media { public class LineSegment : PathSegment, ILineSegment { - public static readonly Windows.DependencyProperty PointProperty = PropertyUtils.Register(nameof(Point), typeof(PointWpf), typeof(LineSegment), PointWpf.Default); + public static readonly System.Windows.DependencyProperty PointProperty = PropertyUtils.Register(nameof(Point), typeof(PointWpf), typeof(LineSegment), PointWpf.Default); public PointWpf Point { diff --git a/src/StandardUI.WPF/generated/Media/LinearGradientBrush.cs b/src/StandardUI.WPF/generated/Media/LinearGradientBrush.cs index dc265a2..063646e 100755 --- a/src/StandardUI.WPF/generated/Media/LinearGradientBrush.cs +++ b/src/StandardUI.WPF/generated/Media/LinearGradientBrush.cs @@ -1,13 +1,13 @@ // This file is generated from ILinearGradientBrush.cs. Update the source file to change its contents. -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Wpf.Media +namespace Microsoft.StandardUI.Wpf.Media { public class LinearGradientBrush : GradientBrush, ILinearGradientBrush { - public static readonly Windows.DependencyProperty StartPointProperty = PropertyUtils.Register(nameof(StartPoint), typeof(PointWpf), typeof(LinearGradientBrush), PointWpf.Default); - public static readonly Windows.DependencyProperty EndPointProperty = PropertyUtils.Register(nameof(EndPoint), typeof(PointWpf), typeof(LinearGradientBrush), PointWpf.Default); + public static readonly System.Windows.DependencyProperty StartPointProperty = PropertyUtils.Register(nameof(StartPoint), typeof(PointWpf), typeof(LinearGradientBrush), PointWpf.Default); + public static readonly System.Windows.DependencyProperty EndPointProperty = PropertyUtils.Register(nameof(EndPoint), typeof(PointWpf), typeof(LinearGradientBrush), PointWpf.Default); public PointWpf StartPoint { diff --git a/src/StandardUI.WPF/generated/Media/PathFigure.cs b/src/StandardUI.WPF/generated/Media/PathFigure.cs index 37ea467..96dfa93 100755 --- a/src/StandardUI.WPF/generated/Media/PathFigure.cs +++ b/src/StandardUI.WPF/generated/Media/PathFigure.cs @@ -1,16 +1,16 @@ // This file is generated from IPathFigure.cs. Update the source file to change its contents. using System.Collections.Generic; -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Wpf.Media +namespace Microsoft.StandardUI.Wpf.Media { public class PathFigure : StandardUIDependencyObject, IPathFigure { - public static readonly Windows.DependencyProperty SegmentsProperty = PropertyUtils.Register(nameof(Segments), typeof(IEnumerable), typeof(PathFigure), null); - public static readonly Windows.DependencyProperty StartPointProperty = PropertyUtils.Register(nameof(StartPoint), typeof(PointWpf), typeof(PathFigure), PointWpf.Default); - public static readonly Windows.DependencyProperty IsClosedProperty = PropertyUtils.Register(nameof(IsClosed), typeof(bool), typeof(PathFigure), false); - public static readonly Windows.DependencyProperty IsFilledProperty = PropertyUtils.Register(nameof(IsFilled), typeof(bool), typeof(PathFigure), true); + public static readonly System.Windows.DependencyProperty SegmentsProperty = PropertyUtils.Register(nameof(Segments), typeof(IEnumerable), typeof(PathFigure), null); + public static readonly System.Windows.DependencyProperty StartPointProperty = PropertyUtils.Register(nameof(StartPoint), typeof(PointWpf), typeof(PathFigure), PointWpf.Default); + public static readonly System.Windows.DependencyProperty IsClosedProperty = PropertyUtils.Register(nameof(IsClosed), typeof(bool), typeof(PathFigure), false); + public static readonly System.Windows.DependencyProperty IsFilledProperty = PropertyUtils.Register(nameof(IsFilled), typeof(bool), typeof(PathFigure), true); public IEnumerable Segments { diff --git a/src/StandardUI.WPF/generated/Media/PathGeometry.cs b/src/StandardUI.WPF/generated/Media/PathGeometry.cs index 97428d4..585fb82 100755 --- a/src/StandardUI.WPF/generated/Media/PathGeometry.cs +++ b/src/StandardUI.WPF/generated/Media/PathGeometry.cs @@ -1,14 +1,14 @@ // This file is generated from IPathGeometry.cs. Update the source file to change its contents. using System.Collections.Generic; -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Wpf.Media +namespace Microsoft.StandardUI.Wpf.Media { public class PathGeometry : Geometry, IPathGeometry { - public static readonly Windows.DependencyProperty FiguresProperty = PropertyUtils.Register(nameof(Figures), typeof(IEnumerable), typeof(PathGeometry), null); - public static readonly Windows.DependencyProperty FillRuleProperty = PropertyUtils.Register(nameof(FillRule), typeof(FillRule), typeof(PathGeometry), FillRule.EvenOdd); + public static readonly System.Windows.DependencyProperty FiguresProperty = PropertyUtils.Register(nameof(Figures), typeof(IEnumerable), typeof(PathGeometry), null); + public static readonly System.Windows.DependencyProperty FillRuleProperty = PropertyUtils.Register(nameof(FillRule), typeof(FillRule), typeof(PathGeometry), FillRule.EvenOdd); public IEnumerable Figures { diff --git a/src/StandardUI.WPF/generated/Media/PathSegment.cs b/src/StandardUI.WPF/generated/Media/PathSegment.cs index 711f1c2..f6da0c7 100755 --- a/src/StandardUI.WPF/generated/Media/PathSegment.cs +++ b/src/StandardUI.WPF/generated/Media/PathSegment.cs @@ -1,8 +1,8 @@ // This file is generated from IPathSegment.cs. Update the source file to change its contents. -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Wpf.Media +namespace Microsoft.StandardUI.Wpf.Media { public class PathSegment : StandardUIDependencyObject, IPathSegment { diff --git a/src/StandardUI.WPF/generated/Media/PolyBezierSegment.cs b/src/StandardUI.WPF/generated/Media/PolyBezierSegment.cs index 1fdaea9..dce7b2e 100755 --- a/src/StandardUI.WPF/generated/Media/PolyBezierSegment.cs +++ b/src/StandardUI.WPF/generated/Media/PolyBezierSegment.cs @@ -1,12 +1,12 @@ // This file is generated from IPolyBezierSegment.cs. Update the source file to change its contents. -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Wpf.Media +namespace Microsoft.StandardUI.Wpf.Media { public class PolyBezierSegment : PathSegment, IPolyBezierSegment { - public static readonly Windows.DependencyProperty PointsProperty = PropertyUtils.Register(nameof(Points), typeof(PointsWpf), typeof(PolyBezierSegment), PointsWpf.Default); + public static readonly System.Windows.DependencyProperty PointsProperty = PropertyUtils.Register(nameof(Points), typeof(PointsWpf), typeof(PolyBezierSegment), PointsWpf.Default); public PointsWpf Points { diff --git a/src/StandardUI.WPF/generated/Media/PolyLineSegment.cs b/src/StandardUI.WPF/generated/Media/PolyLineSegment.cs index 2e9d4fa..5e14b9c 100755 --- a/src/StandardUI.WPF/generated/Media/PolyLineSegment.cs +++ b/src/StandardUI.WPF/generated/Media/PolyLineSegment.cs @@ -1,12 +1,12 @@ // This file is generated from IPolyLineSegment.cs. Update the source file to change its contents. -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Wpf.Media +namespace Microsoft.StandardUI.Wpf.Media { public class PolyLineSegment : PathSegment, IPolyLineSegment { - public static readonly Windows.DependencyProperty PointsProperty = PropertyUtils.Register(nameof(Points), typeof(PointsWpf), typeof(PolyLineSegment), PointsWpf.Default); + public static readonly System.Windows.DependencyProperty PointsProperty = PropertyUtils.Register(nameof(Points), typeof(PointsWpf), typeof(PolyLineSegment), PointsWpf.Default); public PointsWpf Points { diff --git a/src/StandardUI.WPF/generated/Media/PolyQuadraticBezierSegment.cs b/src/StandardUI.WPF/generated/Media/PolyQuadraticBezierSegment.cs index 49e3e2b..690551a 100755 --- a/src/StandardUI.WPF/generated/Media/PolyQuadraticBezierSegment.cs +++ b/src/StandardUI.WPF/generated/Media/PolyQuadraticBezierSegment.cs @@ -1,12 +1,12 @@ // This file is generated from IPolyQuadraticBezierSegment.cs. Update the source file to change its contents. -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Wpf.Media +namespace Microsoft.StandardUI.Wpf.Media { public class PolyQuadraticBezierSegment : PathSegment, IPolyQuadraticBezierSegment { - public static readonly Windows.DependencyProperty PointsProperty = PropertyUtils.Register(nameof(Points), typeof(PointsWpf), typeof(PolyQuadraticBezierSegment), PointsWpf.Default); + public static readonly System.Windows.DependencyProperty PointsProperty = PropertyUtils.Register(nameof(Points), typeof(PointsWpf), typeof(PolyQuadraticBezierSegment), PointsWpf.Default); public PointsWpf Points { diff --git a/src/StandardUI.WPF/generated/Media/QuadraticBezierSegment.cs b/src/StandardUI.WPF/generated/Media/QuadraticBezierSegment.cs index 875f1a6..ee43861 100755 --- a/src/StandardUI.WPF/generated/Media/QuadraticBezierSegment.cs +++ b/src/StandardUI.WPF/generated/Media/QuadraticBezierSegment.cs @@ -1,13 +1,13 @@ // This file is generated from IQuadraticBezierSegment.cs. Update the source file to change its contents. -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Wpf.Media +namespace Microsoft.StandardUI.Wpf.Media { public class QuadraticBezierSegment : PathSegment, IQuadraticBezierSegment { - public static readonly Windows.DependencyProperty Point1Property = PropertyUtils.Register(nameof(Point1), typeof(PointWpf), typeof(QuadraticBezierSegment), PointWpf.Default); - public static readonly Windows.DependencyProperty Point2Property = PropertyUtils.Register(nameof(Point2), typeof(PointWpf), typeof(QuadraticBezierSegment), PointWpf.Default); + public static readonly System.Windows.DependencyProperty Point1Property = PropertyUtils.Register(nameof(Point1), typeof(PointWpf), typeof(QuadraticBezierSegment), PointWpf.Default); + public static readonly System.Windows.DependencyProperty Point2Property = PropertyUtils.Register(nameof(Point2), typeof(PointWpf), typeof(QuadraticBezierSegment), PointWpf.Default); public PointWpf Point1 { diff --git a/src/StandardUI.WPF/generated/Media/RadialGradientBrush.cs b/src/StandardUI.WPF/generated/Media/RadialGradientBrush.cs index a810104..503b7d2 100755 --- a/src/StandardUI.WPF/generated/Media/RadialGradientBrush.cs +++ b/src/StandardUI.WPF/generated/Media/RadialGradientBrush.cs @@ -1,14 +1,14 @@ // This file is generated from IRadialGradientBrush.cs. Update the source file to change its contents. -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Wpf.Media +namespace Microsoft.StandardUI.Wpf.Media { public class RadialGradientBrush : GradientBrush, IRadialGradientBrush { - public static readonly Windows.DependencyProperty CenterProperty = PropertyUtils.Register(nameof(Center), typeof(PointWpf), typeof(RadialGradientBrush), PointWpf.CenterDefault); - public static readonly Windows.DependencyProperty GradientOriginProperty = PropertyUtils.Register(nameof(GradientOrigin), typeof(PointWpf), typeof(RadialGradientBrush), PointWpf.CenterDefault); - public static readonly Windows.DependencyProperty RadiusXProperty = PropertyUtils.Register(nameof(RadiusX), typeof(double), typeof(RadialGradientBrush), 0.5); + public static readonly System.Windows.DependencyProperty CenterProperty = PropertyUtils.Register(nameof(Center), typeof(PointWpf), typeof(RadialGradientBrush), PointWpf.CenterDefault); + public static readonly System.Windows.DependencyProperty GradientOriginProperty = PropertyUtils.Register(nameof(GradientOrigin), typeof(PointWpf), typeof(RadialGradientBrush), PointWpf.CenterDefault); + public static readonly System.Windows.DependencyProperty RadiusXProperty = PropertyUtils.Register(nameof(RadiusX), typeof(double), typeof(RadialGradientBrush), 0.5); public PointWpf Center { diff --git a/src/StandardUI.WPF/generated/Media/RotateTransform.cs b/src/StandardUI.WPF/generated/Media/RotateTransform.cs index 5330061..9b2d7da 100755 --- a/src/StandardUI.WPF/generated/Media/RotateTransform.cs +++ b/src/StandardUI.WPF/generated/Media/RotateTransform.cs @@ -1,14 +1,14 @@ // This file is generated from IRotateTransform.cs. Update the source file to change its contents. -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Wpf.Media +namespace Microsoft.StandardUI.Wpf.Media { public class RotateTransform : Transform, IRotateTransform { - public static readonly Windows.DependencyProperty AngleProperty = PropertyUtils.Register(nameof(Angle), typeof(double), typeof(RotateTransform), 0.0); - public static readonly Windows.DependencyProperty CenterXProperty = PropertyUtils.Register(nameof(CenterX), typeof(double), typeof(RotateTransform), 0.0); - public static readonly Windows.DependencyProperty CenterYProperty = PropertyUtils.Register(nameof(CenterY), typeof(double), typeof(RotateTransform), 0.0); + public static readonly System.Windows.DependencyProperty AngleProperty = PropertyUtils.Register(nameof(Angle), typeof(double), typeof(RotateTransform), 0.0); + public static readonly System.Windows.DependencyProperty CenterXProperty = PropertyUtils.Register(nameof(CenterX), typeof(double), typeof(RotateTransform), 0.0); + public static readonly System.Windows.DependencyProperty CenterYProperty = PropertyUtils.Register(nameof(CenterY), typeof(double), typeof(RotateTransform), 0.0); public double Angle { diff --git a/src/StandardUI.WPF/generated/Media/ScaleTransform.cs b/src/StandardUI.WPF/generated/Media/ScaleTransform.cs index 318df20..43303c4 100755 --- a/src/StandardUI.WPF/generated/Media/ScaleTransform.cs +++ b/src/StandardUI.WPF/generated/Media/ScaleTransform.cs @@ -1,15 +1,15 @@ // This file is generated from IScaleTransform.cs. Update the source file to change its contents. -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Wpf.Media +namespace Microsoft.StandardUI.Wpf.Media { public class ScaleTransform : Transform, IScaleTransform { - public static readonly Windows.DependencyProperty CenterXProperty = PropertyUtils.Register(nameof(CenterX), typeof(double), typeof(ScaleTransform), 0.0); - public static readonly Windows.DependencyProperty CenterYProperty = PropertyUtils.Register(nameof(CenterY), typeof(double), typeof(ScaleTransform), 0.0); - public static readonly Windows.DependencyProperty ScaleXProperty = PropertyUtils.Register(nameof(ScaleX), typeof(double), typeof(ScaleTransform), 1.0); - public static readonly Windows.DependencyProperty ScaleYProperty = PropertyUtils.Register(nameof(ScaleY), typeof(double), typeof(ScaleTransform), 1.0); + public static readonly System.Windows.DependencyProperty CenterXProperty = PropertyUtils.Register(nameof(CenterX), typeof(double), typeof(ScaleTransform), 0.0); + public static readonly System.Windows.DependencyProperty CenterYProperty = PropertyUtils.Register(nameof(CenterY), typeof(double), typeof(ScaleTransform), 0.0); + public static readonly System.Windows.DependencyProperty ScaleXProperty = PropertyUtils.Register(nameof(ScaleX), typeof(double), typeof(ScaleTransform), 1.0); + public static readonly System.Windows.DependencyProperty ScaleYProperty = PropertyUtils.Register(nameof(ScaleY), typeof(double), typeof(ScaleTransform), 1.0); public double CenterX { diff --git a/src/StandardUI.WPF/generated/Media/SolidColorBrush.cs b/src/StandardUI.WPF/generated/Media/SolidColorBrush.cs index 0376b36..47c6907 100755 --- a/src/StandardUI.WPF/generated/Media/SolidColorBrush.cs +++ b/src/StandardUI.WPF/generated/Media/SolidColorBrush.cs @@ -1,12 +1,12 @@ // This file is generated from ISolidColorBrush.cs. Update the source file to change its contents. -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Wpf.Media +namespace Microsoft.StandardUI.Wpf.Media { public class SolidColorBrush : Brush, ISolidColorBrush { - public static readonly Windows.DependencyProperty ColorProperty = PropertyUtils.Register(nameof(Color), typeof(ColorWpf), typeof(SolidColorBrush), ColorWpf.Default); + public static readonly System.Windows.DependencyProperty ColorProperty = PropertyUtils.Register(nameof(Color), typeof(ColorWpf), typeof(SolidColorBrush), ColorWpf.Default); public ColorWpf Color { diff --git a/src/StandardUI.WPF/generated/Media/Transform.cs b/src/StandardUI.WPF/generated/Media/Transform.cs index 568c19c..03a27f2 100755 --- a/src/StandardUI.WPF/generated/Media/Transform.cs +++ b/src/StandardUI.WPF/generated/Media/Transform.cs @@ -1,8 +1,8 @@ // This file is generated from ITransform.cs. Update the source file to change its contents. -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Wpf.Media +namespace Microsoft.StandardUI.Wpf.Media { public class Transform : StandardUIDependencyObject, ITransform { diff --git a/src/StandardUI.WPF/generated/Media/TransformGroup.cs b/src/StandardUI.WPF/generated/Media/TransformGroup.cs index 472595c..0f7f0cf 100755 --- a/src/StandardUI.WPF/generated/Media/TransformGroup.cs +++ b/src/StandardUI.WPF/generated/Media/TransformGroup.cs @@ -1,13 +1,13 @@ // This file is generated from ITransformGroup.cs. Update the source file to change its contents. using System.Collections.Generic; -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Wpf.Media +namespace Microsoft.StandardUI.Wpf.Media { public class TransformGroup : Transform, ITransformGroup { - public static readonly Windows.DependencyProperty ChildrenProperty = PropertyUtils.Register(nameof(Children), typeof(IEnumerable), typeof(TransformGroup), null); + public static readonly System.Windows.DependencyProperty ChildrenProperty = PropertyUtils.Register(nameof(Children), typeof(IEnumerable), typeof(TransformGroup), null); public IEnumerable Children => (IEnumerable) GetValue(ChildrenProperty); } diff --git a/src/StandardUI.WPF/generated/Media/TranslateTransform.cs b/src/StandardUI.WPF/generated/Media/TranslateTransform.cs index b0244a3..ba0c98f 100755 --- a/src/StandardUI.WPF/generated/Media/TranslateTransform.cs +++ b/src/StandardUI.WPF/generated/Media/TranslateTransform.cs @@ -1,13 +1,13 @@ // This file is generated from ITranslateTransform.cs. Update the source file to change its contents. -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Wpf.Media +namespace Microsoft.StandardUI.Wpf.Media { public class TranslateTransform : Transform, ITranslateTransform { - public static readonly Windows.DependencyProperty XProperty = PropertyUtils.Register(nameof(X), typeof(double), typeof(TranslateTransform), 0.0); - public static readonly Windows.DependencyProperty YProperty = PropertyUtils.Register(nameof(Y), typeof(double), typeof(TranslateTransform), 0.0); + public static readonly System.Windows.DependencyProperty XProperty = PropertyUtils.Register(nameof(X), typeof(double), typeof(TranslateTransform), 0.0); + public static readonly System.Windows.DependencyProperty YProperty = PropertyUtils.Register(nameof(Y), typeof(double), typeof(TranslateTransform), 0.0); public double X { diff --git a/src/StandardUI.WPF/generated/PropertyPath.cs b/src/StandardUI.WPF/generated/PropertyPath.cs index 5ff0867..3bed399 100755 --- a/src/StandardUI.WPF/generated/PropertyPath.cs +++ b/src/StandardUI.WPF/generated/PropertyPath.cs @@ -1,12 +1,12 @@ // This file is generated from IPropertyPath.cs. Update the source file to change its contents. -using System.StandardUI; +using Microsoft.StandardUI; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { public class PropertyPath : StandardUIDependencyObject, IPropertyPath { - public static readonly Windows.DependencyProperty PathProperty = PropertyUtils.Register(nameof(Path), typeof(string), typeof(PropertyPath), ""); + public static readonly System.Windows.DependencyProperty PathProperty = PropertyUtils.Register(nameof(Path), typeof(string), typeof(PropertyPath), ""); public string Path => (string) GetValue(PathProperty); } diff --git a/src/StandardUI.WPF/generated/Setter.cs b/src/StandardUI.WPF/generated/Setter.cs index fb67179..94c4e4c 100755 --- a/src/StandardUI.WPF/generated/Setter.cs +++ b/src/StandardUI.WPF/generated/Setter.cs @@ -1,14 +1,14 @@ // This file is generated from ISetter.cs. Update the source file to change its contents. -using System.StandardUI; +using Microsoft.StandardUI; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { public class Setter : UIPropertyObject, ISetter { - public static readonly Windows.DependencyProperty PropertyProperty = PropertyUtils.Register(nameof(Property), typeof(UIProperty), typeof(Setter), null); - public static readonly Windows.DependencyProperty TargetProperty = PropertyUtils.Register(nameof(Target), typeof(TargetPropertyPath), typeof(Setter), null); - public static readonly Windows.DependencyProperty ValueProperty = PropertyUtils.Register(nameof(Value), typeof(object), typeof(Setter), null); + public static readonly System.Windows.DependencyProperty PropertyProperty = PropertyUtils.Register(nameof(Property), typeof(UIProperty), typeof(Setter), null); + public static readonly System.Windows.DependencyProperty TargetProperty = PropertyUtils.Register(nameof(Target), typeof(TargetPropertyPath), typeof(Setter), null); + public static readonly System.Windows.DependencyProperty ValueProperty = PropertyUtils.Register(nameof(Value), typeof(object), typeof(Setter), null); public UIProperty? Property { diff --git a/src/StandardUI.WPF/generated/SetterCollection.cs b/src/StandardUI.WPF/generated/SetterCollection.cs index 649fffa..0fa0c49 100755 --- a/src/StandardUI.WPF/generated/SetterCollection.cs +++ b/src/StandardUI.WPF/generated/SetterCollection.cs @@ -1,9 +1,9 @@ // This file is generated from ISetterCollection.cs. Update the source file to change its contents. using System.Collections.Generic; -using System.StandardUI; +using Microsoft.StandardUI; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { public class SetterCollection : StandardUICollection, ISetterCollection { diff --git a/src/StandardUI.WPF/generated/Shapes/Ellipse.cs b/src/StandardUI.WPF/generated/Shapes/Ellipse.cs index dd2fa0b..a639c20 100755 --- a/src/StandardUI.WPF/generated/Shapes/Ellipse.cs +++ b/src/StandardUI.WPF/generated/Shapes/Ellipse.cs @@ -1,8 +1,8 @@ // This file is generated from IEllipse.cs. Update the source file to change its contents. -using System.StandardUI.Shapes; +using Microsoft.StandardUI.Shapes; -namespace System.StandardUI.Wpf.Shapes +namespace Microsoft.StandardUI.Wpf.Shapes { public class Ellipse : Shape, IEllipse { diff --git a/src/StandardUI.WPF/generated/Shapes/Line.cs b/src/StandardUI.WPF/generated/Shapes/Line.cs index 84c4226..a12f737 100755 --- a/src/StandardUI.WPF/generated/Shapes/Line.cs +++ b/src/StandardUI.WPF/generated/Shapes/Line.cs @@ -1,15 +1,15 @@ // This file is generated from ILine.cs. Update the source file to change its contents. -using System.StandardUI.Shapes; +using Microsoft.StandardUI.Shapes; -namespace System.StandardUI.Wpf.Shapes +namespace Microsoft.StandardUI.Wpf.Shapes { public class Line : Shape, ILine { - public static readonly Windows.DependencyProperty X1Property = PropertyUtils.Register(nameof(X1), typeof(double), typeof(Line), 0.0); - public static readonly Windows.DependencyProperty Y1Property = PropertyUtils.Register(nameof(Y1), typeof(double), typeof(Line), 0.0); - public static readonly Windows.DependencyProperty X2Property = PropertyUtils.Register(nameof(X2), typeof(double), typeof(Line), 0.0); - public static readonly Windows.DependencyProperty Y2Property = PropertyUtils.Register(nameof(Y2), typeof(double), typeof(Line), 0.0); + public static readonly System.Windows.DependencyProperty X1Property = PropertyUtils.Register(nameof(X1), typeof(double), typeof(Line), 0.0); + public static readonly System.Windows.DependencyProperty Y1Property = PropertyUtils.Register(nameof(Y1), typeof(double), typeof(Line), 0.0); + public static readonly System.Windows.DependencyProperty X2Property = PropertyUtils.Register(nameof(X2), typeof(double), typeof(Line), 0.0); + public static readonly System.Windows.DependencyProperty Y2Property = PropertyUtils.Register(nameof(Y2), typeof(double), typeof(Line), 0.0); public double X1 { diff --git a/src/StandardUI.WPF/generated/Shapes/Path.cs b/src/StandardUI.WPF/generated/Shapes/Path.cs index c9982e4..917b7c0 100755 --- a/src/StandardUI.WPF/generated/Shapes/Path.cs +++ b/src/StandardUI.WPF/generated/Shapes/Path.cs @@ -1,14 +1,14 @@ // This file is generated from IPath.cs. Update the source file to change its contents. -using System.StandardUI.Media; -using System.StandardUI.Wpf.Media; -using System.StandardUI.Shapes; +using Microsoft.StandardUI.Media; +using Microsoft.StandardUI.Wpf.Media; +using Microsoft.StandardUI.Shapes; -namespace System.StandardUI.Wpf.Shapes +namespace Microsoft.StandardUI.Wpf.Shapes { public class Path : Shape, IPath { - public static readonly Windows.DependencyProperty DataProperty = PropertyUtils.Register(nameof(Data), typeof(Geometry), typeof(Path), null); + public static readonly System.Windows.DependencyProperty DataProperty = PropertyUtils.Register(nameof(Data), typeof(Geometry), typeof(Path), null); public Geometry Data { diff --git a/src/StandardUI.WPF/generated/Shapes/Polygon.cs b/src/StandardUI.WPF/generated/Shapes/Polygon.cs index 657a914..1441e20 100755 --- a/src/StandardUI.WPF/generated/Shapes/Polygon.cs +++ b/src/StandardUI.WPF/generated/Shapes/Polygon.cs @@ -1,15 +1,15 @@ // This file is generated from IPolygon.cs. Update the source file to change its contents. -using System.StandardUI.Media; -using System.StandardUI.Wpf.Media; -using System.StandardUI.Shapes; +using Microsoft.StandardUI.Media; +using Microsoft.StandardUI.Wpf.Media; +using Microsoft.StandardUI.Shapes; -namespace System.StandardUI.Wpf.Shapes +namespace Microsoft.StandardUI.Wpf.Shapes { public class Polygon : Shape, IPolygon { - public static readonly Windows.DependencyProperty FillRuleProperty = PropertyUtils.Register(nameof(FillRule), typeof(FillRule), typeof(Polygon), FillRule.EvenOdd); - public static readonly Windows.DependencyProperty PointsProperty = PropertyUtils.Register(nameof(Points), typeof(PointsWpf), typeof(Polygon), PointsWpf.Default); + public static readonly System.Windows.DependencyProperty FillRuleProperty = PropertyUtils.Register(nameof(FillRule), typeof(FillRule), typeof(Polygon), FillRule.EvenOdd); + public static readonly System.Windows.DependencyProperty PointsProperty = PropertyUtils.Register(nameof(Points), typeof(PointsWpf), typeof(Polygon), PointsWpf.Default); public FillRule FillRule { diff --git a/src/StandardUI.WPF/generated/Shapes/Polyline.cs b/src/StandardUI.WPF/generated/Shapes/Polyline.cs index 591e02b..3c75874 100755 --- a/src/StandardUI.WPF/generated/Shapes/Polyline.cs +++ b/src/StandardUI.WPF/generated/Shapes/Polyline.cs @@ -1,15 +1,15 @@ // This file is generated from IPolyline.cs. Update the source file to change its contents. -using System.StandardUI.Media; -using System.StandardUI.Wpf.Media; -using System.StandardUI.Shapes; +using Microsoft.StandardUI.Media; +using Microsoft.StandardUI.Wpf.Media; +using Microsoft.StandardUI.Shapes; -namespace System.StandardUI.Wpf.Shapes +namespace Microsoft.StandardUI.Wpf.Shapes { public class Polyline : Shape, IPolyline { - public static readonly Windows.DependencyProperty FillRuleProperty = PropertyUtils.Register(nameof(FillRule), typeof(FillRule), typeof(Polyline), FillRule.EvenOdd); - public static readonly Windows.DependencyProperty PointsProperty = PropertyUtils.Register(nameof(Points), typeof(PointsWpf), typeof(Polyline), PointsWpf.Default); + public static readonly System.Windows.DependencyProperty FillRuleProperty = PropertyUtils.Register(nameof(FillRule), typeof(FillRule), typeof(Polyline), FillRule.EvenOdd); + public static readonly System.Windows.DependencyProperty PointsProperty = PropertyUtils.Register(nameof(Points), typeof(PointsWpf), typeof(Polyline), PointsWpf.Default); public FillRule FillRule { diff --git a/src/StandardUI.WPF/generated/Shapes/Rectangle.cs b/src/StandardUI.WPF/generated/Shapes/Rectangle.cs index 201e49f..332ae41 100755 --- a/src/StandardUI.WPF/generated/Shapes/Rectangle.cs +++ b/src/StandardUI.WPF/generated/Shapes/Rectangle.cs @@ -1,13 +1,13 @@ // This file is generated from IRectangle.cs. Update the source file to change its contents. -using System.StandardUI.Shapes; +using Microsoft.StandardUI.Shapes; -namespace System.StandardUI.Wpf.Shapes +namespace Microsoft.StandardUI.Wpf.Shapes { public class Rectangle : Shape, IRectangle { - public static readonly Windows.DependencyProperty RadiusXProperty = PropertyUtils.Register(nameof(RadiusX), typeof(double), typeof(Rectangle), 0.0); - public static readonly Windows.DependencyProperty RadiusYProperty = PropertyUtils.Register(nameof(RadiusY), typeof(double), typeof(Rectangle), 0.0); + public static readonly System.Windows.DependencyProperty RadiusXProperty = PropertyUtils.Register(nameof(RadiusX), typeof(double), typeof(Rectangle), 0.0); + public static readonly System.Windows.DependencyProperty RadiusYProperty = PropertyUtils.Register(nameof(RadiusY), typeof(double), typeof(Rectangle), 0.0); public double RadiusX { diff --git a/src/StandardUI.WPF/generated/Shapes/Shape.cs b/src/StandardUI.WPF/generated/Shapes/Shape.cs index da96e16..3c963e6 100755 --- a/src/StandardUI.WPF/generated/Shapes/Shape.cs +++ b/src/StandardUI.WPF/generated/Shapes/Shape.cs @@ -1,19 +1,19 @@ // This file is generated from IShape.cs. Update the source file to change its contents. -using System.StandardUI.Media; -using System.StandardUI.Wpf.Media; -using System.StandardUI.Shapes; +using Microsoft.StandardUI.Media; +using Microsoft.StandardUI.Wpf.Media; +using Microsoft.StandardUI.Shapes; -namespace System.StandardUI.Wpf.Shapes +namespace Microsoft.StandardUI.Wpf.Shapes { public class Shape : StandardUIFrameworkElement, IShape { - public static readonly Windows.DependencyProperty FillProperty = PropertyUtils.Register(nameof(Fill), typeof(Brush), typeof(Shape), null); - public static readonly Windows.DependencyProperty StrokeProperty = PropertyUtils.Register(nameof(Stroke), typeof(Brush), typeof(Shape), null); - public static readonly Windows.DependencyProperty StrokeThicknessProperty = PropertyUtils.Register(nameof(StrokeThickness), typeof(double), typeof(Shape), 1.0); - public static readonly Windows.DependencyProperty StrokeMiterLimitProperty = PropertyUtils.Register(nameof(StrokeMiterLimit), typeof(double), typeof(Shape), 10.0); - public static readonly Windows.DependencyProperty StrokeLineCapProperty = PropertyUtils.Register(nameof(StrokeLineCap), typeof(PenLineCap), typeof(Shape), PenLineCap.Flat); - public static readonly Windows.DependencyProperty StrokeLineJoinProperty = PropertyUtils.Register(nameof(StrokeLineJoin), typeof(PenLineJoin), typeof(Shape), PenLineJoin.Miter); + public static readonly System.Windows.DependencyProperty FillProperty = PropertyUtils.Register(nameof(Fill), typeof(Brush), typeof(Shape), null); + public static readonly System.Windows.DependencyProperty StrokeProperty = PropertyUtils.Register(nameof(Stroke), typeof(Brush), typeof(Shape), null); + public static readonly System.Windows.DependencyProperty StrokeThicknessProperty = PropertyUtils.Register(nameof(StrokeThickness), typeof(double), typeof(Shape), 1.0); + public static readonly System.Windows.DependencyProperty StrokeMiterLimitProperty = PropertyUtils.Register(nameof(StrokeMiterLimit), typeof(double), typeof(Shape), 10.0); + public static readonly System.Windows.DependencyProperty StrokeLineCapProperty = PropertyUtils.Register(nameof(StrokeLineCap), typeof(PenLineCap), typeof(Shape), PenLineCap.Flat); + public static readonly System.Windows.DependencyProperty StrokeLineJoinProperty = PropertyUtils.Register(nameof(StrokeLineJoin), typeof(PenLineJoin), typeof(Shape), PenLineJoin.Miter); public Brush? Fill { diff --git a/src/StandardUI.WPF/generated/TargetPropertyPath.cs b/src/StandardUI.WPF/generated/TargetPropertyPath.cs index 8c6d664..c3b76dd 100755 --- a/src/StandardUI.WPF/generated/TargetPropertyPath.cs +++ b/src/StandardUI.WPF/generated/TargetPropertyPath.cs @@ -1,13 +1,13 @@ // This file is generated from ITargetPropertyPath.cs. Update the source file to change its contents. -using System.StandardUI; +using Microsoft.StandardUI; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { public class TargetPropertyPath : StandardUIDependencyObject, ITargetPropertyPath { - public static readonly Windows.DependencyProperty PropertyProperty = PropertyUtils.Register(nameof(Property), typeof(PropertyPath), typeof(TargetPropertyPath), null); - public static readonly Windows.DependencyProperty TargetProperty = PropertyUtils.Register(nameof(Target), typeof(object), typeof(TargetPropertyPath), null); + public static readonly System.Windows.DependencyProperty PropertyProperty = PropertyUtils.Register(nameof(Property), typeof(PropertyPath), typeof(TargetPropertyPath), null); + public static readonly System.Windows.DependencyProperty TargetProperty = PropertyUtils.Register(nameof(Target), typeof(object), typeof(TargetPropertyPath), null); public PropertyPath Property { diff --git a/src/StandardUI.WPF/generated/UIPropertyChangedEventArgs.cs b/src/StandardUI.WPF/generated/UIPropertyChangedEventArgs.cs index 4dc849d..5285b9a 100644 --- a/src/StandardUI.WPF/generated/UIPropertyChangedEventArgs.cs +++ b/src/StandardUI.WPF/generated/UIPropertyChangedEventArgs.cs @@ -1,8 +1,8 @@ // This file is generated from IUIPropertyChangedEventArgs.cs. Update the source file to change its contents. -using System.StandardUI; +using Microsoft.StandardUI; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { public class UIPropertyChangedEventArgs : StandardUIDependencyObject, IUIPropertyChangedEventArgs { diff --git a/src/StandardUI.WPF/generated/UIPropertyMetadata.cs b/src/StandardUI.WPF/generated/UIPropertyMetadata.cs index 1e4f894..afd467e 100644 --- a/src/StandardUI.WPF/generated/UIPropertyMetadata.cs +++ b/src/StandardUI.WPF/generated/UIPropertyMetadata.cs @@ -1,8 +1,8 @@ // This file is generated from IUIPropertyMetadata.cs. Update the source file to change its contents. -using System.StandardUI; +using Microsoft.StandardUI; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { public class UIPropertyMetadata : StandardUIDependencyObject, IUIPropertyMetadata { diff --git a/src/StandardUI.WPF/generated/UIPropertyObject.cs b/src/StandardUI.WPF/generated/UIPropertyObject.cs index a7dd791..3835b66 100644 --- a/src/StandardUI.WPF/generated/UIPropertyObject.cs +++ b/src/StandardUI.WPF/generated/UIPropertyObject.cs @@ -1,8 +1,8 @@ // This file is generated from IUIPropertyObject.cs. Update the source file to change its contents. -using System.StandardUI; +using Microsoft.StandardUI; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { public class UIPropertyObject : StandardUIDependencyObject, IUIPropertyObject { diff --git a/src/StandardUI.WPF/generated/VisualState.cs b/src/StandardUI.WPF/generated/VisualState.cs index 7323cc2..edebf48 100755 --- a/src/StandardUI.WPF/generated/VisualState.cs +++ b/src/StandardUI.WPF/generated/VisualState.cs @@ -1,13 +1,13 @@ // This file is generated from IVisualState.cs. Update the source file to change its contents. -using System.StandardUI; +using Microsoft.StandardUI; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { public class VisualState : UIPropertyObject, IVisualState { - public static readonly Windows.DependencyProperty NameProperty = PropertyUtils.Register(nameof(Name), typeof(string), typeof(VisualState), ""); - public static readonly Windows.DependencyProperty SettersProperty = PropertyUtils.Register(nameof(Setters), typeof(SetterCollection), typeof(VisualState), null); + public static readonly System.Windows.DependencyProperty NameProperty = PropertyUtils.Register(nameof(Name), typeof(string), typeof(VisualState), ""); + public static readonly System.Windows.DependencyProperty SettersProperty = PropertyUtils.Register(nameof(Setters), typeof(SetterCollection), typeof(VisualState), null); private SetterCollection _setterCollection; diff --git a/src/StandardUI.WPF/generated/VisualStateCollection.cs b/src/StandardUI.WPF/generated/VisualStateCollection.cs index 9da112a..28751f6 100755 --- a/src/StandardUI.WPF/generated/VisualStateCollection.cs +++ b/src/StandardUI.WPF/generated/VisualStateCollection.cs @@ -1,9 +1,9 @@ // This file is generated from IVisualStateCollection.cs. Update the source file to change its contents. using System.Collections.Generic; -using System.StandardUI; +using Microsoft.StandardUI; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { public class VisualStateCollection : StandardUICollection, IVisualStateCollection { diff --git a/src/StandardUI.WPF/generated/VisualStateGroup.cs b/src/StandardUI.WPF/generated/VisualStateGroup.cs index d5230fc..68a3652 100755 --- a/src/StandardUI.WPF/generated/VisualStateGroup.cs +++ b/src/StandardUI.WPF/generated/VisualStateGroup.cs @@ -1,14 +1,14 @@ // This file is generated from IVisualStateGroup.cs. Update the source file to change its contents. -using System.StandardUI; +using Microsoft.StandardUI; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { public class VisualStateGroup : UIPropertyObject, IVisualStateGroup { - public static readonly Windows.DependencyProperty CurrentStateProperty = PropertyUtils.Register(nameof(CurrentState), typeof(VisualState), typeof(VisualStateGroup), null); - public static readonly Windows.DependencyProperty NameProperty = PropertyUtils.Register(nameof(Name), typeof(string), typeof(VisualStateGroup), ""); - public static readonly Windows.DependencyProperty StatesProperty = PropertyUtils.Register(nameof(States), typeof(VisualStateCollection), typeof(VisualStateGroup), null); + public static readonly System.Windows.DependencyProperty CurrentStateProperty = PropertyUtils.Register(nameof(CurrentState), typeof(VisualState), typeof(VisualStateGroup), null); + public static readonly System.Windows.DependencyProperty NameProperty = PropertyUtils.Register(nameof(Name), typeof(string), typeof(VisualStateGroup), ""); + public static readonly System.Windows.DependencyProperty StatesProperty = PropertyUtils.Register(nameof(States), typeof(VisualStateCollection), typeof(VisualStateGroup), null); private VisualStateCollection _visualStateCollection; diff --git a/src/StandardUI.WPF/generated/VisualStateGroupCollection.cs b/src/StandardUI.WPF/generated/VisualStateGroupCollection.cs index 5b227cc..866bc5a 100755 --- a/src/StandardUI.WPF/generated/VisualStateGroupCollection.cs +++ b/src/StandardUI.WPF/generated/VisualStateGroupCollection.cs @@ -1,9 +1,9 @@ // This file is generated from IVisualStateGroupCollection.cs. Update the source file to change its contents. using System.Collections.Generic; -using System.StandardUI; +using Microsoft.StandardUI; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { public class VisualStateGroupCollection : StandardUICollection, IVisualStateGroupCollection { diff --git a/src/StandardUI.WPF/generated/VisualStateManager.cs b/src/StandardUI.WPF/generated/VisualStateManager.cs index 732b19b..57e579f 100755 --- a/src/StandardUI.WPF/generated/VisualStateManager.cs +++ b/src/StandardUI.WPF/generated/VisualStateManager.cs @@ -1,8 +1,8 @@ // This file is generated from IVisualStateManager.cs. Update the source file to change its contents. -using System.StandardUI; +using Microsoft.StandardUI; -namespace System.StandardUI.Wpf +namespace Microsoft.StandardUI.Wpf { public class VisualStateManager : StandardUIDependencyObject, IVisualStateManager { diff --git a/src/StandardUI/Color.cs b/src/StandardUI/Color.cs index d3dae7e..1d98afb 100755 --- a/src/StandardUI/Color.cs +++ b/src/StandardUI/Color.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI +namespace Microsoft.StandardUI { /// /// Describes a color in terms of alpha, red, green, and blue channels. diff --git a/src/StandardUI/Colors.cs b/src/StandardUI/Colors.cs index baafedb..57425fa 100755 --- a/src/StandardUI/Colors.cs +++ b/src/StandardUI/Colors.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI +namespace Microsoft.StandardUI { public class Colors { diff --git a/src/StandardUI/Controls/BackgroundSizing.cs b/src/StandardUI/Controls/BackgroundSizing.cs index ea8a8ec..d4b2b07 100644 --- a/src/StandardUI/Controls/BackgroundSizing.cs +++ b/src/StandardUI/Controls/BackgroundSizing.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Controls +namespace Microsoft.StandardUI.Controls { /// /// Defines constants that specify how far an element's background extends in relation to the element's border. diff --git a/src/StandardUI/Controls/CanvasAttachedExtensions.cs b/src/StandardUI/Controls/CanvasAttachedExtensions.cs index d600a3f..77f6c97 100755 --- a/src/StandardUI/Controls/CanvasAttachedExtensions.cs +++ b/src/StandardUI/Controls/CanvasAttachedExtensions.cs @@ -1,6 +1,6 @@ using System; -namespace System.StandardUI.Controls +namespace Microsoft.StandardUI.Controls { public static class CanvasAttachedExtensions { diff --git a/src/StandardUI/Controls/CanvasExtensions.cs b/src/StandardUI/Controls/CanvasExtensions.cs index 12d2fd3..0e6fe68 100755 --- a/src/StandardUI/Controls/CanvasExtensions.cs +++ b/src/StandardUI/Controls/CanvasExtensions.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Controls +namespace Microsoft.StandardUI.Controls { public static class CanvasExtensions { diff --git a/src/StandardUI/Controls/CanvasImplExtensions.cs b/src/StandardUI/Controls/CanvasImplExtensions.cs index 1720f45..608b4ff 100755 --- a/src/StandardUI/Controls/CanvasImplExtensions.cs +++ b/src/StandardUI/Controls/CanvasImplExtensions.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Controls +namespace Microsoft.StandardUI.Controls { public static class CanvasImplExtensions { diff --git a/src/StandardUI/Controls/IBorder.cs b/src/StandardUI/Controls/IBorder.cs index 6b5bc73..48aec23 100644 --- a/src/StandardUI/Controls/IBorder.cs +++ b/src/StandardUI/Controls/IBorder.cs @@ -1,6 +1,6 @@ -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Controls +namespace Microsoft.StandardUI.Controls { [UIModelObject] public interface IBorder : IUIElement diff --git a/src/StandardUI/Controls/ICanvas.cs b/src/StandardUI/Controls/ICanvas.cs index 204f0f6..090b6b7 100755 --- a/src/StandardUI/Controls/ICanvas.cs +++ b/src/StandardUI/Controls/ICanvas.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Controls +namespace Microsoft.StandardUI.Controls { [UIModelObject] public interface ICanvas : IPanel diff --git a/src/StandardUI/Controls/ICanvasAttached.cs b/src/StandardUI/Controls/ICanvasAttached.cs index 670be5f..a05816b 100755 --- a/src/StandardUI/Controls/ICanvasAttached.cs +++ b/src/StandardUI/Controls/ICanvasAttached.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Controls +namespace Microsoft.StandardUI.Controls { [UIModelObject] public interface ICanvasAttached diff --git a/src/StandardUI/Controls/IControl.cs b/src/StandardUI/Controls/IControl.cs index e4d2fba..3d15fc5 100755 --- a/src/StandardUI/Controls/IControl.cs +++ b/src/StandardUI/Controls/IControl.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Controls +namespace Microsoft.StandardUI.Controls { public interface IControl : IUIElement { diff --git a/src/StandardUI/Controls/IControlTemplate.cs b/src/StandardUI/Controls/IControlTemplate.cs index 2f02493..aac60ab 100644 --- a/src/StandardUI/Controls/IControlTemplate.cs +++ b/src/StandardUI/Controls/IControlTemplate.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Controls +namespace Microsoft.StandardUI.Controls { [UIModelObject] public interface IControlTemplate diff --git a/src/StandardUI/Controls/IGrid.cs b/src/StandardUI/Controls/IGrid.cs index 4484b17..c414126 100755 --- a/src/StandardUI/Controls/IGrid.cs +++ b/src/StandardUI/Controls/IGrid.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Controls +namespace Microsoft.StandardUI.Controls { [UIModelObject] public interface IGrid : IPanel diff --git a/src/StandardUI/Controls/IPanel.cs b/src/StandardUI/Controls/IPanel.cs index 5855564..362f814 100755 --- a/src/StandardUI/Controls/IPanel.cs +++ b/src/StandardUI/Controls/IPanel.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Controls +namespace Microsoft.StandardUI.Controls { [UIModelObject] public interface IPanel : IUIElement diff --git a/src/StandardUI/Controls/IStackPanel.cs b/src/StandardUI/Controls/IStackPanel.cs index 4e4c0c1..f086d01 100755 --- a/src/StandardUI/Controls/IStackPanel.cs +++ b/src/StandardUI/Controls/IStackPanel.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Controls +namespace Microsoft.StandardUI.Controls { [UIModelObject] public interface IStackPanel : IPanel diff --git a/src/StandardUI/Controls/IStandardUICollection.cs b/src/StandardUI/Controls/IStandardUICollection.cs index f70fed7..b8443e0 100644 --- a/src/StandardUI/Controls/IStandardUICollection.cs +++ b/src/StandardUI/Controls/IStandardUICollection.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace System.StandardUI +namespace Microsoft.StandardUI { public interface IStandardUICollection : IList { diff --git a/src/StandardUI/Controls/IStandardUIControlEnvironmentPeer.cs b/src/StandardUI/Controls/IStandardUIControlEnvironmentPeer.cs index 1ae1f0f..7e02b89 100644 --- a/src/StandardUI/Controls/IStandardUIControlEnvironmentPeer.cs +++ b/src/StandardUI/Controls/IStandardUIControlEnvironmentPeer.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Controls +namespace Microsoft.StandardUI.Controls { public interface IStandardUIControlEnvironmentPeer : IDependencyObjectEnvironmentPeer { diff --git a/src/StandardUI/Controls/ITextBlock.cs b/src/StandardUI/Controls/ITextBlock.cs index e38135e..cc7009a 100644 --- a/src/StandardUI/Controls/ITextBlock.cs +++ b/src/StandardUI/Controls/ITextBlock.cs @@ -1,7 +1,7 @@ -using System.StandardUI.Media; -using System.StandardUI.Text; +using Microsoft.StandardUI.Media; +using Microsoft.StandardUI.Text; -namespace System.StandardUI.Controls +namespace Microsoft.StandardUI.Controls { [UIModelObject] public interface ITextBlock : IUIElement diff --git a/src/StandardUI/Controls/IUIElementCollection.cs b/src/StandardUI/Controls/IUIElementCollection.cs index 615ae60..93868d7 100755 --- a/src/StandardUI/Controls/IUIElementCollection.cs +++ b/src/StandardUI/Controls/IUIElementCollection.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace System.StandardUI +namespace Microsoft.StandardUI { public interface IUIElementCollection : IStandardUICollection { diff --git a/src/StandardUI/Controls/IUserControl.cs b/src/StandardUI/Controls/IUserControl.cs index e7e9f29..fc80f49 100755 --- a/src/StandardUI/Controls/IUserControl.cs +++ b/src/StandardUI/Controls/IUserControl.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Controls +namespace Microsoft.StandardUI.Controls { public interface IUserControl : IControl { diff --git a/src/StandardUI/Controls/StandardUIControl.cs b/src/StandardUI/Controls/StandardUIControl.cs index 1f5d940..816efbe 100644 --- a/src/StandardUI/Controls/StandardUIControl.cs +++ b/src/StandardUI/Controls/StandardUIControl.cs @@ -1,6 +1,7 @@ -using static System.StandardUI.FactoryStatics; +using System; +using static Microsoft.StandardUI.FactoryStatics; -namespace System.StandardUI.Controls +namespace Microsoft.StandardUI.Controls { public abstract class StandardUIControl : IUIElement { diff --git a/src/StandardUI/Controls/StandardUIUserControl.cs b/src/StandardUI/Controls/StandardUIUserControl.cs index 366dd29..8962ed1 100644 --- a/src/StandardUI/Controls/StandardUIUserControl.cs +++ b/src/StandardUI/Controls/StandardUIUserControl.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Controls +namespace Microsoft.StandardUI.Controls { public class StandardUIUserControl : StandardUIControl { diff --git a/src/StandardUI/Converters/ColorConverter.cs b/src/StandardUI/Converters/ColorConverter.cs index 8f7d73a..6ff45c9 100755 --- a/src/StandardUI/Converters/ColorConverter.cs +++ b/src/StandardUI/Converters/ColorConverter.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace System.StandardUI.Converters +namespace Microsoft.StandardUI.Converters { public static class ColorConverter { diff --git a/src/StandardUI/Converters/PointConverter.cs b/src/StandardUI/Converters/PointConverter.cs index 3bffa2a..8a7f470 100755 --- a/src/StandardUI/Converters/PointConverter.cs +++ b/src/StandardUI/Converters/PointConverter.cs @@ -2,7 +2,7 @@ using System; using System.Globalization; using System.Text; -namespace System.StandardUI.Converters +namespace Microsoft.StandardUI.Converters { public static class PointConverter { diff --git a/src/StandardUI/Converters/PointsConverter.cs b/src/StandardUI/Converters/PointsConverter.cs index 0a2ba4b..c85e009 100755 --- a/src/StandardUI/Converters/PointsConverter.cs +++ b/src/StandardUI/Converters/PointsConverter.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Globalization; using System.Text; -namespace System.StandardUI.Converters +namespace Microsoft.StandardUI.Converters { public static class PointsConverter { diff --git a/src/StandardUI/Converters/SizeConverter.cs b/src/StandardUI/Converters/SizeConverter.cs index e9461ba..f74938d 100755 --- a/src/StandardUI/Converters/SizeConverter.cs +++ b/src/StandardUI/Converters/SizeConverter.cs @@ -1,7 +1,7 @@ using System; using System.Globalization; -namespace System.StandardUI.Converters +namespace Microsoft.StandardUI.Converters { public static class SizeConverter { diff --git a/src/StandardUI/Converters/TokenizerHelper.cs b/src/StandardUI/Converters/TokenizerHelper.cs index 8b6384d..b9746e1 100755 --- a/src/StandardUI/Converters/TokenizerHelper.cs +++ b/src/StandardUI/Converters/TokenizerHelper.cs @@ -11,7 +11,7 @@ using System; using System.Diagnostics; using System.Globalization; -namespace System.StandardUI.Converters +namespace Microsoft.StandardUI.Converters { internal class TokenizerHelper { diff --git a/src/StandardUI/CornerRadius.cs b/src/StandardUI/CornerRadius.cs index 9e4f577..a85b0ba 100644 --- a/src/StandardUI/CornerRadius.cs +++ b/src/StandardUI/CornerRadius.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI +namespace Microsoft.StandardUI { /// /// Describes the characteristics of a rounded corner, such as can be applied to a Border. diff --git a/src/StandardUI/DefaultValueAttribute.cs b/src/StandardUI/DefaultValueAttribute.cs index 8c6339d..8283091 100755 --- a/src/StandardUI/DefaultValueAttribute.cs +++ b/src/StandardUI/DefaultValueAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace System.StandardUI +namespace Microsoft.StandardUI { [AttributeUsage(AttributeTargets.Property | AttributeTargets.Method)] public class DefaultValueAttribute : Attribute diff --git a/src/StandardUI/FactoryStatics.cs b/src/StandardUI/FactoryStatics.cs index d773d7a..4fd029f 100755 --- a/src/StandardUI/FactoryStatics.cs +++ b/src/StandardUI/FactoryStatics.cs @@ -1,8 +1,9 @@ -using System.StandardUI.Controls; -using System.StandardUI.Media; -using System.StandardUI.Shapes; +using Microsoft.StandardUI.Controls; +using Microsoft.StandardUI.Media; +using Microsoft.StandardUI.Shapes; +using System; -namespace System.StandardUI +namespace Microsoft.StandardUI { public static class FactoryStatics { diff --git a/src/StandardUI/IDependencyObjectEnvironmentPeer.cs b/src/StandardUI/IDependencyObjectEnvironmentPeer.cs index 6962844..25540cf 100644 --- a/src/StandardUI/IDependencyObjectEnvironmentPeer.cs +++ b/src/StandardUI/IDependencyObjectEnvironmentPeer.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI +namespace Microsoft.StandardUI { public interface IDependencyObjectEnvironmentPeer { diff --git a/src/StandardUI/INotifyObjectOrSubobjectChanged.cs b/src/StandardUI/INotifyObjectOrSubobjectChanged.cs index fb332c8..e4cc3dd 100755 --- a/src/StandardUI/INotifyObjectOrSubobjectChanged.cs +++ b/src/StandardUI/INotifyObjectOrSubobjectChanged.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace System.StandardUI +namespace Microsoft.StandardUI { public delegate void ObjectOrSubobjectChangedEventHandler(); diff --git a/src/StandardUI/IPropertyPath.cs b/src/StandardUI/IPropertyPath.cs index 8a8fe92..128d2b3 100755 --- a/src/StandardUI/IPropertyPath.cs +++ b/src/StandardUI/IPropertyPath.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI +namespace Microsoft.StandardUI { /// /// Implements a data structure for describing a property as a path below another property, or diff --git a/src/StandardUI/ISetter.cs b/src/StandardUI/ISetter.cs index 8247b1e..4f1e8e3 100755 --- a/src/StandardUI/ISetter.cs +++ b/src/StandardUI/ISetter.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI +namespace Microsoft.StandardUI { [UIModelObject] public interface ISetter : IUIPropertyObject diff --git a/src/StandardUI/ISetterCollection.cs b/src/StandardUI/ISetterCollection.cs index 92c93bb..fcf95cc 100755 --- a/src/StandardUI/ISetterCollection.cs +++ b/src/StandardUI/ISetterCollection.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace System.StandardUI +namespace Microsoft.StandardUI { [UIModelObject] public interface ISetterCollection : IList diff --git a/src/StandardUI/IStandardUIEnvironment.cs b/src/StandardUI/IStandardUIEnvironment.cs index 3f2cdc0..dced1d9 100755 --- a/src/StandardUI/IStandardUIEnvironment.cs +++ b/src/StandardUI/IStandardUIEnvironment.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI +namespace Microsoft.StandardUI { public interface IStandardUIEnvironment { diff --git a/src/StandardUI/IStandardUIFactory.cs b/src/StandardUI/IStandardUIFactory.cs index 0446abf..5363f41 100644 --- a/src/StandardUI/IStandardUIFactory.cs +++ b/src/StandardUI/IStandardUIFactory.cs @@ -1,9 +1,10 @@ -using System.Collections.Generic; -using System.StandardUI.Controls; -using System.StandardUI.Media; -using System.StandardUI.Shapes; +using System; +using System.Collections.Generic; +using Microsoft.StandardUI.Controls; +using Microsoft.StandardUI.Media; +using Microsoft.StandardUI.Shapes; -namespace System.StandardUI +namespace Microsoft.StandardUI { public interface IStandardUIFactory { diff --git a/src/StandardUI/ITargetPropertyPath.cs b/src/StandardUI/ITargetPropertyPath.cs index 8aa2776..01a5c98 100755 --- a/src/StandardUI/ITargetPropertyPath.cs +++ b/src/StandardUI/ITargetPropertyPath.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI +namespace Microsoft.StandardUI { /// /// Represents the path to a property on a target element. diff --git a/src/StandardUI/IUIElement.cs b/src/StandardUI/IUIElement.cs index 5a2d807..97456f5 100755 --- a/src/StandardUI/IUIElement.cs +++ b/src/StandardUI/IUIElement.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI +namespace Microsoft.StandardUI { public interface IUIElement : IUIPropertyObject { diff --git a/src/StandardUI/IUIProperty.cs b/src/StandardUI/IUIProperty.cs index 6fbeae5..a13ec8a 100644 --- a/src/StandardUI/IUIProperty.cs +++ b/src/StandardUI/IUIProperty.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI +namespace Microsoft.StandardUI { public interface IUIProperty { diff --git a/src/StandardUI/IUIPropertyChangedEventArgs.cs b/src/StandardUI/IUIPropertyChangedEventArgs.cs index 30402f3..6c335f4 100644 --- a/src/StandardUI/IUIPropertyChangedEventArgs.cs +++ b/src/StandardUI/IUIPropertyChangedEventArgs.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI +namespace Microsoft.StandardUI { [UIModelObject] public interface IUIPropertyChangedEventArgs diff --git a/src/StandardUI/IUIPropertyMetadata.cs b/src/StandardUI/IUIPropertyMetadata.cs index c362800..d737526 100644 --- a/src/StandardUI/IUIPropertyMetadata.cs +++ b/src/StandardUI/IUIPropertyMetadata.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI +namespace Microsoft.StandardUI { [UIModelObject] public interface IUIPropertyMetadata diff --git a/src/StandardUI/IUIPropertyObject.cs b/src/StandardUI/IUIPropertyObject.cs index 6e7bfc9..fc3467e 100644 --- a/src/StandardUI/IUIPropertyObject.cs +++ b/src/StandardUI/IUIPropertyObject.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI +namespace Microsoft.StandardUI { [UIModelObject] public interface IUIPropertyObject diff --git a/src/StandardUI/IVisualState.cs b/src/StandardUI/IVisualState.cs index 84816c8..613e342 100755 --- a/src/StandardUI/IVisualState.cs +++ b/src/StandardUI/IVisualState.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI +namespace Microsoft.StandardUI { [UIModelObject] public interface IVisualState : IUIPropertyObject diff --git a/src/StandardUI/IVisualStateCollection.cs b/src/StandardUI/IVisualStateCollection.cs index 5700fe9..abf7677 100755 --- a/src/StandardUI/IVisualStateCollection.cs +++ b/src/StandardUI/IVisualStateCollection.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace System.StandardUI +namespace Microsoft.StandardUI { [UIModelObject] public interface IVisualStateCollection : IList diff --git a/src/StandardUI/IVisualStateGroup.cs b/src/StandardUI/IVisualStateGroup.cs index 865f403..405ad42 100755 --- a/src/StandardUI/IVisualStateGroup.cs +++ b/src/StandardUI/IVisualStateGroup.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI +namespace Microsoft.StandardUI { [UIModelObject] public interface IVisualStateGroup : IUIPropertyObject diff --git a/src/StandardUI/IVisualStateGroupCollection.cs b/src/StandardUI/IVisualStateGroupCollection.cs index 134e79d..3465466 100755 --- a/src/StandardUI/IVisualStateGroupCollection.cs +++ b/src/StandardUI/IVisualStateGroupCollection.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace System.StandardUI +namespace Microsoft.StandardUI { [UIModelObject] public interface IVisualStateGroupCollection : IList diff --git a/src/StandardUI/IVisualStateManager.cs b/src/StandardUI/IVisualStateManager.cs index d130d6d..74957e9 100755 --- a/src/StandardUI/IVisualStateManager.cs +++ b/src/StandardUI/IVisualStateManager.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI +namespace Microsoft.StandardUI { [UIModelObject] public interface IVisualStateManager diff --git a/src/StandardUI/Media/BrushMappingMode.cs b/src/StandardUI/Media/BrushMappingMode.cs index 4a4691b..ba4a217 100755 --- a/src/StandardUI/Media/BrushMappingMode.cs +++ b/src/StandardUI/Media/BrushMappingMode.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { public enum BrushMappingMode { diff --git a/src/StandardUI/Media/FillRule.cs b/src/StandardUI/Media/FillRule.cs index d607000..a94c212 100755 --- a/src/StandardUI/Media/FillRule.cs +++ b/src/StandardUI/Media/FillRule.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { public enum FillRule { diff --git a/src/StandardUI/Media/GradientSpreadMethod.cs b/src/StandardUI/Media/GradientSpreadMethod.cs index c591aa3..bc27ad7 100755 --- a/src/StandardUI/Media/GradientSpreadMethod.cs +++ b/src/StandardUI/Media/GradientSpreadMethod.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { public enum GradientSpreadMethod { diff --git a/src/StandardUI/Media/IArcSegment.cs b/src/StandardUI/Media/IArcSegment.cs index a135a34..938d80e 100755 --- a/src/StandardUI/Media/IArcSegment.cs +++ b/src/StandardUI/Media/IArcSegment.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { [UIModelObject] public interface IArcSegment : IPathSegment diff --git a/src/StandardUI/Media/IBezierSegment.cs b/src/StandardUI/Media/IBezierSegment.cs index 716e378..ac7c9d4 100755 --- a/src/StandardUI/Media/IBezierSegment.cs +++ b/src/StandardUI/Media/IBezierSegment.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { [UIModelObject] public interface IBezierSegment : IPathSegment diff --git a/src/StandardUI/Media/IBrush.cs b/src/StandardUI/Media/IBrush.cs index f3832f5..ac32ff0 100755 --- a/src/StandardUI/Media/IBrush.cs +++ b/src/StandardUI/Media/IBrush.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { [UIModelObject] public interface IBrush diff --git a/src/StandardUI/Media/IGeometry.cs b/src/StandardUI/Media/IGeometry.cs index 5e9ea2e..b716c82 100755 --- a/src/StandardUI/Media/IGeometry.cs +++ b/src/StandardUI/Media/IGeometry.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { [UIModelObject] public interface IGeometry diff --git a/src/StandardUI/Media/IGradientBrush.cs b/src/StandardUI/Media/IGradientBrush.cs index e1e05fc..e3e88af 100755 --- a/src/StandardUI/Media/IGradientBrush.cs +++ b/src/StandardUI/Media/IGradientBrush.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { [UIModelObject] public interface IGradientBrush : IBrush diff --git a/src/StandardUI/Media/IGradientStop.cs b/src/StandardUI/Media/IGradientStop.cs index 7fc9feb..1b0bfb1 100755 --- a/src/StandardUI/Media/IGradientStop.cs +++ b/src/StandardUI/Media/IGradientStop.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { [UIModelObject] public interface IGradientStop diff --git a/src/StandardUI/Media/ILineSegment.cs b/src/StandardUI/Media/ILineSegment.cs index 8f21411..7dc1947 100755 --- a/src/StandardUI/Media/ILineSegment.cs +++ b/src/StandardUI/Media/ILineSegment.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { [UIModelObject] public interface ILineSegment : IPathSegment diff --git a/src/StandardUI/Media/ILinearGradientBrush.cs b/src/StandardUI/Media/ILinearGradientBrush.cs index 52341dc..e9e848a 100755 --- a/src/StandardUI/Media/ILinearGradientBrush.cs +++ b/src/StandardUI/Media/ILinearGradientBrush.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { [UIModelObject] public interface ILinearGradientBrush : IGradientBrush diff --git a/src/StandardUI/Media/IPathFigure.cs b/src/StandardUI/Media/IPathFigure.cs index d70a0c8..4585167 100755 --- a/src/StandardUI/Media/IPathFigure.cs +++ b/src/StandardUI/Media/IPathFigure.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { [UIModelObject] public interface IPathFigure diff --git a/src/StandardUI/Media/IPathGeometry.cs b/src/StandardUI/Media/IPathGeometry.cs index 790b4fe..66ae0e4 100755 --- a/src/StandardUI/Media/IPathGeometry.cs +++ b/src/StandardUI/Media/IPathGeometry.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { [UIModelObject] public interface IPathGeometry : IGeometry diff --git a/src/StandardUI/Media/IPathSegment.cs b/src/StandardUI/Media/IPathSegment.cs index 688ca53..2233cc8 100755 --- a/src/StandardUI/Media/IPathSegment.cs +++ b/src/StandardUI/Media/IPathSegment.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { [UIModelObject] public interface IPathSegment diff --git a/src/StandardUI/Media/IPolyBezierSegment.cs b/src/StandardUI/Media/IPolyBezierSegment.cs index 0e6c069..c7fe2fa 100755 --- a/src/StandardUI/Media/IPolyBezierSegment.cs +++ b/src/StandardUI/Media/IPolyBezierSegment.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { [UIModelObject] public interface IPolyBezierSegment : IPathSegment diff --git a/src/StandardUI/Media/IPolyLineSegment.cs b/src/StandardUI/Media/IPolyLineSegment.cs index 43a8b33..c3c74d4 100755 --- a/src/StandardUI/Media/IPolyLineSegment.cs +++ b/src/StandardUI/Media/IPolyLineSegment.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { [UIModelObject] public interface IPolyLineSegment : IPathSegment diff --git a/src/StandardUI/Media/IPolyQuadraticBezierSegment.cs b/src/StandardUI/Media/IPolyQuadraticBezierSegment.cs index 63f60b8..cf93b39 100755 --- a/src/StandardUI/Media/IPolyQuadraticBezierSegment.cs +++ b/src/StandardUI/Media/IPolyQuadraticBezierSegment.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { [UIModelObject] public interface IPolyQuadraticBezierSegment : IPathSegment diff --git a/src/StandardUI/Media/IQuadraticBezierSegment.cs b/src/StandardUI/Media/IQuadraticBezierSegment.cs index 23d8572..e09548a 100755 --- a/src/StandardUI/Media/IQuadraticBezierSegment.cs +++ b/src/StandardUI/Media/IQuadraticBezierSegment.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { [UIModelObject] public interface IQuadraticBezierSegment : IPathSegment diff --git a/src/StandardUI/Media/IRadialGradientBrush.cs b/src/StandardUI/Media/IRadialGradientBrush.cs index 84a8115..f9de8ec 100755 --- a/src/StandardUI/Media/IRadialGradientBrush.cs +++ b/src/StandardUI/Media/IRadialGradientBrush.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { [UIModelObject] public interface IRadialGradientBrush : IGradientBrush diff --git a/src/StandardUI/Media/IRotateTransform.cs b/src/StandardUI/Media/IRotateTransform.cs index e52596f..728a6ef 100755 --- a/src/StandardUI/Media/IRotateTransform.cs +++ b/src/StandardUI/Media/IRotateTransform.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { [UIModelObject] public interface IRotateTransform : ITransform diff --git a/src/StandardUI/Media/IScaleTransform.cs b/src/StandardUI/Media/IScaleTransform.cs index 97dd88e..d4e8bc6 100755 --- a/src/StandardUI/Media/IScaleTransform.cs +++ b/src/StandardUI/Media/IScaleTransform.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { [UIModelObject] public interface IScaleTransform : ITransform diff --git a/src/StandardUI/Media/ISolidColorBrush.cs b/src/StandardUI/Media/ISolidColorBrush.cs index 1f2dfd2..deb883b 100755 --- a/src/StandardUI/Media/ISolidColorBrush.cs +++ b/src/StandardUI/Media/ISolidColorBrush.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { [UIModelObject] public interface ISolidColorBrush : IBrush diff --git a/src/StandardUI/Media/ITransform.cs b/src/StandardUI/Media/ITransform.cs index fe73b02..1fe8ef4 100755 --- a/src/StandardUI/Media/ITransform.cs +++ b/src/StandardUI/Media/ITransform.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { [UIModelObject] public interface ITransform diff --git a/src/StandardUI/Media/ITransformGroup.cs b/src/StandardUI/Media/ITransformGroup.cs index c987f48..3ca707c 100755 --- a/src/StandardUI/Media/ITransformGroup.cs +++ b/src/StandardUI/Media/ITransformGroup.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { [UIModelObject] public interface ITransformGroup : ITransform diff --git a/src/StandardUI/Media/ITranslateTransform.cs b/src/StandardUI/Media/ITranslateTransform.cs index 679c796..00b9632 100755 --- a/src/StandardUI/Media/ITranslateTransform.cs +++ b/src/StandardUI/Media/ITranslateTransform.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { [UIModelObject] public interface ITranslateTransform : ITransform diff --git a/src/StandardUI/Media/PenLineCap.cs b/src/StandardUI/Media/PenLineCap.cs index 39e3088..a1a1c5d 100755 --- a/src/StandardUI/Media/PenLineCap.cs +++ b/src/StandardUI/Media/PenLineCap.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { /// /// Describes the shape at the end of a line or segment. diff --git a/src/StandardUI/Media/PenLineJoin.cs b/src/StandardUI/Media/PenLineJoin.cs index f832bd4..f15ad21 100755 --- a/src/StandardUI/Media/PenLineJoin.cs +++ b/src/StandardUI/Media/PenLineJoin.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { /// /// Describes the shape that joins two lines or segments. diff --git a/src/StandardUI/Media/SweepDirection.cs b/src/StandardUI/Media/SweepDirection.cs index 87307ca..4bb9c0b 100755 --- a/src/StandardUI/Media/SweepDirection.cs +++ b/src/StandardUI/Media/SweepDirection.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { public enum SweepDirection { diff --git a/src/StandardUI/Point.cs b/src/StandardUI/Point.cs index 520e4d8..c8c822c 100755 --- a/src/StandardUI/Point.cs +++ b/src/StandardUI/Point.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI +namespace Microsoft.StandardUI { public struct Point { diff --git a/src/StandardUI/Points.cs b/src/StandardUI/Points.cs index 5fcbd82..33719cc 100755 --- a/src/StandardUI/Points.cs +++ b/src/StandardUI/Points.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace System.StandardUI +namespace Microsoft.StandardUI { public struct Points { diff --git a/src/StandardUI/Rect.cs b/src/StandardUI/Rect.cs index 0e07b42..fa338b8 100755 --- a/src/StandardUI/Rect.cs +++ b/src/StandardUI/Rect.cs @@ -1,4 +1,6 @@ -namespace System.StandardUI +using System; + +namespace Microsoft.StandardUI { /// /// Contains number values that represent the location and size of a rectangle. diff --git a/src/StandardUI/Shapes/IEllipse.cs b/src/StandardUI/Shapes/IEllipse.cs index 581666a..41a6760 100755 --- a/src/StandardUI/Shapes/IEllipse.cs +++ b/src/StandardUI/Shapes/IEllipse.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Shapes +namespace Microsoft.StandardUI.Shapes { [UIModelObject] public interface IEllipse : IShape diff --git a/src/StandardUI/Shapes/ILine.cs b/src/StandardUI/Shapes/ILine.cs index 32c8c12..cb15650 100755 --- a/src/StandardUI/Shapes/ILine.cs +++ b/src/StandardUI/Shapes/ILine.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Shapes +namespace Microsoft.StandardUI.Shapes { [UIModelObject] public interface ILine : IShape diff --git a/src/StandardUI/Shapes/IPath.cs b/src/StandardUI/Shapes/IPath.cs index 80c5da5..0ef4fba 100755 --- a/src/StandardUI/Shapes/IPath.cs +++ b/src/StandardUI/Shapes/IPath.cs @@ -1,6 +1,6 @@ -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Shapes +namespace Microsoft.StandardUI.Shapes { [UIModelObject] public interface IPath : IShape diff --git a/src/StandardUI/Shapes/IPolygon.cs b/src/StandardUI/Shapes/IPolygon.cs index 0c6d452..606cc1b 100755 --- a/src/StandardUI/Shapes/IPolygon.cs +++ b/src/StandardUI/Shapes/IPolygon.cs @@ -1,6 +1,6 @@ -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Shapes +namespace Microsoft.StandardUI.Shapes { [UIModelObject] public interface IPolygon : IShape diff --git a/src/StandardUI/Shapes/IPolyline.cs b/src/StandardUI/Shapes/IPolyline.cs index 4a76a37..173ed1f 100755 --- a/src/StandardUI/Shapes/IPolyline.cs +++ b/src/StandardUI/Shapes/IPolyline.cs @@ -1,6 +1,6 @@ -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Shapes +namespace Microsoft.StandardUI.Shapes { [UIModelObject] public interface IPolyline : IShape diff --git a/src/StandardUI/Shapes/IRectangle.cs b/src/StandardUI/Shapes/IRectangle.cs index d5a29ae..3cbf740 100755 --- a/src/StandardUI/Shapes/IRectangle.cs +++ b/src/StandardUI/Shapes/IRectangle.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Shapes +namespace Microsoft.StandardUI.Shapes { [UIModelObject] public interface IRectangle : IShape diff --git a/src/StandardUI/Shapes/IShape.cs b/src/StandardUI/Shapes/IShape.cs index 698f905..ef76fd7 100755 --- a/src/StandardUI/Shapes/IShape.cs +++ b/src/StandardUI/Shapes/IShape.cs @@ -1,6 +1,6 @@ -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Shapes +namespace Microsoft.StandardUI.Shapes { [UIModelObject] public interface IShape : IUIElement diff --git a/src/StandardUI/Size.cs b/src/StandardUI/Size.cs index 26a3ef4..2ec2116 100755 --- a/src/StandardUI/Size.cs +++ b/src/StandardUI/Size.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI +namespace Microsoft.StandardUI { /// /// Represents number values that specify a height and width. diff --git a/src/StandardUI/StandardUICollection.cs b/src/StandardUI/StandardUICollection.cs index 3c4f387..179d443 100755 --- a/src/StandardUI/StandardUICollection.cs +++ b/src/StandardUI/StandardUICollection.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; -namespace System.StandardUI +namespace Microsoft.StandardUI { public class StandardUICollection : IList, IList, IEnumerable // , INotifyObjectOrSubobjectChanged where TItem : INotifyObjectOrSubobjectChanged { diff --git a/src/StandardUI/StandardUIEnvironment.cs b/src/StandardUI/StandardUIEnvironment.cs index 1085a61..c62ea58 100755 --- a/src/StandardUI/StandardUIEnvironment.cs +++ b/src/StandardUI/StandardUIEnvironment.cs @@ -1,4 +1,6 @@ -namespace System.StandardUI +using System; + +namespace Microsoft.StandardUI { public static class StandardUIEnvironment { diff --git a/src/StandardUI/Text/FontStyle.cs b/src/StandardUI/Text/FontStyle.cs index 6033341..3910e4d 100644 --- a/src/StandardUI/Text/FontStyle.cs +++ b/src/StandardUI/Text/FontStyle.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Text +namespace Microsoft.StandardUI.Text { /// /// Represents the style of a font face (for example, normal or italic). diff --git a/src/StandardUI/Text/FontWeight.cs b/src/StandardUI/Text/FontWeight.cs index 2062e43..68d1b33 100644 --- a/src/StandardUI/Text/FontWeight.cs +++ b/src/StandardUI/Text/FontWeight.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Text +namespace Microsoft.StandardUI.Text { /// /// Expresses the density of a typeface, in terms of the lightness or heaviness of the strokes. diff --git a/src/StandardUI/Text/FontWeights.cs b/src/StandardUI/Text/FontWeights.cs index 2acce26..e2626b1 100644 --- a/src/StandardUI/Text/FontWeights.cs +++ b/src/StandardUI/Text/FontWeights.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI.Text +namespace Microsoft.StandardUI.Text { /// /// Provides a set of predefined font weights as static property values. diff --git a/src/StandardUI/TextAlignment.cs b/src/StandardUI/TextAlignment.cs index 8e73038..c34b6a6 100644 --- a/src/StandardUI/TextAlignment.cs +++ b/src/StandardUI/TextAlignment.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI +namespace Microsoft.StandardUI { /// /// Specifies whether text is centered, left-aligned, or right-aligned. diff --git a/src/StandardUI/Thickness.cs b/src/StandardUI/Thickness.cs index e5cdd80..7c22511 100644 --- a/src/StandardUI/Thickness.cs +++ b/src/StandardUI/Thickness.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI +namespace Microsoft.StandardUI { /// /// Describes the thickness of a frame around a rectangle. Four Double values describe the Left, Top, diff --git a/src/StandardUI/UIModelObjectAttribute.cs b/src/StandardUI/UIModelObjectAttribute.cs index 27adf15..d9c5780 100755 --- a/src/StandardUI/UIModelObjectAttribute.cs +++ b/src/StandardUI/UIModelObjectAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace System.StandardUI +namespace Microsoft.StandardUI { [AttributeUsage(AttributeTargets.Interface)] public class UIModelObjectAttribute : Attribute diff --git a/src/StandardUI/UIPropertyChangedCallback.cs b/src/StandardUI/UIPropertyChangedCallback.cs index b3f71ad..3c9aec4 100644 --- a/src/StandardUI/UIPropertyChangedCallback.cs +++ b/src/StandardUI/UIPropertyChangedCallback.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI +namespace Microsoft.StandardUI { /// /// Represents the callback that is invoked when the effective property value of a dependency property changes. diff --git a/src/StandardUI/UnintializedStandardUIEnvironment.cs b/src/StandardUI/UnintializedStandardUIEnvironment.cs index 5be530f..b2eb218 100755 --- a/src/StandardUI/UnintializedStandardUIEnvironment.cs +++ b/src/StandardUI/UnintializedStandardUIEnvironment.cs @@ -1,7 +1,7 @@ -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; using System; -namespace System.StandardUI +namespace Microsoft.StandardUI { public class UnintializedStandardUIEnvironment : IStandardUIEnvironment { diff --git a/src/StandardUI/UnintializedStandardUIFactory.cs b/src/StandardUI/UnintializedStandardUIFactory.cs index a875508..aa63592 100644 --- a/src/StandardUI/UnintializedStandardUIFactory.cs +++ b/src/StandardUI/UnintializedStandardUIFactory.cs @@ -1,10 +1,10 @@ -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; using System; -using System.StandardUI.Controls; -using System.StandardUI.Shapes; +using Microsoft.StandardUI.Controls; +using Microsoft.StandardUI.Shapes; using System.Collections.Generic; -namespace System.StandardUI +namespace Microsoft.StandardUI { public class UnintializedStandardUIFactory : IStandardUIFactory { diff --git a/src/StandardUI/Visual/IVisual.cs b/src/StandardUI/Visual/IVisual.cs index b45baca..dc4dedf 100755 --- a/src/StandardUI/Visual/IVisual.cs +++ b/src/StandardUI/Visual/IVisual.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI +namespace Microsoft.StandardUI { public interface IVisual { diff --git a/src/StandardUI/Visual/IVisualEnvironment.cs b/src/StandardUI/Visual/IVisualEnvironment.cs index 4c717a1..83defe0 100755 --- a/src/StandardUI/Visual/IVisualEnvironment.cs +++ b/src/StandardUI/Visual/IVisualEnvironment.cs @@ -1,6 +1,6 @@ using System; -namespace System.StandardUI +namespace Microsoft.StandardUI { /// /// The visual environment is responsible for drawing things on the screen, or to a bitmap, diff --git a/src/StandardUI/Visual/IVisualHostControl.cs b/src/StandardUI/Visual/IVisualHostControl.cs index 2411884..abc2b24 100755 --- a/src/StandardUI/Visual/IVisualHostControl.cs +++ b/src/StandardUI/Visual/IVisualHostControl.cs @@ -1,4 +1,4 @@ -namespace System.StandardUI +namespace Microsoft.StandardUI { public interface IVisualHostControl { diff --git a/src/StandardUI/Visual/IVisualizer.cs b/src/StandardUI/Visual/IVisualizer.cs index b2c8847..1a63bac 100755 --- a/src/StandardUI/Visual/IVisualizer.cs +++ b/src/StandardUI/Visual/IVisualizer.cs @@ -1,8 +1,8 @@ -using System.StandardUI.Shapes; +using Microsoft.StandardUI.Shapes; using System; -using System.StandardUI.Controls; +using Microsoft.StandardUI.Controls; -namespace System.StandardUI +namespace Microsoft.StandardUI { /// /// A IVisualizer turns cross platform vector graphics into an IVisual, a platform specific representation those graphics. diff --git a/src/StandardUI/generated/Controls/BorderExtensions.cs b/src/StandardUI/generated/Controls/BorderExtensions.cs index 11ca601..0440701 100644 --- a/src/StandardUI/generated/Controls/BorderExtensions.cs +++ b/src/StandardUI/generated/Controls/BorderExtensions.cs @@ -1,8 +1,8 @@ // This file is generated from IBorder.cs. Update the source file to change its contents. -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Controls +namespace Microsoft.StandardUI.Controls { public static class BorderExtensions { diff --git a/src/StandardUI/generated/Controls/TextBlockExtensions.cs b/src/StandardUI/generated/Controls/TextBlockExtensions.cs index 7f289d7..0b84408 100644 --- a/src/StandardUI/generated/Controls/TextBlockExtensions.cs +++ b/src/StandardUI/generated/Controls/TextBlockExtensions.cs @@ -1,9 +1,9 @@ // This file is generated from ITextBlock.cs. Update the source file to change its contents. -using System.StandardUI.Media; -using System.StandardUI.Text; +using Microsoft.StandardUI.Media; +using Microsoft.StandardUI.Text; -namespace System.StandardUI.Controls +namespace Microsoft.StandardUI.Controls { public static class TextBlockExtensions { diff --git a/src/StandardUI/generated/Media/ArcSegmentExtensions.cs b/src/StandardUI/generated/Media/ArcSegmentExtensions.cs index deeb514..958977c 100755 --- a/src/StandardUI/generated/Media/ArcSegmentExtensions.cs +++ b/src/StandardUI/generated/Media/ArcSegmentExtensions.cs @@ -1,6 +1,6 @@ // This file is generated from IArcSegment.cs. Update the source file to change its contents. -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { public static class ArcSegmentExtensions { diff --git a/src/StandardUI/generated/Media/BezierSegmentExtensions.cs b/src/StandardUI/generated/Media/BezierSegmentExtensions.cs index cd08ddd..4363746 100755 --- a/src/StandardUI/generated/Media/BezierSegmentExtensions.cs +++ b/src/StandardUI/generated/Media/BezierSegmentExtensions.cs @@ -1,6 +1,6 @@ // This file is generated from IBezierSegment.cs. Update the source file to change its contents. -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { public static class BezierSegmentExtensions { diff --git a/src/StandardUI/generated/Media/GeometryExtensions.cs b/src/StandardUI/generated/Media/GeometryExtensions.cs index 9a22631..11589b4 100755 --- a/src/StandardUI/generated/Media/GeometryExtensions.cs +++ b/src/StandardUI/generated/Media/GeometryExtensions.cs @@ -1,6 +1,6 @@ // This file is generated from IGeometry.cs. Update the source file to change its contents. -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { public static class GeometryExtensions { diff --git a/src/StandardUI/generated/Media/GradientBrushExtensions.cs b/src/StandardUI/generated/Media/GradientBrushExtensions.cs index 957cf6c..02184fe 100755 --- a/src/StandardUI/generated/Media/GradientBrushExtensions.cs +++ b/src/StandardUI/generated/Media/GradientBrushExtensions.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { public static class GradientBrushExtensions { diff --git a/src/StandardUI/generated/Media/GradientStopExtensions.cs b/src/StandardUI/generated/Media/GradientStopExtensions.cs index fa46401..b366164 100755 --- a/src/StandardUI/generated/Media/GradientStopExtensions.cs +++ b/src/StandardUI/generated/Media/GradientStopExtensions.cs @@ -1,6 +1,6 @@ // This file is generated from IGradientStop.cs. Update the source file to change its contents. -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { public static class GradientStopExtensions { diff --git a/src/StandardUI/generated/Media/LineSegmentExtensions.cs b/src/StandardUI/generated/Media/LineSegmentExtensions.cs index 19783aa..d14903a 100755 --- a/src/StandardUI/generated/Media/LineSegmentExtensions.cs +++ b/src/StandardUI/generated/Media/LineSegmentExtensions.cs @@ -1,6 +1,6 @@ // This file is generated from ILineSegment.cs. Update the source file to change its contents. -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { public static class LineSegmentExtensions { diff --git a/src/StandardUI/generated/Media/LinearGradientBrushExtensions.cs b/src/StandardUI/generated/Media/LinearGradientBrushExtensions.cs index 52a056c..f226b52 100755 --- a/src/StandardUI/generated/Media/LinearGradientBrushExtensions.cs +++ b/src/StandardUI/generated/Media/LinearGradientBrushExtensions.cs @@ -1,6 +1,6 @@ // This file is generated from ILinearGradientBrush.cs. Update the source file to change its contents. -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { public static class LinearGradientBrushExtensions { diff --git a/src/StandardUI/generated/Media/PathFigureExtensions.cs b/src/StandardUI/generated/Media/PathFigureExtensions.cs index eae62aa..1aa6e2f 100755 --- a/src/StandardUI/generated/Media/PathFigureExtensions.cs +++ b/src/StandardUI/generated/Media/PathFigureExtensions.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { public static class PathFigureExtensions { diff --git a/src/StandardUI/generated/Media/PathGeometryExtensions.cs b/src/StandardUI/generated/Media/PathGeometryExtensions.cs index 854d7e9..ff4b5b4 100755 --- a/src/StandardUI/generated/Media/PathGeometryExtensions.cs +++ b/src/StandardUI/generated/Media/PathGeometryExtensions.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { public static class PathGeometryExtensions { diff --git a/src/StandardUI/generated/Media/PolyBezierSegmentExtensions.cs b/src/StandardUI/generated/Media/PolyBezierSegmentExtensions.cs index ac5b751..2be5449 100755 --- a/src/StandardUI/generated/Media/PolyBezierSegmentExtensions.cs +++ b/src/StandardUI/generated/Media/PolyBezierSegmentExtensions.cs @@ -1,6 +1,6 @@ // This file is generated from IPolyBezierSegment.cs. Update the source file to change its contents. -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { public static class PolyBezierSegmentExtensions { diff --git a/src/StandardUI/generated/Media/PolyLineSegmentExtensions.cs b/src/StandardUI/generated/Media/PolyLineSegmentExtensions.cs index 29c183b..79c70d4 100755 --- a/src/StandardUI/generated/Media/PolyLineSegmentExtensions.cs +++ b/src/StandardUI/generated/Media/PolyLineSegmentExtensions.cs @@ -1,6 +1,6 @@ // This file is generated from IPolyLineSegment.cs. Update the source file to change its contents. -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { public static class PolyLineSegmentExtensions { diff --git a/src/StandardUI/generated/Media/PolyQuadraticBezierSegmentExtensions.cs b/src/StandardUI/generated/Media/PolyQuadraticBezierSegmentExtensions.cs index 0eadb2f..5ee59ff 100755 --- a/src/StandardUI/generated/Media/PolyQuadraticBezierSegmentExtensions.cs +++ b/src/StandardUI/generated/Media/PolyQuadraticBezierSegmentExtensions.cs @@ -1,6 +1,6 @@ // This file is generated from IPolyQuadraticBezierSegment.cs. Update the source file to change its contents. -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { public static class PolyQuadraticBezierSegmentExtensions { diff --git a/src/StandardUI/generated/Media/QuadraticBezierSegmentExtensions.cs b/src/StandardUI/generated/Media/QuadraticBezierSegmentExtensions.cs index 4cce830..ee28343 100755 --- a/src/StandardUI/generated/Media/QuadraticBezierSegmentExtensions.cs +++ b/src/StandardUI/generated/Media/QuadraticBezierSegmentExtensions.cs @@ -1,6 +1,6 @@ // This file is generated from IQuadraticBezierSegment.cs. Update the source file to change its contents. -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { public static class QuadraticBezierSegmentExtensions { diff --git a/src/StandardUI/generated/Media/RadialGradientBrushExtensions.cs b/src/StandardUI/generated/Media/RadialGradientBrushExtensions.cs index 97fcb86..9a79755 100755 --- a/src/StandardUI/generated/Media/RadialGradientBrushExtensions.cs +++ b/src/StandardUI/generated/Media/RadialGradientBrushExtensions.cs @@ -1,6 +1,6 @@ // This file is generated from IRadialGradientBrush.cs. Update the source file to change its contents. -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { public static class RadialGradientBrushExtensions { diff --git a/src/StandardUI/generated/Media/RotateTransformExtensions.cs b/src/StandardUI/generated/Media/RotateTransformExtensions.cs index 53da36f..5f01a42 100755 --- a/src/StandardUI/generated/Media/RotateTransformExtensions.cs +++ b/src/StandardUI/generated/Media/RotateTransformExtensions.cs @@ -1,6 +1,6 @@ // This file is generated from IRotateTransform.cs. Update the source file to change its contents. -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { public static class RotateTransformExtensions { diff --git a/src/StandardUI/generated/Media/ScaleTransformExtensions.cs b/src/StandardUI/generated/Media/ScaleTransformExtensions.cs index 01b4288..9ff2003 100755 --- a/src/StandardUI/generated/Media/ScaleTransformExtensions.cs +++ b/src/StandardUI/generated/Media/ScaleTransformExtensions.cs @@ -1,6 +1,6 @@ // This file is generated from IScaleTransform.cs. Update the source file to change its contents. -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { public static class ScaleTransformExtensions { diff --git a/src/StandardUI/generated/Media/SolidColorBrushExtensions.cs b/src/StandardUI/generated/Media/SolidColorBrushExtensions.cs index 4442cec..3c4c3a9 100755 --- a/src/StandardUI/generated/Media/SolidColorBrushExtensions.cs +++ b/src/StandardUI/generated/Media/SolidColorBrushExtensions.cs @@ -1,6 +1,6 @@ // This file is generated from ISolidColorBrush.cs. Update the source file to change its contents. -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { public static class SolidColorBrushExtensions { diff --git a/src/StandardUI/generated/Media/TranslateTransformExtensions.cs b/src/StandardUI/generated/Media/TranslateTransformExtensions.cs index 1981b15..7bc9800 100755 --- a/src/StandardUI/generated/Media/TranslateTransformExtensions.cs +++ b/src/StandardUI/generated/Media/TranslateTransformExtensions.cs @@ -1,6 +1,6 @@ // This file is generated from ITranslateTransform.cs. Update the source file to change its contents. -namespace System.StandardUI.Media +namespace Microsoft.StandardUI.Media { public static class TranslateTransformExtensions { diff --git a/src/StandardUI/generated/SetterExtensions.cs b/src/StandardUI/generated/SetterExtensions.cs index d677b3b..a9bcd4e 100755 --- a/src/StandardUI/generated/SetterExtensions.cs +++ b/src/StandardUI/generated/SetterExtensions.cs @@ -1,6 +1,6 @@ // This file is generated from ISetter.cs. Update the source file to change its contents. -namespace System.StandardUI +namespace Microsoft.StandardUI { public static class SetterExtensions { diff --git a/src/StandardUI/generated/Shapes/LineExtensions.cs b/src/StandardUI/generated/Shapes/LineExtensions.cs index e58442d..7c44c54 100755 --- a/src/StandardUI/generated/Shapes/LineExtensions.cs +++ b/src/StandardUI/generated/Shapes/LineExtensions.cs @@ -1,6 +1,6 @@ // This file is generated from ILine.cs. Update the source file to change its contents. -namespace System.StandardUI.Shapes +namespace Microsoft.StandardUI.Shapes { public static class LineExtensions { diff --git a/src/StandardUI/generated/Shapes/PathExtensions.cs b/src/StandardUI/generated/Shapes/PathExtensions.cs index a6f3d1a..1e36b94 100755 --- a/src/StandardUI/generated/Shapes/PathExtensions.cs +++ b/src/StandardUI/generated/Shapes/PathExtensions.cs @@ -1,8 +1,8 @@ // This file is generated from IPath.cs. Update the source file to change its contents. -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Shapes +namespace Microsoft.StandardUI.Shapes { public static class PathExtensions { diff --git a/src/StandardUI/generated/Shapes/PolygonExtensions.cs b/src/StandardUI/generated/Shapes/PolygonExtensions.cs index 4b152c1..7634e94 100755 --- a/src/StandardUI/generated/Shapes/PolygonExtensions.cs +++ b/src/StandardUI/generated/Shapes/PolygonExtensions.cs @@ -1,8 +1,8 @@ // This file is generated from IPolygon.cs. Update the source file to change its contents. -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Shapes +namespace Microsoft.StandardUI.Shapes { public static class PolygonExtensions { diff --git a/src/StandardUI/generated/Shapes/PolylineExtensions.cs b/src/StandardUI/generated/Shapes/PolylineExtensions.cs index 737d616..323c912 100755 --- a/src/StandardUI/generated/Shapes/PolylineExtensions.cs +++ b/src/StandardUI/generated/Shapes/PolylineExtensions.cs @@ -1,8 +1,8 @@ // This file is generated from IPolyline.cs. Update the source file to change its contents. -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Shapes +namespace Microsoft.StandardUI.Shapes { public static class PolylineExtensions { diff --git a/src/StandardUI/generated/Shapes/RectangleExtensions.cs b/src/StandardUI/generated/Shapes/RectangleExtensions.cs index 4bf74bd..feb7573 100755 --- a/src/StandardUI/generated/Shapes/RectangleExtensions.cs +++ b/src/StandardUI/generated/Shapes/RectangleExtensions.cs @@ -1,6 +1,6 @@ // This file is generated from IRectangle.cs. Update the source file to change its contents. -namespace System.StandardUI.Shapes +namespace Microsoft.StandardUI.Shapes { public static class RectangleExtensions { diff --git a/src/StandardUI/generated/Shapes/ShapeExtensions.cs b/src/StandardUI/generated/Shapes/ShapeExtensions.cs index 203bf86..5129d1d 100755 --- a/src/StandardUI/generated/Shapes/ShapeExtensions.cs +++ b/src/StandardUI/generated/Shapes/ShapeExtensions.cs @@ -1,8 +1,8 @@ // This file is generated from IShape.cs. Update the source file to change its contents. -using System.StandardUI.Media; +using Microsoft.StandardUI.Media; -namespace System.StandardUI.Shapes +namespace Microsoft.StandardUI.Shapes { public static class ShapeExtensions { diff --git a/src/StandardUI/generated/TargetPropertyPathExtensions.cs b/src/StandardUI/generated/TargetPropertyPathExtensions.cs index d7bacf8..eb185d4 100755 --- a/src/StandardUI/generated/TargetPropertyPathExtensions.cs +++ b/src/StandardUI/generated/TargetPropertyPathExtensions.cs @@ -1,6 +1,6 @@ // This file is generated from ITargetPropertyPath.cs. Update the source file to change its contents. -namespace System.StandardUI +namespace Microsoft.StandardUI { public static class TargetPropertyPathExtensions { diff --git a/src/StandardUI/generated/UIElementExtensions.cs b/src/StandardUI/generated/UIElementExtensions.cs index c2900a9..b182c62 100755 --- a/src/StandardUI/generated/UIElementExtensions.cs +++ b/src/StandardUI/generated/UIElementExtensions.cs @@ -1,6 +1,6 @@ // This file is generated from IUIElement.cs. Update the source file to change its contents. -namespace System.StandardUI +namespace Microsoft.StandardUI { public static class UIElementExtensions {