Skip to content

Commit

Permalink
.NET 9 final bits, remove .NET 6 update Cake
Browse files Browse the repository at this point in the history
  • Loading branch information
devlead committed Nov 23, 2024
1 parent 3b53dae commit d2f5090
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"isRoot": true,
"tools": {
"cake.tool": {
"version": "4.2.0",
"version": "5.0.0",
"commands": [
"dotnet-cake"
],
"rollForward": false
},
"dpi": {
"version": "2024.9.25.81",
"version": "2024.11.4.84",
"commands": [
"dpi"
],
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "9.0.100-rc.2.24474.11"
"version": "9.0.100"
}
}
2 changes: 1 addition & 1 deletion resources/src/MultiTarget/MultiTarget.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
14 changes: 7 additions & 7 deletions src/DPI/DPI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<Nullable>enable</Nullable>
<PackageIcon>icon/dpi.png</PackageIcon>
<ImplicitUsings>enable</ImplicitUsings>
Expand All @@ -16,14 +16,14 @@
<PackageReference Include="Spectre.Console.Cli.Extensions.DependencyInjection" Version="0.2.0" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
<PackageReference Include="Cake.Core" Version="4.2.0" />
<PackageReference Include="Cake.Common" Version="4.2.0" />
<PackageReference Include="Cake.Core" Version="5.0.0" />
<PackageReference Include="Cake.Common" Version="5.0.0" />
<PackageReference Include="Cake.Bridge.DependencyInjection" Version="0.15.0" />
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
<PackageReference Include="System.Text.Json" Version="8.0.5" />
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
<PackageReference Include="System.Text.Json" Version="9.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions src/DPI/Parsers/NuGet/ProjectsAssetsParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ PackageReference basePackageReference
".NETCoreApp,Version=v5.0" => "net5.0",
".NETCoreApp,Version=v6.0" => "net6.0",
".NETCoreApp,Version=v7.0" => "net7.0",
".NETCoreApp,Version=v8.0" => "net8.0",
".NETCoreApp,Version=v9.0" => "net9.0",
_ => targetFramework
},
PackageId = System.IO.Path.GetDirectoryName(package),
Expand Down

0 comments on commit d2f5090

Please sign in to comment.