Merge branch 'release/v24.1.1' into main

Actipro · Feb 26, 2024 · fa308f9 · fa308f9
2 parents e181137 + fb99452
commit fa308f9
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 26 deletions.
diff --git a/Documentation/topics/licensing.md b/Documentation/topics/licensing.md
@@ -152,7 +152,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=24.1.0.0, Culture=neutral, PublicKeyToken=36ff2196ab5654b9
+ActiproSoftware.Products.ActiproLicenseToken, ActiproSoftware.Shared.Wpf, Version=24.1.1.0, Culture=neutral, PublicKeyToken=36ff2196ab5654b9
 ```
 
 > [!IMPORTANT]

diff --git a/Samples/PrismIntegration/PrismIntegration.csproj b/Samples/PrismIntegration/PrismIntegration.csproj
@@ -8,7 +8,7 @@
 
 		<ApplicationIcon>Actipro.ico</ApplicationIcon>
 
-		<Version>24.1.0.0</Version>
+		<Version>24.1.1.0</Version>
 
 		<RootNamespace>ActiproSoftware.Windows.PrismIntegration</RootNamespace>
 		<Company>Actipro Software LLC</Company>
@@ -32,7 +32,7 @@
 	</ItemGroup>
 
 	<ItemGroup Label="Actipro References">
-	    <PackageReference Include="ActiproSoftware.Controls.WPF.Docking" Version="24.1.0" />
+	    <PackageReference Include="ActiproSoftware.Controls.WPF.Docking" Version="24.1.1" />
 	</ItemGroup>
 
 </Project>
diff --git a/Samples/SampleBrowser/ActiproSoftware.References.props b/Samples/SampleBrowser/ActiproSoftware.References.props
@@ -8,7 +8,7 @@
 		https://www.actiprosoftware.com/docs/controls/wpf/nuget
 	 -->
 	<PropertyGroup>
-		<ActiproVersion>24.1.0</ActiproVersion>
+		<ActiproVersion>24.1.1</ActiproVersion>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/Samples/SampleBrowser/ProductSamples/SharedSamples/QuickStart/BadgeIntro/MainControl.xaml b/Samples/SampleBrowser/ProductSamples/SharedSamples/QuickStart/BadgeIntro/MainControl.xaml
@@ -110,6 +110,7 @@
 								shared:BadgeService.VerticalAlignment="{Binding ElementName=badgeAdorned, Path=(shared:BadgeService.VerticalAlignment), Mode=OneWay}"
 								shared:BadgeService.HorizontalOffset="{Binding ElementName=badgeAdorned, Path=(shared:BadgeService.HorizontalOffset), Mode=OneWay}"
 								shared:BadgeService.VerticalOffset="{Binding ElementName=badgeAdorned, Path=(shared:BadgeService.VerticalOffset), Mode=OneWay}"
+								Visibility="{Binding Source={x:Reference badgeAdorned}, Path=Visibility, Mode=OneWay}"
 								>
 							<shared:BadgeService.Badge>
 								<shared:NumericBadge x:Name="numericBadge" Count="100"
@@ -120,7 +121,7 @@
 									CornerRadius="{Binding Source={x:Reference badge}, Path=CornerRadius, Mode=OneWay}"
 									Kind="{Binding Source={x:Reference badge}, Path=Kind, Mode=OneWay}"
 									FontSize="{Binding Source={x:Reference badge}, Path=FontSize, Mode=OneWay}"
-									 >
+									>
 								</shared:NumericBadge>
 							</shared:BadgeService.Badge>
 						</Border>

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("24.1.0.0")]
-[assembly: AssemblyInformationalVersion("24.1.0.0 - 20240206")]
+[assembly: AssemblyVersion("24.1.1.0")]
+[assembly: AssemblyInformationalVersion("24.1.1.0 - 20240226")]
diff --git a/Samples/SampleBrowser/Properties/Licenses.licx b/Samples/SampleBrowser/Properties/Licenses.licx
@@ -1 +1 @@
-ActiproSoftware.Products.ActiproLicenseToken, ActiproSoftware.Shared.Wpf, Version=24.1.0.0, Culture=neutral, PublicKeyToken=36ff2196ab5654b9
+ActiproSoftware.Products.ActiproLicenseToken, ActiproSoftware.Shared.Wpf, Version=24.1.1.0, Culture=neutral, PublicKeyToken=36ff2196ab5654b9
diff --git a/Samples/SampleBrowser/SampleBrowser.csproj b/Samples/SampleBrowser/SampleBrowser.csproj
@@ -7,15 +7,14 @@
 
 		<TargetFrameworks Label="Visual Studio 2019 Targets" Condition="'$(VisualStudioVersion)' == '16.0'">net5.0-windows</TargetFrameworks>
 		<TargetFrameworks Label="Default Targets" Condition="'$(TargetFrameworks)' == ''">net8.0-windows</TargetFrameworks>
-
 
 		<DefineConstants>CODE_ANALYSIS;WPF;DESKTOP</DefineConstants>
 
 		<AssemblyName>SampleBrowser</AssemblyName>
 		<ApplicationIcon>Images\Icons\Actipro.ico</ApplicationIcon>
 		<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
 
-		<Version>24.1.0.0</Version>
+		<Version>24.1.1.0</Version>
 
 		<RootNamespace>ActiproSoftware</RootNamespace>
 

diff --git a/Samples/SampleBrowser/SampleBrowser/Documents/ReleaseHistories/v24.1.xaml b/Samples/SampleBrowser/SampleBrowser/Documents/ReleaseHistories/v24.1.xaml
@@ -10,7 +10,14 @@
 			<Control x:Name="focusCaptureControl" />
 
 
-			<TextBlock Style="{StaticResource DocumentHeadingTextBlockStyle}">2/23/2024 - Version 24.1.0</TextBlock>
+			<TextBlock Style="{StaticResource DocumentHeadingTextBlockStyle}">2/26/2024 - Version 24.1.1</TextBlock>
+			<TextBlock Style="{StaticResource DocumentSubHeadingTextBlockStyle}">Shared</TextBlock>
+			<StackPanel Style="{StaticResource DocumentBulletPanelStyle}">
+				<sampleBrowser:BulletContentControl Content="Fixed an issue where NumericBadge might throw an ExecutionEngineException during initialization." />
+			</StackPanel>
+
+
+			<TextBlock Style="{StaticResource DocumentHeadingTextBlockStyle}">2/26/2024 - Version 24.1.0</TextBlock>
 			<TextBlock Style="{StaticResource DocumentSubHeadingTextBlockStyle}">Bars</TextBlock>
 			<StackPanel Style="{StaticResource DocumentBulletPanelStyle}">
 				<sampleBrowser:BulletContentControl Content="The Bars product has exited the beta phase and is considered ready for production scenarios." />

diff --git a/Samples/WindowsWorkflowIntegration/WindowsWorkflowIntegration.csproj b/Samples/WindowsWorkflowIntegration/WindowsWorkflowIntegration.csproj
@@ -8,7 +8,7 @@
 
 		<ApplicationIcon>Actipro.ico</ApplicationIcon>
 
-		<Version>24.1.0.0</Version>
+		<Version>24.1.1.0</Version>
 
 		<RootNamespace>ActiproSoftware.Windows.WindowsWorkflowIntegration</RootNamespace>
 		<Company>Actipro Software LLC</Company>
@@ -33,8 +33,8 @@
 	</ItemGroup>
 
 	<ItemGroup Label="Actipro References">
-		<PackageReference Include="ActiproSoftware.Controls.WPF.Docking" Version="24.1.0" />
-		<PackageReference Include="ActiproSoftware.Controls.WPF.SyntaxEditor.Addons.DotNet" Version="24.1.0" />
+		<PackageReference Include="ActiproSoftware.Controls.WPF.Docking" Version="24.1.1" />
+		<PackageReference Include="ActiproSoftware.Controls.WPF.SyntaxEditor.Addons.DotNet" Version="24.1.1" />
 	</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>24.1.0.0</Version>
+		<Version>24.1.1.0</Version>
 
 		<RootNamespace>ActiproSoftware</RootNamespace>
 		<Company>Actipro Software LLC</Company>
@@ -34,7 +34,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ActiproSoftware.Controls.WPF.Bars" Version="24.1.0" />
+		<PackageReference Include="ActiproSoftware.Controls.WPF.Bars" Version="24.1.1" />
 	</ItemGroup>
 
 	<ItemGroup Label=".NET Framework" Condition="'$(TargetFramework)' == 'net462'">

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("24.1.0.0")]  // WPF
-[assembly: AssemblyInformationalVersion("24.1.0.0")]  // WPF
+[assembly: AssemblyVersion("24.1.1.0")]  // WPF
+[assembly: AssemblyInformationalVersion("24.1.1.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>24.1.0.0</Version>
+		<Version>24.1.1.0</Version>
 
 		<RootNamespace>ActiproSoftware</RootNamespace>
 		<Company>Actipro Software LLC</Company>
@@ -34,7 +34,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ActiproSoftware.Controls.WPF.Shared" Version="24.1.0" />
+		<PackageReference Include="ActiproSoftware.Controls.WPF.Shared" Version="24.1.1" />
 	</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("24.1.0.0")]  // WPF
-[assembly: AssemblyInformationalVersion("24.1.0.0")]  // WPF
+[assembly: AssemblyVersion("24.1.1.0")]  // WPF
+[assembly: AssemblyInformationalVersion("24.1.1.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>24.1.0.0</Version>
+		<Version>24.1.1.0</Version>
 
 		<RootNamespace>ActiproSoftware</RootNamespace>
 		<Company>Actipro Software LLC</Company>
@@ -34,7 +34,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="ActiproSoftware.Controls.WPF.Editors" Version="24.1.0" />
+	  <PackageReference Include="ActiproSoftware.Controls.WPF.Editors" Version="24.1.1" />
 	</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("24.1.0.0")]  // WPF
-[assembly: AssemblyInformationalVersion("24.1.0.0")]  // WPF
+[assembly: AssemblyVersion("24.1.1.0")]  // WPF
+[assembly: AssemblyInformationalVersion("24.1.1.0")]  // WPF
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ActiproSoftware.Products.ActiproLicenseToken, ActiproSoftware.Shared.Wpf, Version=24.1.0.0, Culture=neutral, PublicKeyToken=36ff2196ab5654b9
		ActiproSoftware.Products.ActiproLicenseToken, ActiproSoftware.Shared.Wpf, Version=24.1.1.0, Culture=neutral, PublicKeyToken=36ff2196ab5654b9