diff --git a/ChocolateyPack-DotNet/tools/chocolateyInstall.ps1 b/ChocolateyPack-DotNet/tools/chocolateyInstall.ps1 index a9cdb40c9c..0ac9d1f1bd 100644 --- a/ChocolateyPack-DotNet/tools/chocolateyInstall.ps1 +++ b/ChocolateyPack-DotNet/tools/chocolateyInstall.ps1 @@ -2,7 +2,7 @@ $ErrorActionPreference = 'Stop'; $toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)" $pkgName = "KS" $url = "https://github.com/Aptivi/NitrocidKS/releases/download/v0.0.24.14-beta/0.0.24.14-bin-dotnet.zip" -$md5check = "4aaddcf574ff53648a2064325b9c9e4a" +$md5check = "44f55beac65f9bfc0d7c5e0e0e2c6a45" Write-Output "<*>: for assumptions, <+> for progress, <-> for error" Write-Output "<*> Installation directory: $toolsDir" diff --git a/ChocolateyPack/tools/chocolateyInstall.ps1 b/ChocolateyPack/tools/chocolateyInstall.ps1 index 9079b74c03..b771b2856b 100644 --- a/ChocolateyPack/tools/chocolateyInstall.ps1 +++ b/ChocolateyPack/tools/chocolateyInstall.ps1 @@ -2,7 +2,7 @@ $ErrorActionPreference = 'Stop'; $toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)" $pkgName = "KS" $url = "https://github.com/Aptivi/NitrocidKS/releases/download/v0.0.24.14-beta/0.0.24.14-bin.zip" -$md5check = "8bf7ffb0c5b093878f09aed8e3011686" +$md5check = "6ad535ec2c761f7fcd7e1e20b6bf41ae" Write-Output "<*>: for assumptions, <+> for progress, <-> for error" Write-Output "<*> Installation directory: $toolsDir" diff --git a/Kernel Simulator/Kernel Simulator.vbproj b/Kernel Simulator/Kernel Simulator.vbproj index bdf3fb8a1d..0b60e48e8a 100644 --- a/Kernel Simulator/Kernel Simulator.vbproj +++ b/Kernel Simulator/Kernel Simulator.vbproj @@ -50,7 +50,7 @@ false 0.0.24.14 0.0.24.14 - 2.1.24.6 + 2.1.24.14 diff --git a/tools/build-dotnet.cmd b/tools/build-dotnet.cmd deleted file mode 100644 index 6ee4424e34..0000000000 --- a/tools/build-dotnet.cmd +++ /dev/null @@ -1,41 +0,0 @@ -@echo off - -REM Kernel Simulator Copyright (C) 2018-2021 EoflaOE -REM -REM This file is part of Kernel Simulator -REM -REM Kernel Simulator is free software: you can redistribute it and/or modify -REM it under the terms of the GNU General Public License as published by -REM the Free Software Foundation, either version 3 of the License, or -REM (at your option) any later version. -REM -REM Kernel Simulator is distributed in the hope that it will be useful, -REM but WITHOUT ANY WARRANTY; without even the implied warranty of -REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -REM GNU General Public License for more details. -REM -REM You should have received a copy of the GNU General Public License -REM along with this program. If not, see . - -REM This script builds KS and packs the artifacts. Use when you have VS installed. -for /f "tokens=* USEBACKQ" %%f in (`type version`) do set ksversion=%%f -set releaseconfig=%1 -if "%releaseconfig%" == "" set releaseconfig=Release-dotnet - -:download -echo Downloading packages... -"%ProgramFiles%\dotnet\dotnet.exe" msbuild "..\Kernel Simulator.sln" -t:restore -p:Configuration=%releaseconfig% -if %errorlevel% == 0 goto :build -echo There was an error trying to download packages (%errorlevel%). -goto :finished - -:build -echo Building Kernel Simulator... -"%ProgramFiles%\dotnet\dotnet.exe" msbuild "..\Kernel Simulator.sln" -p:Configuration=%releaseconfig% -if %errorlevel% == 0 goto :success -echo There was an error trying to build (%errorlevel%). -goto :finished - -:success -echo Build successful. -:finished diff --git a/tools/build-dotnet.sh b/tools/build-dotnet.sh deleted file mode 100644 index ce1859c882..0000000000 --- a/tools/build-dotnet.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -# Kernel Simulator Copyright (C) 2018-2021 EoflaOE -# -# This file is part of Kernel Simulator -# -# Kernel Simulator is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Kernel Simulator is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# This script builds KS. Use when you have dotnet installed. -ksversion=$(cat version) -ksreleaseconf=$1 -if [ -z $ksreleaseconf ]; then - ksreleaseconf=Release-dotnet -fi - -# Check for dependencies -dotnetpath=`which dotnet` -if [ ! $? == 0 ]; then - echo dotnet is not found. - exit 1 -fi - -# Download packages -echo Downloading packages... -"$dotnetpath" msbuild "../Kernel Simulator.sln" -t:restore -p:Configuration=$ksreleaseconf -if [ ! $? == 0 ]; then - echo Download failed. - exit 1 -fi - -# Build KS -echo Building KS... -"$dotnetpath" msbuild "../Kernel Simulator.sln" -p:Configuration=$ksreleaseconf -if [ ! $? == 0 ]; then - echo Build failed. - exit 1 -fi - -# Inform success -echo Build successful. -exit 0 diff --git a/tools/build.cmd b/tools/build.cmd index 6eff78fa49..bf5455f72f 100644 --- a/tools/build.cmd +++ b/tools/build.cmd @@ -19,26 +19,13 @@ REM along with this program. If not, see . REM This script builds KS and packs the artifacts. Use when you have VS installed. for /f "tokens=* USEBACKQ" %%f in (`type version`) do set ksversion=%%f -set releaseconfig=%1 -if "%releaseconfig%" == "" set releaseconfig=Release - -echo Finding MSBuild... -for /f "delims=" %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -prerelease -products * -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe') do set msbuildpath=%%i -if %errorlevel% == 0 goto :download -echo There was an error trying to find MSBuild (%errorlevel%). -goto :finished - -:download -echo MSBuild found in %msbuildpath% -echo Downloading packages... -"%msbuildpath%" "..\Kernel Simulator.sln" -t:restore -p:Configuration=%releaseconfig% -if %errorlevel% == 0 goto :build -echo There was an error trying to download packages (%errorlevel%). -goto :finished :build echo Building Kernel Simulator... -"%msbuildpath%" "..\Kernel Simulator.sln" -p:Configuration=%releaseconfig% +"%ProgramFiles%\dotnet\dotnet.exe" msbuild "..\Kernel Simulator.sln" -t:restore -p:Configuration=Release-dotnet +"%ProgramFiles%\dotnet\dotnet.exe" msbuild "..\Kernel Simulator.sln" -p:Configuration=Release-dotnet +"%ProgramFiles%\dotnet\dotnet.exe" msbuild "..\Kernel Simulator.sln" -t:restore -p:Configuration=Release +"%ProgramFiles%\dotnet\dotnet.exe" msbuild "..\Kernel Simulator.sln" -p:Configuration=Release if %errorlevel% == 0 goto :success echo There was an error trying to build (%errorlevel%). goto :finished diff --git a/tools/build.sh b/tools/build.sh index 9b42e7b880..bc9a730d51 100644 --- a/tools/build.sh +++ b/tools/build.sh @@ -17,31 +17,22 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# This script builds KS. Use when you have MSBuild installed. +# This script builds KS. Use when you have dotnet installed. ksversion=$(cat version) -ksreleaseconf=$1 -if [ -z $ksreleaseconf ]; then - ksreleaseconf=Release -fi # Check for dependencies -msbuildpath=`which msbuild` -if [ ! $? == 0 ]; then - echo MSBuild is not found. - exit 1 -fi - -# Download packages -echo Downloading packages... -"$msbuildpath" "../Kernel Simulator.sln" -t:restore -p:Configuration=$ksreleaseconf +dotnetpath=`which dotnet` if [ ! $? == 0 ]; then - echo Download failed. + echo dotnet is not found. exit 1 fi # Build KS echo Building KS... -"$msbuildpath" "../Kernel Simulator.sln" -p:Configuration=$ksreleaseconf +"$dotnetpath" msbuild "../Kernel Simulator.sln" -t:restore -p:Configuration=Release-dotnet +"$dotnetpath" msbuild "../Kernel Simulator.sln" -p:Configuration=Release-dotnet +"$dotnetpath" msbuild "../Kernel Simulator.sln" -t:restore -p:Configuration=Release +"$dotnetpath" msbuild "../Kernel Simulator.sln" -p:Configuration=Release if [ ! $? == 0 ]; then echo Build failed. exit 1 diff --git a/tools/pack-dotnet.cmd b/tools/pack-dotnet.cmd deleted file mode 100644 index 8a06ec5082..0000000000 --- a/tools/pack-dotnet.cmd +++ /dev/null @@ -1,34 +0,0 @@ -@echo off - -REM Kernel Simulator Copyright (C) 2018-2021 EoflaOE -REM -REM This file is part of Kernel Simulator -REM -REM Kernel Simulator is free software: you can redistribute it and/or modify -REM it under the terms of the GNU General Public License as published by -REM the Free Software Foundation, either version 3 of the License, or -REM (at your option) any later version. -REM -REM Kernel Simulator is distributed in the hope that it will be useful, -REM but WITHOUT ANY WARRANTY; without even the implied warranty of -REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -REM GNU General Public License for more details. -REM -REM You should have received a copy of the GNU General Public License -REM along with this program. If not, see . - -for /f "tokens=* USEBACKQ" %%f in (`type version`) do set ksversion=%%f - -:packbin -echo Packing binary... -"%ProgramFiles%\7-Zip\7z.exe" a -tzip %temp%/%ksversion%-bin-dotnet.zip "..\Kernel Simulator\KSBuild\net6.0\*" >> %temp%/buildandpack.log 2>&1 -if %errorlevel% == 0 goto :complete -echo There was an error trying to pack binary (%errorlevel%). -goto :finished - -:complete -move %temp%\%ksversion%-bin-dotnet.zip -copy "..\Kernel Simulator\KSBuild\net6.0\Kernel Simulator.pdb" .\%ksversion%-dotnet.pdb - -echo Pack successful. -:finished diff --git a/tools/pack-dotnet.sh b/tools/pack-dotnet.sh deleted file mode 100644 index d8ae7b7198..0000000000 --- a/tools/pack-dotnet.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -# Kernel Simulator Copyright (C) 2018-2021 EoflaOE -# -# This file is part of Kernel Simulator -# -# Kernel Simulator is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Kernel Simulator is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# This script builds KS and packs the artifacts. Use when you have MSBuild installed. -ksversion=$(cat version) - -# Check for dependencies -zippath=`which zip` -if [ ! $? == 0 ]; then - echo zip is not found. - exit 1 -fi - -# Pack binary -echo Packing binary... -(cd "../Kernel Simulator/KSBuild/net6.0/" && "$zippath" -r /tmp/$ksversion-bin-dotnet.zip . && cd -) >> ~/tmp/buildandpack.log -if [ ! $? == 0 ]; then - echo Packing using zip failed. - exit 1 -fi - -# Inform success -mv ~/tmp/$ksversion-bin-dotnet.zip . -cp "../Kernel Simulator/KSBuild/net6.0/Kernel Simulator.pdb" ./$ksversion.pdb -echo Build and pack successful. -exit 0 diff --git a/tools/pack.cmd b/tools/pack.cmd index 78324d632d..67cfe69c6e 100644 --- a/tools/pack.cmd +++ b/tools/pack.cmd @@ -23,13 +23,16 @@ for /f "tokens=* USEBACKQ" %%f in (`type version`) do set ksversion=%%f echo Packing binary... del "Kernel Simulator\KSBuild\*.nupkg" >> %temp%/buildandpack.log 2>&1 "%ProgramFiles%\7-Zip\7z.exe" a -tzip %temp%/%ksversion%-bin.zip "..\Kernel Simulator\KSBuild\net48\*" >> %temp%/buildandpack.log 2>&1 +"%ProgramFiles%\7-Zip\7z.exe" a -tzip %temp%/%ksversion%-bin-dotnet.zip "..\Kernel Simulator\KSBuild\net6.0\*" >> %temp%/buildandpack.log 2>&1 if %errorlevel% == 0 goto :complete echo There was an error trying to pack binary (%errorlevel%). goto :finished :complete move %temp%\%ksversion%-bin.zip +move %temp%\%ksversion%-bin-dotnet.zip copy "..\Kernel Simulator\KSBuild\net48\Kernel Simulator.pdb" .\%ksversion%.pdb +copy "..\Kernel Simulator\KSBuild\net6.0\Kernel Simulator.pdb" .\%ksversion%-dotnet.pdb echo Pack successful. :finished diff --git a/tools/pack.sh b/tools/pack.sh index 0c5adb6585..3d3a184113 100644 --- a/tools/pack.sh +++ b/tools/pack.sh @@ -31,6 +31,7 @@ fi echo Packing binary... find . -type f -iname \*.nupkg -delete >> ~/tmp/buildandpack.log (cd "../Kernel Simulator/KSBuild/net48/" && "$zippath" -r /tmp/$ksversion-bin.zip . && cd -) >> ~/tmp/buildandpack.log +(cd "../Kernel Simulator/KSBuild/net6.0/" && "$zippath" -r /tmp/$ksversion-bin-dotnet.zip . && cd -) >> ~/tmp/buildandpack.log if [ ! $? == 0 ]; then echo Packing using zip failed. exit 1 @@ -38,6 +39,8 @@ fi # Inform success mv ~/tmp/$ksversion-bin.zip . +mv ~/tmp/$ksversion-bin-dotnet.zip . cp "../Kernel Simulator/KSBuild/net48/Kernel Simulator.pdb" ./$ksversion.pdb +cp "../Kernel Simulator/KSBuild/net6.0/Kernel Simulator.pdb" ./$ksversion-dotnet.pdb echo Build and pack successful. exit 0