Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Refactor repo structure #171

Merged
merged 30 commits into from
Aug 4, 2022
Merged

refactor: Refactor repo structure #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
50d9a62
chore: Readjust the directory structure
zhenlei520 Aug 1, 2022
8897d99
style: BasicAbility rename to StackSdks
zhenlei520 Aug 1, 2022
ac4a7a7
chore: using global version
zhenlei520 Aug 1, 2022
35a5e71
refactor: Removed using Utils from nuget package
zhenlei520 Aug 1, 2022
5d19599
Merge branch 'refactor/framework' of https://github.com/masastack/MAS…
zhenlei520 Aug 1, 2022
02ac325
chore: init
zhenlei520 Aug 2, 2022
526d358
ci: remove buildingBlocks dependencies
zhenlei520 Aug 2, 2022
dad1d90
ci: Adjust gitignore
zhenlei520 Aug 2, 2022
e374c53
chore: Add Scenes
zhenlei520 Aug 2, 2022
4690d97
chore: remove src by utils
zhenlei520 Aug 2, 2022
0c1b44c
refactor: Refactor repo structure
zhenlei520 Aug 2, 2022
c546eed
refactor: Refactor repo structure
zhenlei520 Aug 3, 2022
7f65493
refactor: Refactor repo structure
zhenlei520 Aug 3, 2022
2ea82e5
refactor: Refactor repo structure
zhenlei520 Aug 3, 2022
ced2544
rename: Oidc rename to OpenIdConnect
zhenlei520 Aug 3, 2022
c19d0a7
rename: Identity.IdentityModel rename to Authentication.Identity
zhenlei520 Aug 3, 2022
fe1358c
rename: EF rename to EntityFrameworkCore
zhenlei520 Aug 3, 2022
83692a8
rename: Benchmark rename to Tests.Benchmark
zhenlei520 Aug 3, 2022
d948c42
chore: global using sort
zhenlei520 Aug 3, 2022
f93be12
refactor: remove invalid references
zhenlei520 Aug 3, 2022
eeb4c76
chore: Ignore deprecation warnings
zhenlei520 Aug 3, 2022
bb507a3
chore: use global using
zhenlei520 Aug 3, 2022
4dbb95d
refactor: Remove the restriction that the Query response value cannot…
zhenlei520 Aug 3, 2022
356fe1b
refactor: Refactor repo structure
zhenlei520 Aug 4, 2022
928c216
chore: Modify unit test name
zhenlei520 Aug 4, 2022
ff2c5fc
rename: Benchmark rename to Perf
zhenlei520 Aug 4, 2022
50cb68c
chore: Adjust the directory structure
zhenlei520 Aug 4, 2022
6bdb514
refactor: Refactor repo structure
zhenlei520 Aug 4, 2022
59c9805
Update pr_run_test_ci.yml
doddgu Aug 4, 2022
ed93d62
Update pr_run_test_ci.yml
doddgu Aug 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 1 addition & 3 deletions .github/workflows/pr_run_test_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:
with:
dotnet-version: '6.0.x'
include-prerelease: true
- name: dependencies
run: git clone -b main https://github.com/masastack/MASA.BuildingBlocks.git ./src/BuildingBlocks/MASA.BuildingBlocks

- name: Configure sysctl limits
run: |
Expand All @@ -49,6 +47,6 @@ jobs:
run: dotnet build --no-restore /p:ContinuousIntegrationBuild=true

- name: test
run: dotnet test --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[*.Tests]*"
run: dotnet test --filter FullyQualifiedName!~Masa.Utils --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[*.Tests]*"


1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ x86/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/
# Visual Studio 2015 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
Expand Down
16 changes: 10 additions & 6 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,20 @@
<MicrosoftTeskSdkPackageVersion>16.9.4</MicrosoftTeskSdkPackageVersion>
<CoverletPackageVersion>3.0.2</CoverletPackageVersion>
<MoqPackageVersion>4.16.1</MoqPackageVersion>
<MasaUtilsPackageVersion>0.5.0</MasaUtilsPackageVersion>
<MapsterPackageVersion>7.3.0</MapsterPackageVersion>
<DaprPackageVersion>1.5.0</DaprPackageVersion>
<GoogleProtobufPackageVersion>3.19.1</GoogleProtobufPackageVersion>
<MedallionDistributedLockPackageVersion>1.0.4</MedallionDistributedLockPackageVersion>

<OpenTelemetryVersion>1.3.0</OpenTelemetryVersion>
<OpenTelemetryContribVersion>1.0.0-beta2</OpenTelemetryContribVersion>
<OpenTelemetryInstrumentationVersion>1.0.0-rc9.3</OpenTelemetryInstrumentationVersion>

