Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-21 12:05:42 +01:00
Code Issues Projects Releases Wiki Activity

[SM-142] Rename CommCore to Commercial.Core (#2158)

Browse Source 
* Rename CommCore to Commercial.Core
This commit is contained in:
Oscar Hinton 2022-08-02 20:41:18 +02:00 committed by GitHub
parent 038d5e7734
commit 1cad0268c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -76,7 +76,7 @@ jobs:
shell: pwsh
- name: Test Bitwarden solution
run: dotnet test ./bitwarden_license/test/CmmCore.Test --configuration Debug --no-build
run: dotnet test ./bitwarden_license/test/Commercial.Core.Test --configuration Debug --no-build
shell: pwsh

6
LICENSE_FAQ.md
View File

@ -16,12 +16,12 @@ Our current software products have the following licenses:
*Bitwarden server:* The main Bitwarden server code is licensed under the AGPL 3.0 license.
*CommCore and SSO integration:* Code for certain new modules that are designed and developed for use by larger
*Commercial.Core and SSO integration:* Code for certain new modules that are designed and developed for use by larger
organizations and enterprise environments is released under the Bitwarden License, a "source available" license. The
Bitwarden License provides users access to product source code for non-production purposes such as development and
testing, but requires a paid subscription for production use of the product, and environments supporting production.
Additionally the Api module by default includes CommCore which is under the Bitwarden License, however this can be
disabled by using `/p:DefineConstants="OSS"` as an argument to `dotnet` while building the module.
Additionally the Api module by default includes Commercial.Core which is under the Bitwarden License, however this can
be disabled by using `/p:DefineConstants="OSS"` as an argument to `dotnet` while building the module.
# Frequently Asked Questions

4
bitwarden-server.sln
View File

@ -61,12 +61,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sso", "bitwarden_license\sr
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Icons.Test", "test\Icons.Test\Icons.Test.csproj", "{C7BA2255-C1B1-4789-8BB9-C27540DA6FB8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommCore", "bitwarden_license\src\CommCore\CommCore.csproj", "{EDC0D688-D58C-4CE1-AA07-3606AC6874B8}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commercial.Core", "bitwarden_license\src\Commercial.Core\Commercial.Core.csproj", "{EDC0D688-D58C-4CE1-AA07-3606AC6874B8}"
ProjectSection(ProjectDependencies) = postProject
{3973D21B-A692-4B60-9B70-3631C057423A} = {3973D21B-A692-4B60-9B70-3631C057423A}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommCore.Test", "bitwarden_license\test\CmmCore.Test\CommCore.Test.csproj", "{0E99A21B-684B-4C59-9831-90F775CAB6F7}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commercial.Core.Test", "bitwarden_license\test\Commercial.Core.Test\Commercial.Core.Test.csproj", "{0E99A21B-684B-4C59-9831-90F775CAB6F7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test - Bitwarden License", "test - Bitwarden License", "{287CFF34-BBDB-4BC4-AF88-1E19A5A4679B}"
EndProject

0
bitwarden_license/src/CommCore/CommCore.csproj → bitwarden_license/src/Commercial.Core/Commercial.Core.csproj
View File

2
bitwarden_license/src/CommCore/Services/ProviderService.cs → bitwarden_license/src/Commercial.Core/Services/ProviderService.cs
View File

@ -13,7 +13,7 @@ using Bit.Core.Settings;
using Bit.Core.Utilities;
using Microsoft.AspNetCore.DataProtection;
namespace Bit.CommCore.Services
namespace Bit.Commercial.Core.Services
{
public class ProviderService : IProviderService
{

4
bitwarden_license/src/CommCore/Utilities/ServiceCollectionExtensions.cs → bitwarden_license/src/Commercial.Core/Utilities/ServiceCollectionExtensions.cs
View File

@ -1,8 +1,8 @@
using Bit.CommCore.Services;
using Bit.Commercial.Core.Services;
using Bit.Core.Services;
using Microsoft.Extensions.DependencyInjection;
namespace Bit.CommCore.Utilities
namespace Bit.Commercial.Core.Utilities
{
public static class ServiceCollectionExtensions
{

0
bitwarden_license/src/CommCore/packages.lock.json → bitwarden_license/src/Commercial.Core/packages.lock.json
View File

4
bitwarden_license/test/CmmCore.Test/AutoFixture/ProviderUserFixtures.cs → bitwarden_license/test/Commercial.Core.Test/AutoFixture/ProviderUserFixtures.cs
View File

@ -3,7 +3,7 @@ using AutoFixture;
using AutoFixture.Xunit2;
using Bit.Core.Enums.Provider;
namespace Bit.CommCore.Test.AutoFixture.ProviderUserFixtures
namespace Bit.Commercial.Core.Test.AutoFixture
{
internal class ProviderUser : ICustomization
{
@ -18,7 +18,7 @@ namespace Bit.CommCore.Test.AutoFixture.ProviderUserFixtures
public void Customize(IFixture fixture)
{
fixture.Customize<Core.Entities.Provider.ProviderUser>(composer => composer
fixture.Customize<Bit.Core.Entities.Provider.ProviderUser>(composer => composer
.With(o => o.Type, Type)
.With(o => o.Status, Status));
}

2
bitwarden_license/test/CmmCore.Test/CommCore.Test.csproj → bitwarden_license/test/Commercial.Core.Test/Commercial.Core.Test.csproj
View File

@ -18,7 +18,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\CommCore\CommCore.csproj" />
<ProjectReference Include="..\..\src\Commercial.Core\Commercial.Core.csproj" />
<ProjectReference Include="..\..\..\test\Core.Test\Core.Test.csproj" />
</ItemGroup>

6
bitwarden_license/test/CmmCore.Test/Services/ProviderServiceTests.cs → bitwarden_license/test/Commercial.Core.Test/Services/ProviderServiceTests.cs
View File

@ -1,5 +1,5 @@
using Bit.CommCore.Services;
using Bit.CommCore.Test.AutoFixture.ProviderUserFixtures;
using Bit.Commercial.Core.Services;
using Bit.Commercial.Core.Test.AutoFixture;
using Bit.Core.Context;
using Bit.Core.Entities;
using Bit.Core.Entities.Provider;
@ -19,7 +19,7 @@ using NSubstitute.ReturnsExtensions;
using Xunit;
using ProviderUser = Bit.Core.Entities.Provider.ProviderUser;
namespace Bit.CommCore.Test.Services
namespace Bit.Commercial.Core.Test.Services
{
public class ProviderServiceTests
{

4
bitwarden_license/test/CmmCore.Test/packages.lock.json → bitwarden_license/test/Commercial.Core.Test/packages.lock.json
View File

@ -2880,13 +2880,13 @@
"type": "Project",
"dependencies": {
"Azure.Messaging.EventGrid": "4.10.0",
"CommCore": "2022.6.2",
"Commercial.Core": "2022.6.2",
"Core": "2022.6.2",
"SharedWeb": "2022.6.2",
"Swashbuckle.AspNetCore": "6.3.1"
}
},
"commcore": {
"commercial.core": {
"type": "Project",
"dependencies": {
"Core": "2022.6.2"

2
src/Admin/Admin.csproj
View File

@ -13,7 +13,7 @@
<Choose>
<When Condition="!$(DefineConstants.Contains('OSS'))">
<ItemGroup>
<ProjectReference Include="..\..\bitwarden_license\src\CommCore\CommCore.csproj" />
<ProjectReference Include="..\..\bitwarden_license\src\Commercial.Core\Commercial.Core.csproj" />
</ItemGroup>
</When>
</Choose>

2
src/Admin/Startup.cs
View File

@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Identity;
using Stripe;
#if !OSS
using Bit.CommCore.Utilities;
using Bit.Commercial.Core.Utilities;
#endif
namespace Bit.Admin

2
src/Admin/packages.lock.json
View File

@ -3145,7 +3145,7 @@
"NETStandard.Library": "1.6.1"
}
},
"commcore": {
"commercial.core": {
"type": "Project",
"dependencies": {
"Core": "2022.6.2"

2
src/Api/Api.csproj
View File

@ -23,7 +23,7 @@
<Choose>
<When Condition="!$(DefineConstants.Contains('OSS'))">
<ItemGroup>
<ProjectReference Include="..\..\bitwarden_license\src\CommCore\CommCore.csproj" />
<ProjectReference Include="..\..\bitwarden_license\src\Commercial.Core\Commercial.Core.csproj" />
</ItemGroup>
</When>
</Choose>

2
src/Api/Startup.cs
View File

@ -14,7 +14,7 @@ using Bit.SharedWeb.Utilities;
using Microsoft.Extensions.DependencyInjection.Extensions;
#if !OSS
using Bit.CommCore.Utilities;
using Bit.Commercial.Core.Utilities;
#endif
namespace Bit.Api

2
src/Api/packages.lock.json
View File

@ -2645,7 +2645,7 @@
"NETStandard.Library": "1.6.1"
}
},
"commcore": {
"commercial.core": {
"type": "Project",
"dependencies": {
"Core": "2022.6.2"

4
test/Api.Test/packages.lock.json
View File

@ -2873,13 +2873,13 @@
"type": "Project",
"dependencies": {
"Azure.Messaging.EventGrid": "4.10.0",
"CommCore": "2022.6.2",
"Commercial.Core": "2022.6.2",
"Core": "2022.6.2",
"SharedWeb": "2022.6.2",
"Swashbuckle.AspNetCore": "6.3.1"
}
},
"commcore": {
"commercial.core": {
"type": "Project",
"dependencies": {
"Core": "2022.6.2"

4
test/Billing.Test/packages.lock.json
View File

@ -3393,7 +3393,7 @@
"type": "Project",
"dependencies": {
"Azure.Messaging.EventGrid": "4.10.0",
"CommCore": "2022.6.2",
"Commercial.Core": "2022.6.2",
"Core": "2022.6.2",
"SharedWeb": "2022.6.2",
"Swashbuckle.AspNetCore": "6.3.1"
@ -3407,7 +3407,7 @@
"SharedWeb": "2022.6.2"
}
},
"commcore": {
"commercial.core": {
"type": "Project",
"dependencies": {
"Core": "2022.6.2"

4
test/Common/packages.lock.json
View File

@ -2869,13 +2869,13 @@
"type": "Project",
"dependencies": {
"Azure.Messaging.EventGrid": "4.10.0",
"CommCore": "2022.6.2",
"Commercial.Core": "2022.6.2",
"Core": "2022.6.2",
"SharedWeb": "2022.6.2",
"Swashbuckle.AspNetCore": "6.3.1"
}
},
"commcore": {
"commercial.core": {
"type": "Project",
"dependencies": {
"Core": "2022.6.2"

4
test/Core.Test/packages.lock.json
View File

@ -2885,13 +2885,13 @@
"type": "Project",
"dependencies": {
"Azure.Messaging.EventGrid": "4.10.0",
"CommCore": "2022.6.2",
"Commercial.Core": "2022.6.2",
"Core": "2022.6.2",
"SharedWeb": "2022.6.2",
"Swashbuckle.AspNetCore": "6.3.1"
}
},
"commcore": {
"commercial.core": {
"type": "Project",
"dependencies": {
"Core": "2022.6.2"

4
test/Identity.IntegrationTest/packages.lock.json
View File

@ -3010,13 +3010,13 @@
"type": "Project",
"dependencies": {
"Azure.Messaging.EventGrid": "4.10.0",
"CommCore": "2022.6.2",
"Commercial.Core": "2022.6.2",
"Core": "2022.6.2",
"SharedWeb": "2022.6.2",
"Swashbuckle.AspNetCore": "6.3.1"
}
},
"commcore": {
"commercial.core": {
"type": "Project",
"dependencies": {
"Core": "2022.6.2"

4
test/Identity.Test/packages.lock.json
View File

@ -2873,13 +2873,13 @@
"type": "Project",
"dependencies": {
"Azure.Messaging.EventGrid": "4.10.0",
"CommCore": "2022.6.2",
"Commercial.Core": "2022.6.2",
"Core": "2022.6.2",
"SharedWeb": "2022.6.2",
"Swashbuckle.AspNetCore": "6.3.1"
}
},
"commcore": {
"commercial.core": {
"type": "Project",
"dependencies": {
"Core": "2022.6.2"

4
test/IntegrationTestCommon/packages.lock.json
View File

@ -2996,13 +2996,13 @@
"type": "Project",
"dependencies": {
"Azure.Messaging.EventGrid": "4.10.0",
"CommCore": "2022.6.2",
"Commercial.Core": "2022.6.2",
"Core": "2022.6.2",
"SharedWeb": "2022.6.2",
"Swashbuckle.AspNetCore": "6.3.1"
}
},
"commcore": {
"commercial.core": {
"type": "Project",
"dependencies": {
"Core": "2022.6.2"

4
util/MySqlMigrations/packages.lock.json
View File

@ -2662,13 +2662,13 @@
"type": "Project",
"dependencies": {
"Azure.Messaging.EventGrid": "4.10.0",
"CommCore": "2022.6.2",
"Commercial.Core": "2022.6.2",
"Core": "2022.6.2",
"SharedWeb": "2022.6.2",
"Swashbuckle.AspNetCore": "6.3.1"
}
},
"commcore": {
"commercial.core": {
"type": "Project",
"dependencies": {
"Core": "2022.6.2"

4
util/PostgresMigrations/packages.lock.json
View File

@ -2662,13 +2662,13 @@
"type": "Project",
"dependencies": {
"Azure.Messaging.EventGrid": "4.10.0",
"CommCore": "2022.6.2",
"Commercial.Core": "2022.6.2",
"Core": "2022.6.2",
"SharedWeb": "2022.6.2",
"Swashbuckle.AspNetCore": "6.3.1"
}
},
"commcore": {
"commercial.core": {
"type": "Project",
"dependencies": {
"Core": "2022.6.2"