Skip to content

Commit

Permalink
Merge pull request #1835 from Krypton-Suite/canary
Browse files Browse the repository at this point in the history
* Version 90
  • Loading branch information
Smurf-IV authored Nov 5, 2024
2 parents 4c38c84 + 2c8fcef commit ce8ba57
Show file tree
Hide file tree
Showing 2,280 changed files with 283,556 additions and 56,738 deletions.
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -325,3 +325,10 @@ Installer Project Files/Krypton Toolkit Suite/Krypton Toolkit Suite-cache/part1/
Source\Miscellaneous Toolkit Items\Krypton Toolkit Documentation\Help
*.bak
Source/Krypton Components/Temp.txt

# Don't ignore these files
!Source/Krypton Components/TestForm/invoices.xml

# Log files
/Logs
Source/Krypton Components/Krypton.Ribbon/Temp.txt
Binary file removed Assets/PDN/New Logo Green.pdn
Binary file not shown.
Binary file removed Assets/PDN/New Logo.pdn
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/PNG/Main Icon/16 x 16/Krypton 16 x 16 LTS.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/PNG/NuGet Package Icons/Krypton LTS.png
Binary file removed Assets/PSD/Main Icon/New Logo Canary.psd
Diff not rendered.
Binary file removed Assets/PSD/Main Icon/New Logo Green.psd
Diff not rendered.
Binary file removed Assets/PSD/Main Icon/New Logo Template.psd
Diff not rendered.
32 changes: 16 additions & 16 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
<Revision>$([System.DateTime]::Now.get_DayOfYear().ToString())</Revision>

<!--Version layout schema:
80 = Major
23 = Minor - Year of release
90 = Major
24 = Minor - Year of release
01 = Build - Month of release
1 = Revision - Day of release (day of year)
-beta = Indicates a pre-release package
-->
<LibraryVersion>80.$(Minor).$(Build).$(Revision)</LibraryVersion>
<LibraryVersion>90.$(Minor).$(Build).$(Revision)</LibraryVersion>

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

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

<!--Version layout schema:
80 = Major
23 = Minor - Year of release
90 = Major
24 = Minor - Year of release
01 = Build - Month of release
1 = Revision - Day of release (day of year)
-alpha = Indicates a pre-release package
-->
<LibraryVersion>80.$(Minor).$(Build).$(Revision)</LibraryVersion>
<LibraryVersion>90.$(Minor).$(Build).$(Revision)</LibraryVersion>

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

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

<!--Version layout schema:
80 = Major
23 = Minor - Year of release
90 = Major
24 = Minor - Year of release
01 = Build - Month of release
1 = Revision - Day of release (day of year)
-->

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

<PackageVersion>80.$(Minor).$(Build).$(Revision)</PackageVersion>
<PackageVersion>90.$(Minor).$(Build).$(Revision)</PackageVersion>
</PropertyGroup>
</When>
<Otherwise>
Expand All @@ -69,16 +69,16 @@
<Revision>$([System.DateTime]::Now.get_DayOfYear().ToString())</Revision>

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

<!--Stable-->
<PackageVersion>80.$(Minor).$(Build).$(Revision)</PackageVersion>
<PackageVersion>90.$(Minor).$(Build).$(Revision)</PackageVersion>
</PropertyGroup>
</Otherwise>
</Choose>
Expand Down
279 changes: 248 additions & 31 deletions Documents/Help/Changelog.md → Documents/Changelog/Changelog.md

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions Documents/Help/Designer-Fix.md

This file was deleted.

2 changes: 1 addition & 1 deletion Documents/License/License.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 3-Clause License

Copyright (c) 2017 - 2023, Krypton Suite
Copyright (c) 2017 - 2024, Krypton Suite

All rights reserved.

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 3-Clause License

Copyright (c) 2017 - 2023, Krypton Suite
Copyright (c) 2017 - 2024, Krypton Suite

All rights reserved.

Expand Down
151 changes: 98 additions & 53 deletions README.md

Large diffs are not rendered by default.

63 changes: 63 additions & 0 deletions Scripts/Batch Files/build-canary.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
@echo off

if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Preview\MSBuild\Current\Bin" goto vs17prev
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin" goto vs17ent
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin" goto vs17pro
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin" goto vs17com
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin" goto vs17build

echo "Unable to detect suitable environment. Check if VS 2022 is installed."

pause
goto exitbatch

:vs17prev
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Preview\MSBuild\Current\Bin
goto build

:vs17ent
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin
goto build

:vs17pro
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin
goto build

:vs17com
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin
goto build

:vs17build
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin
goto build

