diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e05d1f5..1f65364 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,6 +13,18 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Select Xcode version
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: 16.4
+          #xcode-version: latest-stable
+
+      - name: Get Xcode Version
+        id: xcode
+        uses: ./.github/actions/xcode-version
+        with:
+          min_version: '16.4'
+
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
@@ -27,17 +39,6 @@ jobs:
       - name: Install MAUI workloads
         run: dotnet workload install maui-ios maui-android
 
-      - name: Select Xcode version
-        uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: latest-stable
-
-      - name: Get Xcode Version
-        id: xcode
-        uses: ./.github/actions/xcode-version
-        with:
-          min_version: '16.4'
-
       - name: Build
         env:
           dotnet-target: "${{ steps.xcode.outputs.xcode_min_version != 'true' && '-p:DotNetTarget=8.0' || '' }}"
diff --git a/CheatSheet.md b/CheatSheet.md
index bafe4a7..210a0ac 100644
--- a/CheatSheet.md
+++ b/CheatSheet.md
@@ -4,5 +4,17 @@ My personal cheat sheet for things to remember
 ## Build With Full Log
 Make a build and write the full log to `publish.log`. Good for debugging MSBuild.
 ```
-dotnet publish -f:net9.0-ios --verbosity diagnostic --tl:off MAUI.Native.Embedded.Sample/MAUI.Native.Embedded.Sample.csproj > publish.log
+dotnet publish -f:net9.0-ios -v:diag --tl:off MAUI.Native.Embedded.Sample/MAUI.Native.Embedded.Sample.csproj > publish.log
+```
+
+## Build For iOS Device
+In order to build for device (and not simulator) you must provide the `RuntimeIdentifier`.
+This makes a debug build for iOS device.
+```
+dotnet build -f:net9.0-ios -r:ios-arm64 MAUI.Native.Embedded.Sample/MAUI.Native.Embedded.Sample.csproj
+```
+
+## See Xcode project settings
+```
+xcodebuild -showBuildSettings -scheme MAUI.Native.Embedded.ios -project MAUI.Native.Embedded.Sample/Platforms/iOS/MAUI.Native.Embedded.ios/MAUI.Native.Embedded.ios.xcodeproj
 ```
diff --git a/MAUI.Native.Embedded.Sample/MAUI.Native.Embedded.Sample.csproj b/MAUI.Native.Embedded.Sample/MAUI.Native.Embedded.Sample.csproj
index 1118b4c..12bc74b 100644
--- a/MAUI.Native.Embedded.Sample/MAUI.Native.Embedded.Sample.csproj
+++ b/MAUI.Native.Embedded.Sample/MAUI.Native.Embedded.Sample.csproj
@@ -53,7 +53,9 @@
     <!--     Scheme, Configuration, SkipValidation, NoSigning         -->
     <AppClips Include="./Platforms/iOS/MAUI.Native.Embedded.ios/MAUI.Native.Embedded.ios.xcodeproj" />
     <Widgets Include="./Platforms/iOS/MAUI.Native.Embedded.ios/MAUI.Native.Embedded.ios.xcodeproj" />
+  </ItemGroup>
 
+  <ItemGroup>
     <!-- App Icon -->
     <MauiIcon Include="../Assets/appicon.svg" Color="#FFFFFF" />
 
