Skip to content

Commit bd56fbb

Browse files
KrzysztofPajakKrzysztofPajak
committed
Add Grand.Mapping references and update project structure
1 parent 0c7c71d commit bd56fbb

17 files changed

Lines changed: 193 additions & 156 deletions

File tree

‎GrandNode.sln‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.0.32014.148
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.5.11619.145 insiders
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{FA350BD6-C29D-40D9-BA47-FE5FBDFC84A0}"
77
EndProject
@@ -147,16 +147,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "s
147147
EndProject
148148
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grand.Web.AdminShared", "src\Web\Grand.Web.AdminShared\Grand.Web.AdminShared.csproj", "{12C4A556-E62E-4EC0-BCD9-E9D4E1F3D430}"
149149
EndProject
150-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
151-
EndProject
152150
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grand.Mapping.Tests", "src\Tests\Grand.Mapping.Tests\Grand.Mapping.Tests.csproj", "{396E6929-5365-4116-8AA8-DF5327247798}"
153151
EndProject
154-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{03997797-E7F5-0643-168D-B8EA7178C2FE}"
155-
EndProject
156-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{EC447DCF-ABFA-6E24-52A5-D7FD48A5C558}"
157-
EndProject
158-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Business", "Business", "{CC1F4FA2-92F2-BA4B-815B-7EC2CBBCCF50}"
159-
EndProject
160152
Global
161153
GlobalSection(SolutionConfigurationPlatforms) = preSolution
162154
Debug|Any CPU = Debug|Any CPU
@@ -964,9 +956,6 @@ Global
964956
{136F1E35-8B20-465C-8D42-30A5A0D0DA1F} = {583FFBBD-421C-4FB7-BBDA-F9CAF35A354A}
965957
{12C4A556-E62E-4EC0-BCD9-E9D4E1F3D430} = {BF4543A8-0731-4FDD-BB6B-0ADB9561F981}
966958
{396E6929-5365-4116-8AA8-DF5327247798} = {6360202A-F931-4BBD-ADBD-C9A628EE59F8}
967-
{03997797-E7F5-0643-168D-B8EA7178C2FE} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
968-
{EC447DCF-ABFA-6E24-52A5-D7FD48A5C558} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
969-
{CC1F4FA2-92F2-BA4B-815B-7EC2CBBCCF50} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
970959
EndGlobalSection
971960
GlobalSection(ExtensibilityGlobals) = postSolution
972961
SolutionGuid = {88B478F4-FD3B-4C24-9E84-4FAAF0254397}

‎src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@
3333
<ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
3434
<Private>false</Private>
3535
</ProjectReference>
36-
<ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
36+
<ProjectReference Include="..\..\Core\Grand.Mapping\Grand.Mapping.csproj">
37+
<Private>false</Private>
38+
</ProjectReference>
39+
<ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
3740
<Private>false</Private>
3841
</ProjectReference>
3942
<ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">

‎src/Plugins/Authentication.Google/Authentication.Google.csproj‎

Lines changed: 57 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,65 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
2-
<Import Project="..\..\Build\Grand.Common.props" />
3-
<PropertyGroup>
4-
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
5-
<StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
6-
</PropertyGroup>
7-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
8-
<OutputPath>..\..\Web\Grand.Web\Plugins\Authentication.Google</OutputPath>
9-
<OutDir>$(OutputPath)</OutDir>
10-
</PropertyGroup>
2+
<Import Project="..\..\Build\Grand.Common.props" />
3+
<PropertyGroup>
4+
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
5+
<StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
6+
</PropertyGroup>
7+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
8+
<OutputPath>..\..\Web\Grand.Web\Plugins\Authentication.Google</OutputPath>
9+
<OutDir>$(OutputPath)</OutDir>
10+
</PropertyGroup>
1111

12-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
13-
<OutputPath>..\..\Web\Grand.Web\Plugins\Authentication.Google</OutputPath>
14-
<OutDir>$(OutputPath)</OutDir>
15-
</PropertyGroup>
12+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
13+
<OutputPath>..\..\Web\Grand.Web\Plugins\Authentication.Google</OutputPath>
14+
<OutDir>$(OutputPath)</OutDir>
15+
</PropertyGroup>
1616

17-
<ItemGroup>
18-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" />
19-
</ItemGroup>
17+
<ItemGroup>
18+
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" />
19+
</ItemGroup>
2020

21-
<Target Name="CopyFile" AfterTargets="AfterBuild">
22-
<ItemGroup>
23-
<CopyFiles Include="$(NuGetPackageRoot)\microsoft.aspnetcore.authentication.google\10.0.1\lib\net10.0\*.dll" />
24-
</ItemGroup>
25-
<Copy SourceFiles="@(CopyFiles)" DestinationFolder="..\..\Web\Grand.Web\Plugins\Authentication.Google\" />
26-
</Target>
21+
<Target Name="CopyFile" AfterTargets="AfterBuild">
22+
<ItemGroup>
23+
<CopyFiles Include="$(NuGetPackageRoot)\microsoft.aspnetcore.authentication.google\10.0.1\lib\net10.0\*.dll" />
24+
</ItemGroup>
25+
<Copy SourceFiles="@(CopyFiles)" DestinationFolder="..\..\Web\Grand.Web\Plugins\Authentication.Google\" />
26+
</Target>
2727

28-
<ItemGroup>
29-
<ProjectReference Include="..\..\Core\Grand.Data\Grand.Data.csproj">
30-
<Private>false</Private>
31-
</ProjectReference>
32-
<ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
33-
<Private>false</Private>
34-
</ProjectReference>
35-
<ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
36-
<Private>false</Private>
37-
</ProjectReference>
38-
<ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
39-
<Private>false</Private>
40-
</ProjectReference>
41-
<ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
42-
<Private>false</Private>
43-
<ExcludeAssets>all</ExcludeAssets>
44-
</ProjectReference>
45-
<ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj">
46-
<Private>false</Private>
47-
</ProjectReference>
48-
</ItemGroup>
28+
<ItemGroup>
29+
<ProjectReference Include="..\..\Core\Grand.Data\Grand.Data.csproj">
30+
<Private>false</Private>
31+
</ProjectReference>
32+
<ProjectReference Include="..\..\Core\Grand.Mapping\Grand.Mapping.csproj">
33+
<Private>false</Private>
34+
</ProjectReference>
35+
<ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
36+
<Private>false</Private>
37+
</ProjectReference>
38+
<ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
39+
<Private>false</Private>
40+
</ProjectReference>
41+
<ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
42+
<Private>false</Private>
43+
</ProjectReference>
44+
<ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
45+
<Private>false</Private>
46+
<ExcludeAssets>all</ExcludeAssets>
47+
</ProjectReference>
48+
<ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj">
49+
<Private>false</Private>
50+
</ProjectReference>
51+
</ItemGroup>
4952

50-
<ItemGroup>
51-
<None Update="Assets\googlestyles.css">
52-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
53-
</None>
54-
<None Update="Assets\Images\google-signing.png">
55-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
56-
</None>
57-
<None Update="logo.jpg">
58-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
59-
</None>
60-
</ItemGroup>
53+
<ItemGroup>
54+
<None Update="Assets\googlestyles.css">
55+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
56+
</None>
57+
<None Update="Assets\Images\google-signing.png">
58+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
59+
</None>
60+
<None Update="logo.jpg">
61+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
62+
</None>
63+
</ItemGroup>
6164

6265
</Project>

‎src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj‎

Lines changed: 42 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,48 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
2-
<Import Project="..\..\Build\Grand.Common.props" />
3-
<PropertyGroup>
4-
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
5-
<StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
6-
</PropertyGroup>
2+
<Import Project="..\..\Build\Grand.Common.props" />
3+
<PropertyGroup>
4+
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
5+
<StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
6+
</PropertyGroup>
77

8-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
9-
<OutputPath>..\..\Web\Grand.Web\Plugins\DiscountRules.Standard</OutputPath>
10-
<OutDir>$(OutputPath)</OutDir>
11-
</PropertyGroup>
8+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
9+
<OutputPath>..\..\Web\Grand.Web\Plugins\DiscountRules.Standard</OutputPath>
10+
<OutDir>$(OutputPath)</OutDir>
11+
</PropertyGroup>
1212

13-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
14-
<OutputPath>..\..\Web\Grand.Web\Plugins\DiscountRules.Standard</OutputPath>
15-
<OutDir>$(OutputPath)</OutDir>
16-
</PropertyGroup>
13+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
14+
<OutputPath>..\..\Web\Grand.Web\Plugins\DiscountRules.Standard</OutputPath>
15+
<OutDir>$(OutputPath)</OutDir>
16+
</PropertyGroup>
1717

18-
<ItemGroup>
19-
<ProjectReference Include="..\..\Core\Grand.Data\Grand.Data.csproj">
20-
<Private>false</Private>
21-
</ProjectReference>
22-
<ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
23-
<Private>false</Private>
24-
</ProjectReference>
25-
<ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
26-
<Private>false</Private>
27-
</ProjectReference>
28-
<ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
29-
<Private>false</Private>
30-
</ProjectReference>
31-
<ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
32-
<Private>false</Private>
33-
<ExcludeAssets>all</ExcludeAssets>
34-
</ProjectReference>
35-
<ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj">
36-
<Private>false</Private>
37-
</ProjectReference>
38-
</ItemGroup>
39-
<ItemGroup>
40-
<None Update="logo.jpg">
41-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
42-
</None>
43-
</ItemGroup>
18+
<ItemGroup>
19+
<ProjectReference Include="..\..\Core\Grand.Data\Grand.Data.csproj">
20+
<Private>false</Private>
21+
</ProjectReference>
22+
<ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
23+
<Private>false</Private>
24+
</ProjectReference>
25+
<ProjectReference Include="..\..\Core\Grand.Mapping\Grand.Mapping.csproj">
26+
<Private>false</Private>
27+
</ProjectReference>
28+
<ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
29+
<Private>false</Private>
30+
</ProjectReference>
31+
<ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
32+
<Private>false</Private>
33+
</ProjectReference>
34+
<ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
35+
<Private>false</Private>
36+
<ExcludeAssets>all</ExcludeAssets>
37+
</ProjectReference>
38+
<ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj">
39+
<Private>false</Private>
40+
</ProjectReference>
41+
</ItemGroup>
42+
<ItemGroup>
43+
<None Update="logo.jpg">
44+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
45+
</None>
46+
</ItemGroup>
4447

4548
</Project>

‎src/Plugins/ExchangeRate.McExchange/ExchangeRate.McExchange.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
<ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
2222
<Private>false</Private>
2323
</ProjectReference>
24+
<ProjectReference Include="..\..\Core\Grand.Mapping\Grand.Mapping.csproj">
25+
<Private>false</Private>
26+
</ProjectReference>
2427
<ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
2528
<Private>false</Private>
2629
</ProjectReference>

‎src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
<ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
3636
<Private>false</Private>
3737
</ProjectReference>
38+
<ProjectReference Include="..\..\Core\Grand.Mapping\Grand.Mapping.csproj">
39+
<Private>false</Private>
40+
</ProjectReference>
3841
<ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
3942
<Private>false</Private>
4043
</ProjectReference>

‎src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
<ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
2323
<Private>false</Private>
2424
</ProjectReference>
25+
<ProjectReference Include="..\..\Core\Grand.Mapping\Grand.Mapping.csproj">
26+
<Private>false</Private>
27+
</ProjectReference>
2528
<ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
2629
<Private>false</Private>
2730
</ProjectReference>

‎src/Plugins/Payments.StripeCheckout/Payments.StripeCheckout.csproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@
3737
<ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
3838
<Private>false</Private>
3939
</ProjectReference>
40-
<ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
40+
<ProjectReference Include="..\..\Core\Grand.Mapping\Grand.Mapping.csproj">
41+
<Private>false</Private>
42+
</ProjectReference>
43+
<ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
4144
<Private>false</Private>
4245
</ProjectReference>
4346
<ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">

‎src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
<ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
2626
<Private>false</Private>
2727
</ProjectReference>
28+
<ProjectReference Include="..\..\Core\Grand.Mapping\Grand.Mapping.csproj">
29+
<Private>false</Private>
30+
</ProjectReference>
2831
<ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
2932
<Private>false</Private>
3033
</ProjectReference>

‎src/Plugins/Shipping.FixedRateShipping/Shipping.FixedRateShipping.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
<ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
2626
<Private>false</Private>
2727
</ProjectReference>
28+
<ProjectReference Include="..\..\Core\Grand.Mapping\Grand.Mapping.csproj">
29+
<Private>false</Private>
30+
</ProjectReference>
2831
<ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
2932
<Private>false</Private>
3033
</ProjectReference>

0 commit comments

Comments
 (0)