:build
for /f "tokens=* usebackq" %%A in (`tzutil /g`) do (
set "zone=%%A"
)

@echo Started: %date% %time% %zone%
@echo
set targets=Build
if not "%~1" == "" set targets=%~1
"%msbuildpath%\msbuild.exe" /t:%targets% canary.proj /fl /flp:logfile=../Logs/build-log.log /bl:../Logs/build-log.binlog

@echo Build Completed: %date% %time% %zone%

pause

@echo Do you want to return to complete another task? (Y/N)
set /p answer="Enter input: "
if %answer%==Y (goto run)
if %answer%==y (goto run)
if %answer%==N exit
if %answer%==n exit

@echo Invalid input, please try again.

:run
cd ..

run.cmd

:exitbatch
63 changes: 63 additions & 0 deletions Scripts/Batch Files/build-installer.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
@echo off

if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Preview\MSBuild\Current\Bin" goto vs17prev
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin" goto vs17ent
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin" goto vs17pro
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin" goto vs17com
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin" goto vs17build

echo "Unable to detect suitable environment. Check if VS 2022 is installed."

pause
goto exitbatch

:vs17prev
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Preview\MSBuild\Current\Bin
goto build

:vs17ent
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin
goto build

:vs17pro
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin
goto build

:vs17com
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin
goto build

:vs17build
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin
goto build

:build
for /f "tokens=* usebackq" %%A in (`tzutil /g`) do (
set "zone=%%A"
)

@echo Started: %date% %time% %zone%
@echo
set targets=Build
if not "%~1" == "" set targets=%~1
"%msbuildpath%\msbuild.exe" /t:%targets% ../Project Files/installer.proj /fl /flp:logfile=build.log

@echo Build Completed: %date% %time% %zone%

pause

@echo Do you want to return to complete another task? (Y/N)
set /p answer="Enter input: "
if %answer%==Y (goto run)
if %answer%==y (goto run)
if %answer%==N exit
if %answer%==n exit

@echo Invalid input, please try again.

:run
cd ..

run.cmd

:exitbatch
47 changes: 47 additions & 0 deletions Scripts/Batch Files/build-nightly-custom.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
@echo off

if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Preview\MSBuild\Current\Bin" goto vs17prev
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin" goto vs17ent
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin" goto vs17pro
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin" goto vs17com
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin" goto vs17build

echo "Unable to detect suitable environment. Check if VS 2022 is installed."

pause
goto exitbatch

:vs17prev
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Preview\MSBuild\Current\Bin
goto build

:vs17ent
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin
goto build

:vs17pro
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin
goto build

:vs17com
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin
goto build

:vs17build
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin
goto build

:build
for /f "tokens=* usebackq" %%A in (`tzutil /g`) do (
set "zone=%%A"
)

@echo Started: %date% %time% %zone%
@echo
set targets=Build
if not "%~1" == "" set targets=%~1
"%msbuildpath%\msbuild.exe" /t:%targets% nightly.proj /fl /flp:logfile=build.log

@echo Build Completed: %date% %time% %zone%

:exitbatch
67 changes: 67 additions & 0 deletions Scripts/Batch Files/build-nightly.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
@echo off

if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Preview\MSBuild\Current\Bin" goto vs17prev
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin" goto vs17ent
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin" goto vs17pro
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin" goto vs17com
if exist "%ProgramFiles%\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin" goto vs17build

echo "Unable to detect suitable environment. Check if VS 2022 is installed."

pause
goto exitbatch

:vs17prev
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Preview\MSBuild\Current\Bin
goto build

:vs17ent
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin
goto build

:vs17pro
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin
goto build

:vs17com
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin
goto build

:vs17build
set msbuildpath=%ProgramFiles%\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin
goto build

:build
for /f "tokens=* usebackq" %%A in (`tzutil /g`) do (
set "zone=%%A"
)

@echo Started: %date% %time% %zone%
@echo
set targets=Build
if not "%~1" == "" set targets=%~1
"%msbuildpath%\msbuild.exe" -t:%targets% ../Project-Files/nightly.proj /fl /flp:logfile=../../Logs/build-log.log /bl:../../Logs/build-log.binlog

:: -t:rebuild

::-graphBuild:True

@echo Build Completed: %date% %time% %zone%

pause

@echo Do you want to return to complete another task? (Y/N)
set /p answer="Enter input: "
if %answer%==Y (goto run)
if %answer%==y (goto run)
if %answer%==N exit
if %answer%==n exit

@echo Invalid input, please try again.

:run
cd ..

run.cmd

:exitbatch
Loading

0 comments on commit ce8ba57

Please sign in to comment.