diff --git a/Documentation/topics/licensing.md b/Documentation/topics/licensing.md index ccedefa4..ae787295 100644 --- 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 index b481419a..26257c4d 100644 --- a/Samples/PrismIntegration/PrismIntegration.csproj +++ b/Samples/PrismIntegration/PrismIntegration.csproj @@ -8,7 +8,7 @@ Actipro.ico - 24.1.0.0 + 24.1.1.0 ActiproSoftware.Windows.PrismIntegration Actipro Software LLC @@ -32,7 +32,7 @@ - + \ No newline at end of file diff --git a/Samples/SampleBrowser/ActiproSoftware.References.props b/Samples/SampleBrowser/ActiproSoftware.References.props index ad912313..a9cd23ef 100644 --- a/Samples/SampleBrowser/ActiproSoftware.References.props +++ b/Samples/SampleBrowser/ActiproSoftware.References.props @@ -8,7 +8,7 @@ https://www.actiprosoftware.com/docs/controls/wpf/nuget --> - 24.1.0 + 24.1.1 diff --git a/Samples/SampleBrowser/ProductSamples/SharedSamples/QuickStart/BadgeIntro/MainControl.xaml b/Samples/SampleBrowser/ProductSamples/SharedSamples/QuickStart/BadgeIntro/MainControl.xaml index e108188b..b5a7e353 100644 --- 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}" > + > diff --git a/Samples/SampleBrowser/Properties/AssemblyInfo.cs b/Samples/SampleBrowser/Properties/AssemblyInfo.cs index 079e50e3..30d56948 100644 --- 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 index 55dccd26..4fce75b2 100644 --- 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 index 098ba499..58961113 100644 --- a/Samples/SampleBrowser/SampleBrowser.csproj +++ b/Samples/SampleBrowser/SampleBrowser.csproj @@ -7,7 +7,6 @@ net5.0-windows net8.0-windows - CODE_ANALYSIS;WPF;DESKTOP @@ -15,7 +14,7 @@ Images\Icons\Actipro.ico Properties\app.manifest - 24.1.0.0 + 24.1.1.0 ActiproSoftware diff --git a/Samples/SampleBrowser/SampleBrowser/Documents/ReleaseHistories/v24.1.xaml b/Samples/SampleBrowser/SampleBrowser/Documents/ReleaseHistories/v24.1.xaml index 26670459..4bae0e41 100644 --- a/Samples/SampleBrowser/SampleBrowser/Documents/ReleaseHistories/v24.1.xaml +++ b/Samples/SampleBrowser/SampleBrowser/Documents/ReleaseHistories/v24.1.xaml @@ -10,7 +10,14 @@ - 2/23/2024 - Version 24.1.0 + 2/26/2024 - Version 24.1.1 + Shared + + + + + + 2/26/2024 - Version 24.1.0 Bars diff --git a/Samples/WindowsWorkflowIntegration/WindowsWorkflowIntegration.csproj b/Samples/WindowsWorkflowIntegration/WindowsWorkflowIntegration.csproj index a493e5c1..511feae0 100644 --- a/Samples/WindowsWorkflowIntegration/WindowsWorkflowIntegration.csproj +++ b/Samples/WindowsWorkflowIntegration/WindowsWorkflowIntegration.csproj @@ -8,7 +8,7 @@ Actipro.ico - 24.1.0.0 + 24.1.1.0 ActiproSoftware.Windows.WindowsWorkflowIntegration Actipro Software LLC @@ -33,8 +33,8 @@ - - + + \ No newline at end of file diff --git a/Source/Bars.Mvvm/Bars.Mvvm.csproj b/Source/Bars.Mvvm/Bars.Mvvm.csproj index df1c40f4..c369fa45 100644 --- a/Source/Bars.Mvvm/Bars.Mvvm.csproj +++ b/Source/Bars.Mvvm/Bars.Mvvm.csproj @@ -10,7 +10,7 @@ Common view models, templates, and other types used when implementing Bars controls with MVVM (Model-View-ViewModel) patterns. Actipro UI Controls WPF XAML MVVM MMoodel View ViewModel Bars - 24.1.0.0 + 24.1.1.0 ActiproSoftware Actipro Software LLC @@ -34,7 +34,7 @@ - + diff --git a/Source/Bars.Mvvm/Products/Bars.Mvvm/AssemblyInfo.cs b/Source/Bars.Mvvm/Products/Bars.Mvvm/AssemblyInfo.cs index 735262a3..a9465fec 100644 --- 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 index 980d7aab..fd42f6d7 100644 --- a/Source/DataGrid.Contrib/DataGrid.Contrib.csproj +++ b/Source/DataGrid.Contrib/DataGrid.Contrib.csproj @@ -10,7 +10,7 @@ Common extensions, behaviors, and themes for the WPF DataGrid control. Actipro UI Controls WPF XAML DataGrid - 24.1.0.0 + 24.1.1.0 ActiproSoftware Actipro Software LLC @@ -34,7 +34,7 @@ - + diff --git a/Source/DataGrid.Contrib/Products/DataGrid/Contrib/AssemblyInfo.cs b/Source/DataGrid.Contrib/Products/DataGrid/Contrib/AssemblyInfo.cs index 6118ddb1..1bacb19b 100644 --- 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 index 201d3519..61b3f3f3 100644 --- a/Source/Editors.Interop.DataGrid/Editors.Interop.DataGrid.csproj +++ b/Source/Editors.Interop.DataGrid/Editors.Interop.DataGrid.csproj @@ -10,7 +10,7 @@ Provides interoperability between Actipro's WPF Editors product and the WPF DataGrid. Actipro UI Controls WPF XAML Editors DataGrid - 24.1.0.0 + 24.1.1.0 ActiproSoftware Actipro Software LLC @@ -34,7 +34,7 @@ - + diff --git a/Source/Editors.Interop.DataGrid/Products/Editors.Interop.DataGrid/AssemblyInfo.cs b/Source/Editors.Interop.DataGrid/Products/Editors.Interop.DataGrid/AssemblyInfo.cs index 9d11b3a7..96d5e9f9 100644 --- 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