Skip to content

Commit 21a02ee

Browse files
authored
Move InMemory Provider to Rules.Framework and reference projects directly (#128)
* Made references to projects within solution to be made all by project reference * removed dotnet-build step to replace packages by projects * Completed last commit * Moved Providers.InMemory namespace to Rules.Framework assembly * removed License.MD link * Refactored Providers.Inmemory folders
1 parent b2b2256 commit 21a02ee

27 files changed

Lines changed: 15 additions & 91 deletions

.github/workflows/dotnet-build.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -145,27 +145,9 @@ jobs:
145145
- name: Clean
146146
run: dotnet clean -c Release
147147

148-
- name: Replace Rules.Framework package references w/ project references
149-
run: |
150-
dotnet remove src/Rules.Framework.Providers.InMemory/Rules.Framework.Providers.InMemory.csproj package Rules.Framework
151-
dotnet remove src/Rules.Framework.Providers.MongoDb/Rules.Framework.Providers.MongoDb.csproj package Rules.Framework
152-
dotnet remove src/Rules.Framework.WebUI/Rules.Framework.WebUI.csproj package Rules.Framework
153-
dotnet add src/Rules.Framework.Providers.InMemory/Rules.Framework.Providers.InMemory.csproj reference src/Rules.Framework/Rules.Framework.csproj
154-
dotnet add src/Rules.Framework.Providers.MongoDb/Rules.Framework.Providers.MongoDb.csproj reference src/Rules.Framework/Rules.Framework.csproj
155-
dotnet add src/Rules.Framework.WebUI/Rules.Framework.WebUI.csproj reference src/Rules.Framework/Rules.Framework.csproj
156-
157148
- name: Clear Nuget locals
158149
run: dotnet nuget locals all --clear
159150

160-
- name: Restore dependencies w/ Rules.Framework project reference
161-
run: dotnet restore
162-
163-
- name: Build w/ Rules.Framework project reference
164-
run: dotnet build --no-restore -c Release
165-
166-
- name: Test w/ Rules.Framework project reference (no coverage)
167-
run: dotnet test --no-build --verbosity normal -m:1 -c Release
168-
169151
- name: Delete build tag if exists
170152
uses: dev-drprasad/delete-tag-and-release@v0.2.0
171153
continue-on-error: true

.github/workflows/dotnet-publish.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ jobs:
4242
- name: Pack Rules.Framework.Providers.MongoDb
4343
run: dotnet pack src/Rules.Framework.Providers.MongoDb/Rules.Framework.Providers.MongoDb.csproj --include-symbols -c Release /p:Version=$BUILD_VERSION
4444

45-
- name: Pack Rules.Framework.Providers.InMemory
46-
run: dotnet pack src/Rules.Framework.Providers.InMemory/Rules.Framework.Providers.InMemory.csproj --include-symbols -c Release /p:Version=$BUILD_VERSION
47-
4845
- name: Pack Rules.Framework.WebUI
4946
run: dotnet pack src/Rules.Framework.WebUI/Rules.Framework.WebUI.csproj --include-symbols -c Release /p:Version=$BUILD_VERSION
5047

rules-framework.sln

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rules.Framework.Providers.M
2424
EndProject
2525
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}"
2626
EndProject
27-
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}"
28-
EndProject
2927
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}"
3028
EndProject
3129
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}"
@@ -72,10 +70,6 @@ Global
7270
{C2957B7C-D601-4850-BCCE-D9AEF07225AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
7371
{C2957B7C-D601-4850-BCCE-D9AEF07225AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
7472
{C2957B7C-D601-4850-BCCE-D9AEF07225AB}.Release|Any CPU.Build.0 = Release|Any CPU
75-
{D3A17A64-CC74-4EA0-95EA-9E141913BF70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
76-
{D3A17A64-CC74-4EA0-95EA-9E141913BF70}.Debug|Any CPU.Build.0 = Debug|Any CPU
77-
{D3A17A64-CC74-4EA0-95EA-9E141913BF70}.Release|Any CPU.ActiveCfg = Release|Any CPU
78-
{D3A17A64-CC74-4EA0-95EA-9E141913BF70}.Release|Any CPU.Build.0 = Release|Any CPU
7973
{7C04ECEF-6504-453D-ABD8-FD3D5A2CF7F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8074
{7C04ECEF-6504-453D-ABD8-FD3D5A2CF7F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
8175
{7C04ECEF-6504-453D-ABD8-FD3D5A2CF7F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -115,7 +109,6 @@ Global
115109
{460130DF-2360-494C-BB6F-BD87B033DF9D} = {AEE746EC-CEAA-4892-8C29-0CAAB97A23A8}
116110
{8E14BC18-583F-43EF-99CF-08932D6303A0} = {74E24C97-8EE4-4B69-AECD-4765FD2C751F}
117111
{C2957B7C-D601-4850-BCCE-D9AEF07225AB} = {74E24C97-8EE4-4B69-AECD-4765FD2C751F}
118-
{D3A17A64-CC74-4EA0-95EA-9E141913BF70} = {AEE746EC-CEAA-4892-8C29-0CAAB97A23A8}
119112
{7C04ECEF-6504-453D-ABD8-FD3D5A2CF7F6} = {74E24C97-8EE4-4B69-AECD-4765FD2C751F}
120113
{69BBA04D-116C-48EA-A8FD-ECC8CA0D57BE} = {74E24C97-8EE4-4B69-AECD-4765FD2C751F}
121114
{BB319C5B-9BF5-4DDB-B522-CFC64D7272C4} = {74E24C97-8EE4-4B69-AECD-4765FD2C751F}

samples/Rules.Framework.InMemory.Sample/Rules.Framework.InMemory.Sample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<ProjectReference Include="..\..\src\Rules.Framework.Providers.InMemory\Rules.Framework.Providers.InMemory.csproj" />
9+
<ProjectReference Include="..\..\src\Rules.Framework\Rules.Framework.csproj" />
1010
</ItemGroup>
1111

1212
</Project>

samples/Rules.Framework.WebUI.Sample/Rules.Framework.WebUI.Sample.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<ProjectReference Include="..\..\src\Rules.Framework.Providers.InMemory\Rules.Framework.Providers.InMemory.csproj" />
1918
<ProjectReference Include="..\..\src\Rules.Framework.WebUI\Rules.Framework.WebUI.csproj" />
2019
</ItemGroup>
2120

src/Rules.Framework.Providers.InMemory/AssemblyMetadata.cs

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

src/Rules.Framework.Providers.InMemory/GlobalSuppressions.cs

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

src/Rules.Framework.Providers.InMemory/Rules.Framework.Providers.InMemory.csproj

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

src/Rules.Framework.Providers.MongoDb/Rules.Framework.Providers.MongoDb.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@
3737
</PackageReference>
3838
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
3939
<PackageReference Include="MongoDB.Driver" Version="2.13.1" />
40-
<PackageReference Include="Rules.Framework" Version="1.7.5" />
40+
</ItemGroup>
41+
42+
<ItemGroup>
43+
<ProjectReference Include="..\Rules.Framework\Rules.Framework.csproj" />
4144
</ItemGroup>
4245
</Project>

src/Rules.Framework.WebUI/Rules.Framework.WebUI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
</ItemGroup>
4848

4949
<ItemGroup>
50-
<PackageReference Include="Rules.Framework" Version="1.7.5" />
50+
<ProjectReference Include="..\Rules.Framework\Rules.Framework.csproj" />
5151
</ItemGroup>
5252

5353
<ItemGroup>

0 commit comments

Comments
 (0)