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/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: 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 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 diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 4e7dcd48..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 @@ -14,20 +14,20 @@ - + - - + + - + 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; } 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; } 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 +}