From 5c19639e5fb8a0b76e5d7130c8086a4d87f38be5 Mon Sep 17 00:00:00 2001
From: Alex Vincent <alexv@microsoft.com>
Date: Wed, 24 Apr 2024 04:47:56 +0200
Subject: [PATCH] F2calv/2024 02 updates (#166)

* update devcontainer

* nuget updates
---
 .devcontainer/Dockerfile                      |  6 ++---
 .devcontainer/devcontainer.json               | 22 ++++++++++++-------
 .../CasCap.Apis.GooglePhotos.Tests.csproj     | 14 ++++++------
 .../CasCap.Apis.GooglePhotos.csproj           |  8 +++----
 4 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 5b3b129..ca65f7d 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,8 +1,8 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.231.3/containers/dotnet/.devcontainer/base.Dockerfile
 
-# [Choice] .NET version: 6.0, 5.0, 3.1, 6.0-bullseye, 5.0-bullseye, 3.1-bullseye, 6.0-focal, 5.0-focal, 3.1-focal
-ARG VARIANT="6.0-bullseye-slim"
-FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-${VARIANT}
+# [Choice] .NET version
+ARG VARIANT="8.0-bookworm-slim"
+FROM mcr.microsoft.com/vscode/devcontainers/dotnet:1-${VARIANT}
 
 # [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
 ARG NODE_VERSION="none"
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 77df2a2..fc90c91 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -6,18 +6,24 @@
 		"dockerfile": "Dockerfile",
 		"args": {
 			// Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0
-			// Append -bullseye or -focal to pin to an OS version.
-			"VARIANT": "6.0",
+			// Append -bookworm or -focal to pin to an OS version.
+			"VARIANT": "8.0",
 			// Options
 			"NODE_VERSION": "lts/*"
 		}
 	},
-	// Set *default* container specific settings.json values on container create.
-	"settings": {},
-	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": [
-		"ms-dotnettools.csharp"
-	],
+	// Configure tool-specific properties.
+	"customizations": {
+		// Configure properties specific to VS Code.
+		"vscode": {
+			// Set *default* container specific settings.json values on container create.
+			"settings": {},
+			// Add the IDs of extensions you want installed when the container is created.
+			"extensions": [
+				"ms-dotnettools.csharp"
+			]
+		}
+	},
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [5000, 5001],
 	// [Optional] To reuse of your local HTTPS dev cert:
diff --git a/src/CasCap.Apis.GooglePhotos.Tests/CasCap.Apis.GooglePhotos.Tests.csproj b/src/CasCap.Apis.GooglePhotos.Tests/CasCap.Apis.GooglePhotos.Tests.csproj
index d97c4ea..9ab003b 100644
--- a/src/CasCap.Apis.GooglePhotos.Tests/CasCap.Apis.GooglePhotos.Tests.csproj
+++ b/src/CasCap.Apis.GooglePhotos.Tests/CasCap.Apis.GooglePhotos.Tests.csproj
@@ -5,23 +5,23 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CasCap.Common.Testing" Version="3.0.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="CasCap.Common.Testing" Version="3.0.5" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.2" />
-    <PackageReference Include="xunit" Version="2.6.5" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />
+    <PackageReference Include="xunit" Version="2.7.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.msbuild" Version="6.0.0">
+    <PackageReference Include="coverlet.msbuild" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/CasCap.Apis.GooglePhotos/CasCap.Apis.GooglePhotos.csproj b/src/CasCap.Apis.GooglePhotos/CasCap.Apis.GooglePhotos.csproj
index ae71481..0305bbe 100644
--- a/src/CasCap.Apis.GooglePhotos/CasCap.Apis.GooglePhotos.csproj
+++ b/src/CasCap.Apis.GooglePhotos/CasCap.Apis.GooglePhotos.csproj
@@ -25,11 +25,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Apis.Auth" Version="1.65.0" />
-    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.1" />
-    <PackageReference Include="CasCap.Common.Net" Version="3.0.3" />
+    <PackageReference Include="Google.Apis.Auth" Version="1.68.0" />
+    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.4" />
+    <PackageReference Include="CasCap.Common.Net" Version="3.0.5" />
     <PackageReference Include="MimeTypeMapOfficial" Version="1.0.17" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.4" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
   </ItemGroup>