Merge branch 'develop'

peters · peters · commit b6b99b17b409 · 2023-03-23T09:09:00.000+01:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <AvaloniaVersion>11.0.0-preview5</AvaloniaVersion>
+    <AvaloniaVersion>11.0.0-preview6</AvaloniaVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
@@ -14,20 +14,20 @@
     <PackageVersion Include="Jetbrains.Annotations" Version="2022.3.1" />
     <PackageVersion Include="LibLog" Version="5.0.8" />
     <PackageVersion Include="LightInject" Version="6.6.3" />
-    <PackageVersion Include="MessagePack" Version="2.4.59" />
+    <PackageVersion Include="MessagePack" Version="2.5.108" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageVersion Include="Mono.Cecil" Version="0.11.4" />
     <PackageVersion Include="Moq" Version="4.18.4" />
     <PackageVersion Include="NLog" Version="5.1.2" />
     <PackageVersion Include="NuGet.Packaging.Core" Version="6.5.0" />
     <PackageVersion Include="NuGet.Protocol" Version="6.5.0" />
-    <PackageVersion Include="ServiceStack.HttpClient" Version="6.6.0" />
-    <PackageVersion Include="SharpCompress" Version="0.32.2" />
+    <PackageVersion Include="ServiceStack.HttpClient" Version="6.7.0" />
+    <PackageVersion Include="SharpCompress" Version="0.33.0" />
     <PackageVersion Include="System.CodeDom" Version="7.0.0" />
     <PackageVersion Include="System.Security.Permissions" Version="7.0.0" />
     <PackageVersion Include="xunit" Version="2.4.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
     <PackageVersion Include="XunitXml.TestLogger" Version="3.0.78" />
-    <PackageVersion Include="YamlDotNet" Version="12.3.1" />
+    <PackageVersion Include="YamlDotNet" Version="13.0.2" />
   </ItemGroup>
 </Project>
diff --git 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<Bitmap> _bitmaps;
     DispatcherTimer _dispatcherTimer;
@@ -75,4 +75,4 @@ public override void Render(DrawingContext context)
         base.Render(context);
     }
 
-}
+}
diff --git 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
@@ -246,7 +246,7 @@ public async Task<PackageSource> 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<bool> 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
@@ -316,8 +316,11 @@ public async Task<DownloadResourceResult> DownloadAsyncWithProgressAsync(Package
                     
             async Task<DownloadResourceResult> 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<byte>.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
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-next-version: 5.1.1`
	`1`	`+next-version: 5.1.2`
`2`	`2`	`mode: ContinuousDeployment`
`3`	`3`	`continuous-delivery-fallback-tag: ''`
`4`	`4`	`branches:`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`namespace Snap.Installer.Controls;`
`12`	`12`
`13`		`-public class GifAnimationControl : Canvas`
	`13`	`+public class GifAnimationControl : Control`
`14`	`14`	`{`
`15`	`15`	`readonly List<Bitmap> _bitmaps;`
`16`	`16`	`DispatcherTimer _dispatcherTimer;`
`@@ -75,4 +75,4 @@ public override void Render(DrawingContext context)`
`75`	`75`	`base.Render(context);`
`76`	`76`	`}`
`77`	`77`
`78`		`-}`
	`78`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`namespace Snap.Installer;`
`16`	`16`
`17`		`-internal sealed class MainWindow : CustomChromeWindow`
	`17`	`+internal sealed partial class MainWindow : CustomChromeWindow`
`18`	`18`	`{`
`19`	`19`	`public static ISnapInstallerEnvironment Environment { get; set; }`
`20`	`20`	`public static AvaloniaMainWindowViewModel ViewModel { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ public async Task<PackageSource> GetPackageSourceAsync(`
`246`	`246`	`var sourceLocation = packageSource.IsLocalOrUncPath()`
`247`	`247`	`? $"path: {_filesystem.PathGetFullPath(packageSource.SourceUri.AbsolutePath)}. Does the location exist?"`
`248`	`248`	`: packageSource.Name;`
`249`		`- logger?.Error($"Unknown error while downloading releases nupkg {packageId} from {sourceLocation}");`
	`249`	`+ logger?.Error($"Unknown error while downloading releases nupkg {packageId} from {sourceLocation}. Status: {snapReleasesDownloadResult.Status}.");`
`250`	`250`	`return (null, null, null);`
`251`	`251`	`}`
`252`	`252`
`@@ -593,7 +593,7 @@ async Task<bool> TryDownloadAsync([JetBrains.Annotations.NotNull] string package`
`593`	`593`	`{`
`594`	`594`	`if (!downloadResult.SuccessSafe())`
`595`	`595`	`{`
`596`		`- logger?.Error($"Unknown error downloading nupkg: {snapRelease.Filename}.");`
	`596`	`+ logger?.Error($"Unknown error downloading nupkg: {snapRelease.Filename}. Status: {downloadResult.Status}.");`
`597`	`597`	`return false;`
`598`	`598`	`}`
`599`	`599`