From 2fa096fb3dcdc083db706d10eb4d4d5e987cbf5b Mon Sep 17 00:00:00 2001 From: George Pollard Date: Thu, 10 Nov 2022 22:14:51 +0000 Subject: [PATCH] Update Dockerfile installation step --- .devcontainer/Dockerfile | 11 ++- .../IntegrationTests/packages.lock.json | 72 +++++++++---------- src/ApiService/Tests/packages.lock.json | 72 +++++++++---------- 3 files changed, 81 insertions(+), 74 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index a8306878600..0ee7cf587d9 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -7,12 +7,19 @@ FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT} # note: keep this in sync with .github/workflows/ci.yml ARG RUSTVERSION="1.64" +# Needed for dotnet7; remove when available in Ubuntu +RUN wget https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ + && sudo dpkg -i packages-microsoft-prod.deb \ + && rm packages-microsoft-prod.deb + # Install packages required for build: RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ && apt-get -y install --no-install-recommends \ libunwind-dev clang build-essential libssl-dev pkg-config lldb \ - bash-completion npm dotnet7 \ - python-is-python3 direnv uuid-runtime python3-distutils python3-pip python3-venv + bash-completion npm \ + python-is-python3 direnv uuid-runtime python3-distutils python3-pip python3-venv \ + dotnet-sdk-7.0 + # TODO replace with dotnet7 when available in Ubuntu # Install Rust: USER vscode diff --git a/src/ApiService/IntegrationTests/packages.lock.json b/src/ApiService/IntegrationTests/packages.lock.json index 6f063f9a707..2a98dad360f 100644 --- a/src/ApiService/IntegrationTests/packages.lock.json +++ b/src/ApiService/IntegrationTests/packages.lock.json @@ -1,7 +1,7 @@ { "version": 1, "dependencies": { - "net6.0": { + "net7.0": { "coverlet.collector": { "type": "Direct", "requested": "[3.1.2, )", @@ -2405,41 +2405,41 @@ "apiservice": { "type": "Project", "dependencies": { - "Azure.Core": "1.25.0", - "Azure.Data.Tables": "12.5.0", - "Azure.Identity": "1.6.0", - "Azure.Messaging.EventGrid": "4.10.0", - "Azure.ResourceManager": "1.3.1", - "Azure.ResourceManager.Compute": "1.0.0-beta.8", - "Azure.ResourceManager.Monitor": "1.0.0-beta.2", - "Azure.ResourceManager.Network": "1.0.0", - "Azure.ResourceManager.Resources": "1.3.0", - "Azure.ResourceManager.Storage": "1.0.0-beta.11", - "Azure.Security.KeyVault.Secrets": "4.3.0", - "Azure.Storage.Blobs": "12.13.0", - "Azure.Storage.Queues": "12.11.0", - "Faithlife.Utility": "0.12.2", - "Microsoft.Azure.Functions.Worker": "1.10.0", - "Microsoft.Azure.Functions.Worker.ApplicationInsights": "1.0.0-preview3", - "Microsoft.Azure.Functions.Worker.Extensions.EventGrid": "2.1.0", - "Microsoft.Azure.Functions.Worker.Extensions.Http": "3.0.13", - "Microsoft.Azure.Functions.Worker.Extensions.SignalRService": "1.7.0", - "Microsoft.Azure.Functions.Worker.Extensions.Storage": "5.0.0", - "Microsoft.Azure.Functions.Worker.Extensions.Timer": "4.1.0", - "Microsoft.Azure.Functions.Worker.Sdk": "1.7.0", - "Microsoft.Azure.Management.Monitor": "0.28.0-preview", - "Microsoft.Azure.Management.OperationalInsights": "0.24.0-preview", - "Microsoft.Graph": "4.37.0", - "Microsoft.Identity.Client": "4.46.2", - "Microsoft.Identity.Web.TokenCache": "1.23.1", - "Microsoft.TeamFoundationServer.Client": "19.209.0-preview", - "Octokit": "2.0.1", - "Scriban": "5.5.0", - "Semver": "2.1.0", - "SmartAnalyzers.CSharpExtensions.Annotations": "4.2.7", - "System.IdentityModel.Tokens.Jwt": "6.22.1", - "System.Linq.Async": "6.0.1", - "TaskTupleAwaiter": "2.0.0" + "Azure.Core": "[1.25.0, )", + "Azure.Data.Tables": "[12.5.0, )", + "Azure.Identity": "[1.6.0, )", + "Azure.Messaging.EventGrid": "[4.10.0, )", + "Azure.ResourceManager": "[1.3.1, )", + "Azure.ResourceManager.Compute": "[1.0.0-beta.8, )", + "Azure.ResourceManager.Monitor": "[1.0.0-beta.2, )", + "Azure.ResourceManager.Network": "[1.0.0, )", + "Azure.ResourceManager.Resources": "[1.3.0, )", + "Azure.ResourceManager.Storage": "[1.0.0-beta.11, )", + "Azure.Security.KeyVault.Secrets": "[4.3.0, )", + "Azure.Storage.Blobs": "[12.13.0, )", + "Azure.Storage.Queues": "[12.11.0, )", + "Faithlife.Utility": "[0.12.2, )", + "Microsoft.Azure.Functions.Worker": "[1.10.0, )", + "Microsoft.Azure.Functions.Worker.ApplicationInsights": "[1.0.0-preview3, )", + "Microsoft.Azure.Functions.Worker.Extensions.EventGrid": "[2.1.0, )", + "Microsoft.Azure.Functions.Worker.Extensions.Http": "[3.0.13, )", + "Microsoft.Azure.Functions.Worker.Extensions.SignalRService": "[1.7.0, )", + "Microsoft.Azure.Functions.Worker.Extensions.Storage": "[5.0.0, )", + "Microsoft.Azure.Functions.Worker.Extensions.Timer": "[4.1.0, )", + "Microsoft.Azure.Functions.Worker.Sdk": "[1.7.0, )", + "Microsoft.Azure.Management.Monitor": "[0.28.0-preview, )", + "Microsoft.Azure.Management.OperationalInsights": "[0.24.0-preview, )", + "Microsoft.Graph": "[4.37.0, )", + "Microsoft.Identity.Client": "[4.46.2, )", + "Microsoft.Identity.Web.TokenCache": "[1.23.1, )", + "Microsoft.TeamFoundationServer.Client": "[19.209.0-preview, )", + "Octokit": "[2.0.1, )", + "Scriban": "[5.5.0, )", + "Semver": "[2.1.0, )", + "SmartAnalyzers.CSharpExtensions.Annotations": "[4.2.7, )", + "System.IdentityModel.Tokens.Jwt": "[6.22.1, )", + "System.Linq.Async": "[6.0.1, )", + "TaskTupleAwaiter": "[2.0.0, )" } } } diff --git a/src/ApiService/Tests/packages.lock.json b/src/ApiService/Tests/packages.lock.json index 64033bdf541..edddf081854 100644 --- a/src/ApiService/Tests/packages.lock.json +++ b/src/ApiService/Tests/packages.lock.json @@ -1,7 +1,7 @@ { "version": 1, "dependencies": { - "net6.0": { + "net7.0": { "coverlet.collector": { "type": "Direct", "requested": "[3.1.2, )", @@ -2532,41 +2532,41 @@ "apiservice": { "type": "Project", "dependencies": { - "Azure.Core": "1.25.0", - "Azure.Data.Tables": "12.5.0", - "Azure.Identity": "1.6.0", - "Azure.Messaging.EventGrid": "4.10.0", - "Azure.ResourceManager": "1.3.1", - "Azure.ResourceManager.Compute": "1.0.0-beta.8", - "Azure.ResourceManager.Monitor": "1.0.0-beta.2", - "Azure.ResourceManager.Network": "1.0.0", - "Azure.ResourceManager.Resources": "1.3.0", - "Azure.ResourceManager.Storage": "1.0.0-beta.11", - "Azure.Security.KeyVault.Secrets": "4.3.0", - "Azure.Storage.Blobs": "12.13.0", - "Azure.Storage.Queues": "12.11.0", - "Faithlife.Utility": "0.12.2", - "Microsoft.Azure.Functions.Worker": "1.10.0", - "Microsoft.Azure.Functions.Worker.ApplicationInsights": "1.0.0-preview3", - "Microsoft.Azure.Functions.Worker.Extensions.EventGrid": "2.1.0", - "Microsoft.Azure.Functions.Worker.Extensions.Http": "3.0.13", - "Microsoft.Azure.Functions.Worker.Extensions.SignalRService": "1.7.0", - "Microsoft.Azure.Functions.Worker.Extensions.Storage": "5.0.0", - "Microsoft.Azure.Functions.Worker.Extensions.Timer": "4.1.0", - "Microsoft.Azure.Functions.Worker.Sdk": "1.7.0", - "Microsoft.Azure.Management.Monitor": "0.28.0-preview", - "Microsoft.Azure.Management.OperationalInsights": "0.24.0-preview", - "Microsoft.Graph": "4.37.0", - "Microsoft.Identity.Client": "4.46.2", - "Microsoft.Identity.Web.TokenCache": "1.23.1", - "Microsoft.TeamFoundationServer.Client": "19.209.0-preview", - "Octokit": "2.0.1", - "Scriban": "5.5.0", - "Semver": "2.1.0", - "SmartAnalyzers.CSharpExtensions.Annotations": "4.2.7", - "System.IdentityModel.Tokens.Jwt": "6.22.1", - "System.Linq.Async": "6.0.1", - "TaskTupleAwaiter": "2.0.0" + "Azure.Core": "[1.25.0, )", + "Azure.Data.Tables": "[12.5.0, )", + "Azure.Identity": "[1.6.0, )", + "Azure.Messaging.EventGrid": "[4.10.0, )", + "Azure.ResourceManager": "[1.3.1, )", + "Azure.ResourceManager.Compute": "[1.0.0-beta.8, )", + "Azure.ResourceManager.Monitor": "[1.0.0-beta.2, )", + "Azure.ResourceManager.Network": "[1.0.0, )", + "Azure.ResourceManager.Resources": "[1.3.0, )", + "Azure.ResourceManager.Storage": "[1.0.0-beta.11, )", + "Azure.Security.KeyVault.Secrets": "[4.3.0, )", + "Azure.Storage.Blobs": "[12.13.0, )", + "Azure.Storage.Queues": "[12.11.0, )", + "Faithlife.Utility": "[0.12.2, )", + "Microsoft.Azure.Functions.Worker": "[1.10.0, )", + "Microsoft.Azure.Functions.Worker.ApplicationInsights": "[1.0.0-preview3, )", + "Microsoft.Azure.Functions.Worker.Extensions.EventGrid": "[2.1.0, )", + "Microsoft.Azure.Functions.Worker.Extensions.Http": "[3.0.13, )", + "Microsoft.Azure.Functions.Worker.Extensions.SignalRService": "[1.7.0, )", + "Microsoft.Azure.Functions.Worker.Extensions.Storage": "[5.0.0, )", + "Microsoft.Azure.Functions.Worker.Extensions.Timer": "[4.1.0, )", + "Microsoft.Azure.Functions.Worker.Sdk": "[1.7.0, )", + "Microsoft.Azure.Management.Monitor": "[0.28.0-preview, )", + "Microsoft.Azure.Management.OperationalInsights": "[0.24.0-preview, )", + "Microsoft.Graph": "[4.37.0, )", + "Microsoft.Identity.Client": "[4.46.2, )", + "Microsoft.Identity.Web.TokenCache": "[1.23.1, )", + "Microsoft.TeamFoundationServer.Client": "[19.209.0-preview, )", + "Octokit": "[2.0.1, )", + "Scriban": "[5.5.0, )", + "Semver": "[2.1.0, )", + "SmartAnalyzers.CSharpExtensions.Annotations": "[4.2.7, )", + "System.IdentityModel.Tokens.Jwt": "[6.22.1, )", + "System.Linq.Async": "[6.0.1, )", + "TaskTupleAwaiter": "[2.0.0, )" } } }