Skip to content

Commit d4be385

Browse files
ike-kottlowskiike-kottlowski
committed
fix: re-organize projects in solution. SsoFactory now in it's own project with SSO integration test which match the integration test factory pattern more closely.
1 parent 9abe47a commit d4be385

6 files changed

Lines changed: 31 additions & 45 deletions

File tree

‎bitwarden-server.sln‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29102.190
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.14.36705.20 d17.14
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src - AGPL", "src - AGPL", "{DD5BD056-4AAE-43EF-BBD2-0B569B8DA84D}"
77
EndProject
@@ -11,19 +11,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{DD5BD056-4
1111
EndProject
1212
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{458155D3-BCBC-481D-B37A-40D2ED10F0A4}"
1313
ProjectSection(SolutionItems) = preProject
14+
.dockerignore = .dockerignore
15+
.editorconfig = .editorconfig
16+
.gitignore = .gitignore
17+
CONTRIBUTING.md = CONTRIBUTING.md
1418
Directory.Build.props = Directory.Build.props
1519
global.json = global.json
16-
.gitignore = .gitignore
20+
LICENSE.txt = LICENSE.txt
21+
LICENSE_AGPL.txt = LICENSE_AGPL.txt
22+
LICENSE_BITWARDEN.txt = LICENSE_BITWARDEN.txt
23+
LICENSE_FAQ.md = LICENSE_FAQ.md
1724
README.md = README.md
18-
.editorconfig = .editorconfig
19-
TRADEMARK_GUIDELINES.md = TRADEMARK_GUIDELINES.md
2025
SECURITY.md = SECURITY.md
21-
LICENSE_FAQ.md = LICENSE_FAQ.md
22-
LICENSE_BITWARDEN.txt = LICENSE_BITWARDEN.txt
23-
LICENSE_AGPL.txt = LICENSE_AGPL.txt
24-
LICENSE.txt = LICENSE.txt
25-
CONTRIBUTING.md = CONTRIBUTING.md
26-
.dockerignore = .dockerignore
26+
TRADEMARK_GUIDELINES.md = TRADEMARK_GUIDELINES.md
2727
EndProjectSection
2828
EndProject
2929
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "src\Core\Core.csproj", "{3973D21B-A692-4B60-9B70-3631C057423A}"
@@ -135,13 +135,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbSeederUtility", "util\DbS
135135
EndProject
136136
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RustSdk", "util\RustSdk\RustSdk.csproj", "{D1513D90-E4F5-44A9-9121-5E46E3E4A3F7}"
137137
EndProject
138-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSO.Test", "bitwarden_license\test\SSO.Test\SSO.Test.csproj", "{7D98784C-C253-43FB-9873-25B65C6250D6}"
138+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedWeb.Test", "test\SharedWeb.Test\SharedWeb.Test.csproj", "{AD59537D-5259-4B7A-948F-0CF58E80B359}"
139139
EndProject
140-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "bitwarden_license", "bitwarden_license", "{4446E438-C55F-4F3F-9D19-B1BB4999F8B7}"
141-
EndProject
142-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CA5BCFBF-8F56-4684-9A11-C9190BBF1910}"
140+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSO.Test", "bitwarden_license\test\SSO.Test\SSO.Test.csproj", "{7D98784C-C253-43FB-9873-25B65C6250D6}"
143141
EndProject
144-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sso.IntegrationTest", "bitwarden_license\test\Sso.IntegrationTest\Sso.IntegrationTest.csproj", "{6B186C92-45B9-452A-B628-A3B2A8E57614}"
142+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sso.IntegrationTest", "bitwarden_license\test\Sso.IntegrationTest\Sso.IntegrationTest.csproj", "{FFB09376-595B-6F93-36F0-70CAE90AFECB}"
145143
EndProject
146144
Global
147145
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -359,10 +357,10 @@ Global
359357
{7D98784C-C253-43FB-9873-25B65C6250D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
360358
{7D98784C-C253-43FB-9873-25B65C6250D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
361359
{7D98784C-C253-43FB-9873-25B65C6250D6}.Release|Any CPU.Build.0 = Release|Any CPU
362-
{6B186C92-45B9-452A-B628-A3B2A8E57614}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
363-
{6B186C92-45B9-452A-B628-A3B2A8E57614}.Debug|Any CPU.Build.0 = Debug|Any CPU
364-
{6B186C92-45B9-452A-B628-A3B2A8E57614}.Release|Any CPU.ActiveCfg = Release|Any CPU
365-
{6B186C92-45B9-452A-B628-A3B2A8E57614}.Release|Any CPU.Build.0 = Release|Any CPU
360+
{FFB09376-595B-6F93-36F0-70CAE90AFECB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
361+
{FFB09376-595B-6F93-36F0-70CAE90AFECB}.Debug|Any CPU.Build.0 = Debug|Any CPU
362+
{FFB09376-595B-6F93-36F0-70CAE90AFECB}.Release|Any CPU.ActiveCfg = Release|Any CPU
363+
{FFB09376-595B-6F93-36F0-70CAE90AFECB}.Release|Any CPU.Build.0 = Release|Any CPU
366364
EndGlobalSection
367365
GlobalSection(SolutionProperties) = preSolution
368366
HideSolutionNode = FALSE
@@ -418,9 +416,9 @@ Global
418416
{9A612EBA-1C0E-42B8-982B-62F0EE81000A} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84E}
419417
{17A89266-260A-4A03-81AE-C0468C6EE06E} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84E}
420418
{D1513D90-E4F5-44A9-9121-5E46E3E4A3F7} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84E}
419+
{AD59537D-5259-4B7A-948F-0CF58E80B359} = {DD5BD056-4AAE-43EF-BBD2-0B569B8DA84F}
421420
{7D98784C-C253-43FB-9873-25B65C6250D6} = {287CFF34-BBDB-4BC4-AF88-1E19A5A4679B}
422-
{CA5BCFBF-8F56-4684-9A11-C9190BBF1910} = {4446E438-C55F-4F3F-9D19-B1BB4999F8B7}
423-
{6B186C92-45B9-452A-B628-A3B2A8E57614} = {CA5BCFBF-8F56-4684-9A11-C9190BBF1910}
421+
{FFB09376-595B-6F93-36F0-70CAE90AFECB} = {287CFF34-BBDB-4BC4-AF88-1E19A5A4679B}
424422
EndGlobalSection
425423
GlobalSection(ExtensibilityGlobals) = postSolution
426424
SolutionGuid = {E01CBF68-2E20-425F-9EDB-E0A6510CA92F}

