Skip to content

Commit 3ddf843

Browse files
committed
fixed merge issue
2 parents 6ba4900 + 2533b38 commit 3ddf843

135 files changed

Lines changed: 37 additions & 30 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-release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515
- name: Setup .NET 8.0
16-
uses: actions/setup-dotnet@v4
16+
uses: actions/setup-dotnet@v5
1717
with:
1818
dotnet-version: 8.0.x
1919
- name: Extract Version from tag
@@ -24,22 +24,22 @@ jobs:
2424
const version = context.ref.replace('refs/tags/', '');
2525
return version.slice(1);
2626
- name: Change Package Version
27-
working-directory: ./Src
27+
working-directory: ./src
2828
run: |
2929
sed -i -e "s/<Version>[a-zA-Z0-9.-]*<\/Version>/<Version>${{ steps.tag.outputs.result }}<\/Version>/g" SmtpServer/SmtpServer.csproj
3030
- name: Restore dependencies
31-
working-directory: ./Src
31+
working-directory: ./src
3232
run: dotnet restore
3333
- name: Build
34-
working-directory: ./Src
34+
working-directory: ./src
3535
run: dotnet build --configuration Release --no-restore
3636
- name: Test
37-
working-directory: ./Src
37+
working-directory: ./src
3838
run: |
3939
dotnet test --configuration Release --no-restore --no-build --verbosity normal
4040
- name: Build project and generate NuGet package
4141
run: |
42-
dotnet pack --configuration Release --output $GITHUB_WORKSPACE/out Src/SmtpServer/SmtpServer.csproj
42+
dotnet pack --configuration Release --output $GITHUB_WORKSPACE/out src/SmtpServer/SmtpServer.csproj
4343
- name: Push NuGet package
4444
run: |
4545
cd $GITHUB_WORKSPACE/out

.github/workflows/build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ on:
44
workflow_dispatch: # Allow running the workflow manually from the GitHub UI
55
push:
66
paths:
7-
- 'Src/**'
7+
- 'src/**'
88
- '.github/workflows/**'
99
branches: [ master ]
1010
pull_request:
1111
paths:
12-
- 'Src/**'
12+
- 'src/**'
1313
- '.github/workflows/**'
1414

1515
jobs:
@@ -22,18 +22,18 @@ jobs:
2222
#packages: write
2323

2424
steps:
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2626
- name: Setup .NET 8.0
27-
uses: actions/setup-dotnet@v4
27+
uses: actions/setup-dotnet@v5
2828
with:
2929
dotnet-version: 8.0.x
3030
- name: Restore dependencies
31-
working-directory: ./Src
31+
working-directory: ./src
3232
run: dotnet restore
3333
- name: Build
34-
working-directory: ./Src
34+
working-directory: ./src
3535
run: dotnet build --configuration Release --no-restore
3636
- name: Test
37-
working-directory: ./Src
37+
working-directory: ./src
3838
run: |
3939
dotnet test --configuration Release --no-restore --no-build --verbosity normal

README.md

Lines changed: 16 additions & 9 deletions
File renamed without changes.

Examples/SampleApp/Examples/CustomEndpointListenerExample.cs renamed to examples/SampleApp/Examples/CustomEndpointListenerExample.cs

File renamed without changes.

Examples/SampleApp/Examples/DependencyInjectionExample.cs renamed to examples/SampleApp/Examples/DependencyInjectionExample.cs

File renamed without changes.
File renamed without changes.

Examples/SampleApp/Examples/ServerCancellingExample.cs renamed to examples/SampleApp/Examples/ServerCancellingExample.cs

File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)