Skip to content

Commit 3d9648f

Browse files
zhenlei520zhenlei520
authored
rename: Environment -> MultiEnvironment (#345)
1 parent 4a52151 commit 3d9648f

File tree

19 files changed

+27
-32
lines changed

19 files changed

+27
-32
lines changed

‎src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/Masa.BuildingBlocks.Isolation.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftPackageVersion)" />
11-
<FrameworkReference Include="Microsoft.AspNetCore.App"/>
11+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/Middleware/IIsolationMiddleware.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
// Copyright (c) MASA Stack All rights reserved.
22
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
33

4-
namespace Masa.BuildingBlocks.Isolation.Middleware;
4+
// ReSharper disable once CheckNamespace
5+
6+
namespace Masa.BuildingBlocks.Isolation;
57

68
public interface IIsolationMiddleware
79
{

‎src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/Environment/IEnvironmentContext.cs ‎src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiEnvironment/IEnvironmentContext.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
// Copyright (c) MASA Stack All rights reserved.
22
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
33

4-
namespace Masa.BuildingBlocks.Isolation.Environment;
4+
// ReSharper disable once CheckNamespace
5+
6+
namespace Masa.BuildingBlocks.Isolation;
57

68
public interface IEnvironmentContext
79
{

‎src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/Environment/IEnvironmentSetter.cs ‎src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiEnvironment/IEnvironmentSetter.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
// Copyright (c) MASA Stack All rights reserved.
22
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
33

4-
namespace Masa.BuildingBlocks.Isolation.Environment;
4+
// ReSharper disable once CheckNamespace
5+
6+
namespace Masa.BuildingBlocks.Isolation;
57

68
public interface IEnvironmentSetter
79
{

‎src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/Environment/IMultiEnvironment.cs ‎src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiEnvironment/IMultiEnvironment.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
// Copyright (c) MASA Stack All rights reserved.
22
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
33

4-
namespace Masa.BuildingBlocks.Isolation.Environment;
4+
// ReSharper disable once CheckNamespace
5+
6+
namespace Masa.BuildingBlocks.Isolation;
57

68
public interface IMultiEnvironment
79
{

‎src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiTenant/IMultiTenant.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
// Copyright (c) MASA Stack All rights reserved.
22
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
33

4-
namespace Masa.BuildingBlocks.Isolation.MultiTenant;
4+
// ReSharper disable once CheckNamespace
5+
6+
namespace Masa.BuildingBlocks.Isolation;
57

68
public interface IMultiTenant : IMultiTenant<Guid>
79
{

‎src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiTenant/ITenantContext.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
// Copyright (c) MASA Stack All rights reserved.
22
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
33

4-
namespace Masa.BuildingBlocks.Isolation.MultiTenant;
4+
// ReSharper disable once CheckNamespace
5+
6+
namespace Masa.BuildingBlocks.Isolation;
57

68
public interface ITenantContext
79
{

‎src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiTenant/ITenantSetter.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
// Copyright (c) MASA Stack All rights reserved.
22
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
33

4-
namespace Masa.BuildingBlocks.Isolation.MultiTenant;
4+
// ReSharper disable once CheckNamespace
5+
6+
namespace Masa.BuildingBlocks.Isolation;
57

68
public interface ITenantSetter
79
{

‎src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/MultiTenant/Tenant.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
// Copyright (c) MASA Stack All rights reserved.
22
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
33

4-
namespace Masa.BuildingBlocks.Isolation.MultiTenant;
4+
// ReSharper disable once CheckNamespace
5+
6+
namespace Masa.BuildingBlocks.Isolation;
57

68
public class Tenant
79
{

‎src/BuildingBlocks/Isolation/Masa.BuildingBlocks.Isolation/_Imports.cs

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
33

44
global using Masa.BuildingBlocks.Data;
5-
global using Masa.BuildingBlocks.Isolation.Environment;
6-
global using Masa.BuildingBlocks.Isolation.MultiTenant;
75
global using Microsoft.AspNetCore.Http;
86
global using Microsoft.AspNetCore.Routing;
97
global using Microsoft.Extensions.DependencyInjection;

‎src/Contrib/Isolation/Masa.Contrib.Isolation.MultiEnvironment/_Imports.cs

-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
global using Masa.BuildingBlocks.Authentication.Identity;
55
global using Masa.BuildingBlocks.Isolation;
6-
global using Masa.BuildingBlocks.Isolation.Environment;
7-
global using Masa.BuildingBlocks.Isolation.Middleware;
86
global using Masa.BuildingBlocks.Isolation.Parser;
97
global using Masa.Contrib.Isolation.MultiEnvironment.Middleware;
108
global using Microsoft.Extensions.DependencyInjection;

‎src/Contrib/Isolation/Masa.Contrib.Isolation.MultiTenant/_Imports.cs

-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
global using Masa.BuildingBlocks.Authentication.Identity;
55
global using Masa.BuildingBlocks.Isolation;
6-
global using Masa.BuildingBlocks.Isolation.Middleware;
7-
global using Masa.BuildingBlocks.Isolation.MultiTenant;
86
global using Masa.BuildingBlocks.Isolation.Parser;
97
global using Masa.Contrib.Isolation.MultiTenant.Middleware;
108
global using Microsoft.Extensions.DependencyInjection;

‎src/Contrib/Isolation/Masa.Contrib.Isolation/_Imports.cs

-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
global using Masa.BuildingBlocks.Data.UoW;
77
global using Masa.BuildingBlocks.Dispatcher.Events;
88
global using Masa.BuildingBlocks.Isolation;
9-
global using Masa.BuildingBlocks.Isolation.Environment;
10-
global using Masa.BuildingBlocks.Isolation.Middleware;
11-
global using Masa.BuildingBlocks.Isolation.MultiTenant;
129
global using Masa.BuildingBlocks.Isolation.Options;
1310
global using Masa.Contrib.Isolation.Middleware;
1411
global using Microsoft.AspNetCore.Http;

‎src/Contrib/Isolation/Tests/Masa.Contrib.Isolation.MultiEnvironment.Tests/_Imports.cs

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
33

44
global using Masa.BuildingBlocks.Isolation;
5-
global using Masa.BuildingBlocks.Isolation.Environment;
6-
global using Masa.BuildingBlocks.Isolation.Middleware;
75
global using Masa.Contrib.Isolation.MultiEnvironment.Middleware;
86
global using Microsoft.AspNetCore.Http;
97
global using Microsoft.Extensions.DependencyInjection;

‎src/Contrib/Isolation/Tests/Masa.Contrib.Isolation.MultiTenant.Tests/_Imports.cs

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
33

44
global using Masa.BuildingBlocks.Isolation;
5-
global using Masa.BuildingBlocks.Isolation.Middleware;
6-
global using Masa.BuildingBlocks.Isolation.MultiTenant;
75
global using Masa.Contrib.Isolation.MultiTenant.Middleware;
86
global using Microsoft.AspNetCore.Http;
97
global using Microsoft.Extensions.DependencyInjection;

‎src/Contrib/Isolation/Tests/Masa.Contrib.Isolation.Tests/_Imports.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
global using Masa.BuildingBlocks.Data;
55
global using Masa.BuildingBlocks.Data.UoW;
66
global using Masa.BuildingBlocks.Dispatcher.Events;
7-
global using Masa.BuildingBlocks.Isolation.Environment;
8-
global using Masa.BuildingBlocks.Isolation.Middleware;
9-
global using Masa.BuildingBlocks.Isolation.MultiTenant;
7+
global using Masa.BuildingBlocks.Isolation;
108
global using Masa.BuildingBlocks.Isolation.Options;
119
global using Masa.BuildingBlocks.Isolation.Parser;
1210
global using Masa.Contrib.Isolation.MultiEnvironment;

‎src/Contrib/Isolation/UoW/Masa.Contrib.Isolation.UoW.EFCore/_Imports.cs

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
global using Masa.BuildingBlocks.Data;
55
global using Masa.BuildingBlocks.Dispatcher.Events;
66
global using Masa.BuildingBlocks.Isolation;
7-
global using Masa.BuildingBlocks.Isolation.Environment;
8-
global using Masa.BuildingBlocks.Isolation.MultiTenant;
97
global using Masa.Contrib.Data.UoW.EFCore;
108
global using Masa.Contrib.Isolation.UoW.EFCore.Internal;
119
global using Microsoft.EntityFrameworkCore;

‎src/Contrib/Isolation/UoW/Tests/Masa.Contrib.Isolation.UoW.EFCore.Tests/_Imports.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
global using Masa.BuildingBlocks.Data;
55
global using Masa.BuildingBlocks.Data.UoW;
66
global using Masa.BuildingBlocks.Dispatcher.Events;
7-
global using Masa.BuildingBlocks.Isolation.Environment;
8-
global using Masa.BuildingBlocks.Isolation.MultiTenant;
7+
global using Masa.BuildingBlocks.Isolation;
98
global using Masa.BuildingBlocks.Isolation.Options;
10-
global using Masa.Contrib.Data.Contracts.EFCore;
119
global using Masa.Contrib.Isolation.MultiEnvironment;
1210
global using Masa.Contrib.Isolation.MultiTenant;
1311
global using Microsoft.AspNetCore.Builder;

‎src/Contrib/Isolation/UoW/Tests/Masa.Contrib.Isolation.UoW.EFCore.Web.Tests/_Imports.cs

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
global using Masa.BuildingBlocks.Data;
55
global using Masa.BuildingBlocks.Dispatcher.Events;
66
global using Masa.BuildingBlocks.Isolation;
7-
global using Masa.BuildingBlocks.Isolation.Environment;
8-
global using Masa.Contrib.Data.Contracts.EFCore;
97
global using Masa.Contrib.Dispatcher.Events;
108
global using Masa.Contrib.Isolation.MultiEnvironment;
119
global using Masa.Contrib.Isolation.MultiTenant;

0 commit comments

Comments
 (0)