Bump json5 from 1.0.1 to 1.0.2 in /src/Jhipster/ClientApp

.gitignore

@@ -1,3 +1,38 @@
+# Local .terraform directories
+**/.terraform/*
+*.lock.*
+
+# .tfstate files
+*.tfstate
+*.tfstate.*
+
+# Crash log files
+crash.log
+
+# Exclude all .tfvars files, which are likely to contain sentitive data, such as
+# password, private keys, and other secrets. These should not be part of version 
+# control as they are data points which are potentially sensitive and subject 
+# to change depending on the environment.
+#
+*.tfvars
+
+# Ignore override files as they are usually used to override resources locally and so
+# are not checked in
+override.tf
+override.tf.json
+*_override.tf
+*_override.tf.json
+
+# Include override files you do wish to add to version control using negated pattern
+#
+# !example_override.tf
+
+# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan
+# example: *tfplan*
+
+# Ignore CLI configuration files
+.terraformrc
+terraform.rc
 
 ######################
 # Node

.yo-rc-global.json

@@ -0,0 +1,7 @@
+{
+  "generator-jhipster-dotnetcore:3.6.0": {
+    "promptValues": {
+      "nativeLanguage": "fr"
+    }
+  }
+}

.yo-rc.json

@@ -1,40 +1,53 @@
 {
   "generator-jhipster": {
-    "namespace": "Jhipster",
     "applicationType": "monolith",
-    "promptValues": {
-      "nativeLanguage": "en"
-    },
-    "databaseType": "sqllite",
     "authenticationType": "jwt",
-    "serverPort": "5000",
-    "prodDatabaseType": "mysql",
-    "jhipsterVersion": "6.10.5",
     "baseName": "Jhipster",
-    "useSass": true,
-    "clientPackageManager": "npm",
+    "blueprints": [
+      {
+        "name": "generator-jhipster-dotnetcore",
+        "version": "3.6.0"
+      }
+    ],
+    "buildTool": "maven",
+    "cacheProvider": "ehcache",
     "clientFramework": "angularX",
+    "clientPackageManager": "npm",
     "clientTheme": "none",
     "clientThemeVariant": "",
-    "creationTimestamp": 1606077078363,
-    "testFrameworks": [],
-    "jhiPrefix": "jhi",
-    "entitySuffix": "",
+    "cqrsEnabled": false,
+    "creationTimestamp": 1653317189371,
+    "databaseType": "sqllite",
+    "devDatabaseType": "h2Disk",
+    "devServerPort": 4200,
     "dtoSuffix": "DTO",
+    "enableGradleEnterprise": false,
+    "enableHibernateCache": true,
+    "enableTranslation": true,
+    "entitySuffix": "",
+    "jhiPrefix": "jhi",
+    "jhipsterVersion": "7.8.1",
+    "languages": ["fr", "en"],
+    "namespace": "Jhipster",
+    "nativeLanguage": "fr",
     "otherModules": [
       {
         "name": "generator-jhipster-dotnetcore",
-        "version": "2.1.0"
+        "version": "3.6.0"
       }
     ],
-    "enableTranslation": true,
-    "nativeLanguage": "en",
-    "languages": ["en"],
-    "blueprints": [
-      {
-        "name": "generator-jhipster-dotnetcore",
-        "version": "2.1.0"
-      }
-    ]
+    "packageName": "com.mycompany.myapp",
+    "pages": [],
+    "prodDatabaseType": "mysql",
+    "reactive": false,
+    "searchEngine": false,
+    "serverPort": "5000",
+    "serviceDiscoveryType": false,
+    "skipCheckLengthOfIdentifier": false,
+    "skipFakeData": false,
+    "skipUserManagement": false,
+    "testFrameworks": ["cypress"],
+    "websocket": false,
+    "withAdminUi": true
   }
 }

Directory.Build.targets

@@ -1,54 +1,54 @@
 <Project>
   <PropertyGroup>
-		<AspNetCorePackageVersion>5.0.0</AspNetCorePackageVersion>
-		<JHipsterNetPackageVersion>1.0.7</JHipsterNetPackageVersion>
+		<AspNetCorePackageVersion>6.0.5</AspNetCorePackageVersion>
+		<EntityFrameworkPackageVersion>6.0.4</EntityFrameworkPackageVersion>
+		<JHipsterNetPackageVersion>1.0.9</JHipsterNetPackageVersion>
   </PropertyGroup>
 
-  <ItemGroup>	
-	
+  <ItemGroup>
+
 	<PackageReference Update="JHipsterNet.Core" Version="$(JHipsterNetPackageVersion)" />
 	<PackageReference Update="JHipsterNet.Web" Version="$(JHipsterNetPackageVersion)" />
-	<PackageReference Update="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.0" />
-	<PackageReference Update="Hellang.Middleware.ProblemDetails" Version="5.1.1" />
+	<PackageReference Update="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
+	<PackageReference Update="Hellang.Middleware.ProblemDetails" Version="6.4.2" />
 	<PackageReference Update="Microsoft.AspNetCore.SpaServices.Extensions" Version="$(AspNetCorePackageVersion)" />
 	<PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="$(AspNetCorePackageVersion)" />
-	<PackageReference Update="Scrutor" Version="3.3.0" />
-	<PackageReference Update="Serilog.AspNetCore" Version="3.4.0" />
-	<PackageReference Update="Serilog.Settings.Configuration" Version="3.1.0" />
-	<PackageReference Update="Serilog.Sinks.Console" Version="3.1.1" />
-	<PackageReference Update="Serilog.Enrichers.Process" Version="2.0.1" />
+	<PackageReference Update="Scrutor" Version="4.1.0" />
+	<PackageReference Update="Serilog.AspNetCore" Version="5.0.0" />
+	<PackageReference Update="Serilog.Settings.Configuration" Version="3.3.0" />
+	<PackageReference Update="Serilog.Sinks.Console" Version="4.0.1" />
+	<PackageReference Update="Serilog.Enrichers.Process" Version="2.0.2" />
 	<PackageReference Update="Serilog.Enrichers.Thread" Version="3.1.0" />
-	<PackageReference Update="Serilog.Sinks.SyslogMessages" Version="2.0.1" />
-	<PackageReference Update="Swashbuckle.AspNetCore" Version="5.6.3" />
-	<PackageReference Update="LanguageExt.Core" Version="3.4.15" />
-	<PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="6.8.0" />
+	<PackageReference Update="Serilog.Sinks.SyslogMessages" Version="2.0.6" />
+	<PackageReference Update="Swashbuckle.AspNetCore" Version="6.3.1" />
+	<PackageReference Update="LanguageExt.Core" Version="4.1.0" />
+	<PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="6.17.0" />
 	<PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(AspNetCorePackageVersion)" />
-	<PackageReference Update="BCrypt.Net-Next" Version="4.0.2" />
-	
+	<PackageReference Update="BCrypt.Net-Next" Version="4.0.3" />
+
 	<PackageReference Update="Microsoft.AspNetCore.Identity" Version="2.2.0" />
-	<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(AspNetCorePackageVersion)" />
-	<PackageReference Update="Newtonsoft.Json" Version="12.0.3" />
+	<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(EntityFrameworkPackageVersion)" />
+	<PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
 	<PackageReference Update="System.ComponentModel.Annotations" Version="5.0.0" />
-	<PackageReference Update="System.Text.Json" Version="$(AspNetCorePackageVersion)" />	
-	<PackageReference Update="Serilog" Version="2.10.0" />
+	<PackageReference Update="System.Text.Json" Version="6.0.4" />
+	<PackageReference Update="Serilog" Version="2.11.0" />
 
-	<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(AspNetCorePackageVersion)" />
-	<PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="$(AspNetCorePackageVersion)" />
-	<PackageReference Update="Microsoft.EntityFrameworkCore" Version="$(AspNetCorePackageVersion)" />
-	<PackageReference Update="Microsoft.EntityFrameworkCore.Tools" Version="$(AspNetCorePackageVersion)" />
-
-	<PackageReference Update="coverlet.msbuild" Version="2.9.0"/>
-	<PackageReference Update="FakeItEasy" Version="6.2.1" />
+	<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(EntityFrameworkPackageVersion)" />
+	<PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EntityFrameworkPackageVersion)" />
+	<PackageReference Update="Microsoft.EntityFrameworkCore" Version="$(EntityFrameworkPackageVersion)" />
+	<PackageReference Update="Microsoft.EntityFrameworkCore.Tools" Version="$(EntityFrameworkPackageVersion)" />
+	<PackageReference Update="coverlet.msbuild" Version="3.1.2"/>
+	<PackageReference Update="FakeItEasy" Version="7.3.1" />
 	<PackageReference Update="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCorePackageVersion)" />
-	<PackageReference Update="Microsoft.Data.Sqlite.Core" Version="$(AspNetCorePackageVersion)" />
-	<PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="$(AspNetCorePackageVersion)" />
-	<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-	<PackageReference Update="Moq" Version="4.15.2" />
+	<PackageReference Update="Microsoft.Data.Sqlite.Core" Version="$(EntityFrameworkPackageVersion)" />
+	<PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EntityFrameworkPackageVersion)" />
+	<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+	<PackageReference Update="Moq" Version="4.17.2" />
 	<PackageReference Update="xunit" Version="2.4.1" />
-	<PackageReference Update="xunit.runner.visualstudio" Version="2.4.3"/>
+	<PackageReference Update="xunit.runner.visualstudio" Version="2.4.5"/>
 	<PackageReference Update="xunit.runner.console" Version="2.4.1"/>
 	<PackageReference Update="FluentAssertions" Version="5.10.3" />
 	<PackageReference Update="FluentAssertions.AspNetCore.Mvc" Version="3.2.0" />
-	<PackageReference Update="FluentAssertions.Json" Version="5.5.0" />	
+	<PackageReference Update="FluentAssertions.Json" Version="5.5.0" />
   </ItemGroup>
-</Project>
+</Project>

src/Jhipster/Dockerfile → Dockerfile-Back

@@ -1,16 +1,17 @@
 # Based on Microsoft's docker samples for dotnet core
 # available at https://github.com/dotnet/dotnet-docker/tree/master/samples/aspnetapp
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0-focal AS build
 # First install nodejs - required to build generated client app
 WORKDIR /app
 RUN apt-get update -yq && apt-get install -yq curl
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && \
+RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
     apt-get update && \
     apt-get install -yq nodejs && \
     rm -rf /var/lib/apt/lists/*
 
 # Restore dependencies of .net core projects taking advantage of docker layer caching
 COPY src/*/*.csproj ./src/
+COPY Directory.Build.targets Directory.Build.targets
 RUN for file in $(ls src/*.csproj); do mkdir -p ${file%.*} && mv $file ${file%.*}; done
 RUN dotnet restore "src/Jhipster/Jhipster.csproj"
 
@@ -20,18 +21,11 @@ WORKDIR src/Jhipster
 RUN dotnet publish "Jhipster.csproj" -c Release -o /app/out
 
 # Final stage/image
-FROM mcr.microsoft.com/dotnet/aspnet:5.0-alpine AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:6.0-focal AS runtime
 WORKDIR /app
 EXPOSE 80
 COPY --from=build /app/out .
 
 ENV ASPNETCORE_ENVIRONMENT=Production
 
-# See: https://github.com/dotnet/announcements/issues/20
-# Comment to Disable globalization APIs (or delete)
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT false
-RUN apk add --no-cache icu-libs
-ENV LC_ALL en_US.UTF-8
-ENV LANG en_US.UTF-8
-
 ENTRYPOINT ["dotnet", "jhipster.dll"]