Skip to content

Commit bf4f1dd

Browse files
thewizrdthewizrd
committed
Maui: fix release issues with MacCatalyst
1 parent a2114f5 commit bf4f1dd

File tree

5 files changed

+127
-119
lines changed

5 files changed

+127
-119
lines changed

Diff for: ‎Maui/SimpleWeather.Maui/Platforms/MacCatalyst/Entitlements.plist

+7-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
<plist version="1.0">
44
<dict>
55
<key>com.apple.security.app-sandbox</key>
6-
<true/>
7-
<key>com.apple.security.personal-information.location</key>
8-
<true/>
6+
<true/>
7+
<key>com.apple.security.personal-information.location</key>
8+
<true/>
9+
<key>com.apple.security.network.client</key>
10+
<true/>
11+
<key>com.apple.developer.weatherkit</key>
12+
<true/>
913
</dict>
1014
</plist>

Diff for: ‎Maui/SimpleWeather.Maui/Resources/Styles/Controls.xaml

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8" ?>
2+
<?xaml-comp compile="true" ?>
23
<ResourceDictionary
34
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
45
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"

Diff for: ‎Maui/SimpleWeather.Maui/SimpleWeather.Maui.csproj

+30-27
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,15 @@
1010
<UseMaui>true</UseMaui>
1111
<SingleProject>true</SingleProject>
1212
<ImplicitUsings>enable</ImplicitUsings>
13+
1314
<!-- Display name -->
1415
<ApplicationTitle>SimpleWeather</ApplicationTitle>
16+
1517
<!-- App Identifier -->
1618
<ApplicationId Condition="'$(Configuration)' == 'Debug'">com.thewizrd.simpleweather.debug</ApplicationId>
1719
<ApplicationId Condition="'$(Configuration)' == 'Release'">com.thewizrd.simpleweather</ApplicationId>
1820
<ApplicationIdGuid>640a2777-29ff-41b7-9b12-7325a1965902</ApplicationIdGuid>
21+
1922
<!-- Versions -->
2023
<ApplicationDisplayVersion>$(Version)</ApplicationDisplayVersion>
2124
<ApplicationVersion>$(VersionCode)</ApplicationVersion>
@@ -25,10 +28,12 @@
2528
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
2629
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
2730
<DefaultLanguage>en-US</DefaultLanguage>
31+
2832
<!-- Distribution -->
2933
<EnableMsixTooling Condition="$(TargetFramework.Contains('windows'))">true</EnableMsixTooling>
3034
<PublishProfile Condition="$(TargetFramework.Contains('windows'))">Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
3135
</PropertyGroup>
36+
3237
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0-ios|AnyCPU'">
3338
<CreatePackage>false</CreatePackage>
3439
<CodesignProvision>SimpleWeather - Debug</CodesignProvision>
@@ -37,8 +42,8 @@
3742
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net7.0-ios|AnyCPU'">
3843
<WarningLevel>4</WarningLevel>
3944
<CreatePackage>false</CreatePackage>
40-
<CodesignProvision>SimpleWeather - Release</CodesignProvision>
41-
<CodesignKey>iPhone Distribution</CodesignKey>
45+
<CodesignProvision>SimpleWeather - Release (iOS - Debug)</CodesignProvision>
46+
<CodesignKey>iPhone Developer</CodesignKey>
4247
</PropertyGroup>
4348
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0-maccatalyst|AnyCPU'">
4449
<UseHardenedRuntime>true</UseHardenedRuntime>
@@ -56,11 +61,12 @@
5661
<EnableCodeSigning>True</EnableCodeSigning>
5762
<EnablePackageSigning>true</EnablePackageSigning>
5863
<CreatePackage>true</CreatePackage>
59-
<CodesignKey>Apple Distribution: DAVE ANTOINE (F5MCLX6AR8)</CodesignKey>
60-
<CodesignProvision>SimpleWeather - Release (MacCatalyst)</CodesignProvision>
64+
<CodesignKey>Mac Developer</CodesignKey>
65+
<CodesignProvision>SimpleWeather - Release (MacCatalyst - Dev)</CodesignProvision>
6166
<CodesignEntitlements>Platforms\MacCatalyst\Entitlements.plist</CodesignEntitlements>
62-
<PackageSigningKey>3rd Party Mac Developer Installer: DAVE ANTOINE (F5MCLX6AR8)</PackageSigningKey>
67+
<PackageSigningKey>3rd Party Mac Developer Installer</PackageSigningKey>
6368
</PropertyGroup>
69+
6470
<ItemGroup>
6571
<!-- App Icon -->
6672
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#0070c0" />
@@ -73,6 +79,7 @@
7379
<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
7480
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
7581
</ItemGroup>
82+
7683
<ItemGroup>
7784
<PackageReference Include="TimberLog" Version="1.0.0" />
7885
<PackageReference Include="CommunityToolkit.Maui" Version="5.0.0" />
@@ -242,28 +249,24 @@
242249
</Target>
243250
<PropertyGroup Condition=" $([MSBuild]::IsOSPlatform('OSX')) ">
244251
<CustomCommands>
245-
<CustomCommands>
246-
<Command>
247-
<type>BeforeBuild</type>
248-
<command>${SolutionDir}/KeyCheck/bin/Release/net7.0/publish/KeyCheck ${SolutionDir}/SimpleWeather.Shared/Keys</command>
249-
<externalConsole>True</externalConsole>
250-
</Command>
251-
<Command>
252-
<type>BeforeBuild</type>
253-
<command>${SolutionDir}/KeyCheck/bin/Release/net7.0/publish/KeyCheck ${SolutionDir}/SimpleWeather.Weather-API/Keys</command>
254-
<externalConsole>True</externalConsole>
255-
</Command>
256-
<Command>
257-
<type>BeforeBuild</type>
258-
<command>${SolutionDir}/EditManifest/bin/Release/net7.0/publish/EditManifest ${ProjectDir}/Platforms/MacCatalyst/Info.plist "${ProjectConfig}"</command>
259-
<externalConsole>True</externalConsole>
260-
</Command>
261-
<Command>
262-
<type>BeforeBuild</type>
263-
<command>${SolutionDir}/EditManifest/bin/Release/net7.0/publish/EditManifest ${ProjectDir}/Platforms/iOS/Info.plist "${ProjectConfig}"</command>
264-
<externalConsole>True</externalConsole>
265-
</Command>
266-
</CustomCommands>
252+
<CustomCommands>
253+
<Command>
254+
<type>BeforeBuild</type>
255+
<command>${SolutionDir}/KeyCheck/bin/Release/net7.0/publish/KeyCheck ${SolutionDir}/SimpleWeather.Shared/Keys</command>
256+
</Command>
257+
<Command>
258+
<type>BeforeBuild</type>
259+
<command>${SolutionDir}/KeyCheck/bin/Release/net7.0/publish/KeyCheck ${SolutionDir}/SimpleWeather.Weather-API/Keys</command>
260+
</Command>
261+
<Command>
262+
<type>BeforeBuild</type>
263+
<command>${SolutionDir}/EditManifest/bin/Release/net7.0/publish/EditManifest ${ProjectDir}/Platforms/iOS/Info.plist "${ProjectConfig}"</command>
264+
</Command>
265+
<Command>
266+
<type>BeforeBuild</type>
267+
<command>${SolutionDir}/EditManifest/bin/Release/net7.0/publish/EditManifest ${ProjectDir}/Platforms/MacCatalyst/Info.plist "${ProjectConfig}"</command>
268+
</Command>
269+
</CustomCommands>
267270
</CustomCommands>
268271
</PropertyGroup>
269272
<ProjectExtensions>

Diff for: ‎NuGet.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<configuration>
33
<packageSources>
44
<add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" />
5-
<add key="Local NuGet" value="/Users/dave.b.antoine/SimpleWeather/SimpleWeather.Maui/packages" />
5+
<add key="Local NuGet" value="packages" />
66
</packageSources>
77
</configuration>

0 commit comments

Comments
 (0)