From cfdb711d30b8a0b31bdeec0c4ff20a5be029f6ce Mon Sep 17 00:00:00 2001 From: Peter Rekdal Khan-Sunde Date: Sat, 25 Feb 2023 14:12:57 +0100 Subject: [PATCH 01/12] v-next. --- GitVersion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GitVersion.yml b/GitVersion.yml index e73ea8f0..e5de6148 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,4 +1,4 @@ -next-version: 5.1.1 +next-version: 5.1.2 mode: ContinuousDeployment continuous-delivery-fallback-tag: '' branches: From b56b25b586847b24e59f4bb90c93127a4b2696a6 Mon Sep 17 00:00:00 2001 From: Peter Rekdal Khan-Sunde Date: Sun, 26 Feb 2023 10:51:38 +0100 Subject: [PATCH 02/12] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index e191b31f..1931f86d 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,7 @@ Checkout our sample application, [snapx demoapp](https://github.com/fintermobili - Powershell v7 `dotnet tool update powershell -g` - .NET SDK v6.0 - .NET SDK v7.0 +- .NET SDK v8.0 **Windows**: @@ -44,6 +45,7 @@ Checkout our sample application, [snapx demoapp](https://github.com/fintermobili - Powershell v7 `dotnet tool update powershell -g` - .NET SDK v6.0 - .NET SDK v7.0 +- .NET SDK v8.0 - Visual Studio 2022 Community Edition with C++ workload installed @@ -56,6 +58,7 @@ Run `init.ps1` and all dependencies will be built in `Debug` and `Release` mode. - .NET 6.0 LTS - .NET 7.0 +- .NET 8.0 ## Platforms supported From 5ad0af9a29cb1aa3428123f3a4eb22cf0076f69c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Mar 2023 06:41:47 +0100 Subject: [PATCH 03/12] Bump MessagePack from 2.4.59 to 2.5.94 (#305) Bumps [MessagePack](https://github.com/neuecc/MessagePack-CSharp) from 2.4.59 to 2.5.94. - [Release notes](https://github.com/neuecc/MessagePack-CSharp/releases) - [Changelog](https://github.com/neuecc/MessagePack-CSharp/blob/master/prepare_release.ps1) - [Commits](https://github.com/neuecc/MessagePack-CSharp/compare/v2.4.59...v2.5.94) --- updated-dependencies: - dependency-name: MessagePack dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 4e7dcd48..4c5be0b8 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -14,7 +14,7 @@ - + From e22467cfdc0ff42b07dbd5f7f4ce8aaf55c09b54 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Mar 2023 06:42:11 +0100 Subject: [PATCH 04/12] Bump YamlDotNet from 12.3.1 to 13.0.2 (#304) Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 12.3.1 to 13.0.2. - [Release notes](https://github.com/aaubry/YamlDotNet/releases) - [Commits](https://github.com/aaubry/YamlDotNet/compare/v12.3.1...v13.0.2) --- updated-dependencies: - dependency-name: YamlDotNet dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 4c5be0b8..0dbd7d4c 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -28,6 +28,6 @@ - + From e0170f012409c9f0d8322a0d10b50498d1b0a60d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Mar 2023 06:15:23 +0100 Subject: [PATCH 05/12] Bump MessagePack from 2.5.94 to 2.5.103 (#307) Bumps [MessagePack](https://github.com/neuecc/MessagePack-CSharp) from 2.5.94 to 2.5.103. - [Release notes](https://github.com/neuecc/MessagePack-CSharp/releases) - [Changelog](https://github.com/neuecc/MessagePack-CSharp/blob/master/prepare_release.ps1) - [Commits](https://github.com/neuecc/MessagePack-CSharp/compare/v2.5.94...v2.5.103) --- updated-dependencies: - dependency-name: MessagePack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 0dbd7d4c..cc2c35be 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -14,7 +14,7 @@ - + From 50e99c1d1a1bc1e12d6a139caa9b04c0a09d229b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Mar 2023 06:15:54 +0100 Subject: [PATCH 06/12] Bump ServiceStack.HttpClient from 6.6.0 to 6.7.0 (#306) Bumps [ServiceStack.HttpClient](https://github.com/ServiceStack/ServiceStack) from 6.6.0 to 6.7.0. - [Release notes](https://github.com/ServiceStack/ServiceStack/releases) - [Commits](https://github.com/ServiceStack/ServiceStack/compare/v6.6...v6.7) --- updated-dependencies: - dependency-name: ServiceStack.HttpClient dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index cc2c35be..7e3c77e6 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -21,7 +21,7 @@ - + From fd9676a91daf72c8fe086dcd7e068aa2b0608ee3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Mar 2023 08:00:35 +0100 Subject: [PATCH 07/12] Bump MessagePack from 2.5.103 to 2.5.108 (#308) Bumps [MessagePack](https://github.com/neuecc/MessagePack-CSharp) from 2.5.103 to 2.5.108. - [Release notes](https://github.com/neuecc/MessagePack-CSharp/releases) - [Changelog](https://github.com/neuecc/MessagePack-CSharp/blob/master/prepare_release.ps1) - [Commits](https://github.com/neuecc/MessagePack-CSharp/compare/v2.5.103...v2.5.108) --- updated-dependencies: - dependency-name: MessagePack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 7e3c77e6..423a0673 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -14,7 +14,7 @@ - + From 489f2979abb2903bf80069eb034b151250ec2285 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Mar 2023 07:20:17 +0100 Subject: [PATCH 08/12] Bump SharpCompress from 0.32.2 to 0.33.0 (#310) Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.32.2 to 0.33.0. - [Release notes](https://github.com/adamhathcock/sharpcompress/releases) - [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.32.2...0.33.0) --- updated-dependencies: - dependency-name: SharpCompress dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 423a0673..076a98ae 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -22,7 +22,7 @@ - + From b91f418fc2c6185d02b2d9eb5bd5da90a1e04319 Mon Sep 17 00:00:00 2001 From: Peter Rekdal Khan-Sunde Date: Wed, 22 Mar 2023 08:19:50 +0100 Subject: [PATCH 09/12] Update to .NET 8 preview 2. --- .github/workflows/dotnetcore.yml | 6 +++--- build.ps1 | 2 +- docker/Dockerfile | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index b8a1d3f5..1e7d8351 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -15,9 +15,9 @@ env: GITVERSION_VERSION: 5.10.3 MSVS_TOOLSET_VERSION: 16 SNAPX_DOTNET_FRAMEWORK_VERSION: net7.0 - DOTNET_NET60_VERSION: 6.0.406 - DOTNET_NET70_VERSION: 7.0.103 - DOTNET_NET80_VERSION: 8.0.100-preview.1.23115.2 + DOTNET_NET60_VERSION: 6.0.407 + DOTNET_NET70_VERSION: 7.0.202 + DOTNET_NET80_VERSION: 8.0.100-preview.2.23157.25 DOTNET_CLI_TELEMETRY_OPTOUT: 1 DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 DOTNET_NOLOGO: 1 diff --git a/build.ps1 b/build.ps1 index 687b1757..90268830 100644 --- a/build.ps1 +++ b/build.ps1 @@ -8,7 +8,7 @@ param( [Parameter(Position = 2, ValueFromPipelineByPropertyName = $true)] [string] $DockerImageName = "snapx", [Parameter(Position = 3, ValueFromPipelineByPropertyName = $true)] - [string] $DockerVersion = "20.0", + [string] $DockerVersion = "21.0", [Parameter(Position = 4, ValueFromPipelineByPropertyName = $true)] [switch] $DockerLocal, [Parameter(Position = 5, ValueFromPipelineByPropertyName = $true)] diff --git a/docker/Dockerfile b/docker/Dockerfile index d8b964ec..c8fddfc6 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,9 +3,9 @@ FROM ubuntu:20.04 as env-build ENV DEBIAN_FRONTEND=noninteractive ENV SNAPX_DOCKER_WORKING_DIR /build/snapx -ARG DOTNET_60_SDK_VERSION=6.0.406 -ARG DOTNET_70_SDK_VERSION=7.0.103 -ARG DOTNET_80_SDK_VERSION=8.0.100-preview.1.23115.2 +ARG DOTNET_60_SDK_VERSION=6.0.407 +ARG DOTNET_70_SDK_VERSION=7.0.202 +ARG DOTNET_80_SDK_VERSION=8.0.100-preview.2.23157.25 ARG DOTNET_RID=linux-x64 From ebdcff3c54f99492e0f1d66a82351a84426ebe92 Mon Sep 17 00:00:00 2001 From: Peter Rekdal Khan-Sunde Date: Wed, 22 Mar 2023 08:30:39 +0100 Subject: [PATCH 10/12] Bugfix: Return NotFound status if packageStream is null. --- src/Snap/NuGet/NugetService.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Snap/NuGet/NugetService.cs b/src/Snap/NuGet/NugetService.cs index e0285d56..052c0362 100644 --- a/src/Snap/NuGet/NugetService.cs +++ b/src/Snap/NuGet/NugetService.cs @@ -316,8 +316,11 @@ public async Task DownloadAsyncWithProgressAsync(Package async Task ProcessAsync(Stream packageStream) { - if (packageStream == null) throw new ArgumentNullException(nameof(packageStream)); - + if (packageStream == null) + { + return new DownloadResourceResult(DownloadResourceResultStatus.NotFound); + } + var outputStream = new MemoryStream(); var buffer = ArrayPool.Shared.Rent(84000); // Less than LOH @@ -448,4 +451,4 @@ static string BuildApiKey(INuGetPackageSources packageSources, PackageSource pac return decryptedApikey ?? string.Empty; // NB! Has to be string.Empty } -} \ No newline at end of file +} From f30557a861efc158e1fe2761be301491df762f9a Mon Sep 17 00:00:00 2001 From: Peter Rekdal Khan-Sunde Date: Wed, 22 Mar 2023 08:33:04 +0100 Subject: [PATCH 11/12] Include download status in error message. --- src/Snap/Core/SnapPackageManager.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Snap/Core/SnapPackageManager.cs b/src/Snap/Core/SnapPackageManager.cs index f557e227..40ed5085 100644 --- a/src/Snap/Core/SnapPackageManager.cs +++ b/src/Snap/Core/SnapPackageManager.cs @@ -246,7 +246,7 @@ public async Task GetPackageSourceAsync( var sourceLocation = packageSource.IsLocalOrUncPath() ? $"path: {_filesystem.PathGetFullPath(packageSource.SourceUri.AbsolutePath)}. Does the location exist?" : packageSource.Name; - logger?.Error($"Unknown error while downloading releases nupkg {packageId} from {sourceLocation}"); + logger?.Error($"Unknown error while downloading releases nupkg {packageId} from {sourceLocation}. Status: {snapReleasesDownloadResult.Status}."); return (null, null, null); } @@ -593,7 +593,7 @@ async Task TryDownloadAsync([JetBrains.Annotations.NotNull] string package { if (!downloadResult.SuccessSafe()) { - logger?.Error($"Unknown error downloading nupkg: {snapRelease.Filename}."); + logger?.Error($"Unknown error downloading nupkg: {snapRelease.Filename}. Status: {downloadResult.Status}."); return false; } From b981c24e985f643dc285c930f2b7963d467421a3 Mon Sep 17 00:00:00 2001 From: Peter Rekdal Khan-Sunde Date: Wed, 22 Mar 2023 08:35:21 +0100 Subject: [PATCH 12/12] Update Avalonia 11 to preview 6. --- src/Directory.Packages.props | 2 +- src/Snap.Installer/Controls/GifAnimationControl.cs | 4 ++-- src/Snap.Installer/MainWindow.axaml.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 076a98ae..397908be 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -1,7 +1,7 @@ true - 11.0.0-preview5 + 11.0.0-preview6 diff --git a/src/Snap.Installer/Controls/GifAnimationControl.cs b/src/Snap.Installer/Controls/GifAnimationControl.cs index 3967967f..bae57cfc 100644 --- a/src/Snap.Installer/Controls/GifAnimationControl.cs +++ b/src/Snap.Installer/Controls/GifAnimationControl.cs @@ -10,7 +10,7 @@ namespace Snap.Installer.Controls; -public class GifAnimationControl : Canvas +public class GifAnimationControl : Control { readonly List _bitmaps; DispatcherTimer _dispatcherTimer; @@ -75,4 +75,4 @@ public override void Render(DrawingContext context) base.Render(context); } -} \ No newline at end of file +} diff --git a/src/Snap.Installer/MainWindow.axaml.cs b/src/Snap.Installer/MainWindow.axaml.cs index f676ecd2..80df4cec 100644 --- a/src/Snap.Installer/MainWindow.axaml.cs +++ b/src/Snap.Installer/MainWindow.axaml.cs @@ -14,7 +14,7 @@ namespace Snap.Installer; -internal sealed class MainWindow : CustomChromeWindow +internal sealed partial class MainWindow : CustomChromeWindow { public static ISnapInstallerEnvironment Environment { get; set; } public static AvaloniaMainWindowViewModel ViewModel { get; set; }