diff --git a/.github/workflows/dotnet-develop.yml b/.github/workflows/dotnet-develop.yml index 32c4baa..95f0229 100644 --- a/.github/workflows/dotnet-develop.yml +++ b/.github/workflows/dotnet-develop.yml @@ -17,6 +17,10 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.x' + include-prerelease: true - name: Restore env: diff --git a/.github/workflows/dotnet-master.yml b/.github/workflows/dotnet-master.yml index 7ba2f0e..878816f 100644 --- a/.github/workflows/dotnet-master.yml +++ b/.github/workflows/dotnet-master.yml @@ -14,6 +14,10 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.x' + include-prerelease: true - name: Restore env: diff --git a/CHANGELOG.md b/CHANGELOG.md index d0247bf..af56cc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Atlassian Downloader - Changelog +* `1.0.0.8` - switched to `dontet6.0`, updated deps. * `1.0.0.7` - added `unofficial support` of `sourcetree` via automatic mirror [from github](https://github.com/EpicMorg/atlassian-json). fixed `logger` output, code improvments. * `1.0.0.6` - added support of `clover`. fixed broken json parsing. added new `logger`. * `1.0.0.5` - added support for `EAP` releases. diff --git a/src/DonloaderService.cs b/src/DonloaderService.cs index 5166b3b..57051d2 100644 --- a/src/DonloaderService.cs +++ b/src/DonloaderService.cs @@ -105,34 +105,13 @@ namespace EpicMorg.Atlassian.Downloader SetConsoleTitle(); if (options.Version) { - logger.LogInformation($"{assemblyName} {assemblyVersion} {assemblyEnvironment} {assemblyBuildType}"); - Console.BackgroundColor = ConsoleColor.Black; - WriteColorLine("%╔═╦═══════════════════════════════════════════════════════════════════════════════════════╦═╗"); - WriteColorLine("%╠═╝ .''. %╚═%╣"); - WriteColorLine("%║ .:cc;. %║"); - WriteColorLine("%║ .;cccc;. %║"); - WriteColorLine("%║ .;cccccc;. !╔══════════════════════════════════════════════╗ %║"); - WriteColorLine("%║ .:ccccccc;. !║ " + assemblyName + " !║ %║"); - WriteColorLine("%║ 'ccccccccc;. !╠══════════════════════════════════════════════╣ %║"); - WriteColorLine("%║ ,cccccccccc;. !║ &Code: @kastkack !║ %║"); - WriteColorLine("%║ ,ccccccccccc;. !║ &GFX: @stam !║ %║"); - WriteColorLine("%║ .... .:ccccccccccc;. !╠══════════════════════════════════════════════╣ %║"); - WriteColorLine("%║ .',,'..;cccccccccccc;. !║ &Version: " + assemblyVersion + " !║ %║"); - WriteColorLine("%║ .,,,,,'.';cccccccccccc;. !║ &GitHub: $EpicMorg/atlassian-downloader !║ %║"); - WriteColorLine("%║ .,;;;;;,'.':cccccccccccc;. !╚══════════════════════════════════════════════╝ %║"); - WriteColorLine("%║ .;:;;;;;;,...:cccccccccccc;. %║"); - WriteColorLine("%║ .;:::::;;;;'. .;:ccccccccccc;. %║"); - WriteColorLine("%║ .:cc::::::::,. ..:ccccccccccc;. %║"); - WriteColorLine("%║ .:cccccc:::::' .:ccccccccccc;. %║"); - WriteColorLine("%║ .;:::::::::::,. .;:::::::::::,. %║"); - WriteColorLine("%╠═╗ ............ ............ %╔═╣"); - WriteColorLine("%╚═╩═══════════════════════════════════════════════════════════════════════════════════════╩═╝"); - Console.ResetColor(); + ShowVersionInfo(); } else { var feedUrls = this.GetFeedUrls(); + ShowVersionInfo(); logger.LogInformation($"Task started"); foreach (var feedUrl in feedUrls) { @@ -176,6 +155,33 @@ namespace EpicMorg.Atlassian.Downloader this.hostApplicationLifetime.StopApplication(); } + private void ShowVersionInfo() + { + logger.LogInformation($"{assemblyName} {assemblyVersion} {assemblyEnvironment} {assemblyBuildType}"); + Console.BackgroundColor = ConsoleColor.Black; + WriteColorLine("%╔═╦═══════════════════════════════════════════════════════════════════════════════════════╦═╗"); + WriteColorLine("%╠═╝ .''. %╚═%╣"); + WriteColorLine("%║ .:cc;. %║"); + WriteColorLine("%║ .;cccc;. %║"); + WriteColorLine("%║ .;cccccc;. !╔══════════════════════════════════════════════╗ %║"); + WriteColorLine("%║ .:ccccccc;. !║ " + assemblyName + " !║ %║"); + WriteColorLine("%║ 'ccccccccc;. !╠══════════════════════════════════════════════╣ %║"); + WriteColorLine("%║ ,cccccccccc;. !║ &Code: @kastkack !║ %║"); + WriteColorLine("%║ ,ccccccccccc;. !║ &GFX: @stam !║ %║"); + WriteColorLine("%║ .... .:ccccccccccc;. !╠══════════════════════════════════════════════╣ %║"); + WriteColorLine("%║ .',,'..;cccccccccccc;. !║ &Version: " + assemblyVersion + " !║ %║"); + WriteColorLine("%║ .,,,,,'.';cccccccccccc;. !║ &GitHub: $EpicMorg/atlassian-downloader !║ %║"); + WriteColorLine("%║ .,;;;;;,'.':cccccccccccc;. !╚══════════════════════════════════════════════╝ %║"); + WriteColorLine("%║ .;:;;;;;;,...:cccccccccccc;. %║"); + WriteColorLine("%║ .;:::::;;;;'. .;:ccccccccccc;. %║"); + WriteColorLine("%║ .:cc::::::::,. ..:ccccccccccc;. %║"); + WriteColorLine("%║ .:cccccc:::::' .:ccccccccccc;. %║"); + WriteColorLine("%║ .;:::::::::::,. .;:::::::::::,. %║"); + WriteColorLine("%╠═╗ ............ ............ %╔═╣"); + WriteColorLine("%╚═╩═══════════════════════════════════════════════════════════════════════════════════════╩═╝"); + Console.ResetColor(); + } + private async Task<(string json, IDictionary versions)> GetJson(string feedUrl, CancellationToken cancellationToken) { var atlassianJson = await client.GetStringAsync(feedUrl, cancellationToken).ConfigureAwait(false); diff --git a/src/atlassian-downloader.csproj b/src/atlassian-downloader.csproj index 4429888..c096b7e 100644 --- a/src/atlassian-downloader.csproj +++ b/src/atlassian-downloader.csproj @@ -7,7 +7,7 @@ win-x64 true true - net5.0 + net6.0 favicon.ico EpicMorg.Atlassian.Downloader EpicMorg, kasthack, stam @@ -17,8 +17,8 @@ git https://github.com/EpicMorg/atlassian-downloader atlassian, donwloader, epicmorg - 1.0.0.7 - 1.0.0.7 + 1.0.0.8 + 1.0.0.8 1.0.0.7 EpicMorg 2021 Atlassian Downloader @@ -27,16 +27,16 @@ - - - - - - - - - - + + + + + + + + + + True diff --git a/src/build.bat b/src/build.bat index 7ce1684..12a7c62 100644 --- a/src/build.bat +++ b/src/build.bat @@ -1,10 +1,10 @@ SET DOTNET_CLI_TELEMETRY_OPTOUT=true SET DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true -dotnet.exe publish -r win7-x64 --self-contained true --framework net5.0 --configuration Release -p:PublishTrimmed=true -p:PublishSingleFile=false -p:PublishReadyToRun=true -dotnet.exe publish -r win7-x86 --self-contained true --framework net5.0 --configuration Release -p:PublishTrimmed=true -p:PublishSingleFile=false -p:PublishReadyToRun=true -dotnet.exe publish -r win81-arm --self-contained true --framework net5.0 --configuration Release -p:PublishTrimmed=true -p:PublishSingleFile=false -p:PublishReadyToRun=true -dotnet.exe publish -r win10-arm64 --self-contained true --framework net5.0 --configuration Release -p:PublishTrimmed=true -p:PublishSingleFile=false -p:PublishReadyToRun=true -dotnet.exe publish -r linux-x64 --self-contained true --framework net5.0 --configuration Release -p:PublishTrimmed=false -p:PublishSingleFile=false -p:PublishReadyToRun=false -dotnet.exe publish -r linux-musl-x64 --self-contained true --framework net5.0 --configuration Release -p:PublishTrimmed=false -p:PublishSingleFile=false -p:PublishReadyToRun=false -dotnet.exe publish -r osx-x64 --self-contained true --framework net5.0 --configuration Release -p:PublishTrimmed=false -p:PublishSingleFile=false -p:PublishReadyToRun=false \ No newline at end of file +dotnet.exe publish -r win7-x64 --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=true -p:PublishSingleFile=false -p:PublishReadyToRun=true +dotnet.exe publish -r win7-x86 --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=true -p:PublishSingleFile=false -p:PublishReadyToRun=true +dotnet.exe publish -r win81-arm --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=true -p:PublishSingleFile=false -p:PublishReadyToRun=true +dotnet.exe publish -r win10-arm64 --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=true -p:PublishSingleFile=false -p:PublishReadyToRun=true +dotnet.exe publish -r linux-x64 --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=false -p:PublishSingleFile=false -p:PublishReadyToRun=false +dotnet.exe publish -r linux-musl-x64 --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=false -p:PublishSingleFile=false -p:PublishReadyToRun=false +dotnet.exe publish -r osx-x64 --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=false -p:PublishSingleFile=false -p:PublishReadyToRun=false \ No newline at end of file diff --git a/src/build.sh b/src/build.sh index c34fa23..985d789 100644 --- a/src/build.sh +++ b/src/build.sh @@ -2,10 +2,10 @@ export DOTNET_CLI_TELEMETRY_OPTOUT=true export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true -dotnet publish -r win7-x64 --self-contained true --framework net5.0 --configuration Release -p:PublishTrimmed=true -p:PublishSingleFile=false -p:PublishReadyToRun=false -dotnet publish -r win7-x86 --self-contained true --framework net5.0 --configuration Release -p:PublishTrimmed=true -p:PublishSingleFile=false -p:PublishReadyToRun=false -dotnet publish -r win81-arm --self-contained true --framework net5.0 --configuration Release -p:PublishTrimmed=true -p:PublishSingleFile=false -p:PublishReadyToRun=false -dotnet publish -r win10-arm64 --self-contained true --framework net5.0 --configuration Release -p:PublishTrimmed=true -p:PublishSingleFile=false -p:PublishReadyToRun=false -dotnet publish -r linux-x64 --self-contained true --framework net5.0 --configuration Release -p:PublishTrimmed=false -p:PublishSingleFile=false -p:PublishReadyToRun=false -dotnet publish -r linux-musl-x64 --self-contained true --framework net5.0 --configuration Release -p:PublishTrimmed=false -p:PublishSingleFile=false -p:PublishReadyToRun=false -dotnet publish -r osx-x64 --self-contained true --framework net5.0 --configuration Release -p:PublishTrimmed=false -p:PublishSingleFile=false -p:PublishReadyToRun=false \ No newline at end of file +dotnet publish -r win7-x64 --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=true -p:PublishSingleFile=false -p:PublishReadyToRun=false +dotnet publish -r win7-x86 --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=true -p:PublishSingleFile=false -p:PublishReadyToRun=false +dotnet publish -r win81-arm --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=true -p:PublishSingleFile=false -p:PublishReadyToRun=false +dotnet publish -r win10-arm64 --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=true -p:PublishSingleFile=false -p:PublishReadyToRun=false +dotnet publish -r linux-x64 --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=false -p:PublishSingleFile=false -p:PublishReadyToRun=false +dotnet publish -r linux-musl-x64 --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=false -p:PublishSingleFile=false -p:PublishReadyToRun=false +dotnet publish -r osx-x64 --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=false -p:PublishSingleFile=false -p:PublishReadyToRun=false \ No newline at end of file