Skip to content

Commit 575920d

Browse files
committed
Merge branch 'release/v25.1.0' into main
2 parents 97092c1 + 576a4e2 commit 575920d

File tree

136 files changed

+972
-309
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+972
-309
lines changed

.github/workflows/integration-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
env:
2020
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
21-
LICENSEKEY: ${{ secrets.ACTIPRO_CONTROLS_WINFORMS_V24_1_LICENSEKEY }}
21+
LICENSEKEY: ${{ secrets.ACTIPRO_CONTROLS_WINFORMS_V25_1_LICENSEKEY }}
2222

2323
steps:
2424
- name: Cancel duplicate runs

Build/Build.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<RootNamespace>ActiproSoftware.Tools.Builds</RootNamespace>
1717
<Company>Actipro Software LLC</Company>
1818
<Authors>Actipro Software LLC</Authors>
19-
<Copyright>Copyright (c) 2020-2024 Actipro Software LLC. All rights reserved.</Copyright>
19+
<Copyright>Copyright (c) 2020-2025 Actipro Software LLC. All rights reserved.</Copyright>
2020

2121
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
2222

Documentation/docfx.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@
5353
"_appTitle": "Actipro WinForms Controls Docs",
5454
"_docsCompanyHref": "https://www.actiprosoftware.com/products/controls/windowsforms",
5555
"_docsCompanyName": "Actipro Software LLC",
56-
"_docsCopyrightYears": "1999-2024",
56+
"_docsCopyrightYears": "1999-2025",
5757
"_docsProductHref": "https://www.actiprosoftware.com/products/controls/windowsforms",
5858
"_docsProductName": "WinForms Controls",
59-
"_docsProductVersion": "24.1",
59+
"_docsProductVersion": "25.1",
6060
"_disableContribution": true,
6161
"_enableNewTab": true,
6262
"_gitContribute": {

Documentation/topics/bars/designer/creating-layouts.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
2-
title: "Designer for .NET Core / .NET 5 and Higher"
3-
page-title: "Designer for .NET Core / .NET 5 and Higher - Bars Reference"
2+
title: "Designer for .NET"
3+
page-title: "Designer for .NET - Bars Reference"
44
order: 3
55
---
6-
# Designer for .NET Core / .NET 5 and Higher
6+
# Designer for .NET
77

88
> [!IMPORTANT]
9-
> This topic is about working with .NET Core or .NET 5 and higher. See the [Designer for .NET Framework](creating-layouts.netfx.md) topic for working with .NET Framework.
9+
> This topic is about working with .NET 6 and higher. See the [Designer for .NET Framework](creating-layouts.netfx.md) topic for working with .NET Framework.
1010
1111
The Bars controls are fully customized in a standalone dialog which enables easy interaction with toolbars, menus, and commands.
1212

Documentation/topics/bars/designer/creating-layouts.netfx.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ order: 2
66
# Designer for .NET Framework
77

88
> [!IMPORTANT]
9-
> This topic is about working with .NET Framework. See the [Designer for .NET Core / .NET 5 and Higher](creating-layouts.md) topic for working with .NET Core or .NET 5 and higher.
9+
> This topic is about working with .NET Framework. See the [Designer for .NET](creating-layouts.md) topic for working with .NET 6 and higher.
1010
1111
The Bars controls are specifically designed to make the design-time customization experience remarkably like the run-time customization experience. The Bars controls can be completely designed and customized in the designer and rely heavily on drag-and-drop functionality.
1212

Documentation/topics/bars/designer/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ order: 1
55
---
66
# Overview
77

8-
The design-time capabilities provided by Visual Studio are fundamentally different when working with controls that target .NET Framework compared to controls that target .NET Core or .NET 5 and higher. The designer functionality for the Bars controls is optimized based on the target platform.
8+
The design-time capabilities provided by Visual Studio are fundamentally different when working with controls that target .NET compared to controls that target .NET Framework. The designer functionality for the Bars controls is optimized based on the target platform.
99

1010
> [!NOTE]
1111
> See the [Visual Studio Designer](../../visual-studio-designer.md) topic for details and requirements for designer functionality.
@@ -16,8 +16,8 @@ The Bars controls are specifically designed to make the design-time customizatio
1616

1717
See the [Designer for .NET Framework](creating-layouts.netfx.md) topic for more information.
1818

19-
## .NET Core / .NET 5 and Higher
19+
## .NET 6 and Higher
2020

2121
The Bars controls are fully customized in a standalone dialog which enables easy interaction with toolbars, menus, and commands.
2222

23-
See the [Designer for .NET Core / .NET 5 and Higher](creating-layouts.md) topic for more information.
23+
See the [Designer for .NET](creating-layouts.md) topic for more information.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
title: "Converting to v25.1"
3+
page-title: "Converting to v25.1 - Conversion Notes"
4+
order: 5
5+
---
6+
# Converting to v25.1
7+
8+
All of the breaking changes are detailed or linked below.
9+
10+
## New Targets
11+
12+
All NuGet packages include a new target for .NET 8.
13+
14+
NuGet packages for the SyntaxEditor Text assemblies have been moved from .NET 6 to .NET 8. Those who still need to support older versions of .NET can use the .NET Standard 2.0 targets.
15+
16+
NuGet packages no longer include the legacy .NET Core 3.1 target. This target was previously used to support .NET Core 3.1 and .NET 5, neither of which are still supported by Microsoft. Projects that target .NET should be moved to .NET 6 or greater.
17+
18+
The .NET Framework configurations are unchanged.
19+
20+
## Visual Studio 2019 Support Removed
21+
22+
Visual Studio 2019 does not support .NET 6 or higher, so it can no longer be used to build .NET applications that use Actipro components. Applications that target .NET Framework should continue to work, but compatibility is no longer verified with new releases.
23+
24+
## SyntaxEditor Intra-Text Adornment Placement Updates
25+
26+
This version enhances the [Intra-Text Adornments](../syntaxeditor/user-interface/adornment/intra-text-adornments.md) feature with the ability to position the intra-text adornment after the tagged text range instead of before. This option is handy for scenarios such as when AI suggestions should be displayed at the end of a line, after the last character.
27+
28+
The [IsSpacerBefore](xref:ActiproSoftware.Text.Tagging.IIntraTextSpacerTag.IsSpacerBefore) property was added to the [IIntraTextSpacerTag](xref:ActiproSoftware.Text.Tagging.IIntraTextSpacerTag) interface to support this new option. Any classes implementing this interface should return `true` for this property to retain prior version functionality where the adornment appears before the tagged range.

Documentation/topics/conversion/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Occasionally during large updates to a product, some breaking changes are necess
99

1010
Read the following topics that are appropriate for your scenario if you are converting from an older version to the latest version.
1111

12+
- [Converting to v25.1](converting-to-v25-1.md)
13+
1214
- [Converting to v24.1](converting-to-v24-1.md)
1315

1416
- [Converting to v23.1](converting-to-v23-1.md)

Documentation/topics/docking/designer-support.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ A new tool window will be created and docked to the host container control and t
2626
*Dock control in the designer with an on the ColorPicker Smart Tags panel*
2727

2828
> [!TIP]
29-
> The same **Dock in New ToolWindow** action is also available as a designer verb on the context menu of a control when working with .NET Core or .NET 5 and higher.
29+
> The same **Dock in New ToolWindow** action is also available as a designer verb on the context menu of a control when working with .NET 6 and higher.
3030
3131
## Creating a Blank Tool Window
3232

@@ -38,7 +38,7 @@ To create a blank tool window:
3838
A blank tool window will be created that is docked in the host container control. The tool window is a container control, so other child controls such as textboxes can be added to it in the designer.
3939

4040
> [!TIP]
41-
> The same **Create Tool Window** action is also available as a designer verb on the context menu of a [DockManager](xref:@ActiproUIRoot.Controls.Docking.DockManager) component when working with .NET Core or .NET 5 and higher.
41+
> The same **Create Tool Window** action is also available as a designer verb on the context menu of a [DockManager](xref:@ActiproUIRoot.Controls.Docking.DockManager) component when working with .NET 6 and higher.
4242
4343
## Moving Tool Windows
4444

@@ -78,7 +78,7 @@ To open to **Tool Windows** dialog:
7878
>
7979
> Double-click a [DockManager](xref:@ActiproUIRoot.Controls.Docking.DockManager) component to quickly open the **Tool Windows** dialog using the default designer action for the component.
8080
>
81-
> The same **Tool Windows...** action is also available as a designer verb on the context menu of a [DockManager](xref:@ActiproUIRoot.Controls.Docking.DockManager) component or [ToolWindow](xref:@ActiproUIRoot.Controls.Docking.ToolWindow) control when working with .NET Core or .NET 5 and higher.
81+
> The same **Tool Windows...** action is also available as a designer verb on the context menu of a [DockManager](xref:@ActiproUIRoot.Controls.Docking.DockManager) component or [ToolWindow](xref:@ActiproUIRoot.Controls.Docking.ToolWindow) control when working with .NET 6 and higher.
8282
8383
The **Tool Windows** dialog lists all of the tool windows currently being managed by the [DockManager](xref:@ActiproUIRoot.Controls.Docking.DockManager) component.
8484

Documentation/topics/docking/tabstrip/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ order: 1
55
---
66
# Overview
77

8-
[TabStrip](xref:@ActiproUIRoot.Controls.Docking.TabStrip) provides an alternative tab-based control to the `TabControl` that is included in .NET Framework, .NET Core, or .NET 5+. [TabStrip](xref:@ActiproUIRoot.Controls.Docking.TabStrip) has a more robust user interface in that it fully supports [customized rendering](extensible-rendering.md), [tab alignment](tab-alignments.md) on any side, special handling for [tab overflow](tab-overflow-styles.md), control over minimum/maximum tab sizes, interactive tooltip handling, drag/drop reordering of tabs, and more.
8+
[TabStrip](xref:@ActiproUIRoot.Controls.Docking.TabStrip) provides an alternative tab-based control to the `TabControl` that is included in .NET or .NET Framework. [TabStrip](xref:@ActiproUIRoot.Controls.Docking.TabStrip) has a more robust user interface in that it fully supports [customized rendering](extensible-rendering.md), [tab alignment](tab-alignments.md) on any side, special handling for [tab overflow](tab-overflow-styles.md), control over minimum/maximum tab sizes, interactive tooltip handling, drag/drop reordering of tabs, and more.
99

1010
![Screenshot](../images/tabstrip.gif)
1111

0 commit comments

Comments
 (0)