diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 021c618be..949e22993 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -123,7 +123,7 @@ publish-medusa-package: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_TAG script: - LAST_TAG=$(git describe --tags --abbrev=0) - - if [ $CI_COMMIT_TAG ];then MEDUSA_VERSION="$CI_COMMIT_TAG"; else MEDUSA_VERSION="$LAST_TAG-$CI_COMMIT_SHORT_SHA"; fi + - if [ $CI_COMMIT_TAG ];then MEDUSA_VERSION="$CI_COMMIT_TAG"; else MEDUSA_VERSION="$LAST_TAG+$CI_COMMIT_SHORT_SHA"; fi - cd src/Nadeko.Medusa/ - dotnet pack -c Release /p:Version=$MEDUSA_VERSION -o bin/Release/packed - dotnet nuget push bin/Release/packed/ --source https://www.myget.org/F/nadeko/api/v2/package --api-key "$MYGET_API_KEY" diff --git a/Dockerfile b/Dockerfile index 1751b51a3..1216b8bb6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /source COPY src/Nadeko.Medusa/*.csproj src/Nadeko.Medusa/ @@ -20,7 +20,7 @@ RUN set -xe; \ chmod +x /app/NadekoBot # final stage/image -FROM mcr.microsoft.com/dotnet/runtime:6.0 +FROM mcr.microsoft.com/dotnet/runtime:8.0 WORKDIR /app RUN set -xe; \ diff --git a/exe_builder.iss b/exe_builder.iss index 84b863914..2a48a1833 100644 --- a/exe_builder.iss +++ b/exe_builder.iss @@ -1,7 +1,7 @@ #define sysfolder "system" #define version GetEnv("NADEKOBOT_INSTALL_VERSION") -#define target "win7-x64" -#define platform "net6.0" +#define target "win-x64" +#define platform "net8.0" [Setup] AppName = {param:botname|NadekoBot}