‎bitwarden_license/test/Sso.IntegrationTest/Controllers/AccountControllerTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using Bit.Core.Enums;
99
using Bit.Core.Repositories;
1010
using Bit.Core.Services;
11-
using Bit.IntegrationTestCommon.Factories;
1211
using Bit.Sso.IntegrationTest.Utilities;
1312
using Bit.Test.Common.AutoFixture.Attributes;
1413
using Bitwarden.License.Test.Sso.IntegrationTest.Utilities;

‎bitwarden_license/test/Sso.IntegrationTest/Utilities/SsoApplicationFactory.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
using Bit.IntegrationTestCommon.Factories;
2+
3+
namespace Bit.Sso.IntegrationTest.Utilities;
4+
5+
public class SsoApplicationFactory : WebApplicationFactoryBase<Startup>
6+
{
7+
protected override void ConfigureWebHost(IWebHostBuilder builder)
8+
{
9+
base.ConfigureWebHost(builder);
10+
}
11+
}

‎bitwarden_license/test/Sso.IntegrationTest/Utilities/SsoTestDataBuilder.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using Bit.Core.Enums;
77
using Bit.Core.Repositories;
88
using Bit.Core.Settings;
9-
using Bit.IntegrationTestCommon.Factories;
109
using Bitwarden.License.Test.Sso.IntegrationTest.Utilities;
1110
using Duende.IdentityServer.Models;
1211
using Duende.IdentityServer.Services;

‎test/IntegrationTestCommon/Factories/SsoApplicationFactory.cs‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎test/IntegrationTestCommon/IntegrationTestCommon.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<ProjectReference Include="..\..\bitwarden_license\src\Sso\Sso.csproj" />
1413
<ProjectReference Include="..\..\src\Identity\Identity.csproj" />
1514
<ProjectReference Include="..\..\util\Migrator\Migrator.csproj" />
1615
<ProjectReference Include="..\Common\Common.csproj" />

0 commit comments

Comments
 (0)