Skip to content

Commit e745340

Browse files
AntonioFalcaoJrAntonioFalcaoJr
authored
Merge pull request #171 from AntonioFalcao/release
Updating for .NET 6 and GraphQL 4
2 parents 5cc3643 + 086992e commit e745340

229 files changed

Lines changed: 46950 additions & 46915 deletions

File tree

Some content is hidden

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

‎.github/workflows/build-and-test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Setup .NET Core
1414
uses: actions/setup-dotnet@v1
1515
with:
16-
dotnet-version: 5.0.100
16+
dotnet-version: 6.0.100-preview.2.21155.3
1717
- name: Install dependencies
1818
run: dotnet restore -v m
1919
- name: Build
@@ -28,6 +28,6 @@ jobs:
2828
- name: Setup .NET Core
2929
uses: actions/setup-dotnet@v1
3030
with:
31-
dotnet-version: 5.0.100
31+
dotnet-version: 6.0.100-preview.2.21155.3
3232
- name: Test
3333
run: dotnet test --no-restore -v m

‎.github/workflows/webapi-docker-image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@v2
1313
- name: Build the Docker image
14-
run: docker build . --file ./src/Dotnet5.GraphQL3.Store.WebAPI/Dockerfile --tag my-image-name:$(date +%s)
14+
run: docker build . --file ./src/Dotnet6.GraphQL4.Store.WebAPI/Dockerfile --tag my-image-name:$(date +%s)

‎.github/workflows/webapi-docker-publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ jobs:
3030
uses: docker/build-push-action@v2
3131
with:
3232
context: .
33-
file: ./src/Dotnet5.GraphQL3.Store.WebAPI/Dockerfile
33+
file: ./src/Dotnet6.GraphQL4.Store.WebAPI/Dockerfile
3434
push: true
35-
tags: antoniofalcaojr/dotnet5-graphql3-webapi:latest
35+
tags: antoniofalcaojr/dotnet6-graphql4-webapi:latest

‎.github/workflows/webmvc-docker-image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@v2
1313
- name: Build the Docker image
14-
run: docker build . --file ./src/Dotnet5.GraphQL3.Store.WebMVC/Dockerfile --tag my-image-name:$(date +%s)
14+
run: docker build . --file ./src/Dotnet6.GraphQL4.Store.WebMVC/Dockerfile --tag my-image-name:$(date +%s)

‎.github/workflows/webmvc-docker-publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ jobs:
2929
uses: docker/build-push-action@v2
3030
with:
3131
context: .
32-
file: ./src/Dotnet5.GraphQL3.Store.WebMVC/Dockerfile
32+
file: ./src/Dotnet6.GraphQL4.Store.WebMVC/Dockerfile
3333
push: true
34-
tags: antoniofalcaojr/dotnet5-graphql3-webmvc:latest
34+
tags: antoniofalcaojr/dotnet6-graphql4-webmvc:latest

‎Directory.Build.props‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,36 @@
11
<Project>
2+
23
<PropertyGroup Label="Common properties">
3-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
45
<LangVersion>9</LangVersion>
56
</PropertyGroup>
67

78
<PropertyGroup Label="Packages dependency versions">
89

910
<!--Microsoft-->
10-
<Microsoft_DependencyInjection_Version>5.0.0</Microsoft_DependencyInjection_Version>
11+
<Microsoft_Extensions_Version>6.0.0-preview.2.21154.6</Microsoft_Extensions_Version>
1112

1213
<!--EF Core-->
13-
<Microsoft_EntityFrameworkCore_Version>6.0.0-preview.1.21102.2</Microsoft_EntityFrameworkCore_Version>
14+
<Microsoft_EntityFrameworkCore_Version>6.0.0-preview.2.21154.2</Microsoft_EntityFrameworkCore_Version>
15+
<Microsoft_EntityFrameworkCore_DependencyInjection_Version>6.0.0-preview.2.21154.6</Microsoft_EntityFrameworkCore_DependencyInjection_Version>
16+
<Microsoft_HealthChecks_EntityFrameworkCore_Version>6.0.0-preview.2.21154.6</Microsoft_HealthChecks_EntityFrameworkCore_Version>
1417

1518
<!--GraphQL-->
16-
<GraphQL_Server_Version>4.4.1</GraphQL_Server_Version>
19+
<GraphQL_Server_Version>5.0.0</GraphQL_Server_Version>
1720
<GraphQL_Client_Version>3.2.2</GraphQL_Client_Version>
18-
<GraphQL_Version>3.3.2</GraphQL_Version>
21+
<GraphQL_Version>4.1.0</GraphQL_Version>
1922

2023
<!--AutoMapper-->
2124
<AutoMapper_DependencyInjection_Version>8.1.1</AutoMapper_DependencyInjection_Version>
2225
<AutoMapper_Version>10.1.1</AutoMapper_Version>
2326

27+
<!--HealthChecks-->
28+
<HealthChecks_Version>5.0.1</HealthChecks_Version>
29+
2430
<!--Others-->
25-
<FluentValidation_Version>9.5.1</FluentValidation_Version>
31+
<FluentValidation_Version>10.0.0.0-preview4</FluentValidation_Version>
2632
<Scrutor_Version>3.3.0</Scrutor_Version>
2733

2834
</PropertyGroup>
35+
2936
</Project>

Dotnet5.GraphQL3.WebApllicantion.sln renamed to Dotnet6.GraphQL4.WebApllicantion.sln

Lines changed: 159 additions & 159 deletions
Large diffs are not rendered by default.

‎NuGet.Config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
<configuration>
33
<packageSources>
44
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
5-
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
65
</packageSources>
76
</configuration>

‎README.md‎

Lines changed: 35 additions & 30 deletions
Large diffs are not rendered by default.

‎global.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{
2-
"sdk": {
3-
"version": "5.0.100"
4-
}
5-
}
1+
{
2+
"sdk": {
3+
"version": "6.0.100-preview.2.21155.3"
4+
}
5+
}

0 commit comments

Comments
 (0)