Updates for v23.1.2.

Actipro · Jun 14, 2023 · 134d4d8 · 134d4d8
1 parent b355ea2
commit 134d4d8
Show file tree

Hide file tree

Showing 14 changed files with 39 additions and 31 deletions.
diff --git a/Documentation/topics/licensing.md b/Documentation/topics/licensing.md
@@ -144,7 +144,7 @@ The contents of a *licenses.licx* file are pretty simple.  It needs a single lin
 This single line (update the version to match the one you use) should be added to the *licenses.licx* file in any project that uses Actipro @@PlatformName control or SyntaxEditor add-on products:
 
 ```
-ActiproSoftware.Products.ActiproLicenseToken, ActiproSoftware.Shared.Wpf, Version=23.1.1.0, Culture=neutral, PublicKeyToken=36ff2196ab5654b9
+ActiproSoftware.Products.ActiproLicenseToken, ActiproSoftware.Shared.Wpf, Version=23.1.2.0, Culture=neutral, PublicKeyToken=36ff2196ab5654b9
 ```
 
 ### Notes on Build Machines When Using Licenses.licx Files

diff --git a/Samples/PrismIntegration/PrismIntegration.csproj b/Samples/PrismIntegration/PrismIntegration.csproj
@@ -7,7 +7,7 @@
 
 		<ApplicationIcon>Actipro.ico</ApplicationIcon>
 
-		<Version>23.1.1.0</Version>
+		<Version>23.1.2.0</Version>
 
 		<RootNamespace>ActiproSoftware.Windows.PrismIntegration</RootNamespace>
 		<Company>Actipro Software LLC</Company>
@@ -31,7 +31,7 @@
 	</ItemGroup>
 
 	<ItemGroup Label="Actipro References">
-	    <PackageReference Include="ActiproSoftware.Controls.WPF.Docking" Version="23.1.1" />
+	    <PackageReference Include="ActiproSoftware.Controls.WPF.Docking" Version="23.1.2" />
 	</ItemGroup>
 
 </Project>
diff --git a/Samples/SampleBrowser/Properties/AssemblyInfo.cs b/Samples/SampleBrowser/Properties/AssemblyInfo.cs
@@ -64,5 +64,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("23.1.1.0")]
-[assembly: AssemblyInformationalVersion("23.1.1.0 - 20230419")]
+[assembly: AssemblyVersion("23.1.2.0")]
+[assembly: AssemblyInformationalVersion("23.1.2.0 - 20230612")]
diff --git a/Samples/SampleBrowser/Properties/Licenses.licx b/Samples/SampleBrowser/Properties/Licenses.licx
@@ -1 +1 @@
-ActiproSoftware.Products.ActiproLicenseToken, ActiproSoftware.Shared.Wpf, Version=23.1.1.0, Culture=neutral, PublicKeyToken=36ff2196ab5654b9
+ActiproSoftware.Products.ActiproLicenseToken, ActiproSoftware.Shared.Wpf, Version=23.1.2.0, Culture=neutral, PublicKeyToken=36ff2196ab5654b9
diff --git a/Samples/SampleBrowser/SampleBrowser.csproj b/Samples/SampleBrowser/SampleBrowser.csproj
@@ -15,7 +15,7 @@
 		<ApplicationIcon>Images\Icons\Actipro.ico</ApplicationIcon>
 		<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
 
-		<Version>23.1.1.0</Version>
+		<Version>23.1.2.0</Version>
 
 		<RootNamespace>ActiproSoftware</RootNamespace>
 
@@ -68,14 +68,14 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ActiproSoftware.Controls.WPF" Version="23.1.1" />
-		<PackageReference Include="ActiproSoftware.Controls.WPF.Bars.Mvvm" Version="23.1.1" />
-		<PackageReference Include="ActiproSoftware.Controls.WPF.DataGrid.Contrib" Version="23.1.1" />
-		<PackageReference Include="ActiproSoftware.Controls.WPF.SyntaxEditor.Addons.DotNet" Version="23.1.1" />
-		<PackageReference Include="ActiproSoftware.Controls.WPF.SyntaxEditor.Addons.JavaScript" Version="23.1.1" />
-		<PackageReference Include="ActiproSoftware.Controls.WPF.SyntaxEditor.Addons.Python" Version="23.1.1" />
-		<PackageReference Include="ActiproSoftware.Controls.WPF.SyntaxEditor.Addons.XML" Version="23.1.1" />
-		<PackageReference Include="ActiproSoftware.Controls.WPF.Themes.Aero" Version="23.1.1" />
+		<PackageReference Include="ActiproSoftware.Controls.WPF" Version="23.1.2" />
+		<PackageReference Include="ActiproSoftware.Controls.WPF.Bars.Mvvm" Version="23.1.2" />
+		<PackageReference Include="ActiproSoftware.Controls.WPF.DataGrid.Contrib" Version="23.1.2" />
+		<PackageReference Include="ActiproSoftware.Controls.WPF.SyntaxEditor.Addons.DotNet" Version="23.1.2" />
+		<PackageReference Include="ActiproSoftware.Controls.WPF.SyntaxEditor.Addons.JavaScript" Version="23.1.2" />
+		<PackageReference Include="ActiproSoftware.Controls.WPF.SyntaxEditor.Addons.Python" Version="23.1.2" />
+		<PackageReference Include="ActiproSoftware.Controls.WPF.SyntaxEditor.Addons.XML" Version="23.1.2" />
+		<PackageReference Include="ActiproSoftware.Controls.WPF.Themes.Aero" Version="23.1.2" />
 	</ItemGroup>
 
 </Project>
diff --git a/Samples/SampleBrowser/SampleBrowser/Controls/ImageLoader.cs b/Samples/SampleBrowser/SampleBrowser/Controls/ImageLoader.cs
@@ -62,7 +62,7 @@ public static ImageSource GetIcon(string fileName, bool freeze)
 		/// <param name="fileName">The name of the file in the <c>/Images/Other</c> folder.</param>
 		/// <returns>An <see cref="ImageSource"/>.</returns>
 		public static ImageSource GetOther(string fileName)
-			=> GetOther("/Other/" + fileName, freeze: true);
+			=> GetOther(fileName, freeze: true);
 
 		/// <summary>
 		/// Gets an <see cref="ImageSource"/> for an icon.

diff --git a/Samples/SampleBrowser/SampleBrowser/Documents/ReleaseHistories/v23.1.xaml b/Samples/SampleBrowser/SampleBrowser/Documents/ReleaseHistories/v23.1.xaml
@@ -10,6 +10,14 @@
 			<Control x:Name="focusCaptureControl" />
 
 
+			<TextBlock Style="{StaticResource DocumentHeadingTextBlockStyle}">6/14/2023 - Version 23.1.2</TextBlock>
+			<TextBlock Style="{StaticResource DocumentSubHeadingTextBlockStyle}">Themes</TextBlock>
+			<StackPanel Style="{StaticResource DocumentBulletPanelStyle}">
+				<sampleBrowser:BulletContentControl Content="Fixed an issue introduced in v23.1.0 where adorners would no longer show for title bar controls, which could prevent key tips for controls in a ribbon QAT from displaying." />
+			</StackPanel>
+			<Rectangle Style="{StaticResource DocumentSectionHorizontalRuleStyle}" />
+
+
 			<TextBlock Style="{StaticResource DocumentHeadingTextBlockStyle}">6/12/2023 - Version 23.1.1</TextBlock>
 			<TextBlock Style="{StaticResource DocumentSubHeadingTextBlockStyle}">Bars (Beta)</TextBlock>
 			<StackPanel Style="{StaticResource DocumentBulletPanelStyle}">

diff --git a/Samples/WindowsWorkflowIntegration/WindowsWorkflowIntegration.csproj b/Samples/WindowsWorkflowIntegration/WindowsWorkflowIntegration.csproj
@@ -7,7 +7,7 @@
 
 		<ApplicationIcon>Actipro.ico</ApplicationIcon>
 
-		<Version>23.1.1.0</Version>
+		<Version>23.1.2.0</Version>
 
 		<RootNamespace>ActiproSoftware.Windows.WindowsWorkflowIntegration</RootNamespace>
 		<Company>Actipro Software LLC</Company>
@@ -32,8 +32,8 @@
 	</ItemGroup>
 
 	<ItemGroup Label="Actipro References">
-		<PackageReference Include="ActiproSoftware.Controls.WPF.Docking" Version="23.1.1" />
-		<PackageReference Include="ActiproSoftware.Controls.WPF.SyntaxEditor.Addons.DotNet" Version="23.1.1" />
+		<PackageReference Include="ActiproSoftware.Controls.WPF.Docking" Version="23.1.2" />
+		<PackageReference Include="ActiproSoftware.Controls.WPF.SyntaxEditor.Addons.DotNet" Version="23.1.2" />
 	</ItemGroup>
 
 </Project>
diff --git a/Source/Bars.Mvvm/Bars.Mvvm.csproj b/Source/Bars.Mvvm/Bars.Mvvm.csproj
@@ -10,7 +10,7 @@
 		<Description>Common view models, templates, and other types used when implementing Bars controls with MVVM (Model-View-ViewModel) patterns.</Description>
 		<PackageTags>Actipro UI Controls WPF XAML MVVM MMoodel View ViewModel Bars</PackageTags>
 
-		<Version>23.1.1.0</Version>
+		<Version>23.1.2.0</Version>
 
 		<RootNamespace>ActiproSoftware</RootNamespace>
 		<Company>Actipro Software LLC</Company>
@@ -35,7 +35,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ActiproSoftware.Controls.WPF.Bars" Version="23.1.1" />
+		<PackageReference Include="ActiproSoftware.Controls.WPF.Bars" Version="23.1.2" />
 	</ItemGroup>
 
 </Project>
diff --git a/Source/Bars.Mvvm/Products/Bars.Mvvm/AssemblyInfo.cs b/Source/Bars.Mvvm/Products/Bars.Mvvm/AssemblyInfo.cs
@@ -46,5 +46,5 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("23.1.1.0")]  // WPF
-[assembly: AssemblyInformationalVersion("23.1.1.0")]  // WPF
+[assembly: AssemblyVersion("23.1.2.0")]  // WPF
+[assembly: AssemblyInformationalVersion("23.1.2.0")]  // WPF
diff --git a/Source/DataGrid.Contrib/DataGrid.Contrib.csproj b/Source/DataGrid.Contrib/DataGrid.Contrib.csproj
@@ -10,7 +10,7 @@
 		<Description>Common extensions, behaviors, and themes for the WPF DataGrid control.</Description>
 		<PackageTags>Actipro UI Controls WPF XAML DataGrid</PackageTags>
 
-		<Version>23.1.1.0</Version>
+		<Version>23.1.2.0</Version>
 
 		<RootNamespace>ActiproSoftware</RootNamespace>
 		<Company>Actipro Software LLC</Company>
@@ -35,7 +35,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ActiproSoftware.Controls.WPF.Shared" Version="23.1.1" />
+		<PackageReference Include="ActiproSoftware.Controls.WPF.Shared" Version="23.1.2" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/Source/DataGrid.Contrib/Products/DataGrid/Contrib/AssemblyInfo.cs b/Source/DataGrid.Contrib/Products/DataGrid/Contrib/AssemblyInfo.cs
@@ -52,8 +52,8 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("23.1.1.0")]  // WPF
-[assembly: AssemblyInformationalVersion("23.1.1.0")]  // WPF
+[assembly: AssemblyVersion("23.1.2.0")]  // WPF
+[assembly: AssemblyInformationalVersion("23.1.2.0")]  // WPF
 
 namespace ActiproSoftware.Products.DataGrid.Contrib {
 

diff --git a/Source/Editors.Interop.DataGrid/Editors.Interop.DataGrid.csproj b/Source/Editors.Interop.DataGrid/Editors.Interop.DataGrid.csproj
@@ -10,7 +10,7 @@
 		<Description>Provides interoperability between Actipro's WPF Editors product and the WPF DataGrid.</Description>
 		<PackageTags>Actipro UI Controls WPF XAML Editors DataGrid</PackageTags>
 
-		<Version>23.1.1.0</Version>
+		<Version>23.1.2.0</Version>
 
 		<RootNamespace>ActiproSoftware</RootNamespace>
 		<Company>Actipro Software LLC</Company>
@@ -35,7 +35,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="ActiproSoftware.Controls.WPF.Editors" Version="23.1.1" />
+	  <PackageReference Include="ActiproSoftware.Controls.WPF.Editors" Version="23.1.2" />
 	</ItemGroup>
 
 </Project>
diff --git a/Source/Editors.Interop.DataGrid/Products/Editors.Interop.DataGrid/AssemblyInfo.cs b/Source/Editors.Interop.DataGrid/Products/Editors.Interop.DataGrid/AssemblyInfo.cs
@@ -43,5 +43,5 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("23.1.1.0")]  // WPF
-[assembly: AssemblyInformationalVersion("23.1.1.0")]  // WPF
+[assembly: AssemblyVersion("23.1.2.0")]  // WPF
+[assembly: AssemblyInformationalVersion("23.1.2.0")]  // WPF