Fix build

ssaattww · Nov 27, 2023 · dd6046c · dd6046c
1 parent edf3481
commit dd6046c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -29,7 +29,6 @@
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
-    <PublishSingleFile>true</PublishSingleFile>
     <TrimMode>partial</TrimMode>
     <TrimmerSingleWarn>false</TrimmerSingleWarn>
   </PropertyGroup>

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -13,4 +13,22 @@
     <Copy SourceFiles="$(RepoRoot)src\RoslynPad.Runtime\bin\$(Configuration)\$(LtsTargetFramework)\$(_RoslynPadInitialRuntimeIdentifier)\RoslynPad.Runtime.dll" DestinationFolder="$(PublishDir)\runtimes\net" />
     <Copy SourceFiles="$(RepoRoot)src\RoslynPad.Runtime\bin\$(Configuration)\netstandard2.0\$(_RoslynPadInitialRuntimeIdentifier)\RoslynPad.Runtime.dll" DestinationFolder="$(PublishDir)\runtimes\netfx" />
   </Target>
+  <!-- hack to make macOS asset packaging (actool) work on non-Catalyst builds -->
+  <Target Name="Before_CoreCompileImageAssets" BeforeTargets="_CoreCompileImageAssets">
+    <PropertyGroup>
+      <Original_SdkPlatform>$(_SdkPlatform)</Original_SdkPlatform>
+      <_SdkPlatform>MacCatalyst</_SdkPlatform>
+      <Original_UIDeviceFamily>$(_UIDeviceFamily)</Original_UIDeviceFamily>
+      <_UIDeviceFamily>IPad</_UIDeviceFamily>
+      <Original_ComputedTargetFrameworkMoniker>$(_ComputedTargetFrameworkMoniker)</Original_ComputedTargetFrameworkMoniker>
+      <_ComputedTargetFrameworkMoniker>$(_ComputedTargetFrameworkMoniker.Replace('=macos', '=maccatalyst'))</_ComputedTargetFrameworkMoniker>
+    </PropertyGroup>
+  </Target>
+  <Target Name="After_CoreCompileImageAssets" AfterTargets="_CoreCompileImageAssets">
+    <PropertyGroup>
+      <_SdkPlatform>$(Original_SdkPlatform)</_SdkPlatform>
+      <_UIDeviceFamily>$(Original_UIDeviceFamily)</_UIDeviceFamily>
+      <_ComputedTargetFrameworkMoniker>$(Original_ComputedTargetFrameworkMoniker)</_ComputedTargetFrameworkMoniker>
+    </PropertyGroup>
+  </Target>
 </Project>
diff --git a/src/RoslynPad/RoslynPad.csproj b/src/RoslynPad/RoslynPad.csproj
@@ -9,6 +9,7 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Version>$(RoslynPadVersion)</Version>
     <CopyRoslynPadRuntimeAssemblies>true</CopyRoslynPadRuntimeAssemblies>
+    <PublishSingleFile>true</PublishSingleFile>
     <SelfContained>true</SelfContained>
   </PropertyGroup>
   <ItemGroup>