Skip to content

Commit

Permalink
Merge pull request #70 from Krypton-Suite/alpha
Browse files Browse the repository at this point in the history
Build 2111
Too many to view.. 
Letting it through
  • Loading branch information
Smurf-IV authored Nov 1, 2021
2 parents c5d2107 + 2006446 commit a158dc9
Show file tree
Hide file tree
Showing 1,232 changed files with 94,846 additions and 170,538 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -349,3 +349,7 @@ MigrationBackup/
# Ionide (cross platform F# VS Code tools) working folder
.ionide/
*.ini
/Source/WixInstaller/WixInstaller/BasePath50.wxs
/Source/WixInstaller/WixInstaller/BasePath48.wxs
/Source/WixInstaller/WixInstaller.net50/BasePath50.wxs
/Source/WixInstaller/WixInstaller.net48/BasePath48.wxs
10 changes: 7 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,16 @@ There are 2 sets of solutions in these projects:
# [Ribbon Examples](Source/Krypton%20Ribbon%20Examples/README.md)

# Misc Solutions
## [Toolkit Hub](Source/Krypton%20Toolkit%20Hub/README.md)
Preferred method of launching the Toolkit examples

## [Krypton Explorer](Source/Krypton%20Explorer/README.md)
This project allows the launching of the compiled examples directly
This is the old project, that allows the launching of the compiled examples.

## Following need sorting:
### [Toolkit Hub](Source/Krypton%20Toolkit%20Hub/README.md)
## [Wix Installer](Source/WixInstaller/README.md)
- After building the release version of everything then, run this to create the `msi` installer file.

## Following need sorting:
### [Toolkit Updater](Source/Krypton%20Toolkit%Updater/README.md)

### [Palette Designer](Source/Palette%20Designer/README.md)
Expand Down
15 changes: 14 additions & 1 deletion Source/.editorconfig
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
[*.cs]
[*Assembly*.cs]
#Warning CS0105 The using directive for 'System' appeared previously in this namespace Krypton.Toolkit 2019 (net5.0-windows)
dotnet_diagnostic.CS0105.severity = None

[PlatformInvoke.cs]
#Message CA1069 The enum member 'LINELEFT' has the same constant value '0' as member 'LINEUP'
dotnet_diagnostic.CA1069.severity = None

[*.cs]
# Sort System.* using directives alphabetically, and place them before other using directives
dotnet_sort_system_directives_first = true
#Place a blank line between using directive groups.
dotnet_separate_import_directive_groups = true
dotnet_code_quality.enable_platform_analyzer_on_pre_net5_target=true

# CS1591: Missing XML comment for publicly visible type or member
dotnet_diagnostic.CS1591.severity = silent


#warning CA1416: This call site is reachable on all platforms. 'KryptonRibbonGroupButton.Checked' is only supported on: 'Windows' 7.0 and later.
dotnet_diagnostic.CA1416.severity = None
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
// *****************************************************************************
//
// © Component Factory Pty Ltd, 2006 - 2016. All rights reserved.
// The software and associated documentation supplied hereunder are the
// proprietary information of Component Factory Pty Ltd, PO Box 1504,
// Glen Waverley, Vic 3150, Australia and are supplied subject to licence terms.
//
// Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV) 2017 - 2021. All rights reserved. (https://github.com/Krypton-Suite/Standard-Toolkit)
// Version 5.550.0 www.ComponentFactory.com
//
// *****************************************************************************

#region BSD License
/*
*
* Original BSD 3-Clause License (https://github.com/ComponentFactory/Krypton/blob/master/LICENSE)
* © Component Factory Pty Ltd, 2006 - 2016, (Version 4.5.0.0) All rights reserved.
*
* New BSD 3-Clause License (https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/LICENSE)
* Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2017 - 2021. All rights reserved.
*
*/
#endregion
using System.Windows.Forms;

namespace DockingCustomized
Expand Down
23 changes: 11 additions & 12 deletions Source/Krypton Docking Examples/Docking Customized/ContentInput.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
// *****************************************************************************
//
// © Component Factory Pty Ltd, 2006 - 2016. All rights reserved.
// The software and associated documentation supplied hereunder are the
// proprietary information of Component Factory Pty Ltd, PO Box 1504,
// Glen Waverley, Vic 3150, Australia and are supplied subject to licence terms.
//
// Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV) 2017 - 2021. All rights reserved. (https://github.com/Krypton-Suite/Standard-Toolkit)
// Version 5.550.0 www.ComponentFactory.com
//
// *****************************************************************************

#region BSD License
/*
*
* Original BSD 3-Clause License (https://github.com/ComponentFactory/Krypton/blob/master/LICENSE)
* © Component Factory Pty Ltd, 2006 - 2016, (Version 4.5.0.0) All rights reserved.
*
* New BSD 3-Clause License (https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/LICENSE)
* Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2017 - 2021. All rights reserved.
*
*/
#endregion
using System.Windows.Forms;

namespace DockingCustomized
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
// *****************************************************************************
//
// © Component Factory Pty Ltd, 2006 - 2016. All rights reserved.
// The software and associated documentation supplied hereunder are the
// proprietary information of Component Factory Pty Ltd, PO Box 1504,
// Glen Waverley, Vic 3150, Australia and are supplied subject to licence terms.
//
// Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV) 2017 - 2021. All rights reserved. (https://github.com/Krypton-Suite/Standard-Toolkit)
// Version 5.550.0 www.ComponentFactory.com
//
// *****************************************************************************

#region BSD License
/*
*
* Original BSD 3-Clause License (https://github.com/ComponentFactory/Krypton/blob/master/LICENSE)
* © Component Factory Pty Ltd, 2006 - 2016, (Version 4.5.0.0) All rights reserved.
*
* New BSD 3-Clause License (https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/LICENSE)
* Modifications by Peter Wagner(aka Wagnerp) & Simon Coghlan(aka Smurf-IV), et al. 2017 - 2021. All rights reserved.
*
*/
#endregion
using System;
using System.Drawing;
using System.Windows.Forms;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
<Choose>
<When Condition="'$(SolutionName.Endswith(`Nuget`))'">
<ItemGroup>
<PackageReference Include="Krypton.Toolkit.Canary.Lite" Version="6.0.2106" />
<PackageReference Include="Krypton.Docking.Canary.Lite" Version="6.0.2106" />
<PackageReference Include="Krypton.Ribbon.Canary.Lite" Version="6.0.2106" />
<PackageReference Include="Krypton.Toolkit.Canary" Version="6.2110.274-beta" />
<PackageReference Include="Krypton.Docking.Canary" Version="6.2110.274-beta" />
<PackageReference Include="Krypton.Ribbon.Canary" Version="6.2110.274-beta" />
</ItemGroup>
</When>
<Otherwise>
Expand All @@ -31,5 +31,6 @@
</Choose>
<PropertyGroup>
<OutputPath>..\..\..\Binaries\Krypton Demos\$(Configuration)\</OutputPath>
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
</Project>
Loading

0 comments on commit a158dc9

Please sign in to comment.