Skip to content

Commit cc68858

Browse files
harborsiemharborsiem
committed
Version 2.11.1, .NET6
1 parent 15f9cee commit cc68858

File tree

6 files changed

+27
-18
lines changed

6 files changed

+27
-18
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,17 @@
22
All notable changes to this project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

5-
### Ribbon V2.11.0, RibbonTools V1.3.6
5+
### Ribbon V2.11.1, RibbonTools V1.3.6
6+
7+
#### Changed (Ribbon)
8+
9+
- DesignMode issue for .NET5, .NET6 (other naming for the Visual Studio Designer)
610

711
#### Changed (RibbonTools)
812

913
- Bugfixes: GalleryControls in AppMenuGroup and in other Groups
1014
- Default TextPosition in GalleryControls
15+
- RibbonToolsCore.sln only supports .NET6 (VS2022 required)
1116
### Ribbon V2.11.0, RibbonTools V1.3.5
1217

1318
#### Changed (Ribbon)

‎Ribbon/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
3535
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("2.11.0.0")]
36+
[assembly: AssemblyFileVersion("2.11.1.0")]
3737

‎Ribbon/RibbonCore.csproj‎

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

33
<PropertyGroup>
44
<OutputType>Library</OutputType>
5-
<TargetFrameworks>net5.0-windows;netcoreapp3.1;net40</TargetFrameworks>
5+
<TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net40</TargetFrameworks>
66
<UseWindowsForms>true</UseWindowsForms>
77
<ApplicationIcon />
88
<StartupObject />
@@ -19,7 +19,7 @@
1919

2020
<PackageId>WindowsRibbon</PackageId>
2121
<Product>Windows Ribbon Control</Product>
22-
<Version>2.11.0</Version>
22+
<Version>2.11.1</Version>
2323
<Authors>Hartmut Borkenhagen</Authors>
2424
<Company>RibbonLib</Company>
2525
<PackageIcon>Ribbon64.png</PackageIcon>
@@ -36,24 +36,29 @@
3636
<Deterministic>false</Deterministic>
3737
</PropertyGroup>
3838

39-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU' and ('$(TargetFramework)' == 'net5.0-windows' or '$(TargetFramework)' == 'netcoreapp3.1')">
39+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU' and ('$(TargetFramework)' == 'net6.0-windows' or '$(TargetFramework)' == 'net5.0-windows' or '$(TargetFramework)' == 'netcoreapp3.1')">
4040
<DefineConstants>DEBUG;Core</DefineConstants>
4141
</PropertyGroup>
4242

4343
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU' and '$(TargetFramework)' == 'net40'">
4444
<DefineConstants>DEBUG</DefineConstants>
4545
</PropertyGroup>
4646

47-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU' and '$(TargetFramework)' == 'netcoreapp3.1'">
47+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU' and '$(TargetFramework)' == 'net6.0-windows'">
4848
<DefineConstants>TRACE;Core</DefineConstants>
49-
<DocumentationFile>.\bin\Release\netcoreapp3.1\Ribbon.xml</DocumentationFile>
49+
<DocumentationFile>.\bin\Release\net6.0-windows\Ribbon.xml</DocumentationFile>
5050
</PropertyGroup>
5151

5252
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU' and '$(TargetFramework)' == 'net5.0-windows'">
5353
<DefineConstants>TRACE;Core</DefineConstants>
5454
<DocumentationFile>.\bin\Release\net5.0-windows\Ribbon.xml</DocumentationFile>
5555
</PropertyGroup>
5656

57+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU' and '$(TargetFramework)' == 'netcoreapp3.1'">
58+
<DefineConstants>TRACE;Core</DefineConstants>
59+
<DocumentationFile>.\bin\Release\netcoreapp3.1\Ribbon.xml</DocumentationFile>
60+
</PropertyGroup>
61+
5762
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU' and '$(TargetFramework)' == 'net40'">
5863
<DefineConstants>TRACE</DefineConstants>
5964
<DocumentationFile>.\bin\Release\net40\Ribbon.xml</DocumentationFile>

‎Ribbon/Util.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ static class Util
2121
static Util()
2222
{
2323
// design mode is true if host process is: Visual Studio, Visual Studio Express Versions (C#, VB, C++) or SharpDevelop
24-
var designerHosts = new List<string>() { "devenv", "vcsexpress", "vbexpress", "vcexpress", "sharpdevelop" };
24+
var designerHosts = new List<string>() { "designtoolsserver", "devenv", "vcsexpress", "vbexpress", "vcexpress", "sharpdevelop" };
2525
var processName = System.Diagnostics.Process.GetCurrentProcess().ProcessName.ToLower();
2626
_designMode = designerHosts.Contains(processName);
2727
}

‎RibbonTools/Misc/Readme.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ Was aufgefallen ist in Verbindung mit dem Ribbon mit WinForms:
22

33
ApplicationModes in Verbindung mit Button, SplitButton, DropDownButton sind nur im ApplicationMenu (Left Side) zul�ssig.
44
Das wird im RibbonDesigner nicht ber�cksichtigt.
5+
Im Original RibbonDesigner sind ein paar Bugs, die in den RibbonTools korrigiert wurden.
56

67
Wenn ApplicationModes auf Groups oder Tabs verwendet werden, dann m�ssen alle! Tabs und Groups eine
78
Definition von ApplicationModes enthalten.
@@ -11,5 +12,9 @@ Die UICC.exe stellt keinen Fehler fest.
1112

1213
Im RibbonDesigner w�re es einfacher, wenn in der View auch ein Command vergeben werden k�nnte
1314
mit allen notwendigen Eingaben f�r Texte und Images. Oder auch ein Aufruf bei vorhandenem Command f�r die Eingabe von Text, Images
15+
=> einfacher Wechsel zum Command m�glich mit R�ckkehr an die verlassene View
1416

15-
Copy Funktion f�r SizeDefinition (Large nach Medium oder Small)
17+
Copy Funktion f�r SizeDefinition (Large nach Medium oder Small)
18+
19+
Microsoft Bug in UICC.exe mit SizeDefinition ButtonGroupsAndInputs, Beispiel aus Dokumentation funktioniert nicht.
20+
Entfernen der ControlGroup mit Button10 akzeptiert UICC, aber der Button3 erscheint dann an falscher Stelle

‎RibbonTools/RibbonToolsCore.csproj‎

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

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFrameworks>net5.0-windows;netcoreapp3.1</TargetFrameworks>
5+
<TargetFrameworks>net6.0-windows</TargetFrameworks>
66
<UseWindowsForms>true</UseWindowsForms>
77
<UseWPF>true</UseWPF>
88
<ApplicationIcon>Images\Ribbon.ico</ApplicationIcon>
@@ -112,15 +112,9 @@
112112
<EmbeddedResource Include="Wordpad.zip" />
113113
</ItemGroup>
114114

115-
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0-windows'">
115+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows'">
116116
<Reference Include="Ribbon">
117-
<HintPath>..\Ribbon\bin\Release\net5.0-windows\Ribbon.dll</HintPath>
118-
</Reference>
119-
</ItemGroup>
120-
121-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
122-
<Reference Include="Ribbon">
123-
<HintPath>..\Ribbon\bin\Release\netcoreapp3.1\Ribbon.dll</HintPath>
117+
<HintPath>..\Ribbon\bin\Release\net6.0-windows\Ribbon.dll</HintPath>
124118
</Reference>
125119
</ItemGroup>
126120

0 commit comments

Comments
 (0)