Version 2.11.1, .NET6

harborsiem · Nov 11, 2021 · cc68858 · cc68858
1 parent 15f9cee
commit cc68858
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,12 +2,17 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-### Ribbon V2.11.0, RibbonTools V1.3.6
+### Ribbon V2.11.1, RibbonTools V1.3.6
+
+#### Changed (Ribbon)
+
+- DesignMode issue for .NET5, .NET6 (other naming for the Visual Studio Designer)
 
 #### Changed (RibbonTools)
 
 - Bugfixes: GalleryControls in AppMenuGroup and in other Groups
 - Default TextPosition in GalleryControls
+- RibbonToolsCore.sln only supports .NET6 (VS2022 required)
 ### Ribbon V2.11.0, RibbonTools V1.3.5
 
 #### Changed (Ribbon)

diff --git a/Ribbon/Properties/AssemblyInfo.cs b/Ribbon/Properties/AssemblyInfo.cs
@@ -33,5 +33,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("2.11.0.0")]
+[assembly: AssemblyFileVersion("2.11.1.0")]
 
diff --git a/Ribbon/RibbonCore.csproj b/Ribbon/RibbonCore.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>net5.0-windows;netcoreapp3.1;net40</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net40</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon />
     <StartupObject />
@@ -19,7 +19,7 @@
 
     <PackageId>WindowsRibbon</PackageId>
     <Product>Windows Ribbon Control</Product>
-    <Version>2.11.0</Version>
+    <Version>2.11.1</Version>
     <Authors>Hartmut Borkenhagen</Authors>
     <Company>RibbonLib</Company>
     <PackageIcon>Ribbon64.png</PackageIcon>
@@ -36,24 +36,29 @@
     <Deterministic>false</Deterministic>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU' and ('$(TargetFramework)' == 'net5.0-windows' or '$(TargetFramework)' == 'netcoreapp3.1')">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU' and ('$(TargetFramework)' == 'net6.0-windows' or '$(TargetFramework)' == 'net5.0-windows' or '$(TargetFramework)' == 'netcoreapp3.1')">
     <DefineConstants>DEBUG;Core</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU' and '$(TargetFramework)' == 'net40'">
     <DefineConstants>DEBUG</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU' and '$(TargetFramework)' == 'netcoreapp3.1'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU' and '$(TargetFramework)' == 'net6.0-windows'">
     <DefineConstants>TRACE;Core</DefineConstants>
-    <DocumentationFile>.\bin\Release\netcoreapp3.1\Ribbon.xml</DocumentationFile>
+    <DocumentationFile>.\bin\Release\net6.0-windows\Ribbon.xml</DocumentationFile>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU' and '$(TargetFramework)' == 'net5.0-windows'">
     <DefineConstants>TRACE;Core</DefineConstants>
     <DocumentationFile>.\bin\Release\net5.0-windows\Ribbon.xml</DocumentationFile>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU' and '$(TargetFramework)' == 'netcoreapp3.1'">
+    <DefineConstants>TRACE;Core</DefineConstants>
+    <DocumentationFile>.\bin\Release\netcoreapp3.1\Ribbon.xml</DocumentationFile>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU' and '$(TargetFramework)' == 'net40'">
     <DefineConstants>TRACE</DefineConstants>
     <DocumentationFile>.\bin\Release\net40\Ribbon.xml</DocumentationFile>

diff --git a/Ribbon/Util.cs b/Ribbon/Util.cs
@@ -21,7 +21,7 @@ static class Util
         static Util()
         {
             // design mode is true if host process is: Visual Studio, Visual Studio Express Versions (C#, VB, C++) or SharpDevelop
-            var designerHosts = new List<string>() { "devenv", "vcsexpress", "vbexpress", "vcexpress", "sharpdevelop" };
+            var designerHosts = new List<string>() { "designtoolsserver", "devenv", "vcsexpress", "vbexpress", "vcexpress", "sharpdevelop" };
             var processName = System.Diagnostics.Process.GetCurrentProcess().ProcessName.ToLower();
             _designMode = designerHosts.Contains(processName);
         }

diff --git a/RibbonTools/Misc/Readme.txt b/RibbonTools/Misc/Readme.txt
@@ -2,6 +2,7 @@ Was aufgefallen ist in Verbindung mit dem Ribbon mit WinForms:
 
 ApplicationModes in Verbindung mit Button, SplitButton, DropDownButton sind nur im ApplicationMenu (Left Side) zul�ssig.
 Das wird im RibbonDesigner nicht ber�cksichtigt.
+Im Original RibbonDesigner sind ein paar Bugs, die in den RibbonTools korrigiert wurden.
 
 Wenn ApplicationModes auf Groups oder Tabs verwendet werden, dann m�ssen alle! Tabs und Groups eine
 Definition von ApplicationModes enthalten.
@@ -11,5 +12,9 @@ Die UICC.exe stellt keinen Fehler fest.
 
 Im RibbonDesigner w�re es einfacher, wenn in der View auch ein Command vergeben werden k�nnte
 mit allen notwendigen Eingaben f�r Texte und Images. Oder auch ein Aufruf bei vorhandenem Command f�r die Eingabe von Text, Images
+=> einfacher Wechsel zum Command m�glich mit R�ckkehr an die verlassene View
 
-Copy Funktion f�r SizeDefinition (Large  nach Medium oder Small)
+Copy Funktion f�r SizeDefinition (Large  nach Medium oder Small)
+
+Microsoft Bug in UICC.exe mit SizeDefinition ButtonGroupsAndInputs, Beispiel aus Dokumentation funktioniert nicht.
+Entfernen der ControlGroup mit Button10 akzeptiert UICC, aber der Button3 erscheint dann an falscher Stelle
diff --git a/RibbonTools/RibbonToolsCore.csproj b/RibbonTools/RibbonToolsCore.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net5.0-windows;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
 	<UseWPF>true</UseWPF>
     <ApplicationIcon>Images\Ribbon.ico</ApplicationIcon>
@@ -112,15 +112,9 @@
     <EmbeddedResource Include="Wordpad.zip" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0-windows'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows'">
     <Reference Include="Ribbon">
-      <HintPath>..\Ribbon\bin\Release\net5.0-windows\Ribbon.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <Reference Include="Ribbon">
-      <HintPath>..\Ribbon\bin\Release\netcoreapp3.1\Ribbon.dll</HintPath>
+      <HintPath>..\Ribbon\bin\Release\net6.0-windows\Ribbon.dll</HintPath>
     </Reference>
   </ItemGroup>