diff --git a/Documentation/topics/licensing.md b/Documentation/topics/licensing.md index a707e3df..cd693cfa 100644 --- 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 index ced07ad8..6dec7956 100644 --- a/Samples/PrismIntegration/PrismIntegration.csproj +++ b/Samples/PrismIntegration/PrismIntegration.csproj @@ -7,7 +7,7 @@ Actipro.ico - 23.1.1.0 + 23.1.2.0 ActiproSoftware.Windows.PrismIntegration Actipro Software LLC @@ -31,7 +31,7 @@ - + \ No newline at end of file diff --git a/Samples/SampleBrowser/Properties/AssemblyInfo.cs b/Samples/SampleBrowser/Properties/AssemblyInfo.cs index 75c37675..35c66718 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("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 index d54667d1..42fd588d 100644 --- 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 index 09970acf..7a28f932 100644 --- a/Samples/SampleBrowser/SampleBrowser.csproj +++ b/Samples/SampleBrowser/SampleBrowser.csproj @@ -15,7 +15,7 @@ Images\Icons\Actipro.ico Properties\app.manifest - 23.1.1.0 + 23.1.2.0 ActiproSoftware @@ -68,14 +68,14 @@ - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/Samples/SampleBrowser/SampleBrowser/Controls/ImageLoader.cs b/Samples/SampleBrowser/SampleBrowser/Controls/ImageLoader.cs index 4d2c6058..682365da 100644 --- 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) /// The name of the file in the /Images/Other folder. /// An . public static ImageSource GetOther(string fileName) - => GetOther("/Other/" + fileName, freeze: true); + => GetOther(fileName, freeze: true); /// /// Gets an for an icon. diff --git a/Samples/SampleBrowser/SampleBrowser/Documents/ReleaseHistories/v23.1.xaml b/Samples/SampleBrowser/SampleBrowser/Documents/ReleaseHistories/v23.1.xaml index 198a971d..58b4f1df 100644 --- a/Samples/SampleBrowser/SampleBrowser/Documents/ReleaseHistories/v23.1.xaml +++ b/Samples/SampleBrowser/SampleBrowser/Documents/ReleaseHistories/v23.1.xaml @@ -10,6 +10,14 @@ + 6/14/2023 - Version 23.1.2 + Themes + + + + + + 6/12/2023 - Version 23.1.1 Bars (Beta) diff --git a/Samples/WindowsWorkflowIntegration/WindowsWorkflowIntegration.csproj b/Samples/WindowsWorkflowIntegration/WindowsWorkflowIntegration.csproj index 2efd56a3..225dee62 100644 --- a/Samples/WindowsWorkflowIntegration/WindowsWorkflowIntegration.csproj +++ b/Samples/WindowsWorkflowIntegration/WindowsWorkflowIntegration.csproj @@ -7,7 +7,7 @@ Actipro.ico - 23.1.1.0 + 23.1.2.0 ActiproSoftware.Windows.WindowsWorkflowIntegration Actipro Software LLC @@ -32,8 +32,8 @@ - - + + \ No newline at end of file diff --git a/Source/Bars.Mvvm/Bars.Mvvm.csproj b/Source/Bars.Mvvm/Bars.Mvvm.csproj index 22afdf36..12c2f7e3 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 - 23.1.1.0 + 23.1.2.0 ActiproSoftware Actipro Software LLC @@ -35,7 +35,7 @@ - + diff --git a/Source/Bars.Mvvm/Products/Bars.Mvvm/AssemblyInfo.cs b/Source/Bars.Mvvm/Products/Bars.Mvvm/AssemblyInfo.cs index 2f5feaa4..2f0ed146 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("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 index 8ee8f5f9..1dffd1a5 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 - 23.1.1.0 + 23.1.2.0 ActiproSoftware Actipro Software LLC @@ -35,7 +35,7 @@ - + diff --git a/Source/DataGrid.Contrib/Products/DataGrid/Contrib/AssemblyInfo.cs b/Source/DataGrid.Contrib/Products/DataGrid/Contrib/AssemblyInfo.cs index fc235d4d..c385a0e9 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("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 index b0f1f31c..a78d215c 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 - 23.1.1.0 + 23.1.2.0 ActiproSoftware Actipro Software LLC @@ -35,7 +35,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 b0c5fd42..a0621594 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("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