Skip to content

Move InMemory Provider to Rules.Framework and reference projects directly #128

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

Merged
jdromeiro merged 6 commits into from
Mar 10, 2023
Merged

Move InMemory Provider to Rules.Framework and reference projects directly #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c5e5cc4
Made references to projects within solution to be made all by project…
jdromeiro Mar 6, 2023
9eb09f0
removed dotnet-build step to replace packages by projects
jdromeiro Mar 6, 2023
5747d43
Completed last commit
jdromeiro Mar 6, 2023
20d9f3b
Moved Providers.InMemory namespace to Rules.Framework assembly
jdromeiro Mar 9, 2023
40d91a8
removed License.MD link
jdromeiro Mar 9, 2023
01c336a
Refactored Providers.Inmemory folders
jdromeiro Mar 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions .github/workflows/dotnet-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,27 +145,9 @@ jobs:
- name: Clean
run: dotnet clean -c Release

- name: Replace Rules.Framework package references w/ project references
run: |
dotnet remove src/Rules.Framework.Providers.InMemory/Rules.Framework.Providers.InMemory.csproj package Rules.Framework
dotnet remove src/Rules.Framework.Providers.MongoDb/Rules.Framework.Providers.MongoDb.csproj package Rules.Framework
dotnet remove src/Rules.Framework.WebUI/Rules.Framework.WebUI.csproj package Rules.Framework
dotnet add src/Rules.Framework.Providers.InMemory/Rules.Framework.Providers.InMemory.csproj reference src/Rules.Framework/Rules.Framework.csproj
dotnet add src/Rules.Framework.Providers.MongoDb/Rules.Framework.Providers.MongoDb.csproj reference src/Rules.Framework/Rules.Framework.csproj
dotnet add src/Rules.Framework.WebUI/Rules.Framework.WebUI.csproj reference src/Rules.Framework/Rules.Framework.csproj

- name: Clear Nuget locals
run: dotnet nuget locals all --clear

- name: Restore dependencies w/ Rules.Framework project reference
run: dotnet restore

- name: Build w/ Rules.Framework project reference
run: dotnet build --no-restore -c Release

- name: Test w/ Rules.Framework project reference (no coverage)
run: dotnet test --no-build --verbosity normal -m:1 -c Release

- name: Delete build tag if exists
uses: dev-drprasad/delete-tag-and-release@v0.2.0
continue-on-error: true
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/dotnet-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ jobs:
- name: Pack Rules.Framework.Providers.MongoDb
run: dotnet pack src/Rules.Framework.Providers.MongoDb/Rules.Framework.Providers.MongoDb.csproj --include-symbols -c Release /p:Version=$BUILD_VERSION

- name: Pack Rules.Framework.Providers.InMemory
run: dotnet pack src/Rules.Framework.Providers.InMemory/Rules.Framework.Providers.InMemory.csproj --include-symbols -c Release /p:Version=$BUILD_VERSION

- name: Pack Rules.Framework.WebUI
run: dotnet pack src/Rules.Framework.WebUI/Rules.Framework.WebUI.csproj --include-symbols -c Release /p:Version=$BUILD_VERSION

