Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

.NET 8 and associated dependency version updates #68

Draft
wants to merge 12 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": 1,
"isRoot": true,
"tools": {
"paket": {
"version": "8.0.0",
"commands": [
"paket"
]
}
}
}
16 changes: 13 additions & 3 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,20 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: '6.0.100'
dotnet-version: '8.0.100'
- name: Set Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: 20.x
- name: Corepack enable
run: corepack enable
- name: Restore .NET tools
run: dotnet tool restore
- name: Restore dependencies
run: dotnet restore gpp.sln
- name: Build
run: dotnet build gpp.sln
- name: Build
run: dotnet test gpp.sln
- name: Run tests
run: dotnet test gpp.sln
- name: Build docker images
run: docker compose -f docker-compose.yml build
16 changes: 13 additions & 3 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,20 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: '6.0.100'
dotnet-version: '8.0.100'
- name: Set Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: 20.x
- name: Corepack enable
run: corepack enable
- name: Restore .NET tools
run: dotnet tool restore
- name: Restore dependencies
run: dotnet restore gpp.sln
- name: Build
run: dotnet build gpp.sln
- name: Build
run: dotnet test gpp.sln
- name: Run tests
run: dotnet test gpp.sln
- name: Build docker images
run: docker compose -f docker-compose.yml build
557 changes: 557 additions & 0 deletions .paket/Paket.Restore.targets

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

### Changed
- Set cookies to have sliding expiration
- Updated to .NET 8

### Fixed
- Fixed forgot password workflow


## [2.0.1] - 2023-02-02

### Added
Expand Down
3 changes: 3 additions & 0 deletions docker-compose.development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ services:
- ASPNETCORE_URLS=http://0.0.0.0:80

webapigw:
environment:
- ASPNETCORE_URLS=http://0.0.0.0:80
ports:
- "5202:80"

Expand All @@ -22,6 +24,7 @@ services:
- "identity.sqldb:identitydb"
environment:
- ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80
- WebsiteUrl=http://${GPP_EXTERNAL_DNS_NAME_OR_IP}:5101

identity.sqldb:
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ services:
- Authentication__Facebook__AppSecret=${FACEBOOK_SECRET}
- Authentication__Twitter__ConsumerKey=${TWITTER_KEY}
- Authentication__Twitter__ConsumerSecret=${TWITTER_SECRET}
- ConnectionStrings__UserConnection=Server=identitydb,1433;Database=${USER_SQL_DB};User=${USER_SQL_USER};Password=${USER_SQL_PASSWORD}
- ConnectionStrings__UserConnection=Server=identitydb,1433;Database=${USER_SQL_DB};User=${USER_SQL_USER};Password=${USER_SQL_PASSWORD};TrustServerCertificate=true
- EmailFromName=${EMAIL_FROM_NAME}
- EmailFromAddress=${EMAIL_FROM_ADDR}
- SendGridKey=${SENDGRID_KEY}
Expand Down Expand Up @@ -109,4 +109,4 @@ services:
image: eventstore/eventstore:release-5.0.8
ports:
- "2113:2113"
- "1113:1113"
- "1113:1113"
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "6.0.100"
"version": "8.0.100"
}
}
81 changes: 81 additions & 0 deletions paket.dependencies
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
source https://api.nuget.org/v3/index.json

framework: net8.0
storage: none

nuget FSharp.Core ~> 8

group Gateway

source https://api.nuget.org/v3/index.json
storage: none

nuget Microsoft.AspNetCore.Authentication.JwtBearer ~> 8
nuget Microsoft.Extensions.Configuration.Json ~> 8
nuget Ocelot ~> 22
nuget System.IdentityModel.Tokens.Jwt ~> 7.0.3

group Core

source https://api.nuget.org/v3/index.json
storage: none

nuget EventStore.Client ~> 22 # Legacy version for ES v5
nuget Giraffe ~> 6.2
nuget Microsoft.FSharpLu.Json == 0.11.7
nuget Microsoft.AspNetCore.Authentication.JwtBearer ~> 8
nuget Microsoft.Azure.Storage.Blob ~> 11.2.3
nuget Microsoft.Extensions.Configuration ~> 8
nuget Microsoft.Extensions.Configuration.FileExtensions ~> 8
nuget Microsoft.Extensions.Configuration.Json ~> 8
nuget Newtonsoft.Json ~> 13
nuget SixLabors.ImageSharp ~> 1.0.4 # v3 available
nuget StackExchange.Redis ~> 2
nuget System.ComponentModel.Annotations ~> 5

group Identity

source https://api.nuget.org/v3/index.json
storage: none

nuget Microsoft.EntityFrameworkCore ~> 8
nuget Microsoft.EntityFrameworkCore.SqlServer ~> 8
nuget Microsoft.AspNetCore.Identity.EntityFrameworkCore ~> 8
nuget Microsoft.AspNetCore.Authentication.Facebook ~> 8
nuget Microsoft.AspNetCore.Authentication.Twitter ~> 8
nuget Microsoft.Extensions.Configuration ~> 8
nuget Microsoft.Extensions.Configuration.FileExtensions ~> 8
nuget Microsoft.Extensions.Configuration.Json ~> 8
nuget IdentityServer4.AspNetIdentity ~> 3 # v4 available
nuget IdentityServer4.EntityFramework ~> 3 # v4 available
nuget Giraffe ~> 6.2
nuget Giraffe.ViewEngine ~> 1 # v2 available
nuget SendGrid ~> 9

group Web

source https://api.nuget.org/v3/index.json
storage: none

nuget Microsoft.AspNetCore.Mvc.NewtonsoftJson ~> 8
nuget Swashbuckle.AspNetCore ~> 6
nuget TaskBuilder.fs ~> 2.1
nuget IdentityServer4.AccessTokenValidation ~> 3.0.1
nuget Giraffe ~> 6.2
nuget Markdig ~> 0.34
nuget Microsoft.AspNet.WebApi.Client ~> 6
nuget Microsoft.AspNetCore.Authentication.OpenIdConnect ~> 8
nuget Microsoft.Extensions.Http.Polly ~> 8
nuget Microsoft.FSharpLu.Json ~> 0.11.7
nuget Polly ~> 8.2
nuget Polly.Extensions.Http ~> 3
nuget System.IdentityModel.Tokens.Jwt ~> 7

group Test

source https://api.nuget.org/v3/index.json
storage: none

nuget xunit
nuget xunit.runner.visualstudio
nuget Microsoft.NET.Test.Sdk
Loading
Loading