Skip to content

Commit

Permalink
Merge pull request #247 from Avanade/feature/structV8
Browse files Browse the repository at this point in the history
feat(Liquid.Templates): Updates templates for net8.0 and Liquidv8.0 beta
  • Loading branch information
lucianareginalino authored Jun 27, 2024
2 parents 3c57e3f + aeeba11 commit 6e01cb8
Show file tree
Hide file tree
Showing 49 changed files with 133 additions and 130 deletions.
2 changes: 1 addition & 1 deletion templates/src/Liquid.Templates/Liquid.Templates.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<PackageType>Template</PackageType>
<PackageVersion>6.0.0</PackageVersion>
<PackageVersion>8.0.0-beta-01</PackageVersion>
<PackageId>Liquid.Templates</PackageId>
<Title>Liquid Templates</Title>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Liquid.Repository;
using Liquid.Core.Entities;
using System;

namespace PROJECTNAME.Domain.Entities
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Liquid.Repository;
using Liquid.Core.Interfaces;
using MediatR;
using PROJECTNAME.Domain.Entities;
using System.Threading;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Liquid.Repository;
using Liquid.Core.Interfaces;
using MediatR;
using PROJECTNAME.Domain.Entities;
using System.Threading;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Liquid.Repository;
using Liquid.Core.Interfaces;
using MediatR;
using PROJECTNAME.Domain.Entities;
using System.Threading;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Liquid.Repository;
using Liquid.Core.Interfaces;
using MediatR;
using PROJECTNAME.Domain.Entities;
using System.Threading;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Liquid.Repository;
using Liquid.Core.Interfaces;
using MediatR;
using PROJECTNAME.Domain.Entities;
using System.Threading;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Liquid.Repository;
using Liquid.Core.Entities;
using System;

namespace PROJECTNAME.Domain.Entities
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Liquid.Repository;
using Liquid.Core.Interfaces;
using MediatR;
using PROJECTNAME.Domain.Entities;
using System.Threading;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Liquid.Repository;
using Liquid.Core.Interfaces;
using MediatR;
using PROJECTNAME.Domain.Entities;
using System.Threading;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Liquid.Repository;
using Liquid.Core.Interfaces;
using MediatR;
using PROJECTNAME.Domain.Entities;
using System.Threading;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Liquid.Repository;
using Liquid.Core.Interfaces;
using MediatR;
using PROJECTNAME.Domain.Entities;
using System.Threading;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Liquid.Repository;
using Liquid.Core.Interfaces;
using MediatR;
using PROJECTNAME.Domain.Entities;
using System.Threading;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Liquid.Domain" Version="6.0.1" />
<PackageReference Include="Liquid.Repository" Version="6.0.1" />
<PackageReference Include="Liquid.Core" Version="8.0.0-alpha-05" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.32106.194
# Visual Studio Version 17
VisualStudioVersion = 17.8.34408.163
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PROJECTNAME.WebApi", "PROJECTNAME.WebApi\PROJECTNAME.WebApi.csproj", "{A0ACD038-88CB-4717-819D-982EC8FB7B77}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PROJECTNAME.Domain", "PROJECTNAME.Domain\PROJECTNAME.Domain.csproj", "{31F60967-56CC-4B1C-B79F-620DD7DD7031}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PROJECTNAME.WebApi", "PROJECTNAME.WebApi\PROJECTNAME.WebApi.csproj", "{11436432-DC12-4D60-8A84-848A3DC65967}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A0ACD038-88CB-4717-819D-982EC8FB7B77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A0ACD038-88CB-4717-819D-982EC8FB7B77}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A0ACD038-88CB-4717-819D-982EC8FB7B77}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A0ACD038-88CB-4717-819D-982EC8FB7B77}.Release|Any CPU.Build.0 = Release|Any CPU
{31F60967-56CC-4B1C-B79F-620DD7DD7031}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{31F60967-56CC-4B1C-B79F-620DD7DD7031}.Debug|Any CPU.Build.0 = Debug|Any CPU
{31F60967-56CC-4B1C-B79F-620DD7DD7031}.Release|Any CPU.ActiveCfg = Release|Any CPU
{31F60967-56CC-4B1C-B79F-620DD7DD7031}.Release|Any CPU.Build.0 = Release|Any CPU
{11436432-DC12-4D60-8A84-848A3DC65967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{11436432-DC12-4D60-8A84-848A3DC65967}.Debug|Any CPU.Build.0 = Debug|Any CPU
{11436432-DC12-4D60-8A84-848A3DC65967}.Release|Any CPU.ActiveCfg = Release|Any CPU
{11436432-DC12-4D60-8A84-848A3DC65967}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<InvariantGlobalization>true</InvariantGlobalization>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Liquid.WebApi.Http" Version="6.0.1" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
<PackageReference Include="Liquid.WebApi.Http" Version="8.0.0-alpha-02" />
</ItemGroup>


<ItemGroup>
<ProjectReference Include="..\PROJECTNAME.Domain\PROJECTNAME.Domain.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@PROJECTNAME.WebApi_HostAddress = http://localhost:5003

GET {{PROJECTNAME.WebApi_HostAddress}}/ENTITYNAME/
Accept: application/json

###
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
// 9. call cartridge DI method here: builder.Services.AddLiquidEntityFramework<LiquidDbContext, ENTITYNAME, ENTITYIDTYPE>(options);
// 10. edit appsettings.json file to include database configurations if necessary (for InMemory it's not necessary).

builder.Services.AddLiquidHttp(typeof(IDomainInjection).Assembly);
builder.Services.AddLiquidHttp("Liquid", false, typeof(IDomainInjection).Assembly);
builder.Services.AddControllers();
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
builder.Services.AddEndpointsApiExplorer();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,14 @@
"defaultCulture": "pt-BR"
},
"MyMongoDbSettings": {
"DefaultDatabaseSettings": {
"connectionString": "",
"databaseName": "MySampleDb"
},
"Entities": {
"ENTITYNAME": {
"Settings": [
{
"connectionString": "",
"databaseName": "MySampleDb",
"CollectionName": "SampleCollection",
"ShardKey": "id"
}
}
]
}
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Liquid.Repository;
using Liquid.Core.Interfaces;
using MediatR;
using PROJECTNAME.Domain.Entities;
using System.Threading;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Liquid.Repository;
using Liquid.Core.Entities;
using System;

namespace PROJECTNAME.Domain.Entities
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Liquid.Repository;
using Liquid.Core.Interfaces;
using MediatR;
using PROJECTNAME.Domain.Entities;
using System.Threading;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Liquid.Domain" Version="6.0.1" />
<PackageReference Include="Liquid.Repository" Version="6.0.1" />
<PackageReference Include="Liquid.Core" Version="8.0.0-alpha-05" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Liquid.Repository;
using Liquid.Core.Entities;
using System;

namespace PROJECTNAME.Domain.Entities
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Liquid.Repository;
using Liquid.Core.Interfaces;
using MediatR;
using PROJECTNAME.Domain.Entities;
using System.Threading;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<InvariantGlobalization>true</InvariantGlobalization>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Liquid.WebApi.Http" Version="6.0.1" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
<PackageReference Include="Liquid.WebApi.Http" Version="8.0.0-alpha-02" />
</ItemGroup>


<ItemGroup>
<ProjectReference Include="..\PROJECTNAME.Domain\PROJECTNAME.Domain.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@PROJECTNAME.WebApi_HostAddress = http://localhost:5003

GET {{PROJECTNAME.WebApi_HostAddress}}/ENTITYNAME/
Accept: application/json

###
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
// 9. call cartridge DI method here: builder.Services.AddLiquidEntityFramework<LiquidDbContext, ENTITYNAME, ENTITYIDTYPE>(options);
// 10. edit appsettings.json file to include database configurations if necessary (for InMemory it's not necessary).

builder.Services.AddLiquidHttp(typeof(COMMANDNAMEENTITYNAMERequest).Assembly);
builder.Services.AddLiquidHttp("Liquid", false, typeof(COMMANDNAMEENTITYNAMERequest).Assembly);
builder.Services.AddControllers();
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
builder.Services.AddEndpointsApiExplorer();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,14 @@
"defaultCulture": "pt-BR"
},
"MyMongoDbSettings": {
"DefaultDatabaseSettings": {
"connectionString": "",
"databaseName": "MySampleDb"
},
"Entities": {
"ENTITYNAME": {
"Settings": [
{
"connectionString": "",
"databaseName": "MySampleDb",
"CollectionName": "SampleCollection",
"ShardKey": "id"
}
}
]
}
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Liquid.Repository;
using Liquid.Core.Entities;
using System;

namespace PROJECTNAME.Domain.Entities
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Liquid.Repository;
using Liquid.Core.Interfaces;
using MediatR;
using PROJECTNAME.Domain.Entities;
using System.Threading;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Liquid.Domain" Version="6.0.1" />
<PackageReference Include="Liquid.Repository" Version="6.0.1" />
<PackageReference Include="Liquid.Core" Version="8.0.0-alpha-05" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.32106.194
# Visual Studio Version 17
VisualStudioVersion = 17.8.34408.163
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PROJECTNAME.Domain", "PROJECTNAME.Domain\PROJECTNAME.Domain.csproj", "{C45FC20A-6DAD-4BDE-BC3D-EBECF4058565}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PROJECTNAME.WebApi", "PROJECTNAME.WebApi\PROJECTNAME.WebApi.csproj", "{9348549C-2C0F-4503-AEC2-788B3F6B815E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PROJECTNAME.WebApi", "PROJECTNAME.WebApi\PROJECTNAME.WebApi.csproj", "{D5B3CA90-0B90-4CE5-A108-AF53BEE9EB44}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -17,10 +17,10 @@ Global
{C45FC20A-6DAD-4BDE-BC3D-EBECF4058565}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C45FC20A-6DAD-4BDE-BC3D-EBECF4058565}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C45FC20A-6DAD-4BDE-BC3D-EBECF4058565}.Release|Any CPU.Build.0 = Release|Any CPU
{9348549C-2C0F-4503-AEC2-788B3F6B815E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9348549C-2C0F-4503-AEC2-788B3F6B815E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9348549C-2C0F-4503-AEC2-788B3F6B815E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9348549C-2C0F-4503-AEC2-788B3F6B815E}.Release|Any CPU.Build.0 = Release|Any CPU
{D5B3CA90-0B90-4CE5-A108-AF53BEE9EB44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D5B3CA90-0B90-4CE5-A108-AF53BEE9EB44}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D5B3CA90-0B90-4CE5-A108-AF53BEE9EB44}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D5B3CA90-0B90-4CE5-A108-AF53BEE9EB44}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<InvariantGlobalization>true</InvariantGlobalization>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Liquid.WebApi.Http" Version="6.0.1" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
<PackageReference Include="Liquid.WebApi.Http" Version="8.0.0-alpha-02" />
</ItemGroup>


<ItemGroup>
<ProjectReference Include="..\PROJECTNAME.Domain\PROJECTNAME.Domain.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@PROJECTNAME.WebApi_HostAddress = http://localhost:5003

GET {{PROJECTNAME.WebApi_HostAddress}}/ENTITYNAME/
Accept: application/json

###
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
// 9. call cartridge DI method here: builder.Services.AddLiquidEntityFramework<LiquidDbContext, ENTITYNAME, ENTITYIDTYPE>(options);
// 10. edit appsettings.json file to include database configurations if necessary (for InMemory it's not necessary).

builder.Services.AddLiquidHttp(typeof(COMMANDNAMEENTITYNAMERequest).Assembly);
builder.Services.AddLiquidHttp("Liquid", false, typeof(COMMANDNAMEENTITYNAMERequest).Assembly);
builder.Services.AddControllers();
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
builder.Services.AddEndpointsApiExplorer();
Expand Down
Loading

0 comments on commit 6e01cb8

Please sign in to comment.