GitHub-Bitwarden
/
server
mirror of https://github.com/bitwarden/server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Project configuration tune-up (#2994)

pull/3013/head
Matt Bishop 3 years ago committed by GitHub
parent
cc4b6bb2fa
commit
6a9e7a1d0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 95 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      bitwarden_license/src/Scim/Properties/launchSettings.json
  2. 1
      bitwarden_license/src/Scim/Scim.csproj
  3. 5
      bitwarden_license/src/Sso/Properties/launchSettings.json
  4. 2
      bitwarden_license/src/Sso/Sso.csproj
  5. 16
      bitwarden_license/test/Scim.IntegrationTest/Properties/launchSettings.json
  6. 7
      bitwarden_license/test/Scim.IntegrationTest/Scim.IntegrationTest.csproj
  7. 2
      src/Admin/Admin.csproj
  8. 11
      src/Admin/Properties/launchSettings.json
  9. 2
      src/Api/Api.csproj
  10. 3
      src/Api/Properties/launchSettings.json
  11. 1
      src/Billing/Billing.csproj
  12. 8
      src/Billing/Properties/launchSettings.json
  13. 2
      src/Events/Events.csproj
  14. 11
      src/Events/Properties/launchSettings.json
  15. 1
      src/EventsProcessor/EventsProcessor.csproj
  16. 6
      src/EventsProcessor/Properties/launchSettings.json
  17. 1
      src/Icons/Icons.csproj
  18. 6
      src/Icons/Properties/launchSettings.json
  19. 2
      src/Identity/Identity.csproj
  20. 3
      src/Identity/Properties/launchSettings.json
  21. 2
      src/Notifications/Notifications.csproj
  22. 5
      src/Notifications/Properties/launchSettings.json
  23. 7
      test/Api.IntegrationTest/Api.IntegrationTest.csproj
  24. 16
      test/Api.IntegrationTest/Properties/launchSettings.json
  25. 1
      test/Identity.IntegrationTest/Identity.IntegrationTest.csproj
  26. 5
      test/Identity.IntegrationTest/Properties/launchSettings.json
  27. 5
      util/Server/Properties/launchSettings.json
  28. 1
      util/Server/Server.csproj

8
bitwarden_license/src/Scim/Properties/launchSettings.json
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
{
{
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
"profiles": {
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": false,
"launchUrl": "http://localhost:44558",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
@ -18,12 +17,11 @@ @@ -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"
}
}
}
}

1
bitwarden_license/src/Scim/Scim.csproj
Unescape View File

@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
<MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
</PropertyGroup>
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Scim' " />
<ItemGroup>
<ProjectReference Include="..\..\..\src\Core\Core.csproj" />
<ProjectReference Include="..\..\..\src\SharedWeb\SharedWeb.csproj" />

5
bitwarden_license/src/Sso/Properties/launchSettings.json
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
{
{
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
@ -10,14 +10,12 @@ @@ -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 @@ @@ -25,7 +23,6 @@
},
"Sso-SelfHost": {
"commandName": "Project",
"launchBrowser": false,
"applicationUrl": "http://localhost:51823",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",

2
bitwarden_license/src/Sso/Sso.csproj
Unescape View File

@ -4,6 +4,8 @@ @@ -4,6 +4,8 @@
<UserSecretsId>bitwarden-Sso</UserSecretsId>
</PropertyGroup>
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Sso' " />
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Sso-SelfHost' " />
<ItemGroup>
<PackageReference Include="Sustainsys.Saml2.AspNetCore2" Version="2.9.0" />
</ItemGroup>

16
bitwarden_license/test/Scim.IntegrationTest/Properties/launchSettings.json
Unescape View File

@ -0,0 +1,16 @@ @@ -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"
}
}
}
}

7
bitwarden_license/test/Scim.IntegrationTest/Scim.IntegrationTest.csproj
Unescape View File

@ -25,4 +25,11 @@ @@ -25,4 +25,11 @@
<ProjectReference Include="..\..\..\test\Common\Common.csproj" />
<ProjectReference Include="..\..\..\test\IntegrationTestCommon\IntegrationTestCommon.csproj" />
</ItemGroup>
<ItemGroup>
<Content Update="Properties\launchSettings.json">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<CopyToPublishDirectory>Never</CopyToPublishDirectory>
</Content>
</ItemGroup>
</Project>

2
src/Admin/Admin.csproj
Unescape View File

@ -4,6 +4,8 @@ @@ -4,6 +4,8 @@
<UserSecretsId>bitwarden-Admin</UserSecretsId>
</PropertyGroup>
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Admin' " />
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Admin-SelfHost' " />
<ItemGroup>
<ProjectReference Include="..\..\util\MySqlMigrations\MySqlMigrations.csproj" />
<ProjectReference Include="..\..\util\PostgresMigrations\PostgresMigrations.csproj" />

11
src/Admin/Properties/launchSettings.json
Unescape View File

@ -10,27 +10,24 @@ @@ -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/"
}
}
}
}

2
src/Api/Api.csproj
Unescape View File

@ -15,6 +15,8 @@ @@ -15,6 +15,8 @@
<NoWarn>1701;1702;1591</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Api' " />
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Api-SelfHost' " />
<ItemGroup>
<ProjectReference Include="..\SharedWeb\SharedWeb.csproj" />
<ProjectReference Include="..\Core\Core.csproj" />

