Skip to content

Commit

Permalink
allow for net5 target
Browse files Browse the repository at this point in the history
  • Loading branch information
mariotoffia committed Oct 6, 2024
1 parent 7911e31 commit 6dd9b3d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:

- name: Patch csproj files with version
run: |
find . -name '*.csproj' -exec sed -i 's/<Version>.*<\/Version>/<Version>${{ steps.gitversion.outputs.nugetversion }}<\/Version>/g' {} +
find . -name '*.csproj' -exec sed -i 's/<Version>.*<\/Version>/<Version>${{ steps.gitversion.outputs.NuGetVersion }}<\/Version>/g' {} +
- name: SonarScanner begin
run: |
Expand All @@ -66,14 +66,14 @@ jobs:
/d:sonar.login=$SONAR_TOKEN \
/k:mariotoffia_FluentDocker \
/o:mariotoffia \
/v:"${{ steps.gitversion.outputs.nugetversion }}" \
/v:"${{ steps.gitversion.outputs.NuGetVersion }}" \
/d:sonar.cs.opencover.reportsPaths="./output/coverage.opencover.xml" \
/d:sonar.coverage.exclusions="**Tests*.cs"
env:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

- name: Build
run: dotnet build FluentDocker.sln --configuration Release --no-restore --verbosity minimal /p:Version=${{ steps.gitversion.outputs.nugetversion }}
run: dotnet build FluentDocker.sln --configuration Release --no-restore --verbosity minimal /p:Version=${{ steps.gitversion.outputs.NuGetVersion }}

- name: Test
run: dotnet test --settings coverletArgs.runsettings --filter TestCategory=CI -f netcoreapp3.1
Expand All @@ -84,7 +84,7 @@ jobs:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

- name: Package NuGet
run: dotnet pack FluentDocker.sln --configuration Release -o output /p:Version=${{ steps.gitversion.outputs.nugetversion }}
run: dotnet pack FluentDocker.sln --configuration Release -o output /p:Version=${{ steps.gitversion.outputs.NuGetVersion }}

- name: Upload Artifacts
uses: actions/upload-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion Ductus.FluentDocker.Tests/Ductus.FluentDocker.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;netcoreapp3.1;net461</TargetFrameworks>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net461</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down

0 comments on commit 6dd9b3d

Please sign in to comment.