Merge branch 'alpha' into alpha-827-ExposeIPalette

Krypton-Suite · Dec 21, 2022 · 0ebfcae · 0ebfcae
2 parents 8a446ab + d3a95fc
commit 0ebfcae
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 57 deletions.
diff --git a/Documents/Help/Changelog.md b/Documents/Help/Changelog.md
@@ -6,6 +6,7 @@
 
 ## 2023-11-xx - Build 2311 - November 2023
 * Fixed the display of the initial selected theme in the "ThemeSelection ComboBox"
+* Resolved [#874](https://github.com/Krypton-Suite/Standard-Toolkit/issues/874), 80.xx Canary Nuget text is incorrrect
 * Implemented [#866](https://github.com/Krypton-Suite/Standard-Toolkit/issues/866), `KryptonMessageBox` Option to use system icons
 * New `Application``KryptonMessageBoxIcon` type, specify your application icon to show in the `KryptonMessageBox` (recommended image size is 32 x 32)
 * Resolved [#867](https://github.com/Krypton-Suite/Standard-Toolkit/issues/867), KryptonMessageBox does not show help button

diff --git a/Source/Krypton Components/Directory.Build.props b/Source/Krypton Components/Directory.Build.props
@@ -41,7 +41,7 @@
 		<When Condition="'$(Configuration)' == 'Nightly'">
 			<ItemGroup>
 				<None Include="../../../Assets/PNG/NuGet Package Icons/Krypton Nightly.png" Link="Icon.png" Pack="true" PackagePath="" />
-			
+
 				<None Include="..\..\..\Documents\License\License.md">
 					<Pack>True</Pack>
 					<PackagePath>\</PackagePath>

diff --git a/Source/Krypton Components/Directory.Build.targets b/Source/Krypton Components/Directory.Build.targets
@@ -61,7 +61,7 @@
 				<FileVersion>80.$(Minor).$(Build).$(Revision)</FileVersion>
 
 				<LangVersion>preview</LangVersion>
-				
+
 				<AnalysLevel>preview</AnalysLevel>
 
 				<IncludeSymbols>True</IncludeSymbols>
@@ -119,7 +119,7 @@
 				<FileVersion>80.$(Minor).$(Build).$(Revision)</FileVersion>
 
 				<LangVersion>preview</LangVersion>
-				
+
 				<AnalysLevel>preview</AnalysLevel>
 			</PropertyGroup>
 		</Otherwise>
@@ -139,82 +139,33 @@
 				<PackageId Condition="'$(TFMs)' == 'all'">$(PackageId).Canary</PackageId>
 
 
-				<Description Condition="'$(TFMs)' == 'all'">
-					An update to Component factory's krypton toolkit to support .NET Framework 4.6.2 - 4.8.1, .NET Core 3.1 and .NET 5 - 7. $(Description)
-
-					This package supports all .NET Framework versions starting .NET Framework 4.6.2 - 4.8.1, .NET Core 3.1 and .NET 5 - 7.
-					Also, all libraries are included targeting each specific framework version for performance purposes.
-
-					To view all of the standard toolkit package latest version information, please visit: https://github.com/Krypton-Suite/Krypton-Toolkit-Suite-Version-Dashboard/blob/main/Documents/Modules/Standard/Krypton-Toolkit-Suite-Standard-Modules.md
-
-					To find out what's new, please visit: https://github.com/Krypton-Suite/Standard-Toolkit/blob/canary/Documents/Help/Changelog.md
-
-					This package is for those who want to try out the latest features before deployment. Please use $(PackageId) or $(PackageId).Signed if deployment is intended.
-				</Description>
+				<Description Condition="'$(TFMs)' == 'all'">An update to Component factory's krypton toolkit to support .NET Framework 4.6.2 - 4.8.1, .NET Core 3.1 and .NET 6 - 7. $(Description) This package supports all .NET Framework versions starting .NET Framework 4.6.2 - 4.8.1, .NET Core 3.1 and .NET 6 - 7. Also, all libraries are included targeting each specific framework version for performance purposes. To view all of the standard toolkit package latest version information, please visit: https://github.com/Krypton-Suite/Krypton-Toolkit-Suite-Version-Dashboard/blob/main/Documents/Modules/Standard/Krypton-Toolkit-Suite-Standard-Modules.md To find out what's new, please visit: https://github.com/Krypton-Suite/Standard-Toolkit/blob/canary/Documents/Help/Changelog.md This package is for those who want to try out the latest features before deployment.</Description>
 			</PropertyGroup>
 		</When>
 
 		<When Condition="'$(Configuration)' == 'Nightly'">
 			<PropertyGroup>
 				<PackageId Condition="'$(TFMs)' == 'all'">$(PackageId).Nightly</PackageId>
 
-				<Description Condition="'$(TFMs)' == 'all'">
-					An update to Component factory's krypton toolkit to support .NET Framework 4.6.2 - 4.8.1, .NET Core 3.1 and .NET 5 - 7. $(Description)
-
-					This package supports all .NET Framework versions starting .NET Framework 4.6.2 - 4.8.1, .NET Core 3.1 and .NET 5 - 7.
-					Also, all libraries are included targeting each specific framework version for performance purposes.
-
-					To view all of the standard toolkit package latest version information, please visit: https://github.com/Krypton-Suite/Krypton-Toolkit-Suite-Version-Dashboard/blob/main/Documents/Modules/Standard/Krypton-Toolkit-Suite-Standard-Modules.md
-
-					To find out what's new, please visit: https://github.com/Krypton-Suite/Standard-Toolkit/blob/alpha/Documents/Help/Changelog.md
-
-					This package is for those who want to try out the latest cutting edge features before deployment. Please use $(PackageId) or $(PackageId).Signed if deployment is intended.
-				</Description>
+				<Description Condition="'$(TFMs)' == 'all'">An update to Component factory's krypton toolkit to support .NET Framework 4.6.2 - 4.8.1, .NET Core 3.1 and .NET 6 - 7. $(Description) This package supports all .NET Framework versions starting .NET Framework 4.6.2 - 4.8.1, .NET Core 3.1 and .NET 6 - 7. Also, all libraries are included targeting each specific framework version for performance purposes. To view all of the standard toolkit package latest version information, please visit: https://github.com/Krypton-Suite/Krypton-Toolkit-Suite-Version-Dashboard/blob/main/Documents/Modules/Standard/Krypton-Toolkit-Suite-Standard-Modules.md To find out what's new, please visit: https://github.com/Krypton-Suite/Standard-Toolkit/blob/alpha/Documents/Help/Changelog.md This package is for those who want to try out the latest cutting edge features before deployment.</Description>
 			</PropertyGroup>
 		</When>
 
 		<When Condition="'$(Configuration)' == 'Installer'">
 			<PropertyGroup>
 				<PackageId Condition="'$(TFMs)' == 'all'">$(PackageId).Installer</PackageId>
 
-				<Description Condition="'$(TFMs)' == 'all'">
-					An update to Component factory's krypton toolkit to support .NET Framework 4.6.2 - 4.8.1, .NET Core 3.1 and .NET 5 - 7. $(Description)
-
-					This package supports all .NET Framework versions starting .NET Framework 4.6.2 - 4.8.1, .NET Core 3.1 and .NET 5 - 7.
-					Also, all libraries are included targeting each specific framework version for performance purposes.
-
-					To view all of the standard toolkit package latest version information, please visit: https://github.com/Krypton-Suite/Krypton-Toolkit-Suite-Version-Dashboard/blob/main/Documents/Modules/Standard/Krypton-Toolkit-Suite-Standard-Modules.md
-
-					To find out what's new, please visit: https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/Documents/Help/Changelog.md
-
-					FOR USE WITH DEMO INSTALLERS ONLY! Please use $(PackageId) or $(PackageId).Signed if deployment is intended.
-				</Description>
+				<Description Condition="'$(TFMs)' == 'all'">An update to Component factory's krypton toolkit to support .NET Framework 4.6.2 - 4.8.1, .NET Core 3.1 and .NET 6 - 7. $(Description) This package supports all .NET Framework versions starting .NET Framework 4.6.2 - 4.8.1, .NET Core 3.1 and .NET 6 - 7. Also, all libraries are included targeting each specific framework version for performance purposes. To view all of the standard toolkit package latest version information, please visit: https://github.com/Krypton-Suite/Krypton-Toolkit-Suite-Version-Dashboard/blob/main/Documents/Modules/Standard/Krypton-Toolkit-Suite-Standard-Modules.md To find out what's new, please visit: https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/Documents/Help/Changelog.md FOR USE WITH DEMO INSTALLERS ONLY!</Description>
 			</PropertyGroup>
 		</When>
 		<Otherwise>
 			<PropertyGroup>
 				<PackageId Condition="'$(TFMs)' == 'lite'">$(PackageId).Lite</PackageId>
 
-				<Description Condition="'$(TFMs)' == 'lite'">
-					An update to Component factory's krypton toolkit to support .NET Framework 4.8.1, .NET Core 3.1 and .NET 6 - 7. $(Description)
-
-					This package supports all .NET Framework versions starting .NET Framework 4.6.2 - 4.8.1, .NET 6 - 8.
-					Also, all libraries are included targeting each specific framework version for performance purposes.
-
-					To view all of the standard toolkit package latest version information, please visit: https://github.com/Krypton-Suite/Krypton-Toolkit-Suite-Version-Dashboard/blob/main/Documents/Modules/Standard/Krypton-Toolkit-Suite-Standard-Modules.md
-
-					To find out what's new, please visit: https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/Documents/Help/Changelog.md
-				</Description>
+				<Description Condition="'$(TFMs)' == 'lite'">An update to Component factory's krypton toolkit to support .NET Framework 4.8.1, .NET Core 3.1 and .NET 6 - 7. $(Description) This package supports all .NET Framework versions starting .NET Framework 4.6.2 - 4.8.1, .NET 6 - 8. Also, all libraries are included targeting each specific framework version for performance purposes. To view all of the standard toolkit package latest version information, please visit: https://github.com/Krypton-Suite/Krypton-Toolkit-Suite-Version-Dashboard/blob/main/Documents/Modules/Standard/Krypton-Toolkit-Suite-Standard-Modules.md To find out what's new, please visit: https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/Documents/Help/Changelog.md</Description>
 
 				<PackageId Condition="'$(TFMs)' == 'all'">$(PackageId)</PackageId>
-				<Description Condition="'$(TFMs)' == 'all'">
-					An update to Component factory's krypton toolkit to support .NET Framework 4.6.2 - 4.8.1, .NET Core 3.1 and .NET 5 - 7. $(Description)
-
-					This package supports all .NET Framework versions starting .NET Framework 4.6.2 - 4.8.1, .NET Core 3.1 and .NET 5 - 7.
-					Also, all libraries are included targeting each specific framework version for performance purposes.
-
-					To view all of the standard toolkit package latest version information, please visit: https://github.com/Krypton-Suite/Krypton-Toolkit-Suite-Version-Dashboard/blob/main/Documents/Modules/Standard/Krypton-Toolkit-Suite-Standard-Modules.md
-				</Description>
+				<Description Condition="'$(TFMs)' == 'all'">An update to Component factory's krypton toolkit to support .NET Framework 4.6.2 - 4.8.1, .NET Core 3.1 and .NET 6 - 7. $(Description) This package supports all .NET Framework versions starting .NET Framework 4.6.2 - 4.8.1, .NET Core 3.1 and .NET 6 - 7. Also, all libraries are included targeting each specific framework version for performance purposes. To view all of the standard toolkit package latest version information, please visit: https://github.com/Krypton-Suite/Krypton-Toolkit-Suite-Version-Dashboard/blob/main/Documents/Modules/Standard/Krypton-Toolkit-Suite-Standard-Modules.md</Description>
 			</PropertyGroup>
 		</Otherwise>
 	</Choose>