3
src/Api/Properties/launchSettings.json
Unescape View File

@ -10,14 +10,12 @@ @@ -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 @@ @@ -25,7 +23,6 @@
},
"Api-SelfHost": {
"commandName": "Project",
"launchBrowser": false,
"applicationUrl": "http://localhost:4001",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",

1
src/Billing/Billing.csproj
Unescape View File

@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
<MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
</PropertyGroup>
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Billing' " />
<ItemGroup>
<ProjectReference Include="..\SharedWeb\SharedWeb.csproj" />
<ProjectReference Include="..\Core\Core.csproj" />

8
src/Billing/Properties/launchSettings.json
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
{
{
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
"profiles": {
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": false,
"launchUrl": "http://localhost:44518",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
@ -18,12 +17,11 @@ @@ -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"
}
}
}
}

2
src/Events/Events.csproj
Unescape View File

@ -5,6 +5,8 @@ @@ -5,6 +5,8 @@
<MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
</PropertyGroup>
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Events' " />
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Events-SelfHost' " />
<ItemGroup>
<ProjectReference Include="..\SharedWeb\SharedWeb.csproj" />
<ProjectReference Include="..\Core\Core.csproj" />

11
src/Events/Properties/launchSettings.json
Unescape View File

@ -10,27 +10,24 @@ @@ -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/"
}
}
}
}

1
src/EventsProcessor/EventsProcessor.csproj
Unescape View File

@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
<UserSecretsId>bitwarden-EventsProcessor</UserSecretsId>
</PropertyGroup>
<PropertyGroup Condition=" '$(RunConfiguration)' == 'EventsProcessor' " />
<ItemGroup>
<ProjectReference Include="..\SharedWeb\SharedWeb.csproj" />
<ProjectReference Include="..\Core\Core.csproj" />

6
src/EventsProcessor/Properties/launchSettings.json
Unescape View File

@ -10,18 +10,16 @@ @@ -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/"
}
}
}
}

1
src/Icons/Icons.csproj
Unescape View File

@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
<MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
</PropertyGroup>
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Icons' " />
<ItemGroup>
<PackageReference Include="AngleSharp" Version="0.16.1" />
</ItemGroup>

6
src/Icons/Properties/launchSettings.json
Unescape View File

@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
"profiles": {
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": false,
"launchUrl": "bitwarden.com/icon.png",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
@ -18,12 +17,11 @@ @@ -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/"
}
}
}
}

2
src/Identity/Identity.csproj
Unescape View File

@ -5,6 +5,8 @@ @@ -5,6 +5,8 @@
<MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
</PropertyGroup>
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Identity' " />
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Identity-SelfHost' " />
<ItemGroup>
<ProjectReference Include="..\SharedWeb\SharedWeb.csproj" />
<ProjectReference Include="..\Core\Core.csproj" />

3
src/Identity/Properties/launchSettings.json
Unescape View File

@ -10,14 +10,12 @@ @@ -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 @@ @@ -25,7 +23,6 @@
},
"Identity-SelfHost": {
"commandName": "Project",
"launchBrowser": false,
"applicationUrl": "http://localhost:33657",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",

2
src/Notifications/Notifications.csproj
Unescape View File

@ -4,6 +4,8 @@ @@ -4,6 +4,8 @@
<UserSecretsId>bitwarden-Notifications</UserSecretsId>
</PropertyGroup>
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Notifications' " />
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Notifications-SelfHost' " />
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="6.0.4" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="6.0.4" />

5
src/Notifications/Properties/launchSettings.json
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
{
{
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
@ -10,14 +10,12 @@ @@ -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 @@ @@ -25,7 +23,6 @@
},
"Notifications-SelfHost": {
"commandName": "Project",
"launchBrowser": false,
"applicationUrl": "http://localhost:61841",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",

7
test/Api.IntegrationTest/Api.IntegrationTest.csproj
Unescape View File

@ -26,4 +26,11 @@ @@ -26,4 +26,11 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<Content Update="Properties\launchSettings.json">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<CopyToPublishDirectory>Never</CopyToPublishDirectory>
</Content>
</ItemGroup>
</Project>

16
test/Api.IntegrationTest/Properties/launchSettings.json
Unescape View File

@ -0,0 +1,16 @@ @@ -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"
}
}
}
}

1
test/Identity.IntegrationTest/Identity.IntegrationTest.csproj
Unescape View File

@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
<IsPackable>false</IsPackable>
</PropertyGroup>
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Identity.IntegrationTest' " />
<ItemGroup>
<PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

5
test/Identity.IntegrationTest/Properties/launchSettings.json
Unescape View File

@ -2,11 +2,10 @@ @@ -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"
}
}
}
}

5
util/Server/Properties/launchSettings.json
Unescape View File

@ -2,11 +2,10 @@ @@ -2,11 +2,10 @@
"profiles": {
"Server": {
"commandName": "Project",
"launchBrowser": false,
"applicationUrl": "http://localhost:53910/",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "http://localhost:53910/"
}
}
}
}

1
util/Server/Server.csproj
Unescape View File

@ -4,4 +4,5 @@ @@ -4,4 +4,5 @@
<MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
</PropertyGroup>
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Server' " />
</Project>

Write Preview
Loading…
Cancel
Save