From fa46819030973dfac0ff83e9c7404d9b8d9cfa4a Mon Sep 17 00:00:00 2001 From: ParantezTech Date: Sat, 28 Mar 2026 18:23:46 +0300 Subject: [PATCH] fix for actions (again) --- .github/workflows/workflow.yml | 2 +- global.json | 2 +- src/SharpEmu.CLI/SharpEmu.CLI.csproj | 4 ++++ src/SharpEmu.CLI/packages.lock.json | 6 +++--- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 6f5f130..232287c 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -82,7 +82,7 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v5 with: - global-json-file: global.json + dotnet-version: 10.0.103 cache: true cache-dependency-path: | Directory.Packages.props diff --git a/global.json b/global.json index 363e974..abe5820 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { "version": "10.0.103", - "rollForward": "disable" + "rollForward": "latestFeature" } } diff --git a/src/SharpEmu.CLI/SharpEmu.CLI.csproj b/src/SharpEmu.CLI/SharpEmu.CLI.csproj index d622f4a..9d91cf6 100644 --- a/src/SharpEmu.CLI/SharpEmu.CLI.csproj +++ b/src/SharpEmu.CLI/SharpEmu.CLI.csproj @@ -30,6 +30,10 @@ SPDX-License-Identifier: GPL-2.0-or-later true + + + + Always diff --git a/src/SharpEmu.CLI/packages.lock.json b/src/SharpEmu.CLI/packages.lock.json index d230926..60d9ab8 100644 --- a/src/SharpEmu.CLI/packages.lock.json +++ b/src/SharpEmu.CLI/packages.lock.json @@ -4,9 +4,9 @@ "net10.0": { "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[10.0.3, )", - "resolved": "10.0.3", - "contentHash": "0B6nZyCHWXnvmlB559oduOspVdNOnpNXPjhpWVMovLPAsDVG7A4jJR9rzECf67JUzxP8/ee/wA8clwIzJcWNFA==" + "requested": "[10.0.5, )", + "resolved": "10.0.5", + "contentHash": "A+5ZuQ0f449tM+MQrhf6R9ZX7lYpjk/ODEwLYKrnF6111rtARx8fVsm4YznUnQiKnnXfaXNBqgxmil6RW3L3SA==" }, "sharpemu.core": { "type": "Project",