Skip to content

Commit ce8ba57

Browse files
authored
Merge pull request #1835 from Krypton-Suite/canary
* Version 90
2 parents 4c38c84 + 2c8fcef commit ce8ba57

File tree

2,280 files changed

+283556
-56738
lines changed

Some content is hidden

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

2,280 files changed

+283556
-56738
lines changed

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,3 +325,10 @@ Installer Project Files/Krypton Toolkit Suite/Krypton Toolkit Suite-cache/part1/
325325
Source\Miscellaneous Toolkit Items\Krypton Toolkit Documentation\Help
326326
*.bak
327327
Source/Krypton Components/Temp.txt
328+
329+
# Don't ignore these files
330+
!Source/Krypton Components/TestForm/invoices.xml
331+
332+
# Log files
333+
/Logs
334+
Source/Krypton Components/Krypton.Ribbon/Temp.txt

Assets/PDN/New Logo Green.pdn

-44.8 KB
Binary file not shown.

Assets/PDN/New Logo.pdn

-55.7 KB
Binary file not shown.
2.31 KB
-2.14 MB
Binary file not shown.
-2.13 MB
Binary file not shown.
-4.14 MB
Binary file not shown.

Directory.Build.props

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
<Revision>$([System.DateTime]::Now.get_DayOfYear().ToString())</Revision>
88

99
<!--Version layout schema:
10-
80 = Major
11-
23 = Minor - Year of release
10+
90 = Major
11+
24 = Minor - Year of release
1212
01 = Build - Month of release
1313
1 = Revision - Day of release (day of year)
1414
-beta = Indicates a pre-release package
1515
-->
16-
<LibraryVersion>80.$(Minor).$(Build).$(Revision)</LibraryVersion>
16+
<LibraryVersion>90.$(Minor).$(Build).$(Revision)</LibraryVersion>
1717

1818
<!--https://docs.microsoft.com/en-us/nuget/create-packages/prerelease-packages-->
19-
<PackageVersion>80.$(Minor).$(Build).$(Revision)-beta</PackageVersion>
19+
<PackageVersion>90.$(Minor).$(Build).$(Revision)-beta</PackageVersion>
2020
</PropertyGroup>
2121
</When>
2222

@@ -27,17 +27,17 @@
2727
<Revision>$([System.DateTime]::Now.get_DayOfYear().ToString())</Revision>
2828

2929
<!--Version layout schema:
30-
80 = Major
31-
23 = Minor - Year of release
30+
90 = Major
31+
24 = Minor - Year of release
3232
01 = Build - Month of release
3333
1 = Revision - Day of release (day of year)
3434
-alpha = Indicates a pre-release package
3535
-->
36-
<LibraryVersion>80.$(Minor).$(Build).$(Revision)</LibraryVersion>
36+
<LibraryVersion>90.$(Minor).$(Build).$(Revision)</LibraryVersion>
3737

3838
<!--Nightly-->
3939
<!--https://docs.microsoft.com/en-us/nuget/create-packages/prerelease-packages-->
40-
<PackageVersion>80.$(Minor).$(Build).$(Revision)-alpha</PackageVersion>
40+
<PackageVersion>90.$(Minor).$(Build).$(Revision)-alpha</PackageVersion>
4141
</PropertyGroup>
4242
</When>
4343

@@ -48,18 +48,18 @@
4848
<Revision>$([System.DateTime]::Now.get_DayOfYear().ToString())</Revision>
4949

5050
<!--Version layout schema:
51-
80 = Major
52-
23 = Minor - Year of release
51+
90 = Major
52+
24 = Minor - Year of release
5353
01 = Build - Month of release
5454
1 = Revision - Day of release (day of year)
5555
-->
5656

5757
<!--As WIX installer can only cope with build numbers <= 256, the yyMM layout won't work.
5858
Therefore, the build number for these packages will utilise the month number, assuming
5959
that the major number will follow the latest .NET release number.-->
60-
<LibraryVersion>80.$(Minor).$(Build).$(Revision)</LibraryVersion>
60+
<LibraryVersion>90.$(Minor).$(Build).$(Revision)</LibraryVersion>
6161