Expand Down
7 changes: 0 additions & 7 deletions rules-framework.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rules.Framework.Providers.M
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rules.Framework.Providers.MongoDb.Tests", "tests\Rules.Framework.Providers.MongoDb.Tests\Rules.Framework.Providers.MongoDb.Tests.csproj", "{C2957B7C-D601-4850-BCCE-D9AEF07225AB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rules.Framework.Providers.InMemory", "src\Rules.Framework.Providers.InMemory\Rules.Framework.Providers.InMemory.csproj", "{D3A17A64-CC74-4EA0-95EA-9E141913BF70}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rules.Framework.IntegrationTests.Common", "tests\Rules.Framework.IntegrationTests.Common\Rules.Framework.IntegrationTests.Common.csproj", "{7C04ECEF-6504-453D-ABD8-FD3D5A2CF7F6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rules.Framework.Providers.InMemory.IntegrationTests", "tests\Rules.Framework.Providers.InMemory.IntegrationTests\Rules.Framework.Providers.InMemory.IntegrationTests.csproj", "{69BBA04D-116C-48EA-A8FD-ECC8CA0D57BE}"
Expand Down Expand Up @@ -72,10 +70,6 @@ Global
{C2957B7C-D601-4850-BCCE-D9AEF07225AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C2957B7C-D601-4850-BCCE-D9AEF07225AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C2957B7C-D601-4850-BCCE-D9AEF07225AB}.Release|Any CPU.Build.0 = Release|Any CPU
{D3A17A64-CC74-4EA0-95EA-9E141913BF70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D3A17A64-CC74-4EA0-95EA-9E141913BF70}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D3A17A64-CC74-4EA0-95EA-9E141913BF70}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D3A17A64-CC74-4EA0-95EA-9E141913BF70}.Release|Any CPU.Build.0 = Release|Any CPU
{7C04ECEF-6504-453D-ABD8-FD3D5A2CF7F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7C04ECEF-6504-453D-ABD8-FD3D5A2CF7F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7C04ECEF-6504-453D-ABD8-FD3D5A2CF7F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -115,7 +109,6 @@ Global
{460130DF-2360-494C-BB6F-BD87B033DF9D} = {AEE746EC-CEAA-4892-8C29-0CAAB97A23A8}
{8E14BC18-583F-43EF-99CF-08932D6303A0} = {74E24C97-8EE4-4B69-AECD-4765FD2C751F}
{C2957B7C-D601-4850-BCCE-D9AEF07225AB} = {74E24C97-8EE4-4B69-AECD-4765FD2C751F}
{D3A17A64-CC74-4EA0-95EA-9E141913BF70} = {AEE746EC-CEAA-4892-8C29-0CAAB97A23A8}
{7C04ECEF-6504-453D-ABD8-FD3D5A2CF7F6} = {74E24C97-8EE4-4B69-AECD-4765FD2C751F}
{69BBA04D-116C-48EA-A8FD-ECC8CA0D57BE} = {74E24C97-8EE4-4B69-AECD-4765FD2C751F}
{BB319C5B-9BF5-4DDB-B522-CFC64D7272C4} = {74E24C97-8EE4-4B69-AECD-4765FD2C751F}
Expand Down
2 changes: 1 addition & 1 deletion samples/Rules.Framework.InMemory.Sample/Rules.Framework.InMemory.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Rules.Framework.Providers.InMemory\Rules.Framework.Providers.InMemory.csproj" />
<ProjectReference Include="..\..\src\Rules.Framework\Rules.Framework.csproj" />
</ItemGroup>

</Project>
1 change: 0 additions & 1 deletion samples/Rules.Framework.WebUI.Sample/Rules.Framework.WebUI.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Rules.Framework.Providers.InMemory\Rules.Framework.Providers.InMemory.csproj" />
<ProjectReference Include="..\..\src\Rules.Framework.WebUI\Rules.Framework.WebUI.csproj" />
</ItemGroup>

Expand Down
5 changes: 0 additions & 5 deletions src/Rules.Framework.Providers.InMemory/AssemblyMetadata.cs
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions src/Rules.Framework.Providers.InMemory/GlobalSuppressions.cs
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions src/Rules.Framework.Providers.InMemory/Rules.Framework.Providers.InMemory.csproj
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion src/Rules.Framework.Providers.MongoDb/Rules.Framework.Providers.MongoDb.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
</PackageReference>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="MongoDB.Driver" Version="2.13.1" />
<PackageReference Include="Rules.Framework" Version="1.7.5" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Rules.Framework\Rules.Framework.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Rules.Framework.WebUI/Rules.Framework.WebUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Rules.Framework" Version="1.7.5" />
<ProjectReference Include="..\Rules.Framework\Rules.Framework.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions src/Rules.Framework/AssemblyMetadata.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@

[assembly: InternalsVisibleTo("Rules.Framework.Tests")]
[assembly: InternalsVisibleTo("Rules.Framework.IntegrationTests")]
[assembly: InternalsVisibleTo("Rules.Framework.Providers.InMemory.Tests")]
[assembly: InternalsVisibleTo("Rules.Framework.Providers.InMemory.IntegrationTests")]
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
3 changes: 2 additions & 1 deletion src/Rules.Framework/GlobalSuppressions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@
[assembly: SuppressMessage("Design", "CA1062:Validate arguments of public methods", Justification = "<Pending>", Scope = "member", Target = "~M:Rules.Framework.RulesEngine`2.AddRuleAsync(Rules.Framework.Core.Rule{`0,`1})~System.Threading.Tasks.Task")]
[assembly: SuppressMessage("Naming", "CA1717:Only FlagsAttribute enums should have plural names", Justification = "<Pending>", Scope = "type", Target = "~T:Rules.Framework.PriorityOptions")]
[assembly: SuppressMessage("Major Bug", "S2259:Null pointers should not be dereferenced", Justification = "That is validated somes lines above, and if it is null, a RuleOperationResult with error is returned right away.", Scope = "member", Target = "~M:Rules.Framework.RulesEngine`2.UpdateRuleInternalAsync(Rules.Framework.Core.Rule{`0,`1})~System.Threading.Tasks.Task{Rules.Framework.RuleOperationResult}")]
[assembly: SuppressMessage("Minor Code Smell", "S3963:\"static\" fields should be initialized inline", Justification = "To ensure initialization logic ordered as specified in class constructor.", Scope = "member", Target = "~M:Rules.Framework.Evaluation.OperatorsMetadata.#cctor")]
[assembly: SuppressMessage("Minor Code Smell", "S3963:\"static\" fields should be initialized inline", Justification = "To ensure initialization logic ordered as specified in class constructor.", Scope = "member", Target = "~M:Rules.Framework.Evaluation.OperatorsMetadata.#cctor")]
[assembly: SuppressMessage("Major Code Smell", "S2326:Unused type parameters should be removed", Justification = "<Pending>", Scope = "type", Target = "~T:Rules.Framework.Providers.InMemory.DataModel.ConditionNodeDataModel`1")]
0 ...taModel/ComposedConditionNodeDataModel.cs → ...taModel/ComposedConditionNodeDataModel.cs
View file
Open in desktop
File renamed without changes.
0 ...emory/DataModel/ConditionNodeDataModel.cs → ...emory/DataModel/ConditionNodeDataModel.cs
View file
Open in desktop
File renamed without changes.
0 ...iders.InMemory/DataModel/RuleDataModel.cs → ...iders/InMemory/DataModel/RuleDataModel.cs
View file
Open in desktop
File renamed without changes.
0 .../DataModel/ValueConditionNodeDataModel.cs → .../DataModel/ValueConditionNodeDataModel.cs
View file
Open in desktop
File renamed without changes.
0 ...oviders.InMemory/IInMemoryRulesStorage.cs → ...oviders/InMemory/IInMemoryRulesStorage.cs
View file
Open in desktop
File renamed without changes.
0 ...mework.Providers.InMemory/IRuleFactory.cs → ...mework/Providers/InMemory/IRuleFactory.cs
View file
Open in desktop
File renamed without changes.
0 ...Memory/InMemoryProviderRulesDataSource.cs → ...Memory/InMemoryProviderRulesDataSource.cs
View file
Open in desktop
File renamed without changes.
0 ...viderRulesDataSourceSelectorExtensions.cs → ...viderRulesDataSourceSelectorExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...roviders.InMemory/InMemoryRulesStorage.cs → ...roviders/InMemory/InMemoryRulesStorage.cs
View file
Open in desktop
File renamed without changes.
0 ...amework.Providers.InMemory/RuleFactory.cs → ...amework/Providers/InMemory/RuleFactory.cs
View file
Open in desktop
File renamed without changes.
0 ...s.InMemory/ServiceCollectionExtensions.cs → ...s/InMemory/ServiceCollectionExtensions.cs
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion src/Rules.Framework/Rules.Framework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
Expand Down Expand Up @@ -30,6 +30,7 @@
<PackagePath></PackagePath>
</None>
</ItemGroup>


<ItemGroup>
<PackageReference Include="FluentValidation" Version="10.3.6" />
Expand All @@ -41,5 +42,6 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...ders.InMemory.IntegrationTests/Rules.Framework.Providers.InMemory.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Rules.Framework.Providers.InMemory\Rules.Framework.Providers.InMemory.csproj" />
<ProjectReference Include="..\..\src\Rules.Framework\Rules.Framework.csproj" />
<ProjectReference Include="..\Rules.Framework.IntegrationTests.Common\Rules.Framework.IntegrationTests.Common.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion .../Rules.Framework.Providers.InMemory.Tests/Rules.Framework.Providers.InMemory.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Rules.Framework.Providers.InMemory\Rules.Framework.Providers.InMemory.csproj" />
<ProjectReference Include="..\..\src\Rules.Framework\Rules.Framework.csproj" />
</ItemGroup>
</Project>
1 change: 0 additions & 1 deletion tests/Rules.Framework.WebUI.Tests/Rules.Framework.WebUI.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="Moq" Version="4.16.1" />
<PackageReference Include="Rules.Framework" Version="1.7.5" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PrivateAssets>all</PrivateAssets>
Expand Down