diff --git a/CHANGELOG.md b/CHANGELOG.md index 429c83b..654ec63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Atlassian Downloader - Changelog +* `1.0.1.1` - minor update: added `UserAgent` to HTTP headers and added mirrors of json files. * `1.0.1.0` - added support of `Atlassian Bitbucket (Mesh)` product, updated deps, fixed `Chocolatey` support and start logic. * `1.0.0.9` - updated deps. * `1.0.0.8` - switched to `dontet6.0`, updated deps. diff --git a/src/DonloaderService.cs b/src/DonloaderService.cs index 962d164..5468dd7 100644 --- a/src/DonloaderService.cs +++ b/src/DonloaderService.cs @@ -24,6 +24,8 @@ namespace EpicMorg.Atlassian.Downloader System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription); private readonly string assemblyVersion = Assembly.GetEntryAssembly().GetCustomAttribute().InformationalVersion; + private readonly string fileVersion = Assembly.GetEntryAssembly().GetCustomAttribute().Version; + private readonly string assemblyName = Assembly.GetEntryAssembly().GetCustomAttribute().Product; const string assemblyBuildType = #if DEBUG @@ -38,6 +40,7 @@ namespace EpicMorg.Atlassian.Downloader { this.logger = logger; this.client = client; + client.DefaultRequestHeaders.Add("User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:101.0) Gecko/20100101 Firefox/101.0"); this.options = options; this.hostApplicationLifetime = hostApplicationLifetime; } @@ -169,7 +172,7 @@ namespace EpicMorg.Atlassian.Downloader WriteColorLine("%║ ,cccccccccc;. !║ &Code: @kasthack !║ %║"); WriteColorLine("%║ ,ccccccccccc;. !║ &GFX: @stam !║ %║"); WriteColorLine("%║ .... .:ccccccccccc;. !╠══════════════════════════════════════════════╣ %║"); - WriteColorLine("%║ .',,'..;cccccccccccc;. !║ &Version: " + assemblyVersion + " !║ %║"); + WriteColorLine("%║ .',,'..;cccccccccccc;. !║ &Version: " + fileVersion + " !║ %║"); WriteColorLine("%║ .,,,,,'.';cccccccccccc;. !║ &GitHub: $EpicMorg/atlassian-downloader !║ %║"); WriteColorLine("%║ .,;;;;;,'.':cccccccccccc;. !╚══════════════════════════════════════════════╝ %║"); WriteColorLine("%║ .;:;;;;;;,...:cccccccccccc;. %║"); @@ -203,6 +206,8 @@ namespace EpicMorg.Atlassian.Downloader private string[] GetFeedUrls() => options.CustomFeed != null ? options.CustomFeed.Select(a => a.ToString()).ToArray() : new[] { + + //official links "https://my.atlassian.com/download/feeds/archived/bamboo.json", "https://my.atlassian.com/download/feeds/archived/clover.json", "https://my.atlassian.com/download/feeds/archived/confluence.json", @@ -216,6 +221,21 @@ namespace EpicMorg.Atlassian.Downloader "https://my.atlassian.com/download/feeds/archived/stash.json", "https://my.atlassian.com/download/feeds/archived/mesh.json", + //cdn mirror of official links + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/archived/bamboo.json", + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/archived/clover.json", + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/confluence.json", + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/archived/crowd.json", + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/archived/crucible.json", + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/archived/fisheye.json", + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/archived/jira-core.json", + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/archived/jira-servicedesk.json", + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/archived/jira-software.json", + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/archived/jira.json", + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/archived/stash.json", + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/archived/mesh.json", + + //official links "https://my.atlassian.com/download/feeds/current/bamboo.json", "https://my.atlassian.com/download/feeds/current/clover.json", "https://my.atlassian.com/download/feeds/current/confluence.json", @@ -228,17 +248,39 @@ namespace EpicMorg.Atlassian.Downloader "https://my.atlassian.com/download/feeds/current/stash.json", "https://my.atlassian.com/download/feeds/current/mesh.json", + //cdn mirror of official links + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/current/bamboo.json", + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/current/clover.json", + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/current/confluence.json", + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/current/crowd.json", + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/current/crucible.json", + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/current/fisheye.json", + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/current/jira-core.json", + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/current/jira-servicedesk.json", + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/current//jira-software.json", + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/current/stash.json", + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/current/mesh.json", + + //official links "https://my.atlassian.com/download/feeds/eap/bamboo.json", "https://my.atlassian.com/download/feeds/eap/confluence.json", "https://my.atlassian.com/download/feeds/eap/jira.json", "https://my.atlassian.com/download/feeds/eap/jira-servicedesk.json", "https://my.atlassian.com/download/feeds/eap/stash.json", - "https://my.atlassian.com/download/feeds/eap/mesh.json", + //"https://my.atlassian.com/download/feeds/eap/mesh.json", //404 + + //cdn mirror of official links + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/eap/bamboo.json", + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/eap/confluence.json", + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/eap/jira.json", + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/jira-servicedesk.json", + "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/stash.json", + //"https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/eap/mesh.json", //404 - //https://raw.githubusercontent.com/EpicMorg/atlassian-json/master/json-backups/archived/sourcetree.json + //https://raw.githubusercontent.com/EpicMorg/atlassian-json/master/json-backups/archived/sourcetree.json //unstable link with r\l "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/archived/sourcetree.json", - //https://raw.githubusercontent.com/EpicMorg/atlassian-json/master/json-backups/current/sourcetree.json + //https://raw.githubusercontent.com/EpicMorg/atlassian-json/master/json-backups/current/sourcetree.json //unstable link with r\l "https://raw.githack.com/EpicMorg/atlassian-json/master/json-backups/current/sourcetree.json" }; diff --git a/src/atlassian-downloader.csproj b/src/atlassian-downloader.csproj index 105e69e..8895212 100644 --- a/src/atlassian-downloader.csproj +++ b/src/atlassian-downloader.csproj @@ -1,4 +1,4 @@ - + Exe @@ -17,9 +17,9 @@ git https://github.com/EpicMorg/atlassian-downloader atlassian, donwloader, epicmorg - 1.0.1.0 - 1.0.1.0 - 1.0.1.0 + 1.0.1.1 + 1.0.1.1 + 1.0.1.1 EpicMorg 2023 Atlassian Downloader true diff --git a/src/build.bat b/src/build.bat index 12a7c62..7aa2e8b 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 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 +dotnet.exe publish --runtime win7-x64 --force --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=true -p:PublishSingleFile=false -p:PublishReadyToRun=true +dotnet.exe publish --runtime win7-x86 --force --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=true -p:PublishSingleFile=false -p:PublishReadyToRun=true +dotnet.exe publish --runtime win81-arm --force --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=true -p:PublishSingleFile=false -p:PublishReadyToRun=true +dotnet.exe publish --runtime win10-arm64 --force --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=true -p:PublishSingleFile=false -p:PublishReadyToRun=true +dotnet.exe publish --runtime linux-x64 --force --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=false -p:PublishSingleFile=false -p:PublishReadyToRun=false +dotnet.exe publish --runtime linux-musl-x64 --force --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=false -p:PublishSingleFile=false -p:PublishReadyToRun=false +dotnet.exe publish --runtime osx-x64 --force --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 985d789..78191dd 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 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 +dotnet publish --runtime win7-x64 --force --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=true -p:PublishSingleFile=false -p:PublishReadyToRun=false +dotnet publish --runtime win7-x86 --force --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=true -p:PublishSingleFile=false -p:PublishReadyToRun=false +dotnet publish --runtime win81-arm --force --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=true -p:PublishSingleFile=false -p:PublishReadyToRun=false +dotnet publish --runtime win10-arm64 --force --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=true -p:PublishSingleFile=false -p:PublishReadyToRun=false +dotnet publish --runtime linux-x64 --force --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=false -p:PublishSingleFile=false -p:PublishReadyToRun=false +dotnet publish --runtime linux-musl-x64 --force --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=false -p:PublishSingleFile=false -p:PublishReadyToRun=false +dotnet publish --runtime osx-x64 --force --self-contained true --framework net6.0 --configuration Release -p:PublishTrimmed=false -p:PublishSingleFile=false -p:PublishReadyToRun=false \ No newline at end of file