Skip to content

Commit be9371f

Browse files
authored
Update .net7 (jhipster#1330)
* update .net7 * trigger GitHub actions * update mssql connection string * update JHipsterNetPackageVersion 1.0.10
1 parent 1f7e389 commit be9371f

File tree

28 files changed

+56
-55
lines changed

28 files changed

+56
-55
lines changed

.github/workflows/test-integration-jwt.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
architecture: 'x64' # defaults to 'x64'
7070
- uses: actions/setup-dotnet@v3
7171
with:
72-
dotnet-version: '6.0.x'
72+
dotnet-version: '7.0.x'
7373
- name: git history
7474
run: git --no-pager log -n 10 --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue) <%an>%Creset' --abbrev-commit
7575
- name: PREPARE jhipster env

.github/workflows/test-integration-microservice.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
run: npm install -g npm@$(node -e "console.log(require('./generators/generator-dotnetcore-constants.cjs').NPM_VERSION);")
3939
- uses: actions/setup-dotnet@v3
4040
with:
41-
dotnet-version: '6.0.x'
41+
dotnet-version: '7.0.x'
4242
- name: git history
4343
run: git --no-pager log -n 10 --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue) <%an>%Creset' --abbrev-commit
4444
- name: PREPARE jhipster env

.github/workflows/test-integration-oauth.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
run: npm install -g npm@$(node -e "console.log(require('./generators/generator-dotnetcore-constants.cjs').NPM_VERSION);")
6363
- uses: actions/setup-dotnet@v3
6464
with:
65-
dotnet-version: '6.0.x'
65+
dotnet-version: '7.0.x'
6666
- name: git history
6767
run: git --no-pager log -n 10 --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue) <%an>%Creset' --abbrev-commit
6868
- name: PREPARE jhipster env

generators/ci-cd/templates/.github/workflows/dotnet.yml.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Setup .NET
1818
uses: actions/setup-dotnet@v3
1919
with:
20-
dotnet-version: 6.0.x
20+
dotnet-version: 7.0.x
2121
- name: Restore dependencies
2222
run: dotnet restore
2323
- name: Build

generators/ci-cd/templates/.gitlab-ci.yml.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: mcr.microsoft.com/dotnet/sdk:6.0
1+
image: mcr.microsoft.com/dotnet/sdk:7.0-jammy
22

33
before_script:
44
- dotnet --info

generators/client/templates/blazor/src/Project.Client/Project.Client.csproj.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

generators/client/templates/blazor/test/Project.Client.Test/AlertErrorTest.cs.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public class AlertErrorTest : TestContext
4949
.Replace(ServiceDescriptor.Transient<IComponentActivator, ComponentActivator>())
5050
.AddBootstrapProviders()
5151
.AddFontAwesomeIcons();
52-
52+
JSInterop.Mode = JSRuntimeMode.Loose;
5353
}
5454
[Fact]
5555
public async Task Should_Display404_When_404()

generators/client/templates/blazor/test/Project.Client.Test/Pages/Admin/UserManagement/UserDetailTest.cs.ejs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ public class UserDetailTest : TestContext
5757
.AddFontAwesomeIcons();
5858
Services.AddSingleton<IUserService>(_userService.Object);
5959
Services.AddSingleton<INavigationService>(_navidationService.Object);
60+
JSInterop.Mode = JSRuntimeMode.Loose;
6061
}
6162

6263
[Fact]

generators/client/templates/blazor/test/Project.Client.Test/Project.Client.Test.csproj.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

generators/common/templates/dotnetcore/Dockerfile-Back.ejs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
-%>
1515
# Based on Microsoft's docker samples for dotnet core
1616
# available at https://github.com/dotnet/dotnet-docker/tree/master/samples/aspnetapp
17-
FROM mcr.microsoft.com/dotnet/sdk:6.0-focal AS build
17+
FROM mcr.microsoft.com/dotnet/sdk:7.0-jammy AS build
1818
# First install nodejs - required to build generated client app
1919
WORKDIR /app
2020
RUN apt-get update -yq && apt-get install -yq curl
@@ -46,7 +46,7 @@ WORKDIR src/<%= mainProjectDir %>
4646
RUN dotnet publish "<%= pascalizedBaseName %>.csproj" -c Release -o /app/out
4747
4848
# Final stage/image
49-
FROM mcr.microsoft.com/dotnet/aspnet:6.0-focal AS runtime
49+
FROM mcr.microsoft.com/dotnet/aspnet:7.0-jammy AS runtime
5050
EXPOSE 80
5151
WORKDIR /app
5252
COPY docker-entrypoint-back.sh .

0 commit comments

Comments
 (0)