From cfd39ebbd5730d439718ace0239a929c7179059c Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 10 May 2024 02:05:35 +0000 Subject: [PATCH] fix: windows exe shouldn't ask for .net to be installed anymore fix: Version number is now correct docs: Updated .net version name in the docs --- .gitlab-ci.yml | 14 +++++++------- docs/guides/windows-guide.md | 2 +- src/NadekoBot/NadekoBot.csproj | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ee1915f1d..2c4c1ac8c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,12 +30,12 @@ variables: build: stage: build script: - - "dotnet publish -c Release -r linux-x64 --self-contained -p:PublishSingleFile=true -o $LINUX_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj" - - "dotnet publish -c Release -r linux-arm64 --self-contained -p:PublishSingleFile=true -o $LINUX_ARM64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj" - - "dotnet publish -c Release -r win-x64 --self-contained -p:PublishSingleFile=true -o $WIN_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj" - - "dotnet publish -c Release -r win-arm64 --self-contained -p:PublishSingleFile=true -o $WIN_ARM64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj" - - "dotnet publish -c Release -r osx-x64 --self-contained -p:PublishSingleFile=true -o $MACOS_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj" - - "dotnet publish -c Release -r osx-arm64 --self-contained -p:PublishSingleFile=true -o $MACOS_ARM64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj" + - "dotnet publish -c Release -r linux-x64 --self-contained -o $LINUX_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj" + - "dotnet publish -c Release -r linux-arm64 --self-contained -o $LINUX_ARM64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj" + - "dotnet publish -c Release -r win-x64 --self-contained -o $WIN_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj" + - "dotnet publish -c Release -r win-arm64 --self-contained -o $WIN_ARM64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj" + - "dotnet publish -c Release -r osx-x64 --self-contained -o $MACOS_X64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj" + - "dotnet publish -c Release -r osx-arm64 --self-contained -o $MACOS_ARM64_OUTPUT_DIR src/NadekoBot/NadekoBot.csproj" artifacts: paths: - "$LINUX_X64_OUTPUT_DIR/" @@ -113,7 +113,7 @@ build-installer: script: - dotnet clean - dotnet restore -f --no-cache -v n - - dotnet publish -c Release --runtime win-x64 /p:Version=$CI_COMMIT_TAG src/NadekoBot + - dotnet publish -c Release --self-contained --runtime win-x64 /p:Version=$CI_COMMIT_TAG src/NadekoBot - $env:NADEKOBOT_INSTALL_VERSION = $CI_COMMIT_TAG - iscc.exe "/O+" ".\exe_builder.iss" tags: diff --git a/docs/guides/windows-guide.md b/docs/guides/windows-guide.md index 797f075ba..2338cb8b7 100644 --- a/docs/guides/windows-guide.md +++ b/docs/guides/windows-guide.md @@ -67,7 +67,7 @@ You can still install them manually: ##### Prerequisites **Install these before proceeding or your bot will not work!** -- [.net 7](https://dotnet.microsoft.com/en-us/download) - needed to compile and run the bot +- [.net 8](https://dotnet.microsoft.com/en-us/download) - needed to compile and run the bot - [git](https://git-scm.com/downloads) - needed to clone the repository (you can also download the zip manually and extract it, but this guide assumes you're using git) - [Redis] (OPTIONAL)- to cache things needed by some features and persist through restarts diff --git a/src/NadekoBot/NadekoBot.csproj b/src/NadekoBot/NadekoBot.csproj index 3ceab771a..7bef05e92 100644 --- a/src/NadekoBot/NadekoBot.csproj +++ b/src/NadekoBot/NadekoBot.csproj @@ -5,7 +5,7 @@ enable true en - 5.0.0 + 5.0.2 $(MSBuildProjectDirectory)