<FluentValidationPackageVersion>11.1.0</FluentValidationPackageVersion>
<FluentValidationAspNetCorePackageVersion>11.1.2</FluentValidationAspNetCorePackageVersion>
<StackExchangeRedisPackageVersion>2.2.4</StackExchangeRedisPackageVersion>
<NESTPackageVersion>7.17.4</NESTPackageVersion>
<IdentityPackageVersion>6.15.0</IdentityPackageVersion>

<OpenTelemetryVersion>1.3.0</OpenTelemetryVersion>
<OpenTelemetryContribVersion>1.0.0-beta2</OpenTelemetryContribVersion>
<OpenTelemetryInstrumentationVersion>1.0.0-rc9.3</OpenTelemetryInstrumentationVersion>

<PackageId>$(AssemblyName)</PackageId>
<PackageIcon>packageIcon.png</PackageIcon>
<Authors>masastack</Authors>
Expand Down
1,599 changes: 0 additions & 1,599 deletions Masa.Contrib.sln
View file
Open in desktop

This file was deleted.

2,154 changes: 2,154 additions & 0 deletions Masa.Framework.sln
View file
Open in desktop

Large diffs are not rendered by default.

40 changes: 20 additions & 20 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@ The purpose of MASA.Contrib is based on [MASA.BuildingBlocks](https://github.com
* [Dcc](./src/Configuration/Masa.Contrib.Configuration.ConfigurationApi.Dcc/README.md)
* [CQRS](./src/ReadWriteSpliting/Cqrs/Masa.Contrib.ReadWriteSpliting.Cqrs/README.md)
* Data:
* [EntityFrameworkCore](./src/Data/Masa.Contrib.Data.EntityFrameworkCore/README.md)
* [SqlServer](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.SqlServer/README.md)
* [Pomelo.MySql](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.Pomelo.MySql/README.md): Recommend
* [MySql](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.MySql/README.md)
* [Sqlite](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.Sqlite/README.md)
* [Cosmos](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.Cosmos/README.md)
* [InMemory](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.InMemory/README.md)
* [Oracle](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.Oracle/README.md)
* [PostgreSql](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.PostgreSql/README.md)
* [Data.Contracts.EF](./src/Data/Masa.Contrib.Data.Contracts.EF/): data protocol
* [EntityFrameworkCore](./src/Data/Masa.Contrib.Data.EFCore/README.md)
* [SqlServer](./src/Data/Masa.Contrib.Data.EFCore.SqlServer/README.md)
* [Pomelo.MySql](./src/Data/Masa.Contrib.Data.EFCore.Pomelo.MySql/README.md): Recommend
* [MySql](./src/Data/Masa.Contrib.Data.EFCore.MySql/README.md)
* [Sqlite](./src/Data/Masa.Contrib.Data.EFCore.Sqlite/README.md)
* [Cosmos](./src/Data/Masa.Contrib.Data.EFCore.Cosmos/README.md)
* [InMemory](./src/Data/Masa.Contrib.Data.EFCore.InMemory/README.md)
* [Oracle](./src/Data/Masa.Contrib.Data.EFCore.Oracle/README.md)
* [PostgreSql](./src/Data/Masa.Contrib.Data.EFCore.PostgreSql/README.md)
* [Data.Contracts.EF](./src/Data/Masa.Contrib.Data.Contracts.EFCore/): data protocol
* UoW: unit of work
* [EFCore](./src/Data/Masa.Contrib.Data.UoW.EF/README.md)
* [EFCore](./src/Data/Masa.Contrib.Data.UoW.EFCore/README.md)
* IdGenerator: Unique ID generator
* [NormalGuid](./src/Data/IdGenerator/Masa.Contrib.Data.IdGenerator.NormalGuid/README.md): Normal Guid
* [SequentialGuid](./src/Data/IdGenerator/Masa.Contrib.Data.IdGenerator.SequentialGuid/README.md): Sequential Guid
Expand All @@ -43,24 +43,24 @@ The purpose of MASA.Contrib is based on [MASA.BuildingBlocks](https://github.com
* Mapping: object mapping
* [Mapster](./src/Data/Mapping/Masa.Contrib.Data.Mapping.Mapster/README.md)
* [DDD](./src/Ddd/Masa.Contrib.Ddd.Domain/README.md)
* [Ddd.Domain.Repository.EF](./src/Ddd/Masa.Contrib.Ddd.Domain.Repository.EF/README.md): Provide warehousing services
* [Ddd.Domain.Repository.EF](./src/Ddd/Masa.Contrib.Ddd.Domain.Repository.EFCore/README.md): Provide warehousing services
* Dispatcher
* [EventBus](./src/Dispatcher/Masa.Contrib.Dispatcher.Events/README.md): In-process events
* [IntegrationEventBus](./src/Dispatcher/Masa.Contrib.Dispatcher.IntegrationEvents.Dapr/README.md): Cross-process events
* [IntegrationEvents.EventLogs.EF](./src/Dispatcher/Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF/README.md): Provides message management services for cross-process events
* [IntegrationEvents.EventLogs.EF](./src/Dispatcher/Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EFCore/README.md): Provides message management services for cross-process events
* Isolation: Support physical isolation, logical isolation
* [UoW.EF](./src/Isolation/Masa.Contrib.Isolation.UoW.EF/README.md)
* [UoW.EF](./src/Isolation/Masa.Contrib.Isolation.UoW.EFCore/README.md)
* [MultiEnvironment](./src/Isolation/Masa.Contrib.Isolation.MultiEnvironment/README.md): MultiEnvironment
* [MultiTenant](./src/Isolation/Masa.Contrib.Isolation.MultiTenant/README.md): Multi-tenancy
* [MinimalAPI](./src/Service/Masa.Contrib.Service.MinimalAPIs/README.md): Support API classification aggregation similar to Controller
* [MinimalAPI](./src/Service/Masa.Contrib.Service.Mini~~~~malAPIs/README.md): Support API classification aggregation similar to Controller
* Storage: cloud storage
* [Aliyun Storage](./src/Storage/Masa.Contrib.Storage.ObjectStorage.Aliyun/README.md)
* Operational capacity
* [Auth](./src/BasicAbility/Masa.Contrib.BasicAbility.Auth/README.md): Authentication and Authorization
* [Dcc](./src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/README.md): Distributed Configuration Center
* [PM](./src/BasicAbility/Masa.Contrib.BasicAbility.Pm/README.md): Project Management
* [Scheduler](./src/BasicAbility/Masa.Contrib.BasicAbility.Scheduler/README.md): Distributed Scheduler
* [TSC](./src/BasicAbility/Masa.Contrib.BasicAbility.Tsc/README.md): Troubleshooting Console
* [Auth](./src/StackSdks/Masa.Contrib.StackSdks.Auth/README.md): Authentication and Authorization
* [Dcc](./src/StackSdks/Masa.Contrib.StackSdks.Dcc/README.md): Distributed Configuration Center
* [PM](./src/StackSdks/Masa.Contrib.StackSdks.Pm/README.md): Project Management
* [Scheduler](./src/StackSdks/Masa.Contrib.StackSdks.Scheduler/README.md): Distributed Scheduler
* [TSC](./src/StackSdks/Masa.Contrib.StackSdks.Tsc/README.md): Troubleshooting Console



Expand Down
38 changes: 19 additions & 19 deletions README.zh-CN.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@ MASA.Contrib是基于[MASA.BuildingBlocks](https://github.com/masastack/MASA.Bui
* [Dcc](./src/Configuration/Masa.Contrib.Configuration.ConfigurationApi.Dcc/README.zh-CN.md)
* [CQRS](./src/ReadWriteSpliting/Cqrs/Masa.Contrib.ReadWriteSpliting.Cqrs/README.zh-CN.md)
* Data:
* [EntityFrameworkCore](./src/Data/Masa.Contrib.Data.EntityFrameworkCore/README.zh-CN.md)
* [SqlServer](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.SqlServer/README.zh-CN.md)
* [Pomelo.MySql](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.Pomelo.MySql/README.zh-CN.md): 推荐
* [MySql](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.MySql/README.zh-CN.md)
* [Sqlite](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.Sqlite/README.zh-CN.md)
* [Cosmos](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.Cosmos/README.zh-CN.md)
* [InMemory](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.InMemory/README.zh-CN.md)
* [Oracle](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.Oracle/README.zh-CN.md)
* [PostgreSql](./src/Data/Masa.Contrib.Data.EntityFrameworkCore.PostgreSql/README.zh-CN.md)
* [Data.Contracts.EF](./src/Data/Masa.Contrib.Data.Contracts.EF/): 数据规约
* [EntityFrameworkCore](./src/Data/Masa.Contrib.Data.EFCore/README.zh-CN.md)
* [SqlServer](./src/Data/Masa.Contrib.Data.EFCore.SqlServer/README.zh-CN.md)
* [Pomelo.MySql](./src/Data/Masa.Contrib.Data.EFCore.Pomelo.MySql/README.zh-CN.md): 推荐
* [MySql](./src/Data/Masa.Contrib.Data.EFCore.MySql/README.zh-CN.md)
* [Sqlite](./src/Data/Masa.Contrib.Data.EFCore.Sqlite/README.zh-CN.md)
* [Cosmos](./src/Data/Masa.Contrib.Data.EFCore.Cosmos/README.zh-CN.md)
* [InMemory](./src/Data/Masa.Contrib.Data.EFCore.InMemory/README.zh-CN.md)
* [Oracle](./src/Data/Masa.Contrib.Data.EFCore.Oracle/README.zh-CN.md)
* [PostgreSql](./src/Data/Masa.Contrib.Data.EFCore.PostgreSql/README.zh-CN.md)
* [Data.Contracts.EF](./src/Data/Masa.Contrib.Data.Contracts.EFCore/): 数据规约
* UoW: 工作单元
* [EFCore](./src/Data/Masa.Contrib.Data.UoW.EF/README.zh-CN.md)
* [EFCore](./src/Data/Masa.Contrib.Data.UoW.EFCore/README.zh-CN.md)
* IdGenerator: 唯一ID生成器
* [NormalGuid](./src/Data/IdGenerator/Masa.Contrib.Data.IdGenerator.NormalGuid/README.zh-CN.md): 普通的Guid
* [SequentialGuid](./src/Data/IdGenerator/Masa.Contrib.Data.IdGenerator.SequentialGuid/README.zh-CN.md): 有序的Guid
Expand All @@ -43,24 +43,24 @@ MASA.Contrib是基于[MASA.BuildingBlocks](https://github.com/masastack/MASA.Bui
* Mapping: 对象映射
* [Mapster](./src/Data/Mapping/Masa.Contrib.Data.Mapping.Mapster/README.zh-CN.md)
* [DDD](./src/Ddd/Masa.Contrib.Ddd.Domain/README.zh-CN.md)
* [Ddd.Domain.Repository.EF](./src/Ddd/Masa.Contrib.Ddd.Domain.Repository.EF/README.zh-CN.md): 提供仓储服务
* [Ddd.Domain.Repository.EF](./src/Ddd/Masa.Contrib.Ddd.Domain.Repository.EFCore/README.zh-CN.md): 提供仓储服务
* Dispatcher
* [EventBus](./src/Dispatcher/Masa.Contrib.Dispatcher.Events/README.zh-CN.md): 进程内事件
* [IntegrationEventBus](./src/Dispatcher/Masa.Contrib.Dispatcher.IntegrationEvents.Dapr/README.zh-CN.md): 跨进程事件
* [IntegrationEvents.EventLogs.EF](./src/Dispatcher/Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF/README.zh-CN.md): 为跨进程事件提供消息管理服务
* [IntegrationEvents.EventLogs.EF](./src/Dispatcher/Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EFCore/README.zh-CN.md): 为跨进程事件提供消息管理服务
* Isolation: 支持物理隔离、逻辑隔离
* [UoW.EF](./src/Isolation/Masa.Contrib.Isolation.UoW.EF/README.zh-CN.md)
* [UoW.EF](./src/Isolation/Masa.Contrib.Isolation.UoW.EFCore/README.zh-CN.md)
* [MultiEnvironment](./src/Isolation/Masa.Contrib.Isolation.MultiEnvironment/README.zh-CN.md): 多环境
* [MultiTenant](./src/Isolation/Masa.Contrib.Isolation.MultiTenant/README.zh-CN.md): 多租户
* [MinimalAPI](./src/Service/Masa.Contrib.Service.MinimalAPIs/README.zh-CN.md): 支持类似Controller的API分类聚合
* Storage: 云存储
* [阿里云存储](./src/Storage/Masa.Contrib.Storage.ObjectStorage.Aliyun/README.zh-CN.md)
* 业务能力
* [Auth](./src/BasicAbility/Masa.Contrib.BasicAbility.Auth/README.zh-CN.md): 权限认证
* [Dcc](./src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/README.zh-CN.md): 分布式配置中心
* [PM](./src/BasicAbility/Masa.Contrib.BasicAbility.Pm/README.zh-CN.md): 项目管理
* [Scheduler](./src/BasicAbility/Masa.Contrib.BasicAbility.Scheduler/README.zh-CN.md): 分布式调度中心
* [TSC](./src/BasicAbility/Masa.Contrib.BasicAbility.Tsc/README.zh-CN.md): 故障排除平台
* [Auth](./src/StackSdks/Masa.Contrib.StackSdks.Auth/README.zh-CN.md): 权限认证
* [Dcc](./src/StackSdks/Masa.Contrib.StackSdks.Dcc/README.zh-CN.md): 分布式配置中心
* [PM](./src/StackSdks/Masa.Contrib.StackSdks.Pm/README.zh-CN.md): 项目管理
* [Scheduler](./src/StackSdks/Masa.Contrib.StackSdks.Scheduler/README.zh-CN.md): 分布式调度中心
* [TSC](./src/StackSdks/Masa.Contrib.StackSdks.Tsc/README.zh-CN.md): 故障排除平台


## 如何克隆
Expand Down
Loading