Skip to content

Commit

Permalink
[build] Add .NET 9.0, bump version for dependencies, update workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
JanoPL committed Feb 2, 2025
1 parent e45f4f4 commit 5bb5ff7
Show file tree
Hide file tree
Showing 30 changed files with 4,355 additions and 958 deletions.
22 changes: 16 additions & 6 deletions .github/workflows/dotnet-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
configuration: [ Debug ]
dotnet-version: [ 'netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0', 'net8.0' ]
dotnet-version: [ 'netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0', 'net8.0', 'net9.0' ]
steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -58,6 +58,11 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x

- name: Setup .NET Core SDK net9.0
uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.0.x

- name: Install dependencies
run: dotnet restore
Expand All @@ -78,7 +83,7 @@ jobs:
strategy:
matrix:
configuration: [ Debug ]
dotnet-version: [ 'netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0', 'net8.0' ]
dotnet-version: [ 'netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0', 'net8.0', 'net9.0' ]
steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -113,7 +118,12 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x


- name: Setup .NET Core SDK net9.0
uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.0.x

- name: Install dependencies
run: dotnet restore

Expand All @@ -129,7 +139,7 @@ jobs:
run: dotnet test --no-restore --verbosity minimal --configuration ${{ matrix.configuration }} -f ${{ matrix.dotnet-version }} --collect "XPlat Code Coverage"

- name: Rename and move Cobertura test to ${{ github.workspace }}/coverage directory
if: ${{ matrix.dotnet-version == 'net8.0' }}
if: ${{ matrix.dotnet-version == 'net9.0' }}
run: |
mkdir -p ${{ github.workspace }}/coverage
cp ${{ github.workspace }}/tests/UnitTests/TestResults/**/coverage.cobertura.xml ${{ github.workspace }}/coverage/coverage1.xml
Expand All @@ -140,7 +150,7 @@ jobs:
ls ${{ github.workspace }}/coverage
- name: Send coverage reports to Codacy
if: ${{ matrix.dotnet-version == 'net8.0' }}
if: ${{ matrix.dotnet-version == 'net9.0' }}
run: |
bash <(curl -Ls https://coverage.codacy.com/get.sh) report -r ${{ github.workspace }}/coverage/coverage1.xml -t ${{ secrets.CODACY_PROJECT_SECRET }} --partial --language CSharp --force-coverage-parser Cobertura
bash <(curl -Ls https://coverage.codacy.com/get.sh) report -r ${{ github.workspace }}/coverage/coverage2.xml -t ${{ secrets.CODACY_PROJECT_SECRET }} --partial --language CSharp --force-coverage-parser Cobertura
Expand All @@ -149,5 +159,5 @@ jobs:
bash <(curl -Ls https://coverage.codacy.com/get.sh) report -r ${{ github.workspace }}/coverage/coverage5.xml -t ${{ secrets.CODACY_PROJECT_SECRET }} --partial --language CSharp --force-coverage-parser Cobertura
- name: Finalize codacy reporter
if: ${{ matrix.dotnet-version == 'net8.0' }}
if: ${{ matrix.dotnet-version == 'net9.0' }}
run: bash <(curl -Ls https://coverage.codacy.com/get.sh) final -t ${{ secrets.CODACY_PROJECT_SECRET }}
8 changes: 5 additions & 3 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,28 @@
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="ConsoleTables" Version="2.6.1" />
<PackageVersion Include="ConsoleTables" Version="2.6.2" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="Serilog" Version="3.1.1" />
<PackageVersion Include="Serilog.AspNetCore" Version="8.0.1" />
<PackageVersion Include="Serilog.Settings.Configuration" Version="8.0.0" />
<PackageVersion Include="Serilog.Sinks.Console" Version="5.0.1" />
<PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageVersion Include="xunit" Version="2.8.0" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="[2.4.2]" Condition="'$(TargetFramework)' == 'netcoreapp3.1'" />
<PackageVersion Include="xunit.runner.visualstudio" Version="[2.4.2]" Condition="'$(TargetFramework)' == 'net5.0'" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0" Condition="'$(TargetFramework)' == 'net6.0'" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0" Condition="'$(TargetFramework)' == 'net7.0'" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.0" Condition="'$(TargetFramework)' == 'net8.0'" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.1" Condition="'$(TargetFramework)' == 'net9.0'" />
<PackageVersion Include="xunit.MSTest" Version="1.0.3" />
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="[17.0,18.0)" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="[3.1,5.0)" Condition="'$(TargetFramework)' == 'netcoreapp3.1'" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="[5.0,6.0)" Condition="'$(TargetFramework)' == 'net5.0'" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="[6.0,7.0)" Condition="'$(TargetFramework)' == 'net6.0'" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="[7.0,8.0)" Condition="'$(TargetFramework)' == 'net7.0'" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="[8.0,9.0)" Condition="'$(TargetFramework)' == 'net8.0'" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="[9.0,10.0)" Condition="'$(TargetFramework)' == 'net9.0'" />
</ItemGroup>
</Project>
19 changes: 14 additions & 5 deletions RoutesList.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,29 +23,33 @@
<repository type="git" url="https://github.com/JanoPL/Routeslist" />
<dependencies>
<group targetFramework=".NETCoreApp3.1">
<dependency id="ConsoleTables" version="2.6.1" />
<dependency id="ConsoleTables" version="2.6.2" />
<dependency id="Newtonsoft.Json" version="13.0.3"/>
</group>

<group targetFramework="net5.0">
<dependency id="ConsoleTables" version="2.6.1" />
<dependency id="ConsoleTables" version="2.6.2" />
<dependency id="Newtonsoft.Json" version="13.0.3"/>
</group>

<group targetFramework=".net6.0">
<dependency id="ConsoleTables" version="2.6.1" />
<dependency id="ConsoleTables" version="2.6.2" />
<dependency id="Newtonsoft.Json" version="13.0.3"/>
</group>

<group targetFramework=".net7.0">
<dependency id="ConsoleTables" version="2.6.1" />
<dependency id="ConsoleTables" version="2.6.2" />
<dependency id="Newtonsoft.Json" version="13.0.3"/>
</group>

<group targetFramework=".net8.0">
<dependency id="ConsoleTables" version="2.6.1" />
<dependency id="ConsoleTables" version="2.6.2" />
<dependency id="Newtonsoft.Json" version="13.0.3"/>
</group>
<group targetFramework=".net9.0">
<dependency id="ConsoleTables" version="2.6.2" />
<dependency id="Newtonsoft.Json" version="13.0.3"/>
</group>
</dependencies>

<frameworkReferences>
Expand Down Expand Up @@ -96,5 +100,10 @@
<file src=".\src\RoutesList.Gen\bin\Release\net8.0\RoutesList.Gen.dll" target="lib\net8.0" />
<file src=".\src\RoutesList.Build\bin\Release\net8.0\RoutesList.Build.pdb" target="lib\net8.0"/>
<file src=".\src\RoutesList.Gen\bin\Release\net8.0\RoutesList.Gen.pdb" target="lib\net8.0" />

<file src=".\src\RoutesList.Build\bin\Release\net8.0\RoutesList.Build.dll" target="lib\net9.0"/>
<file src=".\src\RoutesList.Gen\bin\Release\net8.0\RoutesList.Gen.dll" target="lib\net9.0" />
<file src=".\src\RoutesList.Build\bin\Release\net8.0\RoutesList.Build.pdb" target="lib\net9.0"/>
<file src=".\src\RoutesList.Gen\bin\Release\net8.0\RoutesList.Gen.pdb" target="lib\net9.0" />
</files>
</package>
22 changes: 17 additions & 5 deletions src/RoutesList.Build/RoutesList.Build.csproj
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>

<CheckEolTargetFramework>false</CheckEolTargetFramework>

<AssemblyVersion>1.1.2.1</AssemblyVersion>
<FileVersion>1.1.2.1</FileVersion>
<Version>1.1.2.1</Version>
<AssemblyVersion>1.1.3</AssemblyVersion>
<FileVersion>1.1.3</FileVersion>
<Version>1.1.3</Version>

<Authors>JanoPL</Authors>
<Company>JanoPL</Company>
<Copyright>JanoPL</Copyright>

<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>

<CheckEolTargetFramework>false</CheckEolTargetFramework>

<Description>Routing debugger for DotNet Core applications - Builder</Description>
<RepositoryUrl>https://github.com/JanoPL/Routeslist</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>Route list, Analizer Route, Debugging, Debugger, development, dev, tools, route, list, RoutesList</PackageTags>
<PackageTags>Route list, Analizer Route, Debugging, Debugger, debug, development, dev, tools, route, routes, list, RoutesList, developing</PackageTags>
<NeutralLanguage>en</NeutralLanguage>
<PackageProjectUrl>https://github.com/JanoPL/Routeslist</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
Expand Down Expand Up @@ -56,6 +58,11 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net9.0|AnyCPU'">
<Optimize>False</Optimize>
<WarningLevel>4</WarningLevel>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.1|AnyCPU'">
<Optimize>True</Optimize>
</PropertyGroup>
Expand All @@ -80,6 +87,11 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net9.0|AnyCPU'">
<Optimize>True</Optimize>
<WarningLevel>4</WarningLevel>
</PropertyGroup>

<ItemGroup>
<None Remove="Resources\StaticFile\index.html" />
<None Remove="Resources\StaticFile\TablePartialView.html" />
Expand Down
92 changes: 77 additions & 15 deletions src/RoutesList.Build/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,71 +4,133 @@
".NETCoreApp,Version=v3.1": {
"ConsoleTables": {
"type": "Direct",
"requested": "[2.6.1, )",
"resolved": "2.6.1",
"contentHash": "TyU885plpk88kMxgayy5+QQvtt/t3ZR45+vSvaKqZiaK+YsGVE6Mv7sV3fwjUMv3jHT15DdkpxW/+o+uc+bAJQ=="
"requested": "[2.6.2, )",
"resolved": "2.6.2",
"contentHash": "/bH4u0Lni2FPUtGvg1oAKpsEzmhhBlqj0DD67kvV/4qELaEBXDbVo9w3lHFQFe00vLEAZi+5Rr8Nai0D2z7+bg==",
"dependencies": {
"Wcwidth": "1.0.0"
}
},
"Newtonsoft.Json": {
"type": "Direct",
"requested": "[13.0.3, )",
"resolved": "13.0.3",
"contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
},
"Wcwidth": {
"type": "Transitive",
"resolved": "1.0.0",
"contentHash": "aekut5BeF4c1Jr2qab3aXcttcgPEfPb2ok2L8911EIzn3RnDBYnUWgx/1OVlqrSXCdwAkBpNgYWXb6b5t4cBng=="
}
},
".NETCoreApp,Version=v5.0": {
"ConsoleTables": {
"type": "Direct",
"requested": "[2.6.1, )",
"resolved": "2.6.1",
"contentHash": "TyU885plpk88kMxgayy5+QQvtt/t3ZR45+vSvaKqZiaK+YsGVE6Mv7sV3fwjUMv3jHT15DdkpxW/+o+uc+bAJQ=="
"requested": "[2.6.2, )",
"resolved": "2.6.2",
"contentHash": "/bH4u0Lni2FPUtGvg1oAKpsEzmhhBlqj0DD67kvV/4qELaEBXDbVo9w3lHFQFe00vLEAZi+5Rr8Nai0D2z7+bg==",
"dependencies": {
"Wcwidth": "1.0.0"
}
},
"Newtonsoft.Json": {
"type": "Direct",
"requested": "[13.0.3, )",
"resolved": "13.0.3",
"contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
},
"Wcwidth": {
"type": "Transitive",
"resolved": "1.0.0",
"contentHash": "aekut5BeF4c1Jr2qab3aXcttcgPEfPb2ok2L8911EIzn3RnDBYnUWgx/1OVlqrSXCdwAkBpNgYWXb6b5t4cBng=="
}
},
"net6.0": {
"ConsoleTables": {
"type": "Direct",
"requested": "[2.6.1, )",
"resolved": "2.6.1",
"contentHash": "TyU885plpk88kMxgayy5+QQvtt/t3ZR45+vSvaKqZiaK+YsGVE6Mv7sV3fwjUMv3jHT15DdkpxW/+o+uc+bAJQ=="
"requested": "[2.6.2, )",
"resolved": "2.6.2",
"contentHash": "/bH4u0Lni2FPUtGvg1oAKpsEzmhhBlqj0DD67kvV/4qELaEBXDbVo9w3lHFQFe00vLEAZi+5Rr8Nai0D2z7+bg==",
"dependencies": {
"Wcwidth": "1.0.0"
}
},
"Newtonsoft.Json": {
"type": "Direct",
"requested": "[13.0.3, )",
"resolved": "13.0.3",
"contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
},
"Wcwidth": {
"type": "Transitive",
"resolved": "1.0.0",
"contentHash": "aekut5BeF4c1Jr2qab3aXcttcgPEfPb2ok2L8911EIzn3RnDBYnUWgx/1OVlqrSXCdwAkBpNgYWXb6b5t4cBng=="
}
},
"net7.0": {
"ConsoleTables": {
"type": "Direct",
"requested": "[2.6.1, )",
"resolved": "2.6.1",
"contentHash": "TyU885plpk88kMxgayy5+QQvtt/t3ZR45+vSvaKqZiaK+YsGVE6Mv7sV3fwjUMv3jHT15DdkpxW/+o+uc+bAJQ=="
"requested": "[2.6.2, )",
"resolved": "2.6.2",
"contentHash": "/bH4u0Lni2FPUtGvg1oAKpsEzmhhBlqj0DD67kvV/4qELaEBXDbVo9w3lHFQFe00vLEAZi+5Rr8Nai0D2z7+bg==",
"dependencies": {
"Wcwidth": "1.0.0"
}
},
"Newtonsoft.Json": {
"type": "Direct",
"requested": "[13.0.3, )",
"resolved": "13.0.3",
"contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
},
"Wcwidth": {
"type": "Transitive",
"resolved": "1.0.0",
"contentHash": "aekut5BeF4c1Jr2qab3aXcttcgPEfPb2ok2L8911EIzn3RnDBYnUWgx/1OVlqrSXCdwAkBpNgYWXb6b5t4cBng=="
}
},
"net8.0": {
"ConsoleTables": {
"type": "Direct",
"requested": "[2.6.1, )",
"resolved": "2.6.1",
"contentHash": "TyU885plpk88kMxgayy5+QQvtt/t3ZR45+vSvaKqZiaK+YsGVE6Mv7sV3fwjUMv3jHT15DdkpxW/+o+uc+bAJQ=="
"requested": "[2.6.2, )",
"resolved": "2.6.2",
"contentHash": "/bH4u0Lni2FPUtGvg1oAKpsEzmhhBlqj0DD67kvV/4qELaEBXDbVo9w3lHFQFe00vLEAZi+5Rr8Nai0D2z7+bg==",
"dependencies": {
"Wcwidth": "1.0.0"
}
},
"Newtonsoft.Json": {
"type": "Direct",
"requested": "[13.0.3, )",
"resolved": "13.0.3",
"contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
},
"Wcwidth": {
"type": "Transitive",
"resolved": "1.0.0",
"contentHash": "aekut5BeF4c1Jr2qab3aXcttcgPEfPb2ok2L8911EIzn3RnDBYnUWgx/1OVlqrSXCdwAkBpNgYWXb6b5t4cBng=="
}
},
"net9.0": {
"ConsoleTables": {
"type": "Direct",
"requested": "[2.6.2, )",
"resolved": "2.6.2",
"contentHash": "/bH4u0Lni2FPUtGvg1oAKpsEzmhhBlqj0DD67kvV/4qELaEBXDbVo9w3lHFQFe00vLEAZi+5Rr8Nai0D2z7+bg==",
"dependencies": {
"Wcwidth": "1.0.0"
}
},
"Newtonsoft.Json": {
"type": "Direct",
"requested": "[13.0.3, )",
"resolved": "13.0.3",
"contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
},
"Wcwidth": {
"type": "Transitive",
"resolved": "1.0.0",
"contentHash": "aekut5BeF4c1Jr2qab3aXcttcgPEfPb2ok2L8911EIzn3RnDBYnUWgx/1OVlqrSXCdwAkBpNgYWXb6b5t4cBng=="
}
}
}
Expand Down
Loading

0 comments on commit 5bb5ff7

Please sign in to comment.