Skip to content

Commit

Permalink
Merge pull request #478 from laedit/feat/upgrade-net8
Browse files Browse the repository at this point in the history
Upgrade to .net8.0
  • Loading branch information
laedit authored May 16, 2024
2 parents 4bfa0df + 7a2b814 commit dde0e11
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,15 @@ jobs:
- name: GendarmeAnalysis
run: |
nuget install mono.gendarme -ExcludeVersion -OutputDirectory tools
./tools/Mono.Gendarme/tools/gendarme.exe --xml GendarmeReport.xml --ignore gendarme.ignore .\src\NVika\bin\Release\net6.0\NVika.exe
./tools/Mono.Gendarme/tools/gendarme.exe --xml GendarmeReport.xml --ignore gendarme.ignore .\src\NVika\bin\Release\net8.0\NVika.exe
- uses: actions/upload-artifact@v4
with:
path: GendarmeReport.xml
name: GendarmeReport.xml

- name: LaunchNVika
run: .\src\NVika\bin\Release\net6.0\NVika.exe --debug --includesource inspectcodereport.xml inspectcodereport.json ./src/NVika/bin/Release/net6.0/static-analysis.sarif.json GendarmeReport.xml
run: .\src\NVika\bin\Release\net8.0\NVika.exe --debug --includesource inspectcodereport.xml inspectcodereport.json ./src/NVika/bin/Release/net8.0/static-analysis.sarif.json GendarmeReport.xml

# - name: Create release notes
# run: |
Expand All @@ -94,13 +94,13 @@ jobs:
run: |
Copy-Item -Path resources/icon.png -Destination src\NVika.MSBuild\
mkdir src\NVika.MSBuild\tools\
Copy-Item -Path "src/NVika/bin/Release/net6.0/publish/*" -Destination src\NVika.MSBuild\tools\
Copy-Item -Path "src/NVika/bin/Release/net8.0/publish/*" -Destination src\NVika.MSBuild\tools\
nuget pack src/NVika.MSBuild/NVika.MSBuild.nuspec -Version ${{ steps.gitversion.outputs.nuGetVersionV2 }} -OutputDirectory artifacts/nuget
- name: Create netcore packages
run: |
mkdir ./artifacts/zips
Compress-Archive -Path src/NVika/bin/Release/net6.0/publish/* -DestinationPath "artifacts/zips/NVika.netcore.${{ steps.gitversion.outputs.nuGetVersionV2 }}.zip"
Compress-Archive -Path src/NVika/bin/Release/net8.0/publish/* -DestinationPath "artifacts/zips/NVika.netcore.${{ steps.gitversion.outputs.nuGetVersionV2 }}.zip"
Copy-Item -Path "src/NVika/bin/Release/NVika.${{ steps.gitversion.outputs.nuGetVersionV2 }}.nupkg" -Destination artifacts/nuget
- name: Create windows version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/infersharp-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
uses: microsoft/[email protected]
id: runinfersharp
with:
binary-path: 'src/NVika/bin/Release/net6.0/'
binary-path: 'src/NVika/bin/Release/net8.0/'

- name: Upload SARIF output to GitHub Security Center
uses: github/codeql-action/upload-sarif@v3
Expand Down
1 change: 1 addition & 0 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# next

- [#478](https://github.com/laedit/vika/pull/478) - Upgrade to .NET 8 +breaking
- [#477](https://github.com/laedit/vika/pull/477) - Fix license on nuget +enhancement

# 3.0.1 (2024-05-04)
Expand Down
2 changes: 1 addition & 1 deletion src/NVika.Tests/NVika.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/NVika/NVika.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ErrorLog>bin\$(Configuration)\$(TargetFramework)\static-analysis.sarif.json;version=2</ErrorLog>
<PackAsTool>true</PackAsTool>
<ToolCommandName>nvika</ToolCommandName>
Expand Down

0 comments on commit dde0e11

Please sign in to comment.