Skip to content

Commit b80c031

Browse files
Smurf-IVSmurf-IV
authored
Merge pull request #474 from Krypton-Suite/alpha
* May 2024 Canary
2 parents 409db7f + 89be669 commit b80c031

File tree

74 files changed

+1364
-702
lines changed

Some content is hidden

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

74 files changed

+1364
-702
lines changed

‎Source/Krypton Toolkit/AutoUpdateCreator/AutoUpdateCreator.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<Choose>
2121
<When Condition="'$(Configuration)' == 'Nightly'">
2222
<ItemGroup>
23-
<PackageReference Include="Krypton.Toolkit.Nightly" Version="90.24.2.60-alpha" />
23+
<PackageReference Include="Krypton.Toolkit.Nightly" Version="90.24.3.78-alpha" />
2424
</ItemGroup>
2525
</When>
2626

‎Source/Krypton Toolkit/Directory.Build.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,9 @@
166166
<PackageId Condition="'$(TFMs)' == 'StableLite'">$(PackageId).Lite</PackageId>
167167

168168
<Description Condition="'$(TFMs)' == 'StableLite'">
169-
An extension to the Standard Toolkit, which supports .NET Framework 4.8 and 4.8.1 and .NET 5 - 7. $(Description)
169+
An extension to the Standard Toolkit, which supports .NET Framework 4.8 and 4.8.1 and .NET 8 - 9. $(Description)
170170

171-
This package supports all .NET Framework versions starting .NET Framework 4.8 and 4.8.1 and .NET 5 - 7.
171+
This package supports all .NET Framework versions starting .NET Framework 4.8 and 4.8.1 and .NET 8 - 9.
172172
Also, all libraries are included targeting each specific framework version for performance purposes.
173173

174174
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

‎Source/Krypton Toolkit/Krypton Toolkit Suite Extended 2022 - VS2022 - NuGet.sln‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Issue Templates", "Issue Te
285285
EndProject
286286
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Krypton.Toolkit.Suite.Extended.Debug.Tools 2022", "Krypton.Toolkit.Suite.Extended.Debug.Tools\Krypton.Toolkit.Suite.Extended.Debug.Tools 2022.csproj", "{DDC3EC31-7D14-47BD-9DAF-24AF5B032354}"
287287
EndProject
288+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Krypton.Toolkit.Suite.Extended.MessageDialog", "Krypton.Toolkit.Suite.Extended.MessageDialog\Krypton.Toolkit.Suite.Extended.MessageDialog.csproj", "{B93429BE-5941-40A4-89F8-C14109959886}"
289+
EndProject
288290
Global
289291
GlobalSection(SolutionConfigurationPlatforms) = preSolution
290292
Canary|Any CPU = Canary|Any CPU
@@ -773,6 +775,14 @@ Global
773775
{DDC3EC31-7D14-47BD-9DAF-24AF5B032354}.Nightly|Any CPU.Build.0 = Nightly|Any CPU
774776
{DDC3EC31-7D14-47BD-9DAF-24AF5B032354}.Release|Any CPU.ActiveCfg = Release|Any CPU
775777
{DDC3EC31-7D14-47BD-9DAF-24AF5B032354}.Release|Any CPU.Build.0 = Release|Any CPU
778+
{B93429BE-5941-40A4-89F8-C14109959886}.Canary|Any CPU.ActiveCfg = Debug|Any CPU
779+
{B93429BE-5941-40A4-89F8-C14109959886}.Canary|Any CPU.Build.0 = Debug|Any CPU
780+
{B93429BE-5941-40A4-89F8-C14109959886}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
781+
{B93429BE-5941-40A4-89F8-C14109959886}.Debug|Any CPU.Build.0 = Debug|Any CPU
782+
{B93429BE-5941-40A4-89F8-C14109959886}.Nightly|Any CPU.ActiveCfg = Nightly|Any CPU
783+
{B93429BE-5941-40A4-89F8-C14109959886}.Nightly|Any CPU.Build.0 = Nightly|Any CPU
784+
{B93429BE-5941-40A4-89F8-C14109959886}.Release|Any CPU.ActiveCfg = Release|Any CPU
785+
{B93429BE-5941-40A4-89F8-C14109959886}.Release|Any CPU.Build.0 = Release|Any CPU
776786
EndGlobalSection
777787
GlobalSection(SolutionProperties) = preSolution
778788
HideSolutionNode = FALSE
@@ -860,6 +870,7 @@ Global
860870
{5D204922-259D-4140-B115-F01EDF031B5A} = {5D85B551-9AFC-4E96-93C3-D8D81B69971F}
861871
{362F24FA-1AA0-4821-A539-C5A863D39B8B} = {5D204922-259D-4140-B115-F01EDF031B5A}
862872
{DDC3EC31-7D14-47BD-9DAF-24AF5B032354} = {726DC0AA-2B0D-4EAC-BB7A-7C49AE13A390}
873+
{B93429BE-5941-40A4-89F8-C14109959886} = {252CCB85-EC69-4B0F-9ACB-4C37AE3F54B5}
863874
EndGlobalSection
864875
GlobalSection(ExtensibilityGlobals) = postSolution
865876
SolutionGuid = {A7CE7732-0982-4703-8EFD-7715D569BAB5}

‎Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.AdvancedDataGridView/Krypton.Toolkit.Suite.Extended.AdvancedDataGridView 2022.csproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,17 @@
8585
<Choose>
8686
<When Condition="'$(Configuration)' == 'Nightly'">
8787
<ItemGroup>
88-
<PackageReference Include="Krypton.Toolkit.Nightly" Version="90.24.2.60-alpha" />
88+
<PackageReference Include="Krypton.Toolkit.Nightly" Version="90.24.5.141-alpha" />
8989
</ItemGroup>
9090
</When>
9191