62-
<PackageVersion>80.$(Minor).$(Build).$(Revision)</PackageVersion>
62+
<PackageVersion>90.$(Minor).$(Build).$(Revision)</PackageVersion>
6363
</PropertyGroup>
6464
</When>
6565
<Otherwise>
@@ -69,16 +69,16 @@
6969
<Revision>$([System.DateTime]::Now.get_DayOfYear().ToString())</Revision>
7070

7171
<!--Version layout schema:
72-
80 = Major
73-
23 = Minor - Year of release
72+
90 = Major
73+
24 = Minor - Year of release
7474
01 = Build - Month of release
7575
1 = Revision - Day of release (day of year)
7676
-->
77-
<LibraryVersion>80.$(Minor).$(Build).$(Revision)</LibraryVersion>
77+
<LibraryVersion>90.$(Minor).$(Build).$(Revision)</LibraryVersion>
7878
<!--https://docs.microsoft.com/en-us/nuget/create-packages/prerelease-packages-->
7979

8080
<!--Stable-->
81-
<PackageVersion>80.$(Minor).$(Build).$(Revision)</PackageVersion>
81+
<PackageVersion>90.$(Minor).$(Build).$(Revision)</PackageVersion>
8282
</PropertyGroup>
8383
</Otherwise>
8484
</Choose>

Documents/Help/Changelog.md renamed to Documents/Changelog/Changelog.md

Lines changed: 248 additions & 31 deletions

Documents/Help/Designer-Fix.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

Documents/License/License.md

Lines changed: 1 addition & 1 deletion

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BSD 3-Clause License
22

3-
Copyright (c) 2017 - 2023, Krypton Suite
3+
Copyright (c) 2017 - 2024, Krypton Suite
44

55
All rights reserved.
66

README.md

Lines changed: 98 additions & 53 deletions

Scripts/Batch Files/build-canary.cmd

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
@echo off
2+
3+
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Preview\MSBuild\Current\Bin" goto vs17prev
4+
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin" goto vs17ent
5+
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin" goto vs17pro
6+
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin" goto vs17com
7+
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin" goto vs17build
8+
9+
echo "Unable to detect suitable environment. Check if VS 2022 is installed."
10+
11+
pause
12+
goto exitbatch
13+
14+
:vs17prev
15+
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Preview\MSBuild\Current\Bin
16+
goto build
17+
18+
:vs17ent
19+
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin
20+
goto build
21+
22+
:vs17pro
23+
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin
24+
goto build
25+
26+
:vs17com
27+
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin
28+
goto build
29+
30+
:vs17build
31+
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin
32+
goto build
33+
34+
:build
35+
for /f "tokens=* usebackq" %%A in (`tzutil /g`) do (
36+
set "zone=%%A"
37+
)
38+
39+
@echo Started: %date% %time% %zone%
40+
@echo
41+
set targets=Build
42+
if not "%~1" == "" set targets=%~1
43+
"%msbuildpath%\msbuild.exe" /t:%targets% canary.proj /fl /flp:logfile=../Logs/build-log.log /bl:../Logs/build-log.binlog
44+
45+
@echo Build Completed: %date% %time% %zone%
46+
47+
pause
48+
49+
@echo Do you want to return to complete another task? (Y/N)
50+
set /p answer="Enter input: "
51+
if %answer%==Y (goto run)
52+
if %answer%==y (goto run)
53+
if %answer%==N exit
54+
if %answer%==n exit
55+
56+
@echo Invalid input, please try again.
57+
58+
:run
59+
cd ..
60+
61+
run.cmd
62+
63+
:exitbatch
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
@echo off
2+
3+
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Preview\MSBuild\Current\Bin" goto vs17prev
4+
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin" goto vs17ent
5+
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin" goto vs17pro
6+
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin" goto vs17com
7+
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin" goto vs17build
8+
9+
echo "Unable to detect suitable environment. Check if VS 2022 is installed."
10+
11+
pause
12+
goto exitbatch
13+
14+
:vs17prev
15+
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Preview\MSBuild\Current\Bin
16+
goto build
17+
18+
:vs17ent
19+
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin
20+
goto build
21+
22+
:vs17pro
23+
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin
24+
goto build
25+
26+
:vs17com
27+
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin
28+
goto build
29+
30+
:vs17build
31+
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin
32+
goto build
33+
34+
:build
35+
for /f "tokens=* usebackq" %%A in (`tzutil /g`) do (
36+
set "zone=%%A"
37+
)
38+
39+
@echo Started: %date% %time% %zone%
40+
@echo
41+
set targets=Build
42+
if not "%~1" == "" set targets=%~1
43+
"%msbuildpath%\msbuild.exe" /t:%targets% ../Project Files/installer.proj /fl /flp:logfile=build.log
44+
45+
@echo Build Completed: %date% %time% %zone%
46+
47+
pause
48+
49+
@echo Do you want to return to complete another task? (Y/N)
50+
set /p answer="Enter input: "
51+
if %answer%==Y (goto run)
52+
if %answer%==y (goto run)
53+
if %answer%==N exit
54+
if %answer%==n exit
55+
56+
@echo Invalid input, please try again.
57+
58+
:run
59+
cd ..
60+
61+
run.cmd
62+
63+
:exitbatch
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
@echo off
2+
3+
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Preview\MSBuild\Current\Bin" goto vs17prev
4+
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin" goto vs17ent
5+
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin" goto vs17pro
6+
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin" goto vs17com
7+
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin" goto vs17build
8+
9+
echo "Unable to detect suitable environment. Check if VS 2022 is installed."
10+
11+
pause
12+
goto exitbatch
13+
14+
:vs17prev
15+
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Preview\MSBuild\Current\Bin
16+
goto build
17+
18+
:vs17ent
19+
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin
20+
goto build
21+
22+
:vs17pro
23+
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin
24+
goto build
25+
26+
:vs17com
27+
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin
28+
goto build
29+
30+
:vs17build
31+
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin
32+
goto build
33+
34+
:build
35+
for /f "tokens=* usebackq" %%A in (`tzutil /g`) do (
36+
set "zone=%%A"
37+
)
38+
39+
@echo Started: %date% %time% %zone%
40+
@echo
41+
set targets=Build
42+
if not "%~1" == "" set targets=%~1
43+
"%msbuildpath%\msbuild.exe" /t:%targets% nightly.proj /fl /flp:logfile=build.log
44+
45+
@echo Build Completed: %date% %time% %zone%
46+
47+
:exitbatch

Scripts/Batch Files/build-nightly.cmd

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
@echo off
2+
3+
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Preview\MSBuild\Current\Bin" goto vs17prev
4+
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin" goto vs17ent
5+
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin" goto vs17pro
6+
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin" goto vs17com
7+
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin" goto vs17build
8+
9+
echo "Unable to detect suitable environment. Check if VS 2022 is installed."
10+
11+
pause
12+
goto exitbatch
13+
14+
:vs17prev
15+
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Preview\MSBuild\Current\Bin
16+
goto build
17+
18+
:vs17ent
19+
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin
20+
goto build
21+
22+
:vs17pro
23+
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin
24+
goto build
25+
26+
:vs17com
27+
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin
28+
goto build
29+
30+
:vs17build
31+
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin
32+
goto build
33+
34+
:build
35+
for /f "tokens=* usebackq" %%A in (`tzutil /g`) do (
36+
set "zone=%%A"
37+
)
38+
39+
@echo Started: %date% %time% %zone%
40+
@echo
41+
set targets=Build
42+
if not "%~1" == "" set targets=%~1
43+
"%msbuildpath%\msbuild.exe" -t:%targets% ../Project-Files/nightly.proj /fl /flp:logfile=../../Logs/build-log.log /bl:../../Logs/build-log.binlog
44+
45+
:: -t:rebuild
46+
47+
::-graphBuild:True
48+
49+
@echo Build Completed: %date% %time% %zone%
50+
51+
pause
52+
53+
@echo Do you want to return to complete another task? (Y/N)
54+
set /p answer="Enter input: "
55+
if %answer%==Y (goto run)
56+
if %answer%==y (goto run)
57+
if %answer%==N exit
58+
if %answer%==n exit
59+
60+
@echo Invalid input, please try again.
61+
62+
:run
63+
cd ..
64+
65+
run.cmd
66+
67+
:exitbatch

0 commit comments

Comments
 (0)