Skip to content

Commit aac8fb1

Browse files
Update to net5.0 and Girafe 5.0 RC 6 (#286)
* Update to net5.0 and Girafe 5.0 RC 6 * Update .NET version in GH Actions * Try to fix gRPC samples * Add Gitpod config * Fix docker image * Fix gitpod tasks * Infra * DI fixes * Fix build GH Action * More tests fixes * Update Gitpod config * Make sure there is host per test * Update readme
1 parent 36f7fdb commit aac8fb1

File tree

74 files changed

+866
-782
lines changed

Some content is hidden

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

74 files changed

+866
-782
lines changed

.config/dotnet-tools.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"isRoot": true,
44
"tools": {
55
"fake-cli": {
6-
"version": "5.19.0",
6+
"version": "5.20.4-alpha.1642",
77
"commands": [
88
"fake"
99
]
1010
},
1111
"paket": {
12-
"version": "5.241.6",
12+
"version": "5.257.0",
1313
"commands": [
1414
"paket"
1515
]

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
44
#-------------------------------------------------------------------------------------------------------------
55

6-
FROM mcr.microsoft.com/dotnet/core/sdk:3.1.301
6+
FROM mcr.microsoft.com/dotnet/sdk:5.0
77

88
# Avoid warnings by switching to noninteractive
99
ENV DEBIAN_FRONTEND=noninteractive

.github/workflows/benchmark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
matrix:
1010
os: [macos-latest]
11-
dotnet: [3.1.301]
11+
dotnet: [5.0.100]
1212
runs-on: ${{ matrix.os }}
1313

1414
steps:

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
matrix:
1010
os: [windows-latest, macos-latest, ubuntu-latest]
11-
dotnet: [3.1.301]
11+
dotnet: [5.0.100]
1212
runs-on: ${{ matrix.os }}
1313

1414
steps:
@@ -20,4 +20,4 @@ jobs:
2020
- name: Restore tools
2121
run: dotnet tool restore
2222
- name: Run Test
23-
run: dotnet fake build
23+
run: dotnet fake build -t Test

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup .NET Core
1616
uses: actions/setup-dotnet@v1
1717
with:
18-
dotnet-version: 3.1.301
18+
dotnet-version: 5.0.100
1919
- name: Restore tools
2020
run: dotnet tool restore
2121
- name: Restore dependencies

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
os: [windows-latest]
14-
dotnet: [3.1.301]
14+
dotnet: [5.0.100]
1515
runs-on: ${{ matrix.os }}
1616

1717
steps:

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,6 @@ flycheck_*.el
132132
# projectiles files
133133
.projectile
134134

135-
### VisualStudioCode ###
136-
.vscode
137-
138-
139135

140136
### VisualStudio ###
141137
## Ignore Visual Studio temporary files, build results, and

.gitpod.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
image:
2+
file: .devcontainer/Dockerfile
3+
tasks:
4+
- before: dotnet tool restore
5+
command: dotnet restore
6+
vscode:
7+
extensions:
8+
- [email protected]:5/iI88WHX4j3iL5jASDTYQ==
9+
- [email protected]:CCkwN8osXB8UmgWjuhT1Mg==

.vscode/launch.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"name": "Debug tests",
6+
"type": "coreclr",
7+
"request": "launch",
8+
"preLaunchTask": "build_tests",
9+
"program": "${workspaceFolder}/tests/Saturn.UnitTests/bin/Debug/net5.0/Saturn.UnitTests.dll",
10+
"cwd": "${workspaceFolder}",
11+
"console": "integratedTerminal",
12+
"stopAtEntry": false,
13+
"justMyCode": false,
14+
"symbolOptions": {
15+
"searchPaths": [],
16+
"searchMicrosoftSymbolServer": true,
17+
"searchNuGetOrgSymbolServer": true
18+
},
19+
"sourceLinkOptions": {
20+
"*": {
21+
"enabled": true
22+
}
23+
},
24+
"enableStepFiltering": false
25+
}
26+
]
27+
}

.vscode/tasks.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "build_tests",
6+
"taskName": "build_tests",
7+
"type": "shell",
8+
"command": "dotnet build tests/Saturn.UnitTests",
9+
"problemMatcher": [
10+
"$msCompile"
11+
],
12+
"group": {
13+
"kind": "build",
14+
"isDefault": true
15+
}
16+
}
17+
]
18+
}

0 commit comments

Comments
 (0)