Skip to content

Commit b35ec62

Browse files
jrgcubanojrgcubano
committed
feat(net5.0): add net5.0 framework support
1 parent 9f9237d commit b35ec62

29 files changed

Lines changed: 717 additions & 652 deletions

‎.editorconfig‎

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

‎.github/workflows/ci.yaml‎

Lines changed: 76 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,77 @@
1-
name: Continuous Integration
2-
on: pull_request
3-
4-
env:
5-
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
6-
DOTNET_CLI_TELEMETRY_OPTOUT: true
7-
8-
jobs:
9-
10-
###################################################
11-
# DOCS
12-
###################################################
13-
14-
# docs:
15-
# name: Documentation
16-
# runs-on: ubuntu-latest
17-
# steps:
18-
# - name: Checkout
19-
# uses: actions/checkout@master
20-
21-
# - name: Setup dotnet
22-
# uses: actions/setup-dotnet@v1
23-
# with:
24-
# dotnet-version: '3.1.402' # SDK Version to use.
25-
26-
# - name: Build
27-
# shell: bash
28-
# env:
29-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
30-
# run: |
31-
# cd docs
32-
# dotnet run --configuration Release
33-
34-
###################################################
35-
# BUILD
36-
###################################################
37-
38-
build:
39-
name: Build
40-
if: "!contains(github.event.head_commit.message, 'skip-ci')"
41-
strategy:
42-
matrix:
43-
kind: ['linux', 'windows', 'macOS']
44-
include:
45-
- kind: linux
46-
os: ubuntu-latest
47-
- kind: windows
48-
os: windows-latest
49-
- kind: macOS
50-
os: macos-latest
51-
runs-on: ${{ matrix.os }}
52-
steps:
53-
- name: Checkout
54-
uses: actions/checkout@v2
55-
with:
56-
fetch-depth: 0
57-
58-
- name: Setup dotnet
59-
uses: actions/setup-dotnet@v1
60-
with:
61-
dotnet-version: 3.1.402
62-
63-
- name: Integration Tests
64-
shell: bash
65-
run: |
66-
dotnet tool restore
67-
68-
- name: Build
69-
shell: bash
70-
run: |
71-
dotnet tool restore
1+
name: Continuous Integration
2+
on: pull_request
3+
4+
env:
5+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
6+
DOTNET_CLI_TELEMETRY_OPTOUT: true
7+
8+
jobs:
9+
10+
###################################################
11+
# DOCS
12+
###################################################
13+
14+
# docs:
15+
# name: Documentation
16+
# runs-on: ubuntu-latest
17+
# steps:
18+
# - name: Checkout
19+
# uses: actions/checkout@master
20+
21+
# - name: Setup dotnet
22+
# uses: actions/setup-dotnet@v1
23+
# with:
24+
# dotnet-version: '5.0.100' # SDK Version to use.
25+
26+
# - name: Build
27+
# shell: bash
28+
# env:
29+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
30+
# run: |
31+
# cd docs
32+
# dotnet run --configuration Release
33+
34+
###################################################
35+
# BUILD
36+
###################################################
37+
38+
build:
39+
name: Build
40+
if: "!contains(github.event.head_commit.message, 'skip-ci')"
41+
strategy:
42+
matrix:
43+
kind: ['linux', 'windows', 'macOS']
44+
include:
45+
- kind: linux
46+
os: ubuntu-latest
47+
- kind: windows
48+
os: windows-latest
49+
- kind: macOS
50+
os: macos-latest
51+
runs-on: ${{ matrix.os }}
52+
steps:
53+
- name: Checkout
54+
uses: actions/checkout@v2
55+
with:
56+
fetch-depth: 0
57+
58+
- name: Setup .NETCore 3.1.402
59+
uses: actions/setup-dotnet@v1
60+
with:
61+
dotnet-version: 3.1.402
62+
63+
- name: Setup .NET 5.x
64+
uses: actions/setup-dotnet@v1
65+
with:
66+
dotnet-version: 5.0.100
67+
68+
- name: Integration Tests
69+
shell: bash
70+
run: |
71+
dotnet tool restore
72+
73+
- name: Build
74+
shell: bash
75+
run: |
76+
dotnet tool restore
7277
dotnet cake

‎.github/workflows/publish.yaml‎

Lines changed: 113 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,104 +1,114 @@
1-
name: Publish
2-
3-
on:
4-
push:
5-
tags:
6-
- '*'
7-
branches:
8-
- master
9-
paths:
10-
- 'src/**'
11-
12-
env:
13-
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
14-
DOTNET_CLI_TELEMETRY_OPTOUT: true
15-
16-
jobs:
17-
18-
###################################################
19-
# DOCS
20-
###################################################
21-
22-
# docs:
23-
# name: Documentation
24-
# runs-on: ubuntu-latest
25-
# steps:
26-
# - name: Checkout
27-
# uses: actions/checkout@master
28-
29-
# - name: Setup dotnet
30-
# uses: actions/setup-dotnet@v1
31-
# with:
32-
# dotnet-version: '3.1.402 # SDK Version to use.
33-
34-
# - name: Build
35-
# shell: bash
36-
# env:
37-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
38-
# run: |
39-
# cd docs
40-
# dotnet run --configuration Release
41-
42-
###################################################
43-
# BUILD
44-
###################################################
45-
46-
build:
47-
name: Build
48-
# needs: [docs]
49-
if: "!contains(github.event.head_commit.message, 'skip-ci') || startsWith(github.ref, 'refs/tags/')"
50-
strategy:
51-
matrix:
52-
kind: ['linux', 'windows', 'macOS']
53-
include:
54-
- kind: linux
55-
os: ubuntu-latest
56-
- kind: windows
57-
os: windows-latest
58-
- kind: macOS
59-
os: macos-latest
60-
runs-on: ${{ matrix.os }}
61-
steps:
62-
- name: Checkout
63-
uses: actions/checkout@v2
64-
with:
65-
fetch-depth: 0
66-
67-
- name: Setup dotnet
68-
uses: actions/setup-dotnet@v1
69-
with:
70-
dotnet-version: 3.1.402
71-
72-
- name: Build
73-
shell: bash
74-
run: |
75-
dotnet tool restore
76-
dotnet cake
77-
78-
###################################################
79-
# PUBLISH
80-
###################################################
81-
82-
publish:
83-
name: Publish
84-
needs: [build]
85-
if: "!contains(github.event.head_commit.message, 'skip-ci') || startsWith(github.ref, 'refs/tags/')"
86-
runs-on: ubuntu-latest
87-
steps:
88-
- name: Checkout
89-
uses: actions/checkout@v2
90-
with:
91-
fetch-depth: 0
92-
93-
- name: Setup dotnet
94-
uses: actions/setup-dotnet@v1
95-
with:
96-
dotnet-version: 3.1.402
97-
98-
- name: Publish
99-
shell: bash
100-
run: |
101-
dotnet tool restore
102-
dotnet cake --target="publish" \
103-
--nuget-key="${{secrets.NUGET_API_KEY}}" \
1+
name: Publish
2+
3+
on:
4+
push:
5+
tags:
6+
- '*'
7+
branches:
8+
- master
9+
paths:
10+
- 'src/**'
11+
12+
env:
13+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
14+
DOTNET_CLI_TELEMETRY_OPTOUT: true
15+
16+
jobs:
17+
18+
###################################################
19+
# DOCS
20+
###################################################
21+
22+
# docs:
23+
# name: Documentation
24+
# runs-on: ubuntu-latest
25+
# steps:
26+
# - name: Checkout
27+
# uses: actions/checkout@master
28+
29+
# - name: Setup dotnet
30+
# uses: actions/setup-dotnet@v1
31+
# with:
32+
# dotnet-version: '5.0.100 # SDK Version to use.
33+
34+
# - name: Build
35+
# shell: bash
36+
# env:
37+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
38+
# run: |
39+
# cd docs
40+
# dotnet run --configuration Release
41+
42+
###################################################
43+
# BUILD
44+
###################################################
45+
46+
build:
47+
name: Build
48+
# needs: [docs]
49+
if: "!contains(github.event.head_commit.message, 'skip-ci') || startsWith(github.ref, 'refs/tags/')"
50+
strategy:
51+
matrix:
52+
kind: ['linux', 'windows', 'macOS']
53+
include:
54+
- kind: linux
55+
os: ubuntu-latest
56+
- kind: windows
57+
os: windows-latest
58+
- kind: macOS
59+
os: macos-latest
60+
runs-on: ${{ matrix.os }}
61+
steps:
62+
- name: Checkout
63+
uses: actions/checkout@v2
64+
with:
65+
fetch-depth: 0
66+
67+
- name: Setup .NETCore 3.1.402
68+
uses: actions/setup-dotnet@v1
69+
with:
70+
dotnet-version: 3.1.402
71+
72+
- name: Setup .NET 5.x
73+
uses: actions/setup-dotnet@v1
74+
with:
75+
dotnet-version: 5.0.100
76+
77+
- name: Build
78+
shell: bash
79+
run: |
80+
dotnet tool restore
81+
dotnet cake
82+
83+
###################################################
84+
# PUBLISH
85+
###################################################
86+
87+
publish:
88+
name: Publish
89+
needs: [build]
90+
if: "!contains(github.event.head_commit.message, 'skip-ci') || startsWith(github.ref, 'refs/tags/')"
91+
runs-on: ubuntu-latest
92+
steps:
93+
- name: Checkout
94+
uses: actions/checkout@v2
95+
with:
96+
fetch-depth: 0
97+
98+
- name: Setup .NETCore 3.1.402
99+
uses: actions/setup-dotnet@v1
100+
with:
101+
dotnet-version: 3.1.402
102+
103+
- name: Setup .NET 5.x
104+
uses: actions/setup-dotnet@v1
105+
with:
106+
dotnet-version: 5.0.100
107+
108+
- name: Publish
109+
shell: bash
110+
run: |
111+
dotnet tool restore
112+
dotnet cake --target="publish" \
113+
--nuget-key="${{secrets.NUGET_API_KEY}}" \
104114
--github-key="${{secrets.GITHUB_TOKEN}}"

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
## What is Appy.Configuration?
66

7-
Configuration providers for NETCore 2.2, 3.0 and 3.1+.
7+
Configuration providers for NETCore 2.2, 3.0, 3.1 and NET 5.0.
88

99
## Configuration Providers
1010

@@ -222,7 +222,7 @@ appy-op --signin yourorg your_name@yourorg.com secretkey --vault Development -en
222222
Enter the password for your_name@yourorg.com at yourorg.1password.com:
223223
...
224224

225-
Updating user environment variables.
225+
Updating 1Password session information.
226226

227227
Appy 1Password session started:
228228
+------------------------------------------------------------+
@@ -268,7 +268,7 @@ appy-op -s -a
268268
In search of supporting projects that want to run or debug their projects inside Docker and at the same time consume the configuration from 1Password, a simple Nano Api integrated directly in the tool was added. This eliminates the need to have any reference to the 1Password cli in your project image.
269269

270270
```console
271-
appy-op -s -api 5500
271+
appy-op -s -a -api 5500
272272
```
273273

274274
When executing or debugging your dotnet project in a Docker container, it will be necessary to specify the url of the tool's Api through an environment variable:

0 commit comments

Comments
 (0)