Skip to content

Commit dcbe464

Browse files
nicolas63nicolas63
committed
Update to Jhipster 3.6.0
1 parent 204bc26 commit dcbe464

File tree

632 files changed

+54979
-39012
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

632 files changed

+54979
-39012
lines changed

‎.gitignore

+35
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,38 @@
1+
# Local .terraform directories
2+
**/.terraform/*
3+
*.lock.*
4+
5+
# .tfstate files
6+
*.tfstate
7+
*.tfstate.*
8+
9+
# Crash log files
10+
crash.log
11+
12+
# Exclude all .tfvars files, which are likely to contain sentitive data, such as
13+
# password, private keys, and other secrets. These should not be part of version
14+
# control as they are data points which are potentially sensitive and subject
15+
# to change depending on the environment.
16+
#
17+
*.tfvars
18+
19+
# Ignore override files as they are usually used to override resources locally and so
20+
# are not checked in
21+
override.tf
22+
override.tf.json
23+
*_override.tf
24+
*_override.tf.json
25+
26+
# Include override files you do wish to add to version control using negated pattern
27+
#
28+
# !example_override.tf
29+
30+
# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan
31+
# example: *tfplan*
32+
33+
# Ignore CLI configuration files
34+
.terraformrc
35+
terraform.rc
136

237
######################
338
# Node

‎.prettierignore

-8
This file was deleted.

‎.prettierrc

-12
This file was deleted.

‎.yo-rc-global.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"generator-jhipster-dotnetcore:3.6.0": {
3+
"promptValues": {
4+
"nativeLanguage": "fr"
5+
}
6+
}
7+
}

‎.yo-rc.json

+37-24
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,53 @@
11
{
22
"generator-jhipster": {
3-
"namespace": "Jhipster",
43
"applicationType": "monolith",
5-
"promptValues": {
6-
"nativeLanguage": "en"
7-
},
8-
"databaseType": "sqllite",
94
"authenticationType": "jwt",
10-
"serverPort": "5000",
11-
"prodDatabaseType": "mysql",
12-
"jhipsterVersion": "6.10.5",
135
"baseName": "Jhipster",
14-
"useSass": true,
15-
"clientPackageManager": "npm",
6+
"blueprints": [
7+
{
8+
"name": "generator-jhipster-dotnetcore",
9+
"version": "3.6.0"
10+
}
11+
],
12+
"buildTool": "maven",
13+
"cacheProvider": "ehcache",
1614
"clientFramework": "angularX",
15+
"clientPackageManager": "npm",
1716
"clientTheme": "none",
1817
"clientThemeVariant": "",
19-
"creationTimestamp": 1606077078363,
20-
"testFrameworks": [],
21-
"jhiPrefix": "jhi",
22-
"entitySuffix": "",
18+
"cqrsEnabled": false,
19+
"creationTimestamp": 1653317189371,
20+
"databaseType": "sqllite",
21+
"devDatabaseType": "h2Disk",
22+
"devServerPort": 4200,
2323
"dtoSuffix": "DTO",
24+
"enableGradleEnterprise": false,
25+
"enableHibernateCache": true,
26+
"enableTranslation": true,
27+
"entitySuffix": "",
28+
"jhiPrefix": "jhi",
29+
"jhipsterVersion": "7.8.1",
30+
"languages": ["fr", "en"],
31+
"namespace": "Jhipster",
32+
"nativeLanguage": "fr",
2433
"otherModules": [
2534
{
2635
"name": "generator-jhipster-dotnetcore",
27-
"version": "2.1.0"
36+
"version": "3.6.0"
2837
}
2938
],
30-
"enableTranslation": true,
31-
"nativeLanguage": "en",
32-
"languages": ["en"],
33-
"blueprints": [
34-
{
35-
"name": "generator-jhipster-dotnetcore",
36-
"version": "2.1.0"
37-
}
38-
]
39+
"packageName": "com.mycompany.myapp",
40+
"pages": [],
41+
"prodDatabaseType": "mysql",
42+
"reactive": false,
43+
"searchEngine": false,
44+
"serverPort": "5000",
45+
"serviceDiscoveryType": false,
46+
"skipCheckLengthOfIdentifier": false,
47+
"skipFakeData": false,
48+
"skipUserManagement": false,
49+
"testFrameworks": ["cypress"],
50+
"websocket": false,
51+
"withAdminUi": true
3952
}
4053
}

‎Directory.Build.targets

+35-35
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
11
<Project>
22
<PropertyGroup>
3-
<AspNetCorePackageVersion>5.0.0</AspNetCorePackageVersion>
4-
<JHipsterNetPackageVersion>1.0.7</JHipsterNetPackageVersion>
3+
<AspNetCorePackageVersion>6.0.5</AspNetCorePackageVersion>
4+
<EntityFrameworkPackageVersion>6.0.4</EntityFrameworkPackageVersion>
5+
<JHipsterNetPackageVersion>1.0.9</JHipsterNetPackageVersion>
56
</PropertyGroup>
67

7-
<ItemGroup>
8-
8+
<ItemGroup>
9+
910
<PackageReference Update="JHipsterNet.Core" Version="$(JHipsterNetPackageVersion)" />
1011
<PackageReference Update="JHipsterNet.Web" Version="$(JHipsterNetPackageVersion)" />
11-
<PackageReference Update="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.0" />
12-
<PackageReference Update="Hellang.Middleware.ProblemDetails" Version="5.1.1" />
12+
<PackageReference Update="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
13+
<PackageReference Update="Hellang.Middleware.ProblemDetails" Version="6.4.2" />
1314
<PackageReference Update="Microsoft.AspNetCore.SpaServices.Extensions" Version="$(AspNetCorePackageVersion)" />
1415
<PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="$(AspNetCorePackageVersion)" />
15-
<PackageReference Update="Scrutor" Version="3.3.0" />
16-
<PackageReference Update="Serilog.AspNetCore" Version="3.4.0" />
17-
<PackageReference Update="Serilog.Settings.Configuration" Version="3.1.0" />
18-
<PackageReference Update="Serilog.Sinks.Console" Version="3.1.1" />
19-
<PackageReference Update="Serilog.Enrichers.Process" Version="2.0.1" />
16+
<PackageReference Update="Scrutor" Version="4.1.0" />
17+
<PackageReference Update="Serilog.AspNetCore" Version="5.0.0" />
18+
<PackageReference Update="Serilog.Settings.Configuration" Version="3.3.0" />
19+
<PackageReference Update="Serilog.Sinks.Console" Version="4.0.1" />
20+
<PackageReference Update="Serilog.Enrichers.Process" Version="2.0.2" />
2021
<PackageReference Update="Serilog.Enrichers.Thread" Version="3.1.0" />
21-
<PackageReference Update="Serilog.Sinks.SyslogMessages" Version="2.0.1" />
22-
<PackageReference Update="Swashbuckle.AspNetCore" Version="5.6.3" />
23-
<PackageReference Update="LanguageExt.Core" Version="3.4.15" />
24-
<PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="6.8.0" />
22+
<PackageReference Update="Serilog.Sinks.SyslogMessages" Version="2.0.6" />
23+
<PackageReference Update="Swashbuckle.AspNetCore" Version="6.3.1" />
24+
<PackageReference Update="LanguageExt.Core" Version="4.1.0" />
25+
<PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="6.17.0" />
2526
<PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(AspNetCorePackageVersion)" />
26-
<PackageReference Update="BCrypt.Net-Next" Version="4.0.2" />
27-
27+
<PackageReference Update="BCrypt.Net-Next" Version="4.0.3" />
28+
2829
<PackageReference Update="Microsoft.AspNetCore.Identity" Version="2.2.0" />
29-
<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(AspNetCorePackageVersion)" />
30-
<PackageReference Update="Newtonsoft.Json" Version="12.0.3" />
30+
<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(EntityFrameworkPackageVersion)" />
31+
<PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
3132
<PackageReference Update="System.ComponentModel.Annotations" Version="5.0.0" />
32-
<PackageReference Update="System.Text.Json" Version="$(AspNetCorePackageVersion)" />
33-
<PackageReference Update="Serilog" Version="2.10.0" />
33+
<PackageReference Update="System.Text.Json" Version="6.0.4" />
34+
<PackageReference Update="Serilog" Version="2.11.0" />
3435

35-
<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(AspNetCorePackageVersion)" />
36-
<PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="$(AspNetCorePackageVersion)" />
37-
<PackageReference Update="Microsoft.EntityFrameworkCore" Version="$(AspNetCorePackageVersion)" />
38-
<PackageReference Update="Microsoft.EntityFrameworkCore.Tools" Version="$(AspNetCorePackageVersion)" />
39-
40-
<PackageReference Update="coverlet.msbuild" Version="2.9.0"/>
41-
<PackageReference Update="FakeItEasy" Version="6.2.1" />
36+
<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(EntityFrameworkPackageVersion)" />
37+
<PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EntityFrameworkPackageVersion)" />
38+
<PackageReference Update="Microsoft.EntityFrameworkCore" Version="$(EntityFrameworkPackageVersion)" />
39+
<PackageReference Update="Microsoft.EntityFrameworkCore.Tools" Version="$(EntityFrameworkPackageVersion)" />
40+
<PackageReference Update="coverlet.msbuild" Version="3.1.2"/>
41+
<PackageReference Update="FakeItEasy" Version="7.3.1" />
4242
<PackageReference Update="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCorePackageVersion)" />
43-
<PackageReference Update="Microsoft.Data.Sqlite.Core" Version="$(AspNetCorePackageVersion)" />
44-
<PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="$(AspNetCorePackageVersion)" />
45-
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.8.3" />
46-
<PackageReference Update="Moq" Version="4.15.2" />
43+
<PackageReference Update="Microsoft.Data.Sqlite.Core" Version="$(EntityFrameworkPackageVersion)" />
44+
<PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EntityFrameworkPackageVersion)" />
45+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.2.0" />
46+
<PackageReference Update="Moq" Version="4.17.2" />
4747
<PackageReference Update="xunit" Version="2.4.1" />
48-
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.3"/>
48+
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.5"/>
4949
<PackageReference Update="xunit.runner.console" Version="2.4.1"/>
5050
<PackageReference Update="FluentAssertions" Version="5.10.3" />
5151
<PackageReference Update="FluentAssertions.AspNetCore.Mvc" Version="3.2.0" />
52-
<PackageReference Update="FluentAssertions.Json" Version="5.5.0" />
52+
<PackageReference Update="FluentAssertions.Json" Version="5.5.0" />
5353
</ItemGroup>
54-
</Project>
54+
</Project>

‎src/Jhipster/Dockerfile renamed to ‎Dockerfile-Back

+4-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
# Based on Microsoft's docker samples for dotnet core
22
# available at https://github.com/dotnet/dotnet-docker/tree/master/samples/aspnetapp
3-
FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
3+
FROM mcr.microsoft.com/dotnet/sdk:6.0-focal AS build
44
# First install nodejs - required to build generated client app
55
WORKDIR /app
66
RUN apt-get update -yq && apt-get install -yq curl
7-
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && \
7+
RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
88
apt-get update && \
99
apt-get install -yq nodejs && \
1010
rm -rf /var/lib/apt/lists/*
1111

1212
# Restore dependencies of .net core projects taking advantage of docker layer caching
1313
COPY src/*/*.csproj ./src/
14+
COPY Directory.Build.targets Directory.Build.targets
1415
RUN for file in $(ls src/*.csproj); do mkdir -p ${file%.*} && mv $file ${file%.*}; done
1516
RUN dotnet restore "src/Jhipster/Jhipster.csproj"
1617

@@ -20,18 +21,11 @@ WORKDIR src/Jhipster
2021
RUN dotnet publish "Jhipster.csproj" -c Release -o /app/out
2122

2223
# Final stage/image
23-
FROM mcr.microsoft.com/dotnet/aspnet:5.0-alpine AS runtime
24+
FROM mcr.microsoft.com/dotnet/aspnet:6.0-focal AS runtime
2425
WORKDIR /app
2526
EXPOSE 80
2627
COPY --from=build /app/out .
2728

2829
ENV ASPNETCORE_ENVIRONMENT=Production
2930

30-
# See: https://github.com/dotnet/announcements/issues/20
31-
# Comment to Disable globalization APIs (or delete)
32-
ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT false
33-
RUN apk add --no-cache icu-libs
34-
ENV LC_ALL en_US.UTF-8
35-
ENV LANG en_US.UTF-8
36-
3731
ENTRYPOINT ["dotnet", "jhipster.dll"]

0 commit comments

Comments
 (0)