Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ jobs:

env:
build_configuration: Release
build_framework: net9.0
build_framework: net10.0

steps:
- uses: actions/checkout@v5

- name: Setup .NET Core
uses: actions/setup-dotnet@v5
with:
dotnet-version: 9
dotnet-version: 10

- name: dotnet restore
run: dotnet restore
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/update-nix-flake.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ on:
# - published

env:
dotnet_major: 9
build_framework: net9.0
dotnet_major: 10
build_framework: net10.0
build_configuration: Release

jobs:
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:

- name: remove duplicate dependencies
run: |
# workaround to fix `ln: failed to create symbolic link '/build/nuget.09LAmy/fallback/microsoft.netcore.app.runtime.linux-x64/9.0.1': File exists`
# workaround to fix `ln: failed to create symbolic link '/build/nuget.09LAmy/fallback/microsoft.netcore.app.runtime.linux-x64/10.0.1': File exists`
# when building the project in nixos

DIRS=(
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:

- name: create dependency file
run: |
nix shell nixpkgs#nuget-to-json nixpkgs#dotnetCorePackages.sdk_9_0 --command sh -c "nuget-to-json nuget-restore/ > deps.json"
nix shell nixpkgs#nuget-to-json nixpkgs#dotnetCorePackages.sdk_10_0 --command sh -c "nuget-to-json nuget-restore/ > deps.json"
rm -r nuget-restore
cat deps.json

Expand Down
7 changes: 6 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
{
"nixEnvSelector.nixFile": "${workspaceFolder}/shell.nix"
"nixEnvSelector.nixFile": "${workspaceFolder}/shell.nix",
"editor.formatOnSave": true,
"dotnet.defaults.buildConfiguration": "Debug",
"dotnet.defaults.runtime": "win-x64",
"dotnet.defaults.framework": "net10.0",
"dotnet.defaults.version": "1.0.0"
}
73 changes: 73 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "dotnet restore",
"type": "shell",
"command": "dotnet",
"args": [
"restore"
],
"group": {
"kind": "build",
"isDefault": true
},
"problemMatcher": "$msCompile"
},
{
"label": "dotnet publish",
"type": "shell",
"command": "dotnet",
"args": [
"publish",
"ProcessTracker",
"--configuration",
"${config:dotnet.defaults.buildConfiguration}",
"--runtime",
"${config:dotnet.defaults.runtime}",
"--framework",
"${config:dotnet.defaults.framework}",
"--self-contained",
"true",
"-p:PublishSingleFile=true",
"-p:PublishTrimmed=false",
"-p:PublishReadyToRun=false",
"-p:Version=${config:dotnet.defaults.version}",
"-p:PackageVersion=${config:dotnet.defaults.version}",
"--output",
"${workspaceFolder}/publish"
],
"problemMatcher": "$msCompile"
},
{
"label": "dotnet test",
"type": "shell",
"command": "dotnet",
"args": [
"test",
"ProcessTrackerCLI.sln",
"--configuration",
"${config:dotnet.defaults.buildConfiguration}",
"--framework",
"${config:dotnet.defaults.framework}",
"--verbosity",
"normal"
],
"options": {
"cwd": "${workspaceFolder}"
},
"problemMatcher": "$msCompile"
},
{
"label": "CI: restore → publish",
"dependsOrder": "sequence",
"dependsOn": [
"dotnet restore",
"dotnet publish"
],
"problemMatcher": [
"$eslint-compact"
]
}
]
}
10 changes: 5 additions & 5 deletions ProcessTracker.Core/ProcessTracker.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.10" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.10" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.10" />
<PackageReference Include="RestSharp" Version="112.1.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
<PackageReference Include="RestSharp" Version="113.0.0" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions ProcessTracker/ProcessTracker.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
<PublishAot>false</PublishAot>
Expand All @@ -14,9 +14,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.10" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.10" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.10" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ProcessTrackerCLI/ProcessTrackerCLI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
Loading