diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index a73cc8b..9db697a 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -8,7 +8,7 @@ on: jobs: build: - + name: Build runs-on: ubuntu-latest steps: @@ -16,7 +16,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: 5.0.x + dotnet-version: 6.0.x - name: Restore dependencies run: dotnet restore - name: Build diff --git a/.vscode/settings.json b/.vscode/settings.json index de2ecf1..30d7c7e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,7 +5,12 @@ "statusBarItem.hoverBackground": "#06aab2", "statusBarItem.remoteBackground": "#047b81", "statusBarItem.remoteForeground": "#e7e7e7", - "tab.activeBorder": "#06aab2" + "tab.activeBorder": "#06aab2", + "sash.hoverBorder": "#06aab2", + "titleBar.activeBackground": "#047b81", + "titleBar.activeForeground": "#e7e7e7", + "titleBar.inactiveBackground": "#047b8199", + "titleBar.inactiveForeground": "#e7e7e799" }, "peacock.color": "#047b81" } \ No newline at end of file diff --git a/IptvPlaylistAggregator.csproj b/IptvPlaylistAggregator.csproj index de2434d..e90285a 100644 --- a/IptvPlaylistAggregator.csproj +++ b/IptvPlaylistAggregator.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net6.0 IptvPlaylistAggregator @@ -17,14 +17,14 @@ - - - - - + + + + + - + diff --git a/UnitTests/IptvPlaylistAggregator.UnitTests.csproj b/UnitTests/IptvPlaylistAggregator.UnitTests.csproj index cde350f..3902696 100644 --- a/UnitTests/IptvPlaylistAggregator.UnitTests.csproj +++ b/UnitTests/IptvPlaylistAggregator.UnitTests.csproj @@ -1,15 +1,15 @@ - net5.0 + net6.0 IptvPlaylistAggregator.UnitTests - + - + diff --git a/package.sh b/package.sh deleted file mode 100644 index 2d4dce5..0000000 --- a/package.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash -APP_NAME=$(git remote -v | tail -1 | sed 's|.*/\([^/]*\)\.git.*|\1|') -VERSION="${1}" -RELEASE_DIR_RELATIVE="bin/Release" -PUBLISH_DIR_RELATIVE="${RELEASE_DIR_RELATIVE}/publish-script-output" -RELEASE_DIR="$(pwd)/${RELEASE_DIR_RELATIVE}" -PUBLISH_DIR="$(pwd)/${PUBLISH_DIR_RELATIVE}" - -if [ -z "${VERSION}" ]; then - echo "ERROR: Please specify a version" - exit 1 -fi - -function package { - local ARCH="${1}" - local OUTPUT_DIR="${PUBLISH_DIR}/${ARCH}" - local OUTPUT_FILE="${RELEASE_DIR}/${APP_NAME}_${VERSION}_${ARCH}.zip" - - echo "Packaging \"${OUTPUT_DIR}\" to \"${OUTPUT_FILE}\"" - - [ -f "${OUTPUT_FILE}" ] && rm "${OUTPUT_FILE}" - - cd "${OUTPUT_DIR}" || exit - zip -q -9 -r "${OUTPUT_FILE}" . - cd - || exit -} - -function dotnet-pub { - local ARCH="${1}" - local OUTPUT_DIR="${PUBLISH_DIR_RELATIVE}/${ARCH}" - - dotnet publish \ - --configuration Release \ - --runtime "${ARCH}" \ - --output "${OUTPUT_DIR}" \ - --self-contained true \ - /p:TrimUnusedDependencies=true \ - /p:LinkDuringPublish=true -} - -function cleanup { - echo "Cleaning build output" - rm -rf "${PUBLISH_DIR}" -} - -function build-release { - local ARCH="${1}" - - dotnet-pub "${ARCH}" - package "${ARCH}" -} - -build-release linux-arm -build-release linux-arm64 -build-release linux-x64 -build-release osx-x64 -build-release win-x64 - -cleanup diff --git a/release.sh b/release.sh new file mode 100644 index 0000000..c654aee --- /dev/null +++ b/release.sh @@ -0,0 +1,4 @@ +#!/bin/bash +DOTNET_VERSION="6.0" +RELEASE_SCRIPT_URL="https://raw.githubusercontent.com/hmlendea/deployment-scripts/master/release/dotnet/${DOTNET_VERSION}.sh" +wget --quiet -O - "${RELEASE_SCRIPT_URL}" | bash /dev/stdin ${@}