diff --git a/MAUI.Native.Embedded.Sample/Platforms/iOS/MAUI.Native.Embedded.ios/MAUI.Native.Embedded.ios.xcodeproj/xcshareddata/xcschemes/MAUI.Native.Embedded.ios.clip.xcscheme b/MAUI.Native.Embedded.Sample/Platforms/iOS/MAUI.Native.Embedded.ios/MAUI.Native.Embedded.ios.xcodeproj/xcshareddata/xcschemes/MAUI.Native.Embedded.ios.clip.xcscheme
new file mode 100644
index 0000000..3341650
--- /dev/null
+++ b/MAUI.Native.Embedded.Sample/Platforms/iOS/MAUI.Native.Embedded.ios/MAUI.Native.Embedded.ios.xcodeproj/xcshareddata/xcschemes/MAUI.Native.Embedded.ios.clip.xcscheme
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "2600"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "27AEEC152E32DE3800C8888B"
+               BuildableName = "MAUI.Native.Embedded.ios.clip.app"
+               BlueprintName = "MAUI.Native.Embedded.ios.clip"
+               ReferencedContainer = "container:MAUI.Native.Embedded.ios.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "27AEEC152E32DE3800C8888B"
+            BuildableName = "MAUI.Native.Embedded.ios.clip.app"
+            BlueprintName = "MAUI.Native.Embedded.ios.clip"
+            ReferencedContainer = "container:MAUI.Native.Embedded.ios.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "27AEEC152E32DE3800C8888B"
+            BuildableName = "MAUI.Native.Embedded.ios.clip.app"
+            BlueprintName = "MAUI.Native.Embedded.ios.clip"
+            ReferencedContainer = "container:MAUI.Native.Embedded.ios.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/MAUI.Native.Embedded.Sample/Platforms/iOS/MAUI.Native.Embedded.ios/MAUI.Native.Embedded.ios.xcodeproj/xcshareddata/xcschemes/MAUI.Native.Embedded.ios.widget.xcscheme b/MAUI.Native.Embedded.Sample/Platforms/iOS/MAUI.Native.Embedded.ios/MAUI.Native.Embedded.ios.xcodeproj/xcshareddata/xcschemes/MAUI.Native.Embedded.ios.widget.xcscheme
new file mode 100644
index 0000000..8d865af
--- /dev/null
+++ b/MAUI.Native.Embedded.Sample/Platforms/iOS/MAUI.Native.Embedded.ios/MAUI.Native.Embedded.ios.xcodeproj/xcshareddata/xcschemes/MAUI.Native.Embedded.ios.widget.xcscheme
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1640"
+   wasCreatedForAppExtension = "YES"
+   version = "2.0">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "27E1AA192E3BEB200088A649"
+               BuildableName = "MAUI.Native.Embedded.ios.widget.appex"
+               BlueprintName = "MAUI.Native.Embedded.ios.widget"
+               ReferencedContainer = "container:MAUI.Native.Embedded.ios.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "27AEEBD32E32D63500C8888B"
+               BuildableName = "MAUI.Native.Embedded.ios.app"
+               BlueprintName = "MAUI.Native.Embedded.ios"
+               ReferencedContainer = "container:MAUI.Native.Embedded.ios.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      launchStyle = "0"
+      askForAppToLaunch = "Yes"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "27AEEBD32E32D63500C8888B"
+            BuildableName = "MAUI.Native.Embedded.ios.app"
+            BlueprintName = "MAUI.Native.Embedded.ios"
+            ReferencedContainer = "container:MAUI.Native.Embedded.ios.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "_XCWidgetKind"
+            value = ""
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "_XCWidgetDefaultView"
+            value = "timeline"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "_XCWidgetFamily"
+            value = "systemMedium"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES"
+      askForAppToLaunch = "Yes"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "27AEEBD32E32D63500C8888B"
+            BuildableName = "MAUI.Native.Embedded.ios.app"
+            BlueprintName = "MAUI.Native.Embedded.ios"
+            ReferencedContainer = "container:MAUI.Native.Embedded.ios.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/MAUI.Native.Embedded.Sample/Platforms/iOS/MAUI.Native.Embedded.ios/MAUI.Native.Embedded.ios.xcodeproj/xcshareddata/xcschemes/MAUI.Native.Embedded.ios.xcscheme b/MAUI.Native.Embedded.Sample/Platforms/iOS/MAUI.Native.Embedded.ios/MAUI.Native.Embedded.ios.xcodeproj/xcshareddata/xcschemes/MAUI.Native.Embedded.ios.xcscheme
new file mode 100644
index 0000000..1da329d
--- /dev/null
+++ b/MAUI.Native.Embedded.Sample/Platforms/iOS/MAUI.Native.Embedded.ios/MAUI.Native.Embedded.ios.xcodeproj/xcshareddata/xcschemes/MAUI.Native.Embedded.ios.xcscheme
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1640"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "27AEEBD32E32D63500C8888B"
+               BuildableName = "MAUI.Native.Embedded.ios.app"
+               BlueprintName = "MAUI.Native.Embedded.ios"
+               ReferencedContainer = "container:MAUI.Native.Embedded.ios.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "27AEEBD32E32D63500C8888B"
+            BuildableName = "MAUI.Native.Embedded.ios.app"
+            BlueprintName = "MAUI.Native.Embedded.ios"
+            ReferencedContainer = "container:MAUI.Native.Embedded.ios.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "27AEEBD32E32D63500C8888B"
+            BuildableName = "MAUI.Native.Embedded.ios.app"
+            BlueprintName = "MAUI.Native.Embedded.ios"
+            ReferencedContainer = "container:MAUI.Native.Embedded.ios.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/MAUI.Native.Embedded.nuget/MAUI.Native.Embedded.nuget.csproj b/MAUI.Native.Embedded.nuget/MAUI.Native.Embedded.nuget.csproj
index df658d5..354b7d6 100644
--- a/MAUI.Native.Embedded.nuget/MAUI.Native.Embedded.nuget.csproj
+++ b/MAUI.Native.Embedded.nuget/MAUI.Native.Embedded.nuget.csproj
@@ -40,6 +40,7 @@
     <None Include="README.md" Pack="true" PackagePath="/" />
     <None Include="build/MarLoe.MAUI.Native.Embedded.props" Pack="true" PackagePath="build/" />
     <None Include="build/MarLoe.MAUI.Native.Embedded.targets" Pack="true" PackagePath="build/" />
+    <None Include="build/MAUI.Native.Embedded.tasks.targets" Pack="true" PackagePath="build/" />
     <None Include="build/MAUI.Native.Embedded.ios.common.targets" Pack="true" PackagePath="build/" />
     <None Include="build/MAUI.Native.Embedded.ios.appclips.targets" Pack="true" PackagePath="build/" />
     <None Include="build/MAUI.Native.Embedded.ios.widgets.targets" Pack="true" PackagePath="build/" />
diff --git a/MAUI.Native.Embedded.nuget/build/MAUI.Native.Embedded.ios.appclips.targets b/MAUI.Native.Embedded.nuget/build/MAUI.Native.Embedded.ios.appclips.targets
index f8f0cb4..4ac72fb 100644
--- a/MAUI.Native.Embedded.nuget/build/MAUI.Native.Embedded.ios.appclips.targets
+++ b/MAUI.Native.Embedded.nuget/build/MAUI.Native.Embedded.ios.appclips.targets
@@ -34,12 +34,12 @@
 
 
   <Target Name="_ResolveAppClips">
-    <Error Condition="Exists('%(AppClips.FullPath)') == 'false'" Code="404" Text="AppClips project not found: '%(AppClips.Identity)'" />
+    <Error Condition="Exists('%(AppClips.FullPath)') == 'false'" Code="NE0404" Text="AppClips project not found: '%(AppClips.Identity)'" />
 
     <ItemGroup>
       <AppClips>
         <!-- Mark this as an AppClips project so we can identyfy it later on  -->
-        <IsAppClips>true</IsAppClips>
+        <_IsAppClips>true</_IsAppClips>
       </AppClips>
 
       <!-- Consolidate all included Xcode projects                            -->
@@ -50,9 +50,9 @@
 
   <Target Name="ProcessAppClips" DependsOnTargets="$(ProcessAppClipsDependsOn)" Condition="'@(AppClips)' != ''">
     <ItemGroup>
-      <!-- Transferthe AppClips items back from XcodeProjects                 -->
+      <!-- Transfer AppClips items back from XcodeProjects                    -->
       <AppClips Remove="@(AppClips)" />
-      <AppClips Include="@(XcodeProjects)" Condition="'%(XcodeProjects.IsAppClips)' == 'true'" />
+      <AppClips Include="@(XcodeProjects)" Condition="'%(XcodeProjects._IsAppClips)' == 'true'" />
     </ItemGroup>
 
     <ItemGroup>
@@ -63,7 +63,7 @@
       <_AppClipsInfoPList Include="%(_AppClipsFiles.FullPath)" Condition="'%(_AppClipsFiles.Filename)%(_AppClipsFiles.Extension)' == 'Info.plist'" />
     </ItemGroup>
 
-    <Error Condition="'@(_AppClipsFiles)' == ''" Code="404" Text="No AppClips found in Xcode project: '%(AppClips.Identity)'" />
+    <Error Condition="'@(_AppClipsFiles)' == ''" Code="NE0404" Text="No AppClips found in Xcode project: '%(AppClips.Identity)'" />
 
     <!-- Extract the bundle identifier from the AppClips found                -->
     <ReadAppManifest AppManifest="@(_AppClipsInfoPList)" TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)">
@@ -80,23 +80,28 @@
       <!-- Include the found AppClips in the MAUI app                         -->
       <MauiAsset Include="@(_AppClipsFiles)" LogicalName="AppClips/%(_AppClipsFiles.TargetPath)" />
     </ItemGroup>
-
   </Target>
 
 
   <Target Name="VerifyAppClips" Condition="'@(AppClips)' != ''">
     <ItemGroup>
-      <_AppClipsMobileProvisioning Condition="'%(AppClips.SkipValidation)' != 'true'" Include="%(AppClips.ArchivePath)/**/AppClips/**/embedded.mobileprovision" />
+      <AppClipsTarget Condition="'%(AppClips.SkipValidation)' != 'true'" Include="$(AppBundleDir)" />
+      <AppClipsTarget Condition="'%(AppClips.SkipValidation)' != 'true' AND '@(AppClipsTarget)' == ''" Include="%(AppClips.ArchivePath)" />
+      <_AppClipsMobileProvisioning Condition="'@(AppClipsTarget)' != ''" Include="%(AppClipsTarget.FullPath)/**/AppClips/**/embedded.mobileprovision" />
     </ItemGroup>
 
     <Exec
       Condition="'@(_AppClipsMobileProvisioning)' != ''"
-      Command="security cms -D -i '@(_AppClipsMobileProvisioning)' | sed -n '/&lt;key&gt;com.apple.developer.parent-application-identifiers&lt;\/key&gt;/,/&lt;\/array&gt;/p' | grep -q '$(ApplicationId)&lt;'"
-      IgnoreExitCode="true">
+      Command="xcrun security cms -D -i '%(_AppClipsMobileProvisioning.FullPath)' | xcrun plutil -extract 'Entitlements.com\.apple\.developer\.parent-application-identifiers' xml1 -o - - | grep -q '$(ApplicationId)&lt;'"
+      IgnoreExitCode="true"
+      StandardOutputImportance="Low">
       <Output TaskParameter="ExitCode" PropertyName="ExitCode" />
     </Exec>
 
-    <Error Condition="'$(ExitCode)' != '' AND '$(ExitCode)' != '0'" Code="1013" Text="AppClips application identifier does not mathc this 'ApplicationId': $(ApplicationId)" />
+    <Error
+      Condition="'$(ExitCode)' != '' AND '$(ExitCode)' != '0'"
+      Code="NE1013"
+      Text="AppClips 'com.apple.developer.parent-application-identifiers' does not match this 'ApplicationId': $(ApplicationId)" />
   </Target>
 
 
@@ -105,7 +110,7 @@
     <PropertyGroup>
       <BuildNativeEmbedded>AppClips</BuildNativeEmbedded>
     </PropertyGroup>
-    <CallTarget Targets="_InitAppClips;_ProcessNativeEmbedded" />
+    <CallTarget Targets="_InitAppClips;_ProcessNativeEmbedded;VerifyNativeEmbedded" />
   </Target>
 
 </Project>
\ No newline at end of file
diff --git a/MAUI.Native.Embedded.nuget/build/MAUI.Native.Embedded.ios.common.targets b/MAUI.Native.Embedded.nuget/build/MAUI.Native.Embedded.ios.common.targets
index afafb96..ff13696 100644
--- a/MAUI.Native.Embedded.nuget/build/MAUI.Native.Embedded.ios.common.targets
+++ b/MAUI.Native.Embedded.nuget/build/MAUI.Native.Embedded.ios.common.targets
@@ -27,9 +27,17 @@
       <XcodeProjects>
         <Scheme Condition="'%(XcodeProjects.Scheme)' == ''">%(XcodeProjects.Filename)</Scheme>
         <Configuration Condition="'%(XcodeProjects.Configuration)' == ''">$(Configuration)</Configuration>
-        <XcodeParams Condition="'%(XcodeProjects.NoSigning)' == 'true'">$(XcodeParams) CODE_SIGN_IDENTITY=”” CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO</XcodeParams>
-        <UniqueId Condition="'%(XcodeProjects.UniqueId)' == ''">$([System.Guid]::NewGuid())</UniqueId>
+        <XcodeParams Condition="'%(XcodeProjects.NoSigning)' == 'true'">$(XcodeParams) CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO</XcodeParams>
       </XcodeProjects>
+    </ItemGroup>
+
+    <GenerateUniqueId Items="@(XcodeProjects)" Exclude="NoSigning">
+      <Output TaskParameter="OutputItems" ItemName="XcodeProjectsWithUniqueId" />
+    </GenerateUniqueId>
+    
+    <ItemGroup>
+      <XcodeProjects Remove="@(XcodeProjects)" />
+      <XcodeProjects Include="@(XcodeProjectsWithUniqueId)" />
 
       <!-- We cannot add the ArchivePath in one go,               -->
       <!-- so we have to do it separately once we have            -->
@@ -56,7 +64,7 @@
   <Target Name="_BuildXcodeProjectsArchive" Condition="'@(XcodeProjects)' != ''">
     <PropertyGroup>
       <_XcodeDestination Condition="$(TargetPlatformIdentifier) == 'ios'">iOS</_XcodeDestination>
-      <_XcodeDestination Condition="$(RuntimeIdentifier.Contains('iossimulator')) == true">iOS Simulator</_XcodeDestination>
+      <_XcodeDestination Condition="$(RuntimeIdentifier.Contains('simulator')) == true">$(_XcodeDestination) Simulator</_XcodeDestination>
       <XCodeCommonParams>$(XCodeCommonParams) -destination 'generic/platform=$(_XcodeDestination)'</XCodeCommonParams>
     </PropertyGroup>
 
@@ -70,7 +78,7 @@
     </ItemGroup>
 
     <Exec
-      Condition="'$(SkipXcodeProjects)' != 'true'"
+      Condition="'$(SkipXcodeBuild)' != 'true'"
       Outputs="%(XcodeProjects.ArchivePath)"
       Command="xcrun xcodebuild archive \
         -project '%(XcodeProjects.FullPath)' \
@@ -81,8 +89,8 @@
         -packageCachePath '%(XcodeProjects._PackageCache)' \
         %(XcodeProjects._XcodeProjectVersion) \
         %(XcodeProjects._XcodeMarketingVersion) \
-        $(XCodeCommonParams) \
-        %(XcodeProjects.XcodeParams)" />
+        %(XcodeProjects.XcodeParams) \
+        $(XCodeCommonParams)" />
 
     <!-- 
       This built in task adds parameters to the xcodebuild that cannot be controlled,
diff --git a/MAUI.Native.Embedded.nuget/build/MAUI.Native.Embedded.ios.widgets.targets b/MAUI.Native.Embedded.nuget/build/MAUI.Native.Embedded.ios.widgets.targets
index fe48c8b..aa851f5 100644
--- a/MAUI.Native.Embedded.nuget/build/MAUI.Native.Embedded.ios.widgets.targets
+++ b/MAUI.Native.Embedded.nuget/build/MAUI.Native.Embedded.ios.widgets.targets
@@ -34,13 +34,13 @@
 
 
   <Target Name="_ResolveWidgets">
-    <Error Condition="Exists('%(Widgets.FullPath)') == 'false'" Code="404" Text="Widgets project not found: '%(Widgets.Identity)'" />
+    <Error Condition="Exists('%(Widgets.FullPath)') == 'false'" Code="NE0404" Text="Widgets project not found: '%(Widgets.Identity)'" />
 
     <ItemGroup>
       <Widgets>
         <!-- Mark this as a Widgets project so we can                         -->
         <!-- identify it from XcodeProjects later on.                         -->
-        <IsWidgets>true</IsWidgets>
+        <_IsWidgets>true</_IsWidgets>
       </Widgets>
 
       <!-- Consolidate all included Xcode projects                            -->
@@ -53,7 +53,7 @@
     <ItemGroup>
       <!-- Transfer Widgets items back from XcodeProjects                     -->
       <Widgets Remove="@(Widgets)" />
-      <Widgets Include="@(XcodeProjects)" Condition="'%(XcodeProjects.IsWidgets)' == 'true'" />
+      <Widgets Include="@(XcodeProjects)" Condition="'%(XcodeProjects._IsWidgets)' == 'true'" />
     </ItemGroup>
 
     <ItemGroup>
@@ -83,7 +83,7 @@
     <!-- Extract mobileprovision to get entitlements we need for codesigning  -->
     <Exec 
       Condition="Exists('%(_WidgetsAppexMobileProvision.FullPath)')"
-      Command="security cms -D -i '%(_WidgetsAppexMobileProvision.FullPath)' | plutil -extract Entitlements xml1 -o - - &gt; '%(_WidgetsAppexMobileProvision.EntitlementPath)'" />
+      Command="xcrun security cms -D -i '%(_WidgetsAppexMobileProvision.FullPath)' | xcrun plutil -extract Entitlements xml1 -o - - &gt; '%(_WidgetsAppexMobileProvision.EntitlementPath)'" />
 
     <ItemGroup>
       <AdditionalAppExtensions Include="%(_WidgetsAppexBundles.FullPath)/..">
@@ -104,7 +104,7 @@
     <PropertyGroup>
       <BuildNativeEmbedded>Widgets</BuildNativeEmbedded>
     </PropertyGroup>
-    <CallTarget Targets="_InitWidgets;_ProcessNativeEmbedded" />
+    <CallTarget Targets="_InitWidgets;_ProcessNativeEmbedded;VerifyWidgets" />
   </Target>
 
 </Project>
\ No newline at end of file
diff --git a/MAUI.Native.Embedded.nuget/build/MAUI.Native.Embedded.tasks.targets b/MAUI.Native.Embedded.nuget/build/MAUI.Native.Embedded.tasks.targets
new file mode 100644
index 0000000..66ff62d
--- /dev/null
+++ b/MAUI.Native.Embedded.nuget/build/MAUI.Native.Embedded.tasks.targets
@@ -0,0 +1,54 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <UsingTask
+    TaskName="GenerateUniqueId"
+    TaskFactory="RoslynCodeTaskFactory"
+    AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
+
+    <ParameterGroup>
+      <Items ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" />
+      <Exclude ParameterType="System.String[]" Required="false" />
+      <OutputItems ParameterType="Microsoft.Build.Framework.ITaskItem[]" Output="true" />
+    </ParameterGroup>
+
+    <Task>
+      <Using Namespace="System" />
+      <Using Namespace="System.Linq" />
+      <Using Namespace="System.Text" />
+      <Using Namespace="System.Security.Cryptography" />
+      <Using Namespace="Microsoft.Build.Framework" />
+      <Using Namespace="Microsoft.Build.Utilities" />
+
+      <Code Type="Fragment" Language="cs">
+        <![CDATA[
+        foreach (var item in Items)
+        {
+            // It UniqueId already exists, we skip it
+            if (!string.IsNullOrEmpty(item.GetMetadata("UniqueId")))
+            {
+                continue;
+            }
+
+            var seed = String.Join(";", 
+              item.CloneCustomMetadata().Keys
+                .OfType<string>()
+                .Where(k => !k.StartsWith("_"))
+                .Where(k => !Exclude?.Contains(k) is false)
+                .Distinct()
+                .OrderBy(k => k)
+                .Select(k => $@"{k}={item.GetMetadata(k)}"));
+
+            using (var md5 = MD5.Create())
+            {
+                var digest = md5.ComputeHash(Encoding.UTF8.GetBytes(seed));
+                item.SetMetadata("UniqueId", BitConverter.ToString(digest).Replace("-", "").ToLowerInvariant());
+            }
+        }
+
+        OutputItems = Items;
+      ]]>
+      </Code>
+    </Task>
+  </UsingTask>
+
+</Project>
\ No newline at end of file
diff --git a/MAUI.Native.Embedded.nuget/build/MarLoe.MAUI.Native.Embedded.targets b/MAUI.Native.Embedded.nuget/build/MarLoe.MAUI.Native.Embedded.targets
index 54b8977..6b7b541 100644
--- a/MAUI.Native.Embedded.nuget/build/MarLoe.MAUI.Native.Embedded.targets
+++ b/MAUI.Native.Embedded.nuget/build/MarLoe.MAUI.Native.Embedded.targets
@@ -1,5 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+  <Import Project="MAUI.Native.Embedded.tasks.targets" />
+
   <Import Project="MAUI.Native.Embedded.ios.common.targets" />
   <Import Project="MAUI.Native.Embedded.ios.widgets.targets" />
   <Import Project="MAUI.Native.Embedded.ios.appclips.targets" />