cyanfish/naps2
1
1
Fork 0
mirror of https://github.com/cyanfish/naps2.git synced 2024-11-20 16:06:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Mac: Upgrade to net9

Browse Source
This commit is contained in:
Ben Olden-Cooligan 2024-09-05 13:35:12 -07:00
parent 30af842903
commit d514ab7846
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NAPS2.App.Mac/NAPS2.App.Mac.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8-macos</TargetFramework>
<TargetFramework>net9-macos</TargetFramework>
<OutputType>Exe</OutputType>
<RootNamespace>NAPS2</RootNamespace>
<AssemblyName>NAPS2</AssemblyName>

2
NAPS2.App.Tests/Targets/MacAppTestTarget.cs
View File

@ -10,7 +10,7 @@ public class MacAppTestTarget : IAppTestTarget
private AppTestExe GetAppTestExe(string argPrefix)
{
return new AppTestExe(
Path.Combine(AppTestHelper.SolutionRoot, "NAPS2.App.Mac", "bin", "Debug", "net8-macos"),
Path.Combine(AppTestHelper.SolutionRoot, "NAPS2.App.Mac", "bin", "Debug", "net9-macos"),
Path.Combine("NAPS2.app", "Contents", "MacOS", "NAPS2"),
argPrefix);
}

2
NAPS2.Lib.Mac/NAPS2.Lib.Mac.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8-macos</TargetFrameworks>
<TargetFrameworks>net9-macos</TargetFrameworks>
<Nullable>enable</Nullable>
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
<RootNamespace>NAPS2</RootNamespace>

4
NAPS2.Lib/NAPS2.Lib.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFrameworks>net8</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('OSX'))">
$(TargetFrameworks);net8-macos
$(TargetFrameworks);net9-macos
</TargetFrameworks>
<Nullable>enable</Nullable>
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
@ -17,7 +17,7 @@
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
<Import Project="..\NAPS2.Setup\targets\LibUsers.targets" />
<PropertyGroup Condition="'$(TargetFramework)' == 'net8-macos'">
<PropertyGroup Condition="'$(TargetFramework)' == 'net9-macos'">
<DefineConstants>MAC</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Release-Msi'">

2
NAPS2.Tools/Project/Packaging/MacPackager.cs
View File

@ -14,7 +14,7 @@ public static class MacPackager
Output.Info($"Packaging installer: {pkgPath}");
Output.Verbose("Building bundle");
var basePath = Path.Combine(Paths.SolutionRoot, "NAPS2.App.Mac", "bin", "Release", "net8-macos");
var basePath = Path.Combine(Paths.SolutionRoot, "NAPS2.App.Mac", "bin", "Release", "net9-macos");
string bundlePath = packageInfo.Platform switch
{
Platform.Mac => Path.Combine(basePath, "NAPS2.app"),

2
NAPS2.Tools/Project/TestCommand.cs
View File

@ -8,7 +8,7 @@ public class TestCommand : ICommand<TestOptions>
{
var arch = RuntimeInformation.OSArchitecture.ToString().ToLowerInvariant();
var depsRootPath = OperatingSystem.IsMacOS()
? $"NAPS2.App.Mac/bin/Debug/net8-macos/osx-{arch}"
? $"NAPS2.App.Mac/bin/Debug/net9-macos/osx-{arch}"
: OperatingSystem.IsLinux()
? $"NAPS2.App.Gtk/bin/Debug/net8/linux-{arch}"
: $"NAPS2.App.WinForms/bin/Debug/net9-windows/win-{arch}";