From 66c5ccf82df0621a2d47950fd3978005b7d3bb14 Mon Sep 17 00:00:00 2001 From: tangowithfoxtrot <5676771+tangowithfoxtrot@users.noreply.github.com> Date: Mon, 6 Nov 2023 13:58:32 -0800 Subject: [PATCH 1/3] Vscode devcontainers (#3080) * add devcontainers for `server` * run db migrations automatically in dev environment * remove curl * remove trailing comma; causes parsing with `jq` * use existing .env * add initializeCommand * use better search string * restructure common files * chmod +x scripts * remove problematic env config scripts * add mention of var that is needed for devcontainer * remove ref to deleted script * Update .devcontainer/community_dev/devcontainer.json Co-authored-by: Justin Baur <19896123+justindbaur@users.noreply.github.com> * Update .devcontainer/internal_dev/devcontainer.json Co-authored-by: Justin Baur <19896123+justindbaur@users.noreply.github.com> * use dev image for `6.0.416` SDK * revert to manual DB migrations * reuse SQL connection string var --------- Co-authored-by: Justin Baur <19896123+justindbaur@users.noreply.github.com> --- .../bitwarden_common/docker-compose.yml | 32 +++++++ .devcontainer/community_dev/devcontainer.json | 14 +++ .../community_dev/postCreateCommand.sh | 63 ++++++++++++++ .devcontainer/internal_dev/devcontainer.json | 16 ++++ .../internal_dev/docker-compose.override.yml | 9 ++ .../internal_dev/postCreateCommand.sh | 85 +++++++++++++++++++ dev/.env.example | 4 + 7 files changed, 223 insertions(+) create mode 100644 .devcontainer/bitwarden_common/docker-compose.yml create mode 100644 .devcontainer/community_dev/devcontainer.json create mode 100755 .devcontainer/community_dev/postCreateCommand.sh create mode 100644 .devcontainer/internal_dev/devcontainer.json create mode 100644 .devcontainer/internal_dev/docker-compose.override.yml create mode 100755 .devcontainer/internal_dev/postCreateCommand.sh diff --git a/.devcontainer/bitwarden_common/docker-compose.yml b/.devcontainer/bitwarden_common/docker-compose.yml new file mode 100644 index 0000000000..295fd08da2 --- /dev/null +++ b/.devcontainer/bitwarden_common/docker-compose.yml @@ -0,0 +1,32 @@ +version: '3' + +services: + bitwarden_server: + image: mcr.microsoft.com/devcontainers/dotnet:dev-6.0 + volumes: + - ../../:/workspace:cached + # Overrides default command so things don't shut down after the process ends. + command: sleep infinity + + bitwarden_mssql: + image: mcr.microsoft.com/azure-sql-edge:latest + restart: unless-stopped + env_file: + ../../dev/.env + environment: + ACCEPT_EULA: "Y" + MSSQL_PID: Developer + volumes: + - edgesql_dev_data:/var/opt/mssql + - ../../util/Migrator:/mnt/migrator/ + - ../../dev/helpers/mssql:/mnt/helpers + - ../../dev/.data/mssql:/mnt/data + network_mode: service:bitwarden_server + + bitwarden_mail: + image: sj26/mailcatcher:latest + restart: unless-stopped + network_mode: service:bitwarden_server + +volumes: + edgesql_dev_data: diff --git a/.devcontainer/community_dev/devcontainer.json b/.devcontainer/community_dev/devcontainer.json new file mode 100644 index 0000000000..b9c31709a8 --- /dev/null +++ b/.devcontainer/community_dev/devcontainer.json @@ -0,0 +1,14 @@ +{ + "name": "Bitwarden Community Dev", + "dockerComposeFile": "../../.devcontainer/bitwarden_common/docker-compose.yml", + "service": "bitwarden_server", + "workspaceFolder": "/workspace", + "customizations": { + "vscode": { + "settings": {}, + "features": {}, + "extensions": ["ms-dotnettools.csdevkit"] + } + }, + "postCreateCommand": "bash .devcontainer/community_dev/postCreateCommand.sh" +} diff --git a/.devcontainer/community_dev/postCreateCommand.sh b/.devcontainer/community_dev/postCreateCommand.sh new file mode 100755 index 0000000000..afb852dc1d --- /dev/null +++ b/.devcontainer/community_dev/postCreateCommand.sh @@ -0,0 +1,63 @@ +#!/usr/bin/env bash +export DEV_DIR=/workspace/dev +export CONTAINER_CONFIG=/workspace/.devcontainer/community_dev +git config --global --add safe.directory /workspace + +get_installation_id_and_key() { + pushd ./dev >/dev/null || exit + echo "Please enter your installation id and key from https://bitwarden.com/host:" + read -r -p "Installation id: " INSTALLATION_ID + read -r -p "Installation key: " INSTALLATION_KEY + jq ".globalSettings.installation.id = \"$INSTALLATION_ID\" | + .globalSettings.installation.key = \"$INSTALLATION_KEY\"" \ + secrets.json.example >secrets.json # create/overwrite secrets.json + popd >/dev/null || exit +} + +configure_other_vars() { + pushd ./dev >/dev/null || exit + cp secrets.json .secrets.json.tmp + # set DB_PASSWORD equal to .services.mssql.environment.MSSQL_SA_PASSWORD, accounting for quotes + DB_PASSWORD="$(grep -oP 'MSSQL_SA_PASSWORD=["'"'"']?\K[^"'"'"'\s]+' $DEV_DIR/.env)" + CERT_OUTPUT="$(./create_certificates_linux.sh)" + #shellcheck disable=SC2086 + IDENTITY_SERVER_FINGERPRINT="$(echo $CERT_OUTPUT | awk -F 'Identity Server Dev: ' '{match($2, /[[:alnum:]]+/); print substr($2, RSTART, RLENGTH)}')" + #shellcheck disable=SC2086 + DATA_PROTECTION_FINGERPRINT="$(echo $CERT_OUTPUT | awk -F 'Data Protection Dev: ' '{match($2, /[[:alnum:]]+/); print substr($2, RSTART, RLENGTH)}')" + SQL_CONNECTION_STRING="Server=localhost;Database=vault_dev;User Id=SA;Password=$DB_PASSWORD;Encrypt=True;TrustServerCertificate=True" + echo "Identity Server Dev: $IDENTITY_SERVER_FINGERPRINT" + echo "Data Protection Dev: $DATA_PROTECTION_FINGERPRINT" + jq \ + ".globalSettings.sqlServer.connectionString = \"$SQL_CONNECTION_STRING\" | + .globalSettings.postgreSql.connectionString = \"Host=localhost;Username=postgres;Password=$DB_PASSWORD;Database=vault_dev;Include Error Detail=true\" | + .globalSettings.mySql.connectionString = \"server=localhost;uid=root;pwd=$DB_PASSWORD;database=vault_dev\" | + .globalSettings.identityServer.certificateThumbprint = \"$IDENTITY_SERVER_FINGERPRINT\" | + .globalSettings.dataProtection.certificateThumbprint = \"$DATA_PROTECTION_FINGERPRINT\"" \ + .secrets.json.tmp >secrets.json + rm -f .secrets.json.tmp + popd >/dev/null || exit +} + +one_time_setup() { + read -r -p \ + "Would you like to configure your secrets and certificates for the first time? +WARNING: This will overwrite any existing secrets.json and certificate files. +Proceed? [y/N] " response + if [[ "$response" =~ ^([yY][eE][sS]|[yY])+$ ]]; then + echo "Running one-time setup script..." + sleep 1 + get_installation_id_and_key + configure_other_vars + pushd ./dev >/dev/null || exit + pwsh ./setup_secrets.ps1 || true + popd >/dev/null || exit + + echo "Running migrations..." + sleep 5 # wait for DB container to start + dotnet run --project ./util/MsSqlMigratorUtility "$SQL_CONNECTION_STRING" + + fi +} + +# main +one_time_setup diff --git a/.devcontainer/internal_dev/devcontainer.json b/.devcontainer/internal_dev/devcontainer.json new file mode 100644 index 0000000000..d86d0576aa --- /dev/null +++ b/.devcontainer/internal_dev/devcontainer.json @@ -0,0 +1,16 @@ +{ + "name": "Bitwarden Dev", + "dockerComposeFile": [ + "../../.devcontainer/bitwarden_common/docker-compose.yml", + "../../.devcontainer/internal_dev/docker-compose.override.yml" + ], "service": "bitwarden_server", + "workspaceFolder": "/workspace", + "customizations": { + "vscode": { + "settings": {}, + "features": {}, + "extensions": ["ms-dotnettools.csdevkit"] + } + }, + "postCreateCommand": "bash .devcontainer/internal_dev/postCreateCommand.sh" +} diff --git a/.devcontainer/internal_dev/docker-compose.override.yml b/.devcontainer/internal_dev/docker-compose.override.yml new file mode 100644 index 0000000000..9aaee9ee62 --- /dev/null +++ b/.devcontainer/internal_dev/docker-compose.override.yml @@ -0,0 +1,9 @@ +version: '3' + +services: + bitwarden_storage: + image: mcr.microsoft.com/azure-storage/azurite:latest + restart: unless-stopped + volumes: + - ../../dev/.data/azurite:/data + network_mode: service:bitwarden_server diff --git a/.devcontainer/internal_dev/postCreateCommand.sh b/.devcontainer/internal_dev/postCreateCommand.sh new file mode 100755 index 0000000000..db074e2184 --- /dev/null +++ b/.devcontainer/internal_dev/postCreateCommand.sh @@ -0,0 +1,85 @@ +#!/usr/bin/env bash +export DEV_DIR=/workspace/dev +export CONTAINER_CONFIG=/workspace/.devcontainer/internal_dev +git config --global --add safe.directory /workspace + +get_installation_id_and_key() { + pushd ./dev >/dev/null || exit + echo "Please enter your installation id and key from https://bitwarden.com/host:" + read -r -p "Installation id: " INSTALLATION_ID + read -r -p "Installation key: " INSTALLATION_KEY + jq ".globalSettings.installation.id = \"$INSTALLATION_ID\" | + .globalSettings.installation.key = \"$INSTALLATION_KEY\"" \ + secrets.json.example >secrets.json # create/overwrite secrets.json + popd >/dev/null || exit +} + +remove_comments() { + # jq will not parse files with comments + file="$1" + + if [[ -f "$file" ]]; then + sed -e '/^\/\//d' -e 's@[[:blank:]]\{1,\}//.*@@' "$file" >"$file.tmp" + mv "$file.tmp" "$file" + fi +} + +configure_other_vars() { + pushd ./dev >/dev/null || exit + cp secrets.json .secrets.json.tmp + # set DB_PASSWORD equal to .services.mssql.environment.MSSQL_SA_PASSWORD, accounting for quotes + DB_PASSWORD="$(grep -oP 'MSSQL_SA_PASSWORD=["'"'"']?\K[^"'"'"'\s]+' $DEV_DIR/.env)" + CERT_OUTPUT="$(./create_certificates_linux.sh)" + #shellcheck disable=SC2086 + IDENTITY_SERVER_FINGERPRINT="$(echo $CERT_OUTPUT | awk -F 'Identity Server Dev: ' '{match($2, /[[:alnum:]]+/); print substr($2, RSTART, RLENGTH)}')" + #shellcheck disable=SC2086 + DATA_PROTECTION_FINGERPRINT="$(echo $CERT_OUTPUT | awk -F 'Data Protection Dev: ' '{match($2, /[[:alnum:]]+/); print substr($2, RSTART, RLENGTH)}')" + SQL_CONNECTION_STRING="Server=localhost;Database=vault_dev;User Id=SA;Password=$DB_PASSWORD;Encrypt=True;TrustServerCertificate=True" + echo "Identity Server Dev: $IDENTITY_SERVER_FINGERPRINT" + echo "Data Protection Dev: $DATA_PROTECTION_FINGERPRINT" + jq \ + ".globalSettings.sqlServer.connectionString = \"$SQL_CONNECTION_STRING\" | + .globalSettings.postgreSql.connectionString = \"Host=localhost;Username=postgres;Password=$DB_PASSWORD;Database=vault_dev;Include Error Detail=true\" | + .globalSettings.mySql.connectionString = \"server=localhost;uid=root;pwd=$DB_PASSWORD;database=vault_dev\" | + .globalSettings.identityServer.certificateThumbprint = \"$IDENTITY_SERVER_FINGERPRINT\" | + .globalSettings.dataProtection.certificateThumbprint = \"$DATA_PROTECTION_FINGERPRINT\"" \ + .secrets.json.tmp >secrets.json + rm .secrets.json.tmp + popd >/dev/null || exit +} + +one_time_setup() { + read -r -p \ + "Would you like to configure your secrets and certificates for the first time? +WARNING: This will overwrite any existing secrets.json and certificate files. +Proceed? [y/N] " response + if [[ "$response" =~ ^([yY][eE][sS]|[yY])+$ ]]; then + echo "Running one-time setup script..." + sleep 1 + read -r -p \ + "Place the secrets.json and dev.pfx files from our shared Collection in the ./dev directory. +Press to continue." + remove_comments ./dev/secrets.json + configure_other_vars + echo "Installing Az module. This will take ~a minute..." + pwsh -Command "Install-Module -Name Az -Scope CurrentUser -Repository PSGallery -Force" + pwsh ./dev/setup_azurite.ps1 + + dotnet tool install dotnet-certificate-tool -g >/dev/null + + read -r -s -p "Paste the \"Licensing Certificate - Dev\" password: " CERT_PASSWORD + echo + pushd ./dev >/dev/null || exit + certificate-tool add --file ./dev.pfx --password "$CERT_PASSWORD" + echo "Injecting dotnet secrets..." + pwsh ./setup_secrets.ps1 || true + popd >/dev/null || exit + + echo "Running migrations..." + sleep 5 # wait for DB container to start + dotnet run --project ./util/MsSqlMigratorUtility "$SQL_CONNECTION_STRING" + fi +} + +# main +one_time_setup diff --git a/dev/.env.example b/dev/.env.example index 18346872e6..d0ebf50efb 100644 --- a/dev/.env.example +++ b/dev/.env.example @@ -1,7 +1,11 @@ COMPOSE_PROJECT_NAME=bitwardenserver # Ensure the MSSQL_PASSWORD is complex and follows the password policy defined at # https://docs.microsoft.com/en-us/sql/relational-databases/security/password-policy?view=sql-server-ver15 + +# The MSSQL*_PASSWORD variables can be the same value; MSSQL_SA_PASSWORD is used for VS Code devcontainers +# and MSSQL_PASSWORD is used for docker-compose for traditional dev configurations. MSSQL_PASSWORD=SET_A_PASSWORD_HERE_123 +MSSQL_SA_PASSWORD=SET_A_PASSWORD_HERE_123 MAILCATCHER_PORT=1080 # Alternative databases From 3f7ff52f0bef4d8a189baf4a710582e0583a4908 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 20:21:47 -0500 Subject: [PATCH 2/3] Bumped version to 2023.10.2 (#3415) Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com> --- Directory.Build.props | 2 +- .../packages.lock.json | 2 +- bitwarden_license/src/Scim/packages.lock.json | 10 +++--- bitwarden_license/src/Sso/packages.lock.json | 10 +++--- .../Commercial.Core.Test/packages.lock.json | 8 ++--- .../Scim.IntegrationTest/packages.lock.json | 24 ++++++------- .../test/Scim.Test/packages.lock.json | 16 ++++----- src/Admin/packages.lock.json | 30 ++++++++-------- src/Api/packages.lock.json | 16 ++++----- src/Billing/packages.lock.json | 10 +++--- src/Events/packages.lock.json | 10 +++--- src/EventsProcessor/packages.lock.json | 10 +++--- src/Icons/packages.lock.json | 10 +++--- src/Identity/packages.lock.json | 10 +++--- src/Notifications/packages.lock.json | 10 +++--- src/SharedWeb/packages.lock.json | 4 +-- test/Api.IntegrationTest/packages.lock.json | 34 +++++++++---------- test/Api.Test/packages.lock.json | 30 ++++++++-------- test/Billing.Test/packages.lock.json | 16 ++++----- test/Core.Test/packages.lock.json | 2 +- test/Icons.Test/packages.lock.json | 16 ++++----- .../packages.lock.json | 20 +++++------ test/Identity.Test/packages.lock.json | 16 ++++----- .../packages.lock.json | 10 +++--- .../packages.lock.json | 4 +-- test/IntegrationTestCommon/packages.lock.json | 16 ++++----- util/MsSqlMigratorUtility/packages.lock.json | 2 +- util/MySqlMigrations/packages.lock.json | 2 +- util/PostgresMigrations/packages.lock.json | 2 +- util/Setup/packages.lock.json | 2 +- util/SqlServerEFScaffold/packages.lock.json | 24 ++++++------- util/SqliteMigrations/packages.lock.json | 2 +- 32 files changed, 190 insertions(+), 190 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index c915ffaaea..e6be6fa772 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ net6.0 - 2023.10.1 + 2023.10.2 Bit.$(MSBuildProjectName) true enable diff --git a/bitwarden_license/src/Commercial.Infrastructure.EntityFramework/packages.lock.json b/bitwarden_license/src/Commercial.Infrastructure.EntityFramework/packages.lock.json index c230392f01..95af9471f4 100644 --- a/bitwarden_license/src/Commercial.Infrastructure.EntityFramework/packages.lock.json +++ b/bitwarden_license/src/Commercial.Infrastructure.EntityFramework/packages.lock.json @@ -2628,7 +2628,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", diff --git a/bitwarden_license/src/Scim/packages.lock.json b/bitwarden_license/src/Scim/packages.lock.json index 722ede68b8..afb234b03e 100644 --- a/bitwarden_license/src/Scim/packages.lock.json +++ b/bitwarden_license/src/Scim/packages.lock.json @@ -2631,7 +2631,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Dapper": "[2.0.123, )" } }, @@ -2639,7 +2639,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", @@ -2651,9 +2651,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "Infrastructure.Dapper": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.Dapper": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } } } diff --git a/bitwarden_license/src/Sso/packages.lock.json b/bitwarden_license/src/Sso/packages.lock.json index 59724fbae9..8cb3fb4f99 100644 --- a/bitwarden_license/src/Sso/packages.lock.json +++ b/bitwarden_license/src/Sso/packages.lock.json @@ -2791,7 +2791,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Dapper": "[2.0.123, )" } }, @@ -2799,7 +2799,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", @@ -2811,9 +2811,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "Infrastructure.Dapper": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.Dapper": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } } } diff --git a/bitwarden_license/test/Commercial.Core.Test/packages.lock.json b/bitwarden_license/test/Commercial.Core.Test/packages.lock.json index 205a8205c7..19fb59a560 100644 --- a/bitwarden_license/test/Commercial.Core.Test/packages.lock.json +++ b/bitwarden_license/test/Commercial.Core.Test/packages.lock.json @@ -2667,7 +2667,7 @@ "commercial.core": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )" + "Core": "[2023.10.2, )" } }, "common": { @@ -2675,7 +2675,7 @@ "dependencies": { "AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )", "NSubstitute": "[4.3.0, )", @@ -2729,8 +2729,8 @@ "dependencies": { "AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )", - "Common": "[2023.10.1, )", - "Core": "[2023.10.1, )", + "Common": "[2023.10.2, )", + "Core": "[2023.10.2, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )", "NSubstitute": "[4.3.0, )", diff --git a/bitwarden_license/test/Scim.IntegrationTest/packages.lock.json b/bitwarden_license/test/Scim.IntegrationTest/packages.lock.json index 3c292e2a4a..ff879aa8fb 100644 --- a/bitwarden_license/test/Scim.IntegrationTest/packages.lock.json +++ b/bitwarden_license/test/Scim.IntegrationTest/packages.lock.json @@ -2981,7 +2981,7 @@ "dependencies": { "AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )", "NSubstitute": "[4.3.0, )", @@ -3033,15 +3033,15 @@ "identity": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "SharedWeb": "[2023.10.1, )", + "Core": "[2023.10.2, )", + "SharedWeb": "[2023.10.2, )", "Swashbuckle.AspNetCore.SwaggerGen": "[6.5.0, )" } }, "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Dapper": "[2.0.123, )" } }, @@ -3049,7 +3049,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", @@ -3061,8 +3061,8 @@ "integrationtestcommon": { "type": "Project", "dependencies": { - "Common": "[2023.10.1, )", - "Identity": "[2023.10.1, )", + "Common": "[2023.10.2, )", + "Identity": "[2023.10.2, )", "Microsoft.AspNetCore.Mvc.Testing": "[6.0.5, )", "Microsoft.Extensions.Configuration": "[6.0.1, )" } @@ -3070,16 +3070,16 @@ "scim": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "SharedWeb": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "SharedWeb": "[2023.10.2, )" } }, "sharedweb": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "Infrastructure.Dapper": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.Dapper": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } } } diff --git a/bitwarden_license/test/Scim.Test/packages.lock.json b/bitwarden_license/test/Scim.Test/packages.lock.json index f57a9109f1..4f3fa8335e 100644 --- a/bitwarden_license/test/Scim.Test/packages.lock.json +++ b/bitwarden_license/test/Scim.Test/packages.lock.json @@ -2834,7 +2834,7 @@ "dependencies": { "AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )", "NSubstitute": "[4.3.0, )", @@ -2886,7 +2886,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Dapper": "[2.0.123, )" } }, @@ -2894,7 +2894,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", @@ -2906,16 +2906,16 @@ "scim": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "SharedWeb": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "SharedWeb": "[2023.10.2, )" } }, "sharedweb": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "Infrastructure.Dapper": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.Dapper": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } } } diff --git a/src/Admin/packages.lock.json b/src/Admin/packages.lock.json index d714421eee..c468daf7dd 100644 --- a/src/Admin/packages.lock.json +++ b/src/Admin/packages.lock.json @@ -2792,15 +2792,15 @@ "commercial.core": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )" + "Core": "[2023.10.2, )" } }, "commercial.infrastructure.entityframework": { "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } }, "core": { @@ -2848,7 +2848,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Dapper": "[2.0.123, )" } }, @@ -2856,7 +2856,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", @@ -2868,7 +2868,7 @@ "migrator": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.Extensions.Logging": "[6.0.0, )", "dbup-sqlserver": "[5.0.8, )" } @@ -2876,30 +2876,30 @@ "mysqlmigrations": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } }, "postgresmigrations": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } }, "sharedweb": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "Infrastructure.Dapper": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.Dapper": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } }, "sqlitemigrations": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } } } diff --git a/src/Api/packages.lock.json b/src/Api/packages.lock.json index 8d05794c47..656993aa8f 100644 --- a/src/Api/packages.lock.json +++ b/src/Api/packages.lock.json @@ -2772,15 +2772,15 @@ "commercial.core": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )" + "Core": "[2023.10.2, )" } }, "commercial.infrastructure.entityframework": { "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } }, "core": { @@ -2828,7 +2828,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Dapper": "[2.0.123, )" } }, @@ -2836,7 +2836,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", @@ -2848,9 +2848,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "Infrastructure.Dapper": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.Dapper": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } } } diff --git a/src/Billing/packages.lock.json b/src/Billing/packages.lock.json index 722ede68b8..afb234b03e 100644 --- a/src/Billing/packages.lock.json +++ b/src/Billing/packages.lock.json @@ -2631,7 +2631,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Dapper": "[2.0.123, )" } }, @@ -2639,7 +2639,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", @@ -2651,9 +2651,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "Infrastructure.Dapper": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.Dapper": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } } } diff --git a/src/Events/packages.lock.json b/src/Events/packages.lock.json index 722ede68b8..afb234b03e 100644 --- a/src/Events/packages.lock.json +++ b/src/Events/packages.lock.json @@ -2631,7 +2631,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Dapper": "[2.0.123, )" } }, @@ -2639,7 +2639,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", @@ -2651,9 +2651,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "Infrastructure.Dapper": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.Dapper": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } } } diff --git a/src/EventsProcessor/packages.lock.json b/src/EventsProcessor/packages.lock.json index 722ede68b8..afb234b03e 100644 --- a/src/EventsProcessor/packages.lock.json +++ b/src/EventsProcessor/packages.lock.json @@ -2631,7 +2631,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Dapper": "[2.0.123, )" } }, @@ -2639,7 +2639,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", @@ -2651,9 +2651,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "Infrastructure.Dapper": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.Dapper": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } } } diff --git a/src/Icons/packages.lock.json b/src/Icons/packages.lock.json index a5c16d3f74..229ece1a67 100644 --- a/src/Icons/packages.lock.json +++ b/src/Icons/packages.lock.json @@ -2640,7 +2640,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Dapper": "[2.0.123, )" } }, @@ -2648,7 +2648,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", @@ -2660,9 +2660,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "Infrastructure.Dapper": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.Dapper": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } } } diff --git a/src/Identity/packages.lock.json b/src/Identity/packages.lock.json index 375aef79d5..d71bee3386 100644 --- a/src/Identity/packages.lock.json +++ b/src/Identity/packages.lock.json @@ -2653,7 +2653,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Dapper": "[2.0.123, )" } }, @@ -2661,7 +2661,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", @@ -2673,9 +2673,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "Infrastructure.Dapper": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.Dapper": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } } } diff --git a/src/Notifications/packages.lock.json b/src/Notifications/packages.lock.json index 69046d6f34..42f6066da0 100644 --- a/src/Notifications/packages.lock.json +++ b/src/Notifications/packages.lock.json @@ -2681,7 +2681,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Dapper": "[2.0.123, )" } }, @@ -2689,7 +2689,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", @@ -2701,9 +2701,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "Infrastructure.Dapper": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.Dapper": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } } } diff --git a/src/SharedWeb/packages.lock.json b/src/SharedWeb/packages.lock.json index 50125960fa..99ec0add7f 100644 --- a/src/SharedWeb/packages.lock.json +++ b/src/SharedWeb/packages.lock.json @@ -2631,7 +2631,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Dapper": "[2.0.123, )" } }, @@ -2639,7 +2639,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", diff --git a/test/Api.IntegrationTest/packages.lock.json b/test/Api.IntegrationTest/packages.lock.json index 1632bc8869..8c6f6ef33f 100644 --- a/test/Api.IntegrationTest/packages.lock.json +++ b/test/Api.IntegrationTest/packages.lock.json @@ -3138,25 +3138,25 @@ "AspNetCore.HealthChecks.SqlServer": "[6.0.2, )", "AspNetCore.HealthChecks.Uris": "[6.0.3, )", "Azure.Messaging.EventGrid": "[4.10.0, )", - "Commercial.Core": "[2023.10.1, )", - "Commercial.Infrastructure.EntityFramework": "[2023.10.1, )", - "Core": "[2023.10.1, )", - "SharedWeb": "[2023.10.1, )", + "Commercial.Core": "[2023.10.2, )", + "Commercial.Infrastructure.EntityFramework": "[2023.10.2, )", + "Core": "[2023.10.2, )", + "SharedWeb": "[2023.10.2, )", "Swashbuckle.AspNetCore": "[6.5.0, )" } }, "commercial.core": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )" + "Core": "[2023.10.2, )" } }, "commercial.infrastructure.entityframework": { "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } }, "common": { @@ -3164,7 +3164,7 @@ "dependencies": { "AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )", "NSubstitute": "[4.3.0, )", @@ -3216,15 +3216,15 @@ "identity": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "SharedWeb": "[2023.10.1, )", + "Core": "[2023.10.2, )", + "SharedWeb": "[2023.10.2, )", "Swashbuckle.AspNetCore.SwaggerGen": "[6.5.0, )" } }, "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Dapper": "[2.0.123, )" } }, @@ -3232,7 +3232,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", @@ -3244,8 +3244,8 @@ "integrationtestcommon": { "type": "Project", "dependencies": { - "Common": "[2023.10.1, )", - "Identity": "[2023.10.1, )", + "Common": "[2023.10.2, )", + "Identity": "[2023.10.2, )", "Microsoft.AspNetCore.Mvc.Testing": "[6.0.5, )", "Microsoft.Extensions.Configuration": "[6.0.1, )" } @@ -3253,9 +3253,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "Infrastructure.Dapper": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.Dapper": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } } } diff --git a/test/Api.Test/packages.lock.json b/test/Api.Test/packages.lock.json index a7b6197016..6e10a8f410 100644 --- a/test/Api.Test/packages.lock.json +++ b/test/Api.Test/packages.lock.json @@ -3015,25 +3015,25 @@ "AspNetCore.HealthChecks.SqlServer": "[6.0.2, )", "AspNetCore.HealthChecks.Uris": "[6.0.3, )", "Azure.Messaging.EventGrid": "[4.10.0, )", - "Commercial.Core": "[2023.10.1, )", - "Commercial.Infrastructure.EntityFramework": "[2023.10.1, )", - "Core": "[2023.10.1, )", - "SharedWeb": "[2023.10.1, )", + "Commercial.Core": "[2023.10.2, )", + "Commercial.Infrastructure.EntityFramework": "[2023.10.2, )", + "Core": "[2023.10.2, )", + "SharedWeb": "[2023.10.2, )", "Swashbuckle.AspNetCore": "[6.5.0, )" } }, "commercial.core": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )" + "Core": "[2023.10.2, )" } }, "commercial.infrastructure.entityframework": { "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } }, "common": { @@ -3041,7 +3041,7 @@ "dependencies": { "AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )", "NSubstitute": "[4.3.0, )", @@ -3095,8 +3095,8 @@ "dependencies": { "AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )", - "Common": "[2023.10.1, )", - "Core": "[2023.10.1, )", + "Common": "[2023.10.2, )", + "Core": "[2023.10.2, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )", "NSubstitute": "[4.3.0, )", @@ -3106,7 +3106,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Dapper": "[2.0.123, )" } }, @@ -3114,7 +3114,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", @@ -3126,9 +3126,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "Infrastructure.Dapper": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.Dapper": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } } } diff --git a/test/Billing.Test/packages.lock.json b/test/Billing.Test/packages.lock.json index 9c99d0c5ca..bd2e2b72af 100644 --- a/test/Billing.Test/packages.lock.json +++ b/test/Billing.Test/packages.lock.json @@ -2842,8 +2842,8 @@ "billing": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "SharedWeb": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "SharedWeb": "[2023.10.2, )" } }, "common": { @@ -2851,7 +2851,7 @@ "dependencies": { "AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )", "NSubstitute": "[4.3.0, )", @@ -2903,7 +2903,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Dapper": "[2.0.123, )" } }, @@ -2911,7 +2911,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", @@ -2923,9 +2923,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "Infrastructure.Dapper": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.Dapper": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } } } diff --git a/test/Core.Test/packages.lock.json b/test/Core.Test/packages.lock.json index e7ab5a43b6..400368f27c 100644 --- a/test/Core.Test/packages.lock.json +++ b/test/Core.Test/packages.lock.json @@ -2673,7 +2673,7 @@ "dependencies": { "AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )", "NSubstitute": "[4.3.0, )", diff --git a/test/Icons.Test/packages.lock.json b/test/Icons.Test/packages.lock.json index ad10e6ecfd..cfe72eca3a 100644 --- a/test/Icons.Test/packages.lock.json +++ b/test/Icons.Test/packages.lock.json @@ -2842,7 +2842,7 @@ "dependencies": { "AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )", "NSubstitute": "[4.3.0, )", @@ -2895,14 +2895,14 @@ "type": "Project", "dependencies": { "AngleSharp": "[1.0.4, )", - "Core": "[2023.10.1, )", - "SharedWeb": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "SharedWeb": "[2023.10.2, )" } }, "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Dapper": "[2.0.123, )" } }, @@ -2910,7 +2910,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", @@ -2922,9 +2922,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "Infrastructure.Dapper": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.Dapper": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } } } diff --git a/test/Identity.IntegrationTest/packages.lock.json b/test/Identity.IntegrationTest/packages.lock.json index 1a4247ec18..733bea4dfc 100644 --- a/test/Identity.IntegrationTest/packages.lock.json +++ b/test/Identity.IntegrationTest/packages.lock.json @@ -2981,7 +2981,7 @@ "dependencies": { "AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )", "NSubstitute": "[4.3.0, )", @@ -3033,15 +3033,15 @@ "identity": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "SharedWeb": "[2023.10.1, )", + "Core": "[2023.10.2, )", + "SharedWeb": "[2023.10.2, )", "Swashbuckle.AspNetCore.SwaggerGen": "[6.5.0, )" } }, "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Dapper": "[2.0.123, )" } }, @@ -3049,7 +3049,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", @@ -3061,8 +3061,8 @@ "integrationtestcommon": { "type": "Project", "dependencies": { - "Common": "[2023.10.1, )", - "Identity": "[2023.10.1, )", + "Common": "[2023.10.2, )", + "Identity": "[2023.10.2, )", "Microsoft.AspNetCore.Mvc.Testing": "[6.0.5, )", "Microsoft.Extensions.Configuration": "[6.0.1, )" } @@ -3070,9 +3070,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "Infrastructure.Dapper": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.Dapper": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } } } diff --git a/test/Identity.Test/packages.lock.json b/test/Identity.Test/packages.lock.json index 2b2820ea74..416bab394e 100644 --- a/test/Identity.Test/packages.lock.json +++ b/test/Identity.Test/packages.lock.json @@ -2856,7 +2856,7 @@ "dependencies": { "AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )", "NSubstitute": "[4.3.0, )", @@ -2908,15 +2908,15 @@ "identity": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "SharedWeb": "[2023.10.1, )", + "Core": "[2023.10.2, )", + "SharedWeb": "[2023.10.2, )", "Swashbuckle.AspNetCore.SwaggerGen": "[6.5.0, )" } }, "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Dapper": "[2.0.123, )" } }, @@ -2924,7 +2924,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", @@ -2936,9 +2936,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "Infrastructure.Dapper": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.Dapper": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } } } diff --git a/test/Infrastructure.EFIntegration.Test/packages.lock.json b/test/Infrastructure.EFIntegration.Test/packages.lock.json index 858754eb8f..675462c787 100644 --- a/test/Infrastructure.EFIntegration.Test/packages.lock.json +++ b/test/Infrastructure.EFIntegration.Test/packages.lock.json @@ -2836,7 +2836,7 @@ "dependencies": { "AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )", "NSubstitute": "[4.3.0, )", @@ -2890,8 +2890,8 @@ "dependencies": { "AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )", - "Common": "[2023.10.1, )", - "Core": "[2023.10.1, )", + "Common": "[2023.10.2, )", + "Core": "[2023.10.2, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )", "NSubstitute": "[4.3.0, )", @@ -2901,7 +2901,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Dapper": "[2.0.123, )" } }, @@ -2909,7 +2909,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", diff --git a/test/Infrastructure.IntegrationTest/packages.lock.json b/test/Infrastructure.IntegrationTest/packages.lock.json index ec0e0a4996..ec3f9b4d81 100644 --- a/test/Infrastructure.IntegrationTest/packages.lock.json +++ b/test/Infrastructure.IntegrationTest/packages.lock.json @@ -2746,7 +2746,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Dapper": "[2.0.123, )" } }, @@ -2754,7 +2754,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", diff --git a/test/IntegrationTestCommon/packages.lock.json b/test/IntegrationTestCommon/packages.lock.json index 53320be614..062a494910 100644 --- a/test/IntegrationTestCommon/packages.lock.json +++ b/test/IntegrationTestCommon/packages.lock.json @@ -2966,7 +2966,7 @@ "dependencies": { "AutoFixture.AutoNSubstitute": "[4.17.0, )", "AutoFixture.Xunit2": "[4.17.0, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Kralizek.AutoFixture.Extensions.MockHttp": "[1.2.0, )", "Microsoft.NET.Test.Sdk": "[17.1.0, )", "NSubstitute": "[4.3.0, )", @@ -3018,15 +3018,15 @@ "identity": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "SharedWeb": "[2023.10.1, )", + "Core": "[2023.10.2, )", + "SharedWeb": "[2023.10.2, )", "Swashbuckle.AspNetCore.SwaggerGen": "[6.5.0, )" } }, "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Dapper": "[2.0.123, )" } }, @@ -3034,7 +3034,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", @@ -3046,9 +3046,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "Infrastructure.Dapper": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.Dapper": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } } } diff --git a/util/MsSqlMigratorUtility/packages.lock.json b/util/MsSqlMigratorUtility/packages.lock.json index ed07358b35..b665121e8b 100644 --- a/util/MsSqlMigratorUtility/packages.lock.json +++ b/util/MsSqlMigratorUtility/packages.lock.json @@ -2709,7 +2709,7 @@ "migrator": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.Extensions.Logging": "[6.0.0, )", "dbup-sqlserver": "[5.0.8, )" } diff --git a/util/MySqlMigrations/packages.lock.json b/util/MySqlMigrations/packages.lock.json index f57e95b2b7..8b152d37c2 100644 --- a/util/MySqlMigrations/packages.lock.json +++ b/util/MySqlMigrations/packages.lock.json @@ -2657,7 +2657,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", diff --git a/util/PostgresMigrations/packages.lock.json b/util/PostgresMigrations/packages.lock.json index f57e95b2b7..8b152d37c2 100644 --- a/util/PostgresMigrations/packages.lock.json +++ b/util/PostgresMigrations/packages.lock.json @@ -2657,7 +2657,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", diff --git a/util/Setup/packages.lock.json b/util/Setup/packages.lock.json index fb1aeb0aab..580df58028 100644 --- a/util/Setup/packages.lock.json +++ b/util/Setup/packages.lock.json @@ -2677,7 +2677,7 @@ "migrator": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.Extensions.Logging": "[6.0.0, )", "dbup-sqlserver": "[5.0.8, )" } diff --git a/util/SqlServerEFScaffold/packages.lock.json b/util/SqlServerEFScaffold/packages.lock.json index 5a154ded38..3587e297bc 100644 --- a/util/SqlServerEFScaffold/packages.lock.json +++ b/util/SqlServerEFScaffold/packages.lock.json @@ -2801,25 +2801,25 @@ "AspNetCore.HealthChecks.SqlServer": "[6.0.2, )", "AspNetCore.HealthChecks.Uris": "[6.0.3, )", "Azure.Messaging.EventGrid": "[4.10.0, )", - "Commercial.Core": "[2023.10.1, )", - "Commercial.Infrastructure.EntityFramework": "[2023.10.1, )", - "Core": "[2023.10.1, )", - "SharedWeb": "[2023.10.1, )", + "Commercial.Core": "[2023.10.2, )", + "Commercial.Infrastructure.EntityFramework": "[2023.10.2, )", + "Core": "[2023.10.2, )", + "SharedWeb": "[2023.10.2, )", "Swashbuckle.AspNetCore": "[6.5.0, )" } }, "commercial.core": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )" + "Core": "[2023.10.2, )" } }, "commercial.infrastructure.entityframework": { "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } }, "core": { @@ -2867,7 +2867,7 @@ "infrastructure.dapper": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Dapper": "[2.0.123, )" } }, @@ -2875,7 +2875,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", @@ -2887,9 +2887,9 @@ "sharedweb": { "type": "Project", "dependencies": { - "Core": "[2023.10.1, )", - "Infrastructure.Dapper": "[2023.10.1, )", - "Infrastructure.EntityFramework": "[2023.10.1, )" + "Core": "[2023.10.2, )", + "Infrastructure.Dapper": "[2023.10.2, )", + "Infrastructure.EntityFramework": "[2023.10.2, )" } } } diff --git a/util/SqliteMigrations/packages.lock.json b/util/SqliteMigrations/packages.lock.json index f57e95b2b7..8b152d37c2 100644 --- a/util/SqliteMigrations/packages.lock.json +++ b/util/SqliteMigrations/packages.lock.json @@ -2657,7 +2657,7 @@ "type": "Project", "dependencies": { "AutoMapper.Extensions.Microsoft.DependencyInjection": "[12.0.1, )", - "Core": "[2023.10.1, )", + "Core": "[2023.10.2, )", "Microsoft.EntityFrameworkCore.Relational": "[7.0.5, )", "Microsoft.EntityFrameworkCore.SqlServer": "[7.0.5, )", "Microsoft.EntityFrameworkCore.Sqlite": "[7.0.5, )", From 8256b58e00689399ea87a7594450899e78f84852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Ch=C4=99ci=C5=84ski?= Date: Tue, 7 Nov 2023 10:42:20 +0100 Subject: [PATCH 3/3] [DEVOPS-1646] MsSqlMigratorUtility docker image is not recognizing input flags (#3413) --- util/MsSqlMigratorUtility/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/util/MsSqlMigratorUtility/Dockerfile b/util/MsSqlMigratorUtility/Dockerfile index 3678d429e3..1a33ff12d2 100644 --- a/util/MsSqlMigratorUtility/Dockerfile +++ b/util/MsSqlMigratorUtility/Dockerfile @@ -5,6 +5,4 @@ LABEL com.bitwarden.product="bitwarden" WORKDIR /app COPY obj/build-output/publish . -ENTRYPOINT ["sh", "-c", "dotnet /app/MsSqlMigratorUtility.dll \"${MSSQL_CONN_STRING}\""] - -CMD [ "-v" ] +ENTRYPOINT ["sh", "-c", "dotnet /app/MsSqlMigratorUtility.dll \"${MSSQL_CONN_STRING}\" -v ${@}", "--" ]