Upgrade macOS app to net7

ExQDev · Nov 9, 2022 · 71d1d18 · 71d1d18
1 parent f900619
commit 71d1d18
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/NAPS2.App.Mac/NAPS2.App.Mac.csproj b/NAPS2.App.Mac/NAPS2.App.Mac.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6-macos10.15</TargetFramework>
+    <TargetFramework>net7-macos10.15</TargetFramework>
     <OutputType>Exe</OutputType>
     <RootNamespace>NAPS2</RootNamespace>
     <AssemblyName>NAPS2</AssemblyName>

diff --git a/NAPS2.Lib.Mac/NAPS2.Lib.Mac.csproj b/NAPS2.Lib.Mac/NAPS2.Lib.Mac.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6-macos10.15</TargetFrameworks>
+        <TargetFrameworks>net7-macos10.15</TargetFrameworks>
         <Nullable>enable</Nullable>
         <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
         <RootNamespace>NAPS2</RootNamespace>
@@ -17,9 +17,7 @@
     <ItemGroup>
         <ProjectReference Include="..\NAPS2.Images.Mac\NAPS2.Images.Mac.csproj" />
         <ProjectReference Include="..\NAPS2.Lib\NAPS2.Lib.csproj" />
-        <PackageReference Include="Eto.Forms" Version="2.7.2" Condition="'$(TargetFramework)' == 'net6'" />
-        <PackageReference Include="Eto.Platform.Mac64" Version="2.7.2" Condition="'$(TargetFramework)' == 'net6'" />
-        <PackageReference Include="Eto.Platform.macOS" Version="2.7.2" Condition="'$(TargetFramework)' == 'net6-macos10.15'" />
+        <PackageReference Include="Eto.Platform.macOS" Version="2.7.2" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/NAPS2.Tools/Project/Packaging/MacPackager.cs b/NAPS2.Tools/Project/Packaging/MacPackager.cs
@@ -12,7 +12,7 @@ public static void Package(PackageInfo packageInfo, bool verbose)
         var runtimeId = packageInfo.Platform == Platform.MacArm ? "osx-arm64" : "osx-x64";
         Cli.Run("dotnet", $"publish NAPS2.App.Mac -c InstallerEXE -r {runtimeId}", verbose);
         // TODO: Fix version
-        var sourcePath = Path.Combine(Paths.SolutionRoot, "NAPS2.App.Mac", "bin", "InstallerEXE", "net6-macos10.15",
+        var sourcePath = Path.Combine(Paths.SolutionRoot, "NAPS2.App.Mac", "bin", "InstallerEXE", "net7-macos10.15",
             runtimeId, "publish", "NAPS2-1.0.pkg");
         if (File.Exists(pkgPath))
         {