9292
<When Condition="'$(Configuration)' == 'Canary'">
9393
<ItemGroup>
94+
<<<<<<< HEAD
95+
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.5.141-beta" />
96+
=======
9497
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.4.113-beta" />
98+
>>>>>>> origin/canary
9599
</ItemGroup>
96100
</When>
97101

‎Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Buttons/Krypton.Toolkit.Suite.Extended.Buttons 2022.csproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,17 @@
8383
<Choose>
8484
<When Condition="'$(Configuration)' == 'Nightly'">
8585
<ItemGroup>
86-
<PackageReference Include="Krypton.Toolkit.Nightly" Version="90.24.2.60-alpha" />
86+
<PackageReference Include="Krypton.Toolkit.Nightly" Version="90.24.5.141-alpha" />
8787
</ItemGroup>
8888
</When>
8989

9090
<When Condition="'$(Configuration)' == 'Canary'">
9191
<ItemGroup>
92+
<<<<<<< HEAD
93+
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.5.141-beta" />
94+
=======
9295
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.4.113-beta" />
96+
>>>>>>> origin/canary
9397
</ItemGroup>
9498
</When>
9599

‎Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Calendar/Krypton.Toolkit.Suite.Extended.Calendar 2022.csproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,17 @@
8383
<Choose>
8484
<When Condition="'$(Configuration)' == 'Nightly'">
8585
<ItemGroup>
86-
<PackageReference Include="Krypton.Toolkit.Nightly" Version="90.24.2.60-alpha" />
86+
<PackageReference Include="Krypton.Toolkit.Nightly" Version="90.24.5.141-alpha" />
8787
</ItemGroup>
8888
</When>
8989

9090
<When Condition="'$(Configuration)' == 'Canary'">
9191
<ItemGroup>
92+
<<<<<<< HEAD
93+
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.5.141-beta" />
94+
=======
9295
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.4.113-beta" />
96+
>>>>>>> origin/canary
9397
</ItemGroup>
9498
</When>
9599

‎Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.CheckSum.Tools/Krypton.Toolkit.Suite.Extended.CheckSum.Tools 2022.csproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,17 @@
8585
<Choose>
8686
<When Condition="'$(Configuration)' == 'Nightly'">
8787
<ItemGroup>
88-
<PackageReference Include="Krypton.Toolkit.Nightly" Version="90.24.2.60-alpha" />
88+
<PackageReference Include="Krypton.Toolkit.Nightly" Version="90.24.5.141-alpha" />
8989
</ItemGroup>
9090
</When>
9191

9292
<When Condition="'$(Configuration)' == 'Canary'">
9393
<ItemGroup>
94+
<<<<<<< HEAD
95+
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.5.141-beta" />
96+
=======
9497
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.4.113-beta" />
98+
>>>>>>> origin/canary
9599
</ItemGroup>
96100
</When>
97101

‎Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar/Krypton.Toolkit.Suite.Extended.Circular.ProgressBar 2022.csproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,17 @@
8585
<Choose>
8686
<When Condition="'$(Configuration)' == 'Nightly'">
8787
<ItemGroup>
88-
<PackageReference Include="Krypton.Toolkit.Nightly" Version="90.24.2.60-alpha" />
88+
<PackageReference Include="Krypton.Toolkit.Nightly" Version="90.24.5.141-alpha" />
8989
</ItemGroup>
9090
</When>
9191

9292
<When Condition="'$(Configuration)' == 'Canary'">
9393
<ItemGroup>
94+
<<<<<<< HEAD
95+
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.5.141-beta" />
96+
=======
9497
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.4.113-beta" />
98+
>>>>>>> origin/canary
9599
</ItemGroup>
96100
</When>
97101

‎Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.ComboBox/Krypton.Toolkit.Suite.Extended.ComboBox 2022.csproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,17 @@
8585
<Choose>
8686
<When Condition="'$(Configuration)' == 'Nightly'">
8787
<ItemGroup>
88-
<PackageReference Include="Krypton.Toolkit.Nightly" Version="90.24.2.60-alpha" />
88+
<PackageReference Include="Krypton.Toolkit.Nightly" Version="90.24.5.141-alpha" />
8989
</ItemGroup>
9090
</When>
9191

9292
<When Condition="'$(Configuration)' == 'Canary'">
9393
<ItemGroup>
94+
<<<<<<< HEAD
95+
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.5.141-beta" />
96+
=======
9497
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.4.113-beta" />
98+
>>>>>>> origin/canary
9599
</ItemGroup>
96100
</When>
97101

‎Source/Krypton Toolkit/Krypton.Toolkit.Suite.Extended.Common/Krypton.Toolkit.Suite.Extended.Common 2022.csproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,17 @@
8585
<Choose>
8686
<When Condition="'$(Configuration)' == 'Nightly'">
8787
<ItemGroup>
88-
<PackageReference Include="Krypton.Toolkit.Nightly" Version="90.24.2.60-alpha" />
88+
<PackageReference Include="Krypton.Toolkit.Nightly" Version="90.24.5.141-alpha" />
8989
</ItemGroup>
9090
</When>
9191

9292
<When Condition="'$(Configuration)' == 'Canary'">
9393
<ItemGroup>
94+
<<<<<<< HEAD
95+
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.5.141-beta" />
96+
=======
9497
<PackageReference Include="Krypton.Toolkit.Canary" Version="90.24.4.113-beta" />
98+
>>>>>>> origin/canary
9599
</ItemGroup>
96100
</When>
97101

0 commit comments

Comments
 (0)