Skip to content

Commit 04fb9e0

Browse files
billhennbillhenn
committed
Merge branch 'release/v23.1.2' into main
2 parents 8a1b21f + 134d4d8 commit 04fb9e0

File tree

14 files changed

+39
-31
lines changed

14 files changed

+39
-31
lines changed

‎Documentation/topics/licensing.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ The contents of a *licenses.licx* file are pretty simple. It needs a single lin
144144
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:
145145

146146
```
147-
ActiproSoftware.Products.ActiproLicenseToken, ActiproSoftware.Shared.Wpf, Version=23.1.1.0, Culture=neutral, PublicKeyToken=36ff2196ab5654b9
147+
ActiproSoftware.Products.ActiproLicenseToken, ActiproSoftware.Shared.Wpf, Version=23.1.2.0, Culture=neutral, PublicKeyToken=36ff2196ab5654b9
148148
```
149149

150150
### Notes on Build Machines When Using Licenses.licx Files

‎Samples/PrismIntegration/PrismIntegration.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<ApplicationIcon>Actipro.ico</ApplicationIcon>
99

10-
<Version>23.1.1.0</Version>
10+
<Version>23.1.2.0</Version>
1111

1212
<RootNamespace>ActiproSoftware.Windows.PrismIntegration</RootNamespace>
1313
<Company>Actipro Software LLC</Company>
@@ -31,7 +31,7 @@
3131
</ItemGroup>
3232

3333
<ItemGroup Label="Actipro References">
34-
<PackageReference Include="ActiproSoftware.Controls.WPF.Docking" Version="23.1.1" />
34+
<PackageReference Include="ActiproSoftware.Controls.WPF.Docking" Version="23.1.2" />
3535
</ItemGroup>
3636

3737
</Project>

‎Samples/SampleBrowser/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,5 @@
6464
//
6565
// You can specify all the values or you can default the Revision and Build Numbers
6666
// by using the '*' as shown below:
67-
[assembly: AssemblyVersion("23.1.1.0")]
68-
[assembly: AssemblyInformationalVersion("23.1.1.0 - 20230419")]
67+
[assembly: AssemblyVersion("23.1.2.0")]
68+
[assembly: AssemblyInformationalVersion("23.1.2.0 - 20230612")]

‎Samples/SampleBrowser/Properties/Licenses.licx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ActiproSoftware.Products.ActiproLicenseToken, ActiproSoftware.Shared.Wpf, Version=23.1.1.0, Culture=neutral, PublicKeyToken=36ff2196ab5654b9
1+
ActiproSoftware.Products.ActiproLicenseToken, ActiproSoftware.Shared.Wpf, Version=23.1.2.0, Culture=neutral, PublicKeyToken=36ff2196ab5654b9

‎Samples/SampleBrowser/SampleBrowser.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<ApplicationIcon>Images\Icons\Actipro.ico</ApplicationIcon>
1616
<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
1717

18-
<Version>23.1.1.0</Version>
18+
<Version>23.1.2.0</Version>
1919

2020
<RootNamespace>ActiproSoftware</RootNamespace>
2121

@@ -68,14 +68,14 @@
6868
</ItemGroup>
6969

7070
<ItemGroup>
71-
<PackageReference Include="ActiproSoftware.Controls.WPF" Version="23.1.1" />
72-
<PackageReference Include="ActiproSoftware.Controls.WPF.Bars.Mvvm" Version="23.1.1" />
73-
<PackageReference Include="ActiproSoftware.Controls.WPF.DataGrid.Contrib" Version="23.1.1" />
74-
<PackageReference Include="ActiproSoftware.Controls.WPF.SyntaxEditor.Addons.DotNet" Version="23.1.1" />
75-
<PackageReference Include="ActiproSoftware.Controls.WPF.SyntaxEditor.Addons.JavaScript" Version="23.1.1" />
76-
<PackageReference Include="ActiproSoftware.Controls.WPF.SyntaxEditor.Addons.Python" Version="23.1.1" />
77-
<PackageReference Include="ActiproSoftware.Controls.WPF.SyntaxEditor.Addons.XML" Version="23.1.1" />
78-
<PackageReference Include="ActiproSoftware.Controls.WPF.Themes.Aero" Version="23.1.1" />
71+
<PackageReference Include="ActiproSoftware.Controls.WPF" Version="23.1.2" />
72+
<PackageReference Include="ActiproSoftware.Controls.WPF.Bars.Mvvm" Version="23.1.2" />
73+
<PackageReference Include="ActiproSoftware.Controls.WPF.DataGrid.Contrib" Version="23.1.2" />
74+
<PackageReference Include="ActiproSoftware.Controls.WPF.SyntaxEditor.Addons.DotNet" Version="23.1.2" />
75+
<PackageReference Include="ActiproSoftware.Controls.WPF.SyntaxEditor.Addons.JavaScript" Version="23.1.2" />
76+
<PackageReference Include="ActiproSoftware.Controls.WPF.SyntaxEditor.Addons.Python" Version="23.1.2" />
77+
<PackageReference Include="ActiproSoftware.Controls.WPF.SyntaxEditor.Addons.XML" Version="23.1.2" />
78+
<PackageReference Include="ActiproSoftware.Controls.WPF.Themes.Aero" Version="23.1.2" />
7979
</ItemGroup>
8080

8181
</Project>

‎Samples/SampleBrowser/SampleBrowser/Controls/ImageLoader.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public static ImageSource GetIcon(string fileName, bool freeze)
6262
/// <param name="fileName">The name of the file in the <c>/Images/Other</c> folder.</param>
6363
/// <returns>An <see cref="ImageSource"/>.</returns>
6464
public static ImageSource GetOther(string fileName)
65-
=> GetOther("/Other/" + fileName, freeze: true);
65+
=> GetOther(fileName, freeze: true);
6666

6767
/// <summary>
6868
/// Gets an <see cref="ImageSource"/> for an icon.

‎Samples/SampleBrowser/SampleBrowser/Documents/ReleaseHistories/v23.1.xaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@
1010
<Control x:Name="focusCaptureControl" />
1111

1212

13+
<TextBlock Style="{StaticResource DocumentHeadingTextBlockStyle}">6/14/2023 - Version 23.1.2</TextBlock>
14+
<TextBlock Style="{StaticResource DocumentSubHeadingTextBlockStyle}">Themes</TextBlock>
15+
<StackPanel Style="{StaticResource DocumentBulletPanelStyle}">
16+
<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." />
17+
</StackPanel>
18+
<Rectangle Style="{StaticResource DocumentSectionHorizontalRuleStyle}" />
19+
20+
1321
<TextBlock Style="{StaticResource DocumentHeadingTextBlockStyle}">6/12/2023 - Version 23.1.1</TextBlock>
1422
<TextBlock Style="{StaticResource DocumentSubHeadingTextBlockStyle}">Bars (Beta)</TextBlock>
1523
<StackPanel Style="{StaticResource DocumentBulletPanelStyle}">

‎Samples/WindowsWorkflowIntegration/WindowsWorkflowIntegration.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<ApplicationIcon>Actipro.ico</ApplicationIcon>
99

10-
<Version>23.1.1.0</Version>
10+
<Version>23.1.2.0</Version>
1111

1212
<RootNamespace>ActiproSoftware.Windows.WindowsWorkflowIntegration</RootNamespace>
1313
<Company>Actipro Software LLC</Company>
@@ -32,8 +32,8 @@
3232
</ItemGroup>
3333

3434
<ItemGroup Label="Actipro References">
35-
<PackageReference Include="ActiproSoftware.Controls.WPF.Docking" Version="23.1.1" />
36-
<PackageReference Include="ActiproSoftware.Controls.WPF.SyntaxEditor.Addons.DotNet" Version="23.1.1" />
35+
<PackageReference Include="ActiproSoftware.Controls.WPF.Docking" Version="23.1.2" />
36+
<PackageReference Include="ActiproSoftware.Controls.WPF.SyntaxEditor.Addons.DotNet" Version="23.1.2" />
3737
</ItemGroup>
3838

3939
</Project>

‎Source/Bars.Mvvm/Bars.Mvvm.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<Description>Common view models, templates, and other types used when implementing Bars controls with MVVM (Model-View-ViewModel) patterns.</Description>
1111
<PackageTags>Actipro UI Controls WPF XAML MVVM MMoodel View ViewModel Bars</PackageTags>
1212

13-
<Version>23.1.1.0</Version>
13+
<Version>23.1.2.0</Version>
1414

1515
<RootNamespace>ActiproSoftware</RootNamespace>
1616
<Company>Actipro Software LLC</Company>
@@ -35,7 +35,7 @@
3535
</PropertyGroup>
3636

3737
<ItemGroup>
38-
<PackageReference Include="ActiproSoftware.Controls.WPF.Bars" Version="23.1.1" />
38+
<PackageReference Include="ActiproSoftware.Controls.WPF.Bars" Version="23.1.2" />
3939
</ItemGroup>
4040

4141
</Project>

‎Source/Bars.Mvvm/Products/Bars.Mvvm/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@
4646
// You can specify all the values or you can default the Revision and Build Numbers
4747
// by using the '*' as shown below:
4848

49-
[assembly: AssemblyVersion("23.1.1.0")] // WPF
50-
[assembly: AssemblyInformationalVersion("23.1.1.0")] // WPF
49+
[assembly: AssemblyVersion("23.1.2.0")] // WPF
50+
[assembly: AssemblyInformationalVersion("23.1.2.0")] // WPF

0 commit comments

Comments
 (0)