From 6a9e7a1d0a98831f5b26187168224a6770680521 Mon Sep 17 00:00:00 2001 From: Matt Bishop Date: Thu, 8 Jun 2023 13:21:03 -0400 Subject: [PATCH] Project configuration tune-up (#2994) --- .../src/Scim/Properties/launchSettings.json | 8 +++----- bitwarden_license/src/Scim/Scim.csproj | 1 + .../src/Sso/Properties/launchSettings.json | 9 +++------ bitwarden_license/src/Sso/Sso.csproj | 2 ++ .../Properties/launchSettings.json | 16 ++++++++++++++++ .../Scim.IntegrationTest.csproj | 7 +++++++ src/Admin/Admin.csproj | 2 ++ src/Admin/Properties/launchSettings.json | 11 ++++------- src/Api/Api.csproj | 2 ++ src/Api/Properties/launchSettings.json | 3 --- src/Billing/Billing.csproj | 1 + src/Billing/Properties/launchSettings.json | 8 +++----- src/Events/Events.csproj | 2 ++ src/Events/Properties/launchSettings.json | 11 ++++------- src/EventsProcessor/EventsProcessor.csproj | 1 + .../Properties/launchSettings.json | 8 +++----- src/Icons/Icons.csproj | 1 + src/Icons/Properties/launchSettings.json | 8 +++----- src/Identity/Identity.csproj | 2 ++ src/Identity/Properties/launchSettings.json | 3 --- src/Notifications/Notifications.csproj | 2 ++ src/Notifications/Properties/launchSettings.json | 9 +++------ .../Api.IntegrationTest.csproj | 7 +++++++ .../Properties/launchSettings.json | 16 ++++++++++++++++ .../Identity.IntegrationTest.csproj | 1 + .../Properties/launchSettings.json | 5 ++--- util/Server/Properties/launchSettings.json | 7 +++---- util/Server/Server.csproj | 1 + 28 files changed, 95 insertions(+), 59 deletions(-) create mode 100644 bitwarden_license/test/Scim.IntegrationTest/Properties/launchSettings.json create mode 100644 test/Api.IntegrationTest/Properties/launchSettings.json diff --git a/bitwarden_license/src/Scim/Properties/launchSettings.json b/bitwarden_license/src/Scim/Properties/launchSettings.json index a391acb2b..aa77a5198 100644 --- a/bitwarden_license/src/Scim/Properties/launchSettings.json +++ b/bitwarden_license/src/Scim/Properties/launchSettings.json @@ -1,4 +1,4 @@ -{ +{ "iisSettings": { "windowsAuthentication": false, "anonymousAuthentication": true, @@ -10,7 +10,6 @@ "profiles": { "IIS Express": { "commandName": "IISExpress", - "launchBrowser": false, "launchUrl": "http://localhost:44558", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" @@ -18,12 +17,11 @@ }, "Scim": { "commandName": "Project", - "launchBrowser": false, "launchUrl": "http://localhost:44558", + "applicationUrl": "http://localhost:44559", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "http://localhost:44559" + } } } } diff --git a/bitwarden_license/src/Scim/Scim.csproj b/bitwarden_license/src/Scim/Scim.csproj index 6f4db722b..7d1ea317b 100644 --- a/bitwarden_license/src/Scim/Scim.csproj +++ b/bitwarden_license/src/Scim/Scim.csproj @@ -5,6 +5,7 @@ false + diff --git a/bitwarden_license/src/Sso/Properties/launchSettings.json b/bitwarden_license/src/Sso/Properties/launchSettings.json index e9c6e1dd1..ce32b2110 100644 --- a/bitwarden_license/src/Sso/Properties/launchSettings.json +++ b/bitwarden_license/src/Sso/Properties/launchSettings.json @@ -1,7 +1,7 @@ -{ +{ "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, + "windowsAuthentication": false, + "anonymousAuthentication": true, "iisExpress": { "applicationUrl": "http://localhost:51822", "sslPort": 0 @@ -10,14 +10,12 @@ "profiles": { "IIS Express": { "commandName": "IISExpress", - "launchBrowser": false, "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } }, "Sso": { "commandName": "Project", - "launchBrowser": false, "applicationUrl": "http://localhost:51822", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" @@ -25,7 +23,6 @@ }, "Sso-SelfHost": { "commandName": "Project", - "launchBrowser": false, "applicationUrl": "http://localhost:51823", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development", diff --git a/bitwarden_license/src/Sso/Sso.csproj b/bitwarden_license/src/Sso/Sso.csproj index 29843dac3..357335548 100644 --- a/bitwarden_license/src/Sso/Sso.csproj +++ b/bitwarden_license/src/Sso/Sso.csproj @@ -4,6 +4,8 @@ bitwarden-Sso + + diff --git a/bitwarden_license/test/Scim.IntegrationTest/Properties/launchSettings.json b/bitwarden_license/test/Scim.IntegrationTest/Properties/launchSettings.json new file mode 100644 index 000000000..485fc8885 --- /dev/null +++ b/bitwarden_license/test/Scim.IntegrationTest/Properties/launchSettings.json @@ -0,0 +1,16 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true + }, + "profiles": { + "Bit.Scim.IntegrationTest": { + "commandName": "Project", + "launchBrowser": true, + "applicationUrl": "http://localhost:14696", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/bitwarden_license/test/Scim.IntegrationTest/Scim.IntegrationTest.csproj b/bitwarden_license/test/Scim.IntegrationTest/Scim.IntegrationTest.csproj index 5d199ddb7..1a2b9bc76 100644 --- a/bitwarden_license/test/Scim.IntegrationTest/Scim.IntegrationTest.csproj +++ b/bitwarden_license/test/Scim.IntegrationTest/Scim.IntegrationTest.csproj @@ -25,4 +25,11 @@ + + + true + PreserveNewest + Never + + diff --git a/src/Admin/Admin.csproj b/src/Admin/Admin.csproj index daad8acf1..334f0e3d7 100644 --- a/src/Admin/Admin.csproj +++ b/src/Admin/Admin.csproj @@ -4,6 +4,8 @@ bitwarden-Admin + + diff --git a/src/Admin/Properties/launchSettings.json b/src/Admin/Properties/launchSettings.json index 579b1e11a..16e75d438 100644 --- a/src/Admin/Properties/launchSettings.json +++ b/src/Admin/Properties/launchSettings.json @@ -10,27 +10,24 @@ "profiles": { "IIS Express": { "commandName": "IISExpress", - "launchBrowser": false, "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } }, "Admin": { "commandName": "Project", - "launchBrowser": false, + "applicationUrl": "http://localhost:62911/", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "http://localhost:62911/" + } }, "Admin-SelfHost": { "commandName": "Project", - "launchBrowser": false, + "applicationUrl": "http://localhost:62912/", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development", "developSelfHosted": "true" - }, - "applicationUrl": "http://localhost:62912/" + } } } } diff --git a/src/Api/Api.csproj b/src/Api/Api.csproj index dbd1b92d3..ea37ffb59 100644 --- a/src/Api/Api.csproj +++ b/src/Api/Api.csproj @@ -15,6 +15,8 @@ 1701;1702;1591 + + diff --git a/src/Api/Properties/launchSettings.json b/src/Api/Properties/launchSettings.json index e98581f08..f40c28ea9 100644 --- a/src/Api/Properties/launchSettings.json +++ b/src/Api/Properties/launchSettings.json @@ -10,14 +10,12 @@ "profiles": { "IIS Express": { "commandName": "IISExpress", - "launchBrowser": false, "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } }, "Api": { "commandName": "Project", - "launchBrowser": false, "applicationUrl": "http://localhost:4000", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" @@ -25,7 +23,6 @@ }, "Api-SelfHost": { "commandName": "Project", - "launchBrowser": false, "applicationUrl": "http://localhost:4001", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development", diff --git a/src/Billing/Billing.csproj b/src/Billing/Billing.csproj index 3fa3af711..b30d987a9 100644 --- a/src/Billing/Billing.csproj +++ b/src/Billing/Billing.csproj @@ -5,6 +5,7 @@ false + diff --git a/src/Billing/Properties/launchSettings.json b/src/Billing/Properties/launchSettings.json index 361a4a8ea..5b3fd3764 100644 --- a/src/Billing/Properties/launchSettings.json +++ b/src/Billing/Properties/launchSettings.json @@ -1,4 +1,4 @@ -{ +{ "iisSettings": { "windowsAuthentication": false, "anonymousAuthentication": true, @@ -10,7 +10,6 @@ "profiles": { "IIS Express": { "commandName": "IISExpress", - "launchBrowser": false, "launchUrl": "http://localhost:44518", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" @@ -18,12 +17,11 @@ }, "Billing": { "commandName": "Project", - "launchBrowser": false, "launchUrl": "http://localhost:44518", + "applicationUrl": "http://localhost:44519", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "http://localhost:44519" + } } } } diff --git a/src/Events/Events.csproj b/src/Events/Events.csproj index 77588ccda..dcd66892e 100644 --- a/src/Events/Events.csproj +++ b/src/Events/Events.csproj @@ -5,6 +5,8 @@ false + + diff --git a/src/Events/Properties/launchSettings.json b/src/Events/Properties/launchSettings.json index f1d0b1b27..a743b51c5 100644 --- a/src/Events/Properties/launchSettings.json +++ b/src/Events/Properties/launchSettings.json @@ -10,27 +10,24 @@ "profiles": { "IIS Express": { "commandName": "IISExpress", - "launchBrowser": false, "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } }, "Events": { "commandName": "Project", - "launchBrowser": false, + "applicationUrl": "http://localhost:46273/", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "http://localhost:46273/" + } }, "Events-SelfHost": { "commandName": "Project", - "launchBrowser": false, + "applicationUrl": "http://localhost:46274/", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development", "developSelfHosted": "true" - }, - "applicationUrl": "http://localhost:46274/" + } } } } diff --git a/src/EventsProcessor/EventsProcessor.csproj b/src/EventsProcessor/EventsProcessor.csproj index 050f96bac..2f1aeaef5 100644 --- a/src/EventsProcessor/EventsProcessor.csproj +++ b/src/EventsProcessor/EventsProcessor.csproj @@ -4,6 +4,7 @@ bitwarden-EventsProcessor + diff --git a/src/EventsProcessor/Properties/launchSettings.json b/src/EventsProcessor/Properties/launchSettings.json index e0b76f0ad..f772b225d 100644 --- a/src/EventsProcessor/Properties/launchSettings.json +++ b/src/EventsProcessor/Properties/launchSettings.json @@ -10,18 +10,16 @@ "profiles": { "IIS Express": { "commandName": "IISExpress", - "launchBrowser": false, "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } }, "EventsProcessor": { "commandName": "Project", - "launchBrowser": false, + "applicationUrl": "http://localhost:54103/", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "http://localhost:54103/" + } } } -} \ No newline at end of file +} diff --git a/src/Icons/Icons.csproj b/src/Icons/Icons.csproj index a102e23ab..5ecd13946 100644 --- a/src/Icons/Icons.csproj +++ b/src/Icons/Icons.csproj @@ -5,6 +5,7 @@ false + diff --git a/src/Icons/Properties/launchSettings.json b/src/Icons/Properties/launchSettings.json index 0366a14de..9588da8c5 100644 --- a/src/Icons/Properties/launchSettings.json +++ b/src/Icons/Properties/launchSettings.json @@ -10,7 +10,6 @@ "profiles": { "IIS Express": { "commandName": "IISExpress", - "launchBrowser": false, "launchUrl": "bitwarden.com/icon.png", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" @@ -18,12 +17,11 @@ }, "Icons": { "commandName": "Project", - "launchBrowser": false, "launchUrl": "bitwarden.com/icon.png", + "applicationUrl": "http://localhost:50024/", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "http://localhost:50024/" + } } } -} \ No newline at end of file +} diff --git a/src/Identity/Identity.csproj b/src/Identity/Identity.csproj index 3bcc67f34..504227b61 100644 --- a/src/Identity/Identity.csproj +++ b/src/Identity/Identity.csproj @@ -5,6 +5,8 @@ false + + diff --git a/src/Identity/Properties/launchSettings.json b/src/Identity/Properties/launchSettings.json index da74cf4e5..8dcc422bc 100644 --- a/src/Identity/Properties/launchSettings.json +++ b/src/Identity/Properties/launchSettings.json @@ -10,14 +10,12 @@ "profiles": { "IIS Express": { "commandName": "IISExpress", - "launchBrowser": false, "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } }, "Identity": { "commandName": "Project", - "launchBrowser": false, "applicationUrl": "http://localhost:33656", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" @@ -25,7 +23,6 @@ }, "Identity-SelfHost": { "commandName": "Project", - "launchBrowser": false, "applicationUrl": "http://localhost:33657", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development", diff --git a/src/Notifications/Notifications.csproj b/src/Notifications/Notifications.csproj index 39855c13d..b9f252801 100644 --- a/src/Notifications/Notifications.csproj +++ b/src/Notifications/Notifications.csproj @@ -4,6 +4,8 @@ bitwarden-Notifications + + diff --git a/src/Notifications/Properties/launchSettings.json b/src/Notifications/Properties/launchSettings.json index e1ac5a613..adff79ae3 100644 --- a/src/Notifications/Properties/launchSettings.json +++ b/src/Notifications/Properties/launchSettings.json @@ -1,7 +1,7 @@ -{ +{ "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, + "windowsAuthentication": false, + "anonymousAuthentication": true, "iisExpress": { "applicationUrl": "http://localhost:61840", "sslPort": 0 @@ -10,14 +10,12 @@ "profiles": { "IIS Express": { "commandName": "IISExpress", - "launchBrowser": false, "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } }, "Notifications": { "commandName": "Project", - "launchBrowser": false, "applicationUrl": "http://localhost:61840", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" @@ -25,7 +23,6 @@ }, "Notifications-SelfHost": { "commandName": "Project", - "launchBrowser": false, "applicationUrl": "http://localhost:61841", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development", diff --git a/test/Api.IntegrationTest/Api.IntegrationTest.csproj b/test/Api.IntegrationTest/Api.IntegrationTest.csproj index b1a887492..3e300df9c 100644 --- a/test/Api.IntegrationTest/Api.IntegrationTest.csproj +++ b/test/Api.IntegrationTest/Api.IntegrationTest.csproj @@ -26,4 +26,11 @@ PreserveNewest + + + true + PreserveNewest + Never + + diff --git a/test/Api.IntegrationTest/Properties/launchSettings.json b/test/Api.IntegrationTest/Properties/launchSettings.json new file mode 100644 index 000000000..04fd816af --- /dev/null +++ b/test/Api.IntegrationTest/Properties/launchSettings.json @@ -0,0 +1,16 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true + }, + "profiles": { + "Bit.Api.IntegrationTest": { + "commandName": "Project", + "launchBrowser": true, + "applicationUrl": "http://localhost:33506", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/test/Identity.IntegrationTest/Identity.IntegrationTest.csproj b/test/Identity.IntegrationTest/Identity.IntegrationTest.csproj index a1f96a89c..3b95e7da4 100644 --- a/test/Identity.IntegrationTest/Identity.IntegrationTest.csproj +++ b/test/Identity.IntegrationTest/Identity.IntegrationTest.csproj @@ -4,6 +4,7 @@ false + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Identity.IntegrationTest/Properties/launchSettings.json b/test/Identity.IntegrationTest/Properties/launchSettings.json index c39093e3e..43e4ad659 100644 --- a/test/Identity.IntegrationTest/Properties/launchSettings.json +++ b/test/Identity.IntegrationTest/Properties/launchSettings.json @@ -2,11 +2,10 @@ "profiles": { "Identity.IntegrationTest": { "commandName": "Project", - "launchBrowser": false, + "applicationUrl": "https://localhost:55088;http://localhost:55089", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "https://localhost:55088;http://localhost:55089" + } } } } diff --git a/util/Server/Properties/launchSettings.json b/util/Server/Properties/launchSettings.json index 3bbca7ce5..22aba45f0 100644 --- a/util/Server/Properties/launchSettings.json +++ b/util/Server/Properties/launchSettings.json @@ -2,11 +2,10 @@ "profiles": { "Server": { "commandName": "Project", - "launchBrowser": false, + "applicationUrl": "http://localhost:53910/", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "http://localhost:53910/" + } } } -} \ No newline at end of file +} diff --git a/util/Server/Server.csproj b/util/Server/Server.csproj index 7179fdc16..5aaeee7f4 100644 --- a/util/Server/Server.csproj +++ b/util/Server/Server.csproj @@ -4,4 +4,5 @@ false +