Merge pull request #4 from ChrisPulman/AddOlderTargets

ChrisPulman · Mar 12, 2023 · 4a998bd · 4a998bd
2 parents 0878955 + bb6fea7
commit 4a998bd
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 11 deletions.
diff --git a/Version.json b/Version.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.2",
+    "version": "0.3",
     "publicReleaseRefSpec": [
         "^refs/heads/master$",
         "^refs/heads/main$"

diff --git a/src/AppBarButton.WPF/AppBarButton.WPF.csproj b/src/AppBarButton.WPF/AppBarButton.WPF.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>net462;net6.0-windows;net7.0-windows</TargetFrameworks>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
+    <RootNamespace>CP</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/AppBarButton.WPF/AssemblyInfo.cs b/src/AppBarButton.WPF/AssemblyInfo.cs
@@ -4,7 +4,7 @@
 using System.Windows;
 using System.Windows.Markup;
 
-[assembly: XmlnsDefinition("https://github.com/ChrisPulman/AppBarButton.WPF", "AppBarButton.WPF")]
-[assembly: XmlnsDefinition("https://github.com/ChrisPulman/AppBarButton.WPF", "AppBarButton.WPF.Controls")]
-[assembly: XmlnsPrefix("https://github.com/ChrisPulman/AppBarButton.WPF", "appbarbtn")]
+[assembly: XmlnsDefinition("https://github.com/ChrisPulman/AppBarButton.WPF", "CP.WPF")]
+[assembly: XmlnsDefinition("https://github.com/ChrisPulman/AppBarButton.WPF", "CP.WPF.Controls")]
+[assembly: XmlnsPrefix("https://github.com/ChrisPulman/AppBarButton.WPF", "abb")]
 [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
diff --git a/src/AppBarButton.WPF/Assets/Converters.xaml b/src/AppBarButton.WPF/Assets/Converters.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:converters="clr-namespace:AppBarButton.WPF.Converters">
+    xmlns:converters="clr-namespace:CP.WPF.Converters">
 
     <converters:ToUpperConverter x:Key="ToUpperConverter" />
     <converters:ToLowerConverter x:Key="ToLowerConverter" />

diff --git a/src/AppBarButton.WPF/Controls/AppBarButton.cs b/src/AppBarButton.WPF/Controls/AppBarButton.cs
@@ -8,7 +8,7 @@
 using System.Windows.Media;
 using System.Xml.Linq;
 
-namespace AppBarButton.WPF.Controls
+namespace CP.WPF.Controls
 {
     /// <summary>
     /// Adds icon content to a standard button.
@@ -240,7 +240,7 @@ private static void SetIcon(DependencyObject d, DependencyPropertyChangedEventAr
             // find all embedded XAML icon files
             var assembly = GetType().Assembly;
             var iconResourceNames = from name in assembly.GetManifestResourceNames()
-                                    where name.Equals($"AppBarButton.WPF.Assets.AppBar.appbar.{icon.ToString().Replace('_', '.')}.xaml", System.StringComparison.Ordinal)
+                                    where name.Equals($"CP.Assets.AppBar.appbar.{icon.ToString().Replace('_', '.')}.xaml", System.StringComparison.Ordinal)
                                     select name;
 
             // load the resource stream

diff --git a/src/AppBarButton.WPF/Controls/AppBarIcons.cs b/src/AppBarButton.WPF/Controls/AppBarIcons.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Chris Pulman. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace AppBarButton.WPF.Controls
+namespace CP.WPF.Controls
 {
     /// <summary>
     /// Standard Application bar icons.

diff --git a/src/AppBarButton.WPF/Converters/ToLowerConverter.cs b/src/AppBarButton.WPF/Converters/ToLowerConverter.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Windows.Data;
 
-namespace AppBarButton.WPF.Converters
+namespace CP.WPF.Converters
 {
     /// <summary>
     /// Converts string values to lower case.

diff --git a/src/AppBarButton.WPF/Converters/ToUpperConverter.cs b/src/AppBarButton.WPF/Converters/ToUpperConverter.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Windows.Data;
 
-namespace AppBarButton.WPF.Converters
+namespace CP.WPF.Converters
 {
     /// <summary>
     /// Converts string values to upper case.

diff --git a/src/AppBarButton.WPF/Themes/AppBarButton.xaml b/src/AppBarButton.WPF/Themes/AppBarButton.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:AppBarButton.WPF.Controls">
+    xmlns:controls="clr-namespace:CP.WPF.Controls">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="/AppBarButton.WPF;component/Assets/Converters.xaml" />