Skip to content

Commit 4491716

Browse files
Merge branch 'master' into task/#10_smtptogoinjectedclient
2 parents 9287303 + 092ab01 commit 4491716

6 files changed

Lines changed: 16 additions & 33 deletions

File tree

.github/workflows/createrelease.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,12 @@ jobs:
1313
runs-on: ubuntu-latest
1414

1515
steps:
16-
- uses: actions/checkout@v1
16+
- uses: actions/checkout@v2.3.4
1717

1818
- name: Get the version
1919
id: get_version
2020
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
2121

22-
- name: Setup .NET Core 3.1
23-
uses: actions/setup-dotnet@v1
24-
with:
25-
dotnet-version: 3.1.102
26-
2722
- name: Restore Nuget Packages
2823
run: dotnet restore MessagingService.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json
2924

@@ -77,15 +72,15 @@ jobs:
7772
7873
- name: Get Release
7974
id: getrelease
80-
uses: octokit/request-action@v1.x
75+
uses: octokit/request-action@v2.0.17
8176
with:
8277
route: GET /repos/StuartFerguson/Messaging/releases/tags/${{ steps.get_version.outputs.VERSION }}
8378
env:
8479
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8580

8681
- name: Build Release Notes
8782
id: buildreleasenotes
88-
uses: gr2m/get-json-paths-action@v1.x
83+
uses: gr2m/get-json-paths-action@v1.0.4
8984
with:
9085
json: ${{ steps.getrelease.outputs.data }}
9186
releasenote: "body"

.github/workflows/nightlybuild.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- uses: actions/checkout@v1
18-
19-
- name: Setup .NET Core
20-
uses: actions/setup-dotnet@v1
21-
with:
22-
dotnet-version: 3.1.102
17+
- uses: actions/[email protected]
2318

2419
- name: Restore Nuget Packages
2520
run: dotnet restore MessagingService.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json
@@ -35,7 +30,7 @@ jobs:
3530
dotnet test "MessagingService.Tests\MessagingService.Tests.csproj" /p:CollectCoverage=true /p:Exclude="[xunit*]*" /p:ExcludeByAttribute="Obsolete" /p:ExcludeByAttribute="GeneratedCodeAttribute" /p:ExcludeByAttribute="CompilerGeneratedAttribute" /p:ExcludeByAttribute="ExcludeFromCodeCoverageAttribute" /p:CoverletOutput="../lcov3.info" /maxcpucount:1 /p:CoverletOutputFormat="lcov"
3631
3732
- name: Setup Node.js for use with actions
38-
uses: actions/setup-node@v1.1.0
33+
uses: actions/setup-node@v1.4.4
3934

4035
- name: Combine Coverage
4136
run: |

.github/workflows/prereleasenuget.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,23 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v1
19-
20-
- name: Setup .NET Core
21-
uses: actions/setup-dotnet@v1
18+
- uses: actions/[email protected]
2219
with:
23-
dotnet-version: 3.1.102
20+
fetch-depth: 0
2421

2522
- name: Restore Nuget Packages
2623
run: dotnet restore MessagingService.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json
2724

2825
- name: Build Code
2926
run: dotnet build MessagingService.sln --configuration Release
3027

31-
- name: Get the last version
32-
id: get_version
33-
run: echo ::set-output name=VERSION::$(git tag --sort=committerdate | tail -1)
34-
28+
- name: 'Get Previous tag'
29+
id: previoustag
30+
uses: "WyriHaximus/[email protected]"
31+
3532
- name: Print Version
3633
id: next_version
37-
run: echo ::set-output name=VERSION::${{ steps.get_version.outputs.VERSION }}-build$GITHUB_RUN_NUMBER
34+
run: echo ::set-output name=VERSION::${{ steps.previoustag.outputs.tag }}-build$GITHUB_RUN_NUMBER
3835

3936
- name: Build and Publish Nuget Packages
4037
run: |

.github/workflows/pullrequest.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- uses: actions/checkout@v1
18-
19-
- name: Setup .NET Core
20-
uses: actions/setup-dotnet@v1
21-
with:
22-
dotnet-version: 3.1.102
17+
- uses: actions/[email protected]
2318

2419
- name: Restore Nuget Packages
2520
run: dotnet restore MessagingService.sln --source https://api.nuget.org/v3/index.json --source https://www.myget.org/F/transactionprocessing/api/v3/index.json

.github/workflows/release-management.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
# Drafts your next Release notes as Pull Requests are merged into "master"
14-
- uses: toolmantim/release-drafter@v5.2.0
14+
- uses: toolmantim/release-drafter@v5.12.1
1515
env:
1616
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

MessagingService/nlog.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
archiveNumbering="Date"
1010
archiveDateFormat="yyyyMMdd-HH"
1111
archiveEvery="Hour"
12-
keepFileOpen="false"/>
12+
keepFileOpen="false"
13+
maxArchiveFiles="24"/>/>
1314
</target>
1415
</targets>
1516

0 commit comments

Comments
 (0)