From 6c1b809ba0e8fa24625859000652f9cc9d164b69 Mon Sep 17 00:00:00 2001 From: Haritha Mohan Date: Tue, 22 Aug 2023 23:29:53 -0400 Subject: [PATCH 1/5] Fix failing submission tests for net8.0-xcode15 updates All tests are passing with the exception of the watchOS intents sample. This is because of a mismatch in min os version support due to the recent change of armv7k arch no longer being supported and the defined version in Xamarin.framework. --- FSharpMacCoolApp/FSharpMacCoolApp/Info.plist | 2 +- FSharpMacCoolApp/dotnet/FSharpMacCoolApp.fsproj | 3 ++- FSharpiOSCoolApp/FSharpiOSCoolApp/FSharpiOSCoolApp.fsproj | 4 ++-- FSharpiOSCoolApp/FSharpiOSCoolApp/Info.plist | 2 +- FSharpiOSCoolApp/dotnet/FSharpiOSCoolApp.fsproj | 7 ++++--- MacCoolApp/MacCoolApp/Info.plist | 2 +- MacCoolApp_DontLink/MacCoolApp/Info.plist | 2 +- MacCoolApp_DontLink/dotnet/MacCoolApp.csproj | 3 ++- MyCatalystApp/MyCatalystApp.csproj | 3 ++- MyFatCatalystApp/MyFatCatalystApp.csproj | 3 ++- MyNotarizedCatalystApp/MyNotarizedCatalystApp.csproj | 3 ++- MyUnlinkedCatalystApp/MyUnlinkedCatalystApp.csproj | 3 ++- ODRsTVOS/ODRsTVOS/Info.plist | 2 +- ODRsTVOS_Extension/ODRsTVOS/Info.plist | 2 +- ODRsTVOS_Extension/ODRsTVOSExt/Info.plist | 2 +- ODRsTVOS_Extension/dotnet/ODRsTVOS/ODRsTVOS.csproj | 5 +++-- ODRsTVOS_Extension/dotnet/ODRsTVOSExt/ODRsTVOSExt.csproj | 5 +++-- SceneKitGame/SceneKitGame/Info.plist | 2 +- SceneKitGame/dotnet/SceneKitGame.csproj | 5 +++-- UICatalog/UICatalog/Info.plist | 2 +- UICatalog/dotnet/UICatalog.csproj | 5 +++-- WatchOS/MainApp.WatchApp/Info.plist | 2 +- WatchOS/MainApp.WatchApp/MainApp.WatchApp.csproj | 4 ++-- WatchOS/MainApp.WatchAppExtension/Info.plist | 2 +- .../MainApp.WatchAppExtension.csproj | 6 +++--- WatchOSIntents/intentsphone/Info.plist | 2 +- WatchOSIntents/intentsphone/intentsphone.csproj | 4 ++-- WatchOSIntents/intentsphoneUI/Info.plist | 2 +- WatchOSIntents/intentsphoneUI/intentsphoneUI.csproj | 4 ++-- WatchOSIntents/intentswatch/Info.plist | 2 +- WatchOSIntents/intentswatch/intentswatch.csproj | 6 +++--- WatchOSIntents/intentsxamsample.watchkitapp/Info.plist | 2 +- .../intentsxamsample.watchkitapp.csproj | 4 ++-- .../intentsxamsample.watchkitappExtension/Info.plist | 2 +- .../intentsxamsample.watchkitappExtension.csproj | 6 +++--- WatchOSIntents/intentsxamsample/Info.plist | 2 +- WatchOSIntents/intentsxamsample/intentsxamsample.csproj | 4 ++-- iOSCoolApp/dotnet/iOSCoolApp.csproj | 7 ++++--- iOSCoolApp/iOSCoolApp/Info.plist | 2 +- iOSCoolApp/iOSCoolApp/iOSCoolApp.csproj | 4 ++-- iTravel/dotnet/iTravel.csproj | 5 +++-- iTravel/iTravel/Info.plist | 2 +- iTravel/iTravel/iTravel.csproj | 2 +- 43 files changed, 78 insertions(+), 65 deletions(-) diff --git a/FSharpMacCoolApp/FSharpMacCoolApp/Info.plist b/FSharpMacCoolApp/FSharpMacCoolApp/Info.plist index da42a5b..873bd38 100644 --- a/FSharpMacCoolApp/FSharpMacCoolApp/Info.plist +++ b/FSharpMacCoolApp/FSharpMacCoolApp/Info.plist @@ -13,7 +13,7 @@ CFBundleVersion 1.0 LSMinimumSystemVersion - 10.11 + 10.15 CFBundleDevelopmentRegion en CFBundleInfoDictionaryVersion diff --git a/FSharpMacCoolApp/dotnet/FSharpMacCoolApp.fsproj b/FSharpMacCoolApp/dotnet/FSharpMacCoolApp.fsproj index b009d46..2c7d32a 100644 --- a/FSharpMacCoolApp/dotnet/FSharpMacCoolApp.fsproj +++ b/FSharpMacCoolApp/dotnet/FSharpMacCoolApp.fsproj @@ -4,7 +4,8 @@ - net6.0-macos + net8.0-macos + True osx-x64 Exe FSharpMacCoolApp diff --git a/FSharpiOSCoolApp/FSharpiOSCoolApp/FSharpiOSCoolApp.fsproj b/FSharpiOSCoolApp/FSharpiOSCoolApp/FSharpiOSCoolApp.fsproj index 081a829..a29ca9e 100644 --- a/FSharpiOSCoolApp/FSharpiOSCoolApp/FSharpiOSCoolApp.fsproj +++ b/FSharpiOSCoolApp/FSharpiOSCoolApp/FSharpiOSCoolApp.fsproj @@ -34,7 +34,7 @@ prompt true - ARMv7, ARM64 + ARM64 Entitlements.plist false Apple Distribution: Luis Aguilera (DPXCPAGVTZ) @@ -66,7 +66,7 @@ bin\iPhone\Debug DEBUG;ENABLE_TEST_CLOUD prompt - ARMv7, ARM64 + ARM64 Entitlements.plist true false diff --git a/FSharpiOSCoolApp/FSharpiOSCoolApp/Info.plist b/FSharpiOSCoolApp/FSharpiOSCoolApp/Info.plist index 464d51a..fa591bd 100644 --- a/FSharpiOSCoolApp/FSharpiOSCoolApp/Info.plist +++ b/FSharpiOSCoolApp/FSharpiOSCoolApp/Info.plist @@ -13,7 +13,7 @@ LSRequiresIPhoneOS MinimumOSVersion - 9.0 + 11.0 UIDeviceFamily 1 diff --git a/FSharpiOSCoolApp/dotnet/FSharpiOSCoolApp.fsproj b/FSharpiOSCoolApp/dotnet/FSharpiOSCoolApp.fsproj index 0d5225a..f8affe4 100644 --- a/FSharpiOSCoolApp/dotnet/FSharpiOSCoolApp.fsproj +++ b/FSharpiOSCoolApp/dotnet/FSharpiOSCoolApp.fsproj @@ -4,12 +4,13 @@ - net6.0-ios - ios-arm64;ios-arm + net8.0-ios + True + ios-arm64 Exe FSharpiOSCoolApp FSharpiOSCoolApp - 10.0 + 11.0 Apple Distribution: Luis Aguilera (DPXCPAGVTZ) true true diff --git a/MacCoolApp/MacCoolApp/Info.plist b/MacCoolApp/MacCoolApp/Info.plist index 5457607..53b7c09 100644 --- a/MacCoolApp/MacCoolApp/Info.plist +++ b/MacCoolApp/MacCoolApp/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? LSMinimumSystemVersion - 10.10 + 10.15 NSMainNibFile MainMenu NSPrincipalClass diff --git a/MacCoolApp_DontLink/MacCoolApp/Info.plist b/MacCoolApp_DontLink/MacCoolApp/Info.plist index e5b82fc..8615907 100644 --- a/MacCoolApp_DontLink/MacCoolApp/Info.plist +++ b/MacCoolApp_DontLink/MacCoolApp/Info.plist @@ -25,7 +25,7 @@ CFBundleVersion 1.0 LSMinimumSystemVersion - 10.10 + 10.15 NSHumanReadableCopyright olegoid NSMainNibFile diff --git a/MacCoolApp_DontLink/dotnet/MacCoolApp.csproj b/MacCoolApp_DontLink/dotnet/MacCoolApp.csproj index d98dd7e..d452350 100644 --- a/MacCoolApp_DontLink/dotnet/MacCoolApp.csproj +++ b/MacCoolApp_DontLink/dotnet/MacCoolApp.csproj @@ -5,7 +5,8 @@ // We test this because ? the linker is disabled and all symbols are present in the binary // actually because of QTKit deprecation we are forced to use "Link SDK" and an XML file that preserve (almost) everything else --> - net6.0-macos + net8.0-macos + True osx-arm64;osx-x64 Exe MacCoolApp diff --git a/MyCatalystApp/MyCatalystApp.csproj b/MyCatalystApp/MyCatalystApp.csproj index 9b8f15c..554ac99 100644 --- a/MyCatalystApp/MyCatalystApp.csproj +++ b/MyCatalystApp/MyCatalystApp.csproj @@ -1,7 +1,8 @@ - net6.0-maccatalyst + net8.0-maccatalyst + True Exe SdkOnly diff --git a/MyFatCatalystApp/MyFatCatalystApp.csproj b/MyFatCatalystApp/MyFatCatalystApp.csproj index e8df234..3451f88 100644 --- a/MyFatCatalystApp/MyFatCatalystApp.csproj +++ b/MyFatCatalystApp/MyFatCatalystApp.csproj @@ -1,7 +1,8 @@ - net6.0-maccatalyst + net8.0-maccatalyst + True Exe maccatalyst-arm64;maccatalyst-x64 SdkOnly diff --git a/MyNotarizedCatalystApp/MyNotarizedCatalystApp.csproj b/MyNotarizedCatalystApp/MyNotarizedCatalystApp.csproj index 55c4967..265bbad 100644 --- a/MyNotarizedCatalystApp/MyNotarizedCatalystApp.csproj +++ b/MyNotarizedCatalystApp/MyNotarizedCatalystApp.csproj @@ -1,7 +1,8 @@ - net7.0-maccatalyst + net8.0-maccatalyst + True Exe maccatalyst-arm64 diff --git a/MyUnlinkedCatalystApp/MyUnlinkedCatalystApp.csproj b/MyUnlinkedCatalystApp/MyUnlinkedCatalystApp.csproj index a37971a..83f02d6 100644 --- a/MyUnlinkedCatalystApp/MyUnlinkedCatalystApp.csproj +++ b/MyUnlinkedCatalystApp/MyUnlinkedCatalystApp.csproj @@ -1,7 +1,8 @@ - net6.0-maccatalyst + net8.0-maccatalyst + True Exe None diff --git a/ODRsTVOS/ODRsTVOS/Info.plist b/ODRsTVOS/ODRsTVOS/Info.plist index 31b48ab..a71b51c 100644 --- a/ODRsTVOS/ODRsTVOS/Info.plist +++ b/ODRsTVOS/ODRsTVOS/Info.plist @@ -13,7 +13,7 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.2 + 11.0 UIDeviceFamily 3 diff --git a/ODRsTVOS_Extension/ODRsTVOS/Info.plist b/ODRsTVOS_Extension/ODRsTVOS/Info.plist index c917457..c17d13a 100644 --- a/ODRsTVOS_Extension/ODRsTVOS/Info.plist +++ b/ODRsTVOS_Extension/ODRsTVOS/Info.plist @@ -9,7 +9,7 @@ CFBundleIdentifier com.xamarin.odr-tvos MinimumOSVersion - 9.2 + 11.0 UIDeviceFamily 3 diff --git a/ODRsTVOS_Extension/ODRsTVOSExt/Info.plist b/ODRsTVOS_Extension/ODRsTVOSExt/Info.plist index e698ee3..be0f8ab 100644 --- a/ODRsTVOS_Extension/ODRsTVOSExt/Info.plist +++ b/ODRsTVOS_Extension/ODRsTVOSExt/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType XPC! MinimumOSVersion - 10.2 + 11.0 NSExtension NSExtensionAttributes diff --git a/ODRsTVOS_Extension/dotnet/ODRsTVOS/ODRsTVOS.csproj b/ODRsTVOS_Extension/dotnet/ODRsTVOS/ODRsTVOS.csproj index 8ec88a6..97bab61 100644 --- a/ODRsTVOS_Extension/dotnet/ODRsTVOS/ODRsTVOS.csproj +++ b/ODRsTVOS_Extension/dotnet/ODRsTVOS/ODRsTVOS.csproj @@ -4,12 +4,13 @@ - net6.0-tvos + net8.0-tvos + True tvos-arm64 Exe ODRsTVOS ODRsTVOS - 10.0 + 11.0 true Apple Distribution: Luis Aguilera (DPXCPAGVTZ) diff --git a/ODRsTVOS_Extension/dotnet/ODRsTVOSExt/ODRsTVOSExt.csproj b/ODRsTVOS_Extension/dotnet/ODRsTVOSExt/ODRsTVOSExt.csproj index 6490bf3..b22b5ef 100644 --- a/ODRsTVOS_Extension/dotnet/ODRsTVOSExt/ODRsTVOSExt.csproj +++ b/ODRsTVOS_Extension/dotnet/ODRsTVOSExt/ODRsTVOSExt.csproj @@ -4,12 +4,13 @@ - net6.0-tvos + net8.0-tvos + True tvos-arm64 ODRsTVOSExt ODRsTVOSExt true - 10.2 + 11.0 true Apple Distribution: Luis Aguilera (DPXCPAGVTZ) diff --git a/SceneKitGame/SceneKitGame/Info.plist b/SceneKitGame/SceneKitGame/Info.plist index 83dfe8f..d0797cc 100644 --- a/SceneKitGame/SceneKitGame/Info.plist +++ b/SceneKitGame/SceneKitGame/Info.plist @@ -9,7 +9,7 @@ CFBundleIdentifier com.xamarin.scenekit-tvos MinimumOSVersion - 9.1 + 11.0 UIDeviceFamily 3 diff --git a/SceneKitGame/dotnet/SceneKitGame.csproj b/SceneKitGame/dotnet/SceneKitGame.csproj index 94d7c32..033b7e3 100644 --- a/SceneKitGame/dotnet/SceneKitGame.csproj +++ b/SceneKitGame/dotnet/SceneKitGame.csproj @@ -1,12 +1,13 @@ - net6.0-tvos + net8.0-tvos + True tvos-arm64 Exe SceneKitGame SceneKitGame - 10.0 + 11.0 true Apple Distribution: Luis Aguilera (DPXCPAGVTZ) diff --git a/UICatalog/UICatalog/Info.plist b/UICatalog/UICatalog/Info.plist index 8322e46..19bfa3c 100644 --- a/UICatalog/UICatalog/Info.plist +++ b/UICatalog/UICatalog/Info.plist @@ -22,7 +22,7 @@ GCSupportsControllerUserInteraction MinimumOSVersion - 9.0 + 11.0 UIDeviceFamily 3 diff --git a/UICatalog/dotnet/UICatalog.csproj b/UICatalog/dotnet/UICatalog.csproj index a5fccf7..b63140b 100644 --- a/UICatalog/dotnet/UICatalog.csproj +++ b/UICatalog/dotnet/UICatalog.csproj @@ -4,12 +4,13 @@ - net6.0-tvos + net8.0-tvos + True tvos-arm64 Exe UICatalog UICatalog - 10.0 + 11.0 true Apple Distribution: Luis Aguilera (DPXCPAGVTZ) diff --git a/WatchOS/MainApp.WatchApp/Info.plist b/WatchOS/MainApp.WatchApp/Info.plist index c1c4b70..bcf6223 100644 --- a/WatchOS/MainApp.WatchApp/Info.plist +++ b/WatchOS/MainApp.WatchApp/Info.plist @@ -11,7 +11,7 @@ CFBundleShortVersionString 1.0 MinimumOSVersion - 5.0 + 9.0 UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/WatchOS/MainApp.WatchApp/MainApp.WatchApp.csproj b/WatchOS/MainApp.WatchApp/MainApp.WatchApp.csproj index d89c1b7..4d89faa 100644 --- a/WatchOS/MainApp.WatchApp/MainApp.WatchApp.csproj +++ b/WatchOS/MainApp.WatchApp/MainApp.WatchApp.csproj @@ -43,7 +43,7 @@ true Entitlements.plist SdkOnly - ARMv7k + ARM64_32 NSUrlSessionHandler false @@ -81,7 +81,7 @@ Entitlements.plist 28208 SdkOnly - ARMv7k + ARM64_32 NSUrlSessionHandler false diff --git a/WatchOS/MainApp.WatchAppExtension/Info.plist b/WatchOS/MainApp.WatchAppExtension/Info.plist index 81265e3..d10876f 100644 --- a/WatchOS/MainApp.WatchAppExtension/Info.plist +++ b/WatchOS/MainApp.WatchAppExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 1.0 MinimumOSVersion - 5.0 + 9.0 NSExtension NSExtensionAttributes diff --git a/WatchOS/MainApp.WatchAppExtension/MainApp.WatchAppExtension.csproj b/WatchOS/MainApp.WatchAppExtension/MainApp.WatchAppExtension.csproj index c57f247..efe5620 100644 --- a/WatchOS/MainApp.WatchAppExtension/MainApp.WatchAppExtension.csproj +++ b/WatchOS/MainApp.WatchAppExtension/MainApp.WatchAppExtension.csproj @@ -43,12 +43,12 @@ true Entitlements.plist SdkOnly - ARMv7k + ARM64_32 NSUrlSessionHandler false WatchKit Catalog Watch App Extension - --abi=armv7k+llvm,arm64_32+llvm + --abi=arm64_32+llvm pdbonly @@ -82,7 +82,7 @@ Entitlements.plist 42332 SdkOnly - ARMv7k + ARM64_32 NSUrlSessionHandler false diff --git a/WatchOSIntents/intentsphone/Info.plist b/WatchOSIntents/intentsphone/Info.plist index 5ce2b8d..d0afc89 100644 --- a/WatchOSIntents/intentsphone/Info.plist +++ b/WatchOSIntents/intentsphone/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType XPC! MinimumOSVersion - 10.3 + 11.0 NSExtension NSExtensionAttributes diff --git a/WatchOSIntents/intentsphone/intentsphone.csproj b/WatchOSIntents/intentsphone/intentsphone.csproj index 69e139c..9f0f787 100644 --- a/WatchOSIntents/intentsphone/intentsphone.csproj +++ b/WatchOSIntents/intentsphone/intentsphone.csproj @@ -40,7 +40,7 @@ true Entitlements.plist SdkOnly - ARMv7, ARM64 + ARM64 HttpClientHandler Intents Sample - Distribution Profile @@ -76,7 +76,7 @@ Entitlements.plist 10001 SdkOnly - ARMv7, ARM64 + ARM64 HttpClientHandler diff --git a/WatchOSIntents/intentsphoneUI/Info.plist b/WatchOSIntents/intentsphoneUI/Info.plist index 31ddefe..6cd5cd9 100644 --- a/WatchOSIntents/intentsphoneUI/Info.plist +++ b/WatchOSIntents/intentsphoneUI/Info.plist @@ -19,7 +19,7 @@ CFBundleVersion 1.0 MinimumOSVersion - 10.3 + 11.0 NSExtension NSExtensionAttributes diff --git a/WatchOSIntents/intentsphoneUI/intentsphoneUI.csproj b/WatchOSIntents/intentsphoneUI/intentsphoneUI.csproj index df814e0..3406c7f 100644 --- a/WatchOSIntents/intentsphoneUI/intentsphoneUI.csproj +++ b/WatchOSIntents/intentsphoneUI/intentsphoneUI.csproj @@ -40,7 +40,7 @@ true Entitlements.plist SdkOnly - ARMv7, ARM64 + ARM64 HttpClientHandler Intents Sample - Distribution Profile @@ -76,7 +76,7 @@ Entitlements.plist 10001 SdkOnly - ARMv7, ARM64 + ARM64 HttpClientHandler diff --git a/WatchOSIntents/intentswatch/Info.plist b/WatchOSIntents/intentswatch/Info.plist index f37c47a..2cfa65e 100644 --- a/WatchOSIntents/intentswatch/Info.plist +++ b/WatchOSIntents/intentswatch/Info.plist @@ -19,7 +19,7 @@ CFBundleVersion 1.0 MinimumOSVersion - 3.2 + 10.0 NSExtension NSExtensionAttributes diff --git a/WatchOSIntents/intentswatch/intentswatch.csproj b/WatchOSIntents/intentswatch/intentswatch.csproj index 8484494..ebbb219 100644 --- a/WatchOSIntents/intentswatch/intentswatch.csproj +++ b/WatchOSIntents/intentswatch/intentswatch.csproj @@ -42,9 +42,9 @@ true Entitlements.plist SdkOnly - ARMv7k + ARM64_32 NSUrlSessionHandler - --abi=armv7k+llvm,arm64_32+llvm + --abi=arm64_32+llvm Intents Sample - Distribution Profile @@ -80,7 +80,7 @@ Entitlements.plist 10001 SdkOnly - ARMv7k + ARM64_32 NSUrlSessionHandler diff --git a/WatchOSIntents/intentsxamsample.watchkitapp/Info.plist b/WatchOSIntents/intentsxamsample.watchkitapp/Info.plist index a7fcac6..4082a6f 100644 --- a/WatchOSIntents/intentsxamsample.watchkitapp/Info.plist +++ b/WatchOSIntents/intentsxamsample.watchkitapp/Info.plist @@ -15,7 +15,7 @@ CFBundleVersion 1.0 MinimumOSVersion - 3.2 + 10.0 UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/WatchOSIntents/intentsxamsample.watchkitapp/intentsxamsample.watchkitapp.csproj b/WatchOSIntents/intentsxamsample.watchkitapp/intentsxamsample.watchkitapp.csproj index 28248e1..98e1f2b 100644 --- a/WatchOSIntents/intentsxamsample.watchkitapp/intentsxamsample.watchkitapp.csproj +++ b/WatchOSIntents/intentsxamsample.watchkitapp/intentsxamsample.watchkitapp.csproj @@ -42,7 +42,7 @@ true Entitlements.plist SdkOnly - ARMv7k + ARM64_32 NSUrlSessionHandler Intents Sample - Distribution Profile @@ -78,7 +78,7 @@ true Entitlements.plist SdkOnly - ARMv7k + ARM64_32 NSUrlSessionHandler diff --git a/WatchOSIntents/intentsxamsample.watchkitappExtension/Info.plist b/WatchOSIntents/intentsxamsample.watchkitappExtension/Info.plist index b6c71d3..17f3e89 100644 --- a/WatchOSIntents/intentsxamsample.watchkitappExtension/Info.plist +++ b/WatchOSIntents/intentsxamsample.watchkitappExtension/Info.plist @@ -15,7 +15,7 @@ CFBundleVersion 1.0 MinimumOSVersion - 3.2 + 10.0 NSExtension NSExtensionAttributes diff --git a/WatchOSIntents/intentsxamsample.watchkitappExtension/intentsxamsample.watchkitappExtension.csproj b/WatchOSIntents/intentsxamsample.watchkitappExtension/intentsxamsample.watchkitappExtension.csproj index 230c007..db51c5b 100644 --- a/WatchOSIntents/intentsxamsample.watchkitappExtension/intentsxamsample.watchkitappExtension.csproj +++ b/WatchOSIntents/intentsxamsample.watchkitappExtension/intentsxamsample.watchkitappExtension.csproj @@ -42,10 +42,10 @@ true Entitlements.plist SdkOnly - ARMv7k + ARM64_32 NSUrlSessionHandler Intents Sample - Distribution Profile - --abi=armv7k+llvm,arm64_32+llvm + --abi=arm64_32+llvm pdbonly @@ -80,7 +80,7 @@ Entitlements.plist 10001 SdkOnly - ARMv7k + ARM64_32 NSUrlSessionHandler diff --git a/WatchOSIntents/intentsxamsample/Info.plist b/WatchOSIntents/intentsxamsample/Info.plist index 8548998..db2e0ed 100644 --- a/WatchOSIntents/intentsxamsample/Info.plist +++ b/WatchOSIntents/intentsxamsample/Info.plist @@ -13,7 +13,7 @@ LSRequiresIPhoneOS MinimumOSVersion - 10.3 + 11.0 UIDeviceFamily 1 diff --git a/WatchOSIntents/intentsxamsample/intentsxamsample.csproj b/WatchOSIntents/intentsxamsample/intentsxamsample.csproj index b2c0072..c33d0da 100644 --- a/WatchOSIntents/intentsxamsample/intentsxamsample.csproj +++ b/WatchOSIntents/intentsxamsample/intentsxamsample.csproj @@ -40,7 +40,7 @@ true Entitlements.plist SdkOnly - ARMv7, ARM64 + ARM64 HttpClientHandler x86 true @@ -77,7 +77,7 @@ true Entitlements.plist SdkOnly - ARMv7, ARM64 + ARM64 HttpClientHandler x86 diff --git a/iOSCoolApp/dotnet/iOSCoolApp.csproj b/iOSCoolApp/dotnet/iOSCoolApp.csproj index 30a08e6..932de85 100644 --- a/iOSCoolApp/dotnet/iOSCoolApp.csproj +++ b/iOSCoolApp/dotnet/iOSCoolApp.csproj @@ -4,12 +4,13 @@ - net6.0-ios - ios-arm64;ios-arm + net8.0-ios + True + ios-arm64 Exe iOSCoolApp iOSCoolApp - 10.0 + 11.0 Apple Distribution: Luis Aguilera (DPXCPAGVTZ) iOS Publish Workflow II - Distribution Profile (.N true diff --git a/iOSCoolApp/iOSCoolApp/Info.plist b/iOSCoolApp/iOSCoolApp/Info.plist index 299f47b..4a4ee04 100644 --- a/iOSCoolApp/iOSCoolApp/Info.plist +++ b/iOSCoolApp/iOSCoolApp/Info.plist @@ -15,7 +15,7 @@ LSRequiresIPhoneOS MinimumOSVersion - 9.0 + 11.0 UIDeviceFamily 1 diff --git a/iOSCoolApp/iOSCoolApp/iOSCoolApp.csproj b/iOSCoolApp/iOSCoolApp/iOSCoolApp.csproj index b18aee1..8151f3d 100644 --- a/iOSCoolApp/iOSCoolApp/iOSCoolApp.csproj +++ b/iOSCoolApp/iOSCoolApp/iOSCoolApp.csproj @@ -32,7 +32,7 @@ prompt 4 Entitlements.plist - ARMv7, ARM64 + ARM64 false Apple Distribution: Luis Aguilera (DPXCPAGVTZ) true @@ -63,7 +63,7 @@ prompt 4 false - ARMv7, ARM64 + ARM64 Entitlements.plist true iPhone Developer diff --git a/iTravel/dotnet/iTravel.csproj b/iTravel/dotnet/iTravel.csproj index 577bee9..28b3c5a 100644 --- a/iTravel/dotnet/iTravel.csproj +++ b/iTravel/dotnet/iTravel.csproj @@ -6,12 +6,13 @@ // - Build without LLVM (i.e. Mono AOT) // - No 32bits slice since it's too big to be generated successfully (since mono-2019-02) --> - net6.0-ios + net8.0-ios + True ios-arm64 Exe iTravel iTravel - 10.0 + 11.0 Apple Distribution: Luis Aguilera (DPXCPAGVTZ) paris rotterdam diff --git a/iTravel/iTravel/Info.plist b/iTravel/iTravel/Info.plist index bee2b3d..db8a621 100644 --- a/iTravel/iTravel/Info.plist +++ b/iTravel/iTravel/Info.plist @@ -11,7 +11,7 @@ LSRequiresIPhoneOS MinimumOSVersion - 9.0 + 11.0 UIDeviceFamily 1 diff --git a/iTravel/iTravel/iTravel.csproj b/iTravel/iTravel/iTravel.csproj index d19d6e0..76dca86 100644 --- a/iTravel/iTravel/iTravel.csproj +++ b/iTravel/iTravel/iTravel.csproj @@ -74,7 +74,7 @@ true Entitlements.plist None - ARMv7, ARM64 + ARM64 x86 Istanbul Paris From 9f99fa80823cc85201168cef7515813c5cac3ecf Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Tue, 5 Sep 2023 16:09:16 +0200 Subject: [PATCH 2/5] Mark ODRsTVOS' extension project as such. (#53) This makes us actually treat the extension as an extension, and embed it in the app bundle. --- ODRsTVOS_Extension/dotnet/ODRsTVOS/ODRsTVOS.csproj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ODRsTVOS_Extension/dotnet/ODRsTVOS/ODRsTVOS.csproj b/ODRsTVOS_Extension/dotnet/ODRsTVOS/ODRsTVOS.csproj index 8ec88a6..1cf772d 100644 --- a/ODRsTVOS_Extension/dotnet/ODRsTVOS/ODRsTVOS.csproj +++ b/ODRsTVOS_Extension/dotnet/ODRsTVOS/ODRsTVOS.csproj @@ -108,7 +108,9 @@ - + + true + From 8572d285089a61a94ae747a6f51f2312b3272d72 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Tue, 5 Sep 2023 16:09:36 +0200 Subject: [PATCH 3/5] Use the current .NET version in the target framework. (#54) We build using a very specific version of .NET + our workloads, so make sure to use the .NET version we want (the current one), instead of an older .NET version. --- FSharpMacCoolApp/dotnet/FSharpMacCoolApp.fsproj | 2 +- FSharpiOSCoolApp/dotnet/FSharpiOSCoolApp.fsproj | 2 +- MacCoolApp_DontLink/dotnet/MacCoolApp.csproj | 2 +- MyCatalystApp/MyCatalystApp.csproj | 2 +- MyFatCatalystApp/MyFatCatalystApp.csproj | 2 +- MyNotarizedCatalystApp/MyNotarizedCatalystApp.csproj | 2 +- MyUnlinkedCatalystApp/MyUnlinkedCatalystApp.csproj | 2 +- ODRsTVOS_Extension/dotnet/ODRsTVOS/ODRsTVOS.csproj | 2 +- ODRsTVOS_Extension/dotnet/ODRsTVOSExt/ODRsTVOSExt.csproj | 2 +- SceneKitGame/dotnet/SceneKitGame.csproj | 2 +- UICatalog/dotnet/UICatalog.csproj | 2 +- iOSCoolApp/dotnet/iOSCoolApp.csproj | 2 +- iTravel/dotnet/iTravel.csproj | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/FSharpMacCoolApp/dotnet/FSharpMacCoolApp.fsproj b/FSharpMacCoolApp/dotnet/FSharpMacCoolApp.fsproj index b009d46..ba61c03 100644 --- a/FSharpMacCoolApp/dotnet/FSharpMacCoolApp.fsproj +++ b/FSharpMacCoolApp/dotnet/FSharpMacCoolApp.fsproj @@ -4,7 +4,7 @@ - net6.0-macos + net$(BundledNETCoreAppTargetFrameworkVersion)-macos osx-x64 Exe FSharpMacCoolApp diff --git a/FSharpiOSCoolApp/dotnet/FSharpiOSCoolApp.fsproj b/FSharpiOSCoolApp/dotnet/FSharpiOSCoolApp.fsproj index 0d5225a..8366cc9 100644 --- a/FSharpiOSCoolApp/dotnet/FSharpiOSCoolApp.fsproj +++ b/FSharpiOSCoolApp/dotnet/FSharpiOSCoolApp.fsproj @@ -4,7 +4,7 @@ - net6.0-ios + net$(BundledNETCoreAppTargetFrameworkVersion)-ios ios-arm64;ios-arm Exe FSharpiOSCoolApp diff --git a/MacCoolApp_DontLink/dotnet/MacCoolApp.csproj b/MacCoolApp_DontLink/dotnet/MacCoolApp.csproj index d98dd7e..5f113bc 100644 --- a/MacCoolApp_DontLink/dotnet/MacCoolApp.csproj +++ b/MacCoolApp_DontLink/dotnet/MacCoolApp.csproj @@ -5,7 +5,7 @@ // We test this because ? the linker is disabled and all symbols are present in the binary // actually because of QTKit deprecation we are forced to use "Link SDK" and an XML file that preserve (almost) everything else --> - net6.0-macos + net$(BundledNETCoreAppTargetFrameworkVersion)-macos osx-arm64;osx-x64 Exe MacCoolApp diff --git a/MyCatalystApp/MyCatalystApp.csproj b/MyCatalystApp/MyCatalystApp.csproj index 9b8f15c..7097780 100644 --- a/MyCatalystApp/MyCatalystApp.csproj +++ b/MyCatalystApp/MyCatalystApp.csproj @@ -1,7 +1,7 @@ - net6.0-maccatalyst + net$(BundledNETCoreAppTargetFrameworkVersion)-maccatalyst Exe SdkOnly diff --git a/MyFatCatalystApp/MyFatCatalystApp.csproj b/MyFatCatalystApp/MyFatCatalystApp.csproj index e8df234..e177e65 100644 --- a/MyFatCatalystApp/MyFatCatalystApp.csproj +++ b/MyFatCatalystApp/MyFatCatalystApp.csproj @@ -1,7 +1,7 @@ - net6.0-maccatalyst + net$(BundledNETCoreAppTargetFrameworkVersion)-maccatalyst Exe maccatalyst-arm64;maccatalyst-x64 SdkOnly diff --git a/MyNotarizedCatalystApp/MyNotarizedCatalystApp.csproj b/MyNotarizedCatalystApp/MyNotarizedCatalystApp.csproj index 55c4967..118d47a 100644 --- a/MyNotarizedCatalystApp/MyNotarizedCatalystApp.csproj +++ b/MyNotarizedCatalystApp/MyNotarizedCatalystApp.csproj @@ -1,7 +1,7 @@ - net7.0-maccatalyst + net$(BundledNETCoreAppTargetFrameworkVersion)-maccatalyst Exe maccatalyst-arm64 diff --git a/MyUnlinkedCatalystApp/MyUnlinkedCatalystApp.csproj b/MyUnlinkedCatalystApp/MyUnlinkedCatalystApp.csproj index a37971a..a2f0edb 100644 --- a/MyUnlinkedCatalystApp/MyUnlinkedCatalystApp.csproj +++ b/MyUnlinkedCatalystApp/MyUnlinkedCatalystApp.csproj @@ -1,7 +1,7 @@ - net6.0-maccatalyst + net$(BundledNETCoreAppTargetFrameworkVersion)-maccatalyst Exe None diff --git a/ODRsTVOS_Extension/dotnet/ODRsTVOS/ODRsTVOS.csproj b/ODRsTVOS_Extension/dotnet/ODRsTVOS/ODRsTVOS.csproj index 1cf772d..6d7f7c0 100644 --- a/ODRsTVOS_Extension/dotnet/ODRsTVOS/ODRsTVOS.csproj +++ b/ODRsTVOS_Extension/dotnet/ODRsTVOS/ODRsTVOS.csproj @@ -4,7 +4,7 @@ - net6.0-tvos + net$(BundledNETCoreAppTargetFrameworkVersion)-tvos tvos-arm64 Exe ODRsTVOS diff --git a/ODRsTVOS_Extension/dotnet/ODRsTVOSExt/ODRsTVOSExt.csproj b/ODRsTVOS_Extension/dotnet/ODRsTVOSExt/ODRsTVOSExt.csproj index 6490bf3..b59943e 100644 --- a/ODRsTVOS_Extension/dotnet/ODRsTVOSExt/ODRsTVOSExt.csproj +++ b/ODRsTVOS_Extension/dotnet/ODRsTVOSExt/ODRsTVOSExt.csproj @@ -4,7 +4,7 @@ - net6.0-tvos + net$(BundledNETCoreAppTargetFrameworkVersion)-tvos tvos-arm64 ODRsTVOSExt ODRsTVOSExt diff --git a/SceneKitGame/dotnet/SceneKitGame.csproj b/SceneKitGame/dotnet/SceneKitGame.csproj index 94d7c32..e2ac4c9 100644 --- a/SceneKitGame/dotnet/SceneKitGame.csproj +++ b/SceneKitGame/dotnet/SceneKitGame.csproj @@ -1,7 +1,7 @@ - net6.0-tvos + net$(BundledNETCoreAppTargetFrameworkVersion)-tvos tvos-arm64 Exe SceneKitGame diff --git a/UICatalog/dotnet/UICatalog.csproj b/UICatalog/dotnet/UICatalog.csproj index a5fccf7..1832274 100644 --- a/UICatalog/dotnet/UICatalog.csproj +++ b/UICatalog/dotnet/UICatalog.csproj @@ -4,7 +4,7 @@ - net6.0-tvos + net$(BundledNETCoreAppTargetFrameworkVersion)-tvos tvos-arm64 Exe UICatalog diff --git a/iOSCoolApp/dotnet/iOSCoolApp.csproj b/iOSCoolApp/dotnet/iOSCoolApp.csproj index 30a08e6..2bbb98a 100644 --- a/iOSCoolApp/dotnet/iOSCoolApp.csproj +++ b/iOSCoolApp/dotnet/iOSCoolApp.csproj @@ -4,7 +4,7 @@ - net6.0-ios + net$(BundledNETCoreAppTargetFrameworkVersion)-ios ios-arm64;ios-arm Exe iOSCoolApp diff --git a/iTravel/dotnet/iTravel.csproj b/iTravel/dotnet/iTravel.csproj index 577bee9..cfdc552 100644 --- a/iTravel/dotnet/iTravel.csproj +++ b/iTravel/dotnet/iTravel.csproj @@ -6,7 +6,7 @@ // - Build without LLVM (i.e. Mono AOT) // - No 32bits slice since it's too big to be generated successfully (since mono-2019-02) --> - net6.0-ios + net$(BundledNETCoreAppTargetFrameworkVersion)-ios ios-arm64 Exe iTravel From 7bea9861195b47d8c073baac1e605ddab561a318 Mon Sep 17 00:00:00 2001 From: Haritha Mohan Date: Tue, 5 Sep 2023 22:38:35 -0400 Subject: [PATCH 4/5] remove tfm from output paths --- FSharpMacCoolApp/dotnet/FSharpMacCoolApp.fsproj | 1 + FSharpiOSCoolApp/dotnet/FSharpiOSCoolApp.fsproj | 1 + MacCoolApp_DontLink/dotnet/MacCoolApp.csproj | 1 + MyCatalystApp/MyCatalystApp.csproj | 1 + MyFatCatalystApp/MyFatCatalystApp.csproj | 1 + MyNotarizedCatalystApp/MyNotarizedCatalystApp.csproj | 1 + MyUnlinkedCatalystApp/MyUnlinkedCatalystApp.csproj | 1 + ODRsTVOS_Extension/dotnet/ODRsTVOS/ODRsTVOS.csproj | 1 + ODRsTVOS_Extension/dotnet/ODRsTVOSExt/ODRsTVOSExt.csproj | 1 + SceneKitGame/dotnet/SceneKitGame.csproj | 1 + UICatalog/dotnet/UICatalog.csproj | 1 + iOSCoolApp/dotnet/iOSCoolApp.csproj | 1 + iTravel/dotnet/iTravel.csproj | 1 + 13 files changed, 13 insertions(+) diff --git a/FSharpMacCoolApp/dotnet/FSharpMacCoolApp.fsproj b/FSharpMacCoolApp/dotnet/FSharpMacCoolApp.fsproj index cf40e03..d520745 100644 --- a/FSharpMacCoolApp/dotnet/FSharpMacCoolApp.fsproj +++ b/FSharpMacCoolApp/dotnet/FSharpMacCoolApp.fsproj @@ -6,6 +6,7 @@ --> net$(BundledNETCoreAppTargetFrameworkVersion)-macos True + false osx-x64 Exe FSharpMacCoolApp diff --git a/FSharpiOSCoolApp/dotnet/FSharpiOSCoolApp.fsproj b/FSharpiOSCoolApp/dotnet/FSharpiOSCoolApp.fsproj index b4fa95b..cd8746f 100644 --- a/FSharpiOSCoolApp/dotnet/FSharpiOSCoolApp.fsproj +++ b/FSharpiOSCoolApp/dotnet/FSharpiOSCoolApp.fsproj @@ -6,6 +6,7 @@ --> net$(BundledNETCoreAppTargetFrameworkVersion)-ios True + false ios-arm64;ios-arm Exe FSharpiOSCoolApp diff --git a/MacCoolApp_DontLink/dotnet/MacCoolApp.csproj b/MacCoolApp_DontLink/dotnet/MacCoolApp.csproj index b2cb06a..e78763e 100644 --- a/MacCoolApp_DontLink/dotnet/MacCoolApp.csproj +++ b/MacCoolApp_DontLink/dotnet/MacCoolApp.csproj @@ -7,6 +7,7 @@ --> net$(BundledNETCoreAppTargetFrameworkVersion)-macos True + false osx-arm64;osx-x64 Exe MacCoolApp diff --git a/MyCatalystApp/MyCatalystApp.csproj b/MyCatalystApp/MyCatalystApp.csproj index 8d1a221..175297b 100644 --- a/MyCatalystApp/MyCatalystApp.csproj +++ b/MyCatalystApp/MyCatalystApp.csproj @@ -3,6 +3,7 @@ net$(BundledNETCoreAppTargetFrameworkVersion)-maccatalyst True + false Exe SdkOnly diff --git a/MyFatCatalystApp/MyFatCatalystApp.csproj b/MyFatCatalystApp/MyFatCatalystApp.csproj index fb88248..c136ba7 100644 --- a/MyFatCatalystApp/MyFatCatalystApp.csproj +++ b/MyFatCatalystApp/MyFatCatalystApp.csproj @@ -3,6 +3,7 @@ net$(BundledNETCoreAppTargetFrameworkVersion)-maccatalyst True + false Exe maccatalyst-arm64;maccatalyst-x64 SdkOnly diff --git a/MyNotarizedCatalystApp/MyNotarizedCatalystApp.csproj b/MyNotarizedCatalystApp/MyNotarizedCatalystApp.csproj index a3b9864..8b22c96 100644 --- a/MyNotarizedCatalystApp/MyNotarizedCatalystApp.csproj +++ b/MyNotarizedCatalystApp/MyNotarizedCatalystApp.csproj @@ -3,6 +3,7 @@ net$(BundledNETCoreAppTargetFrameworkVersion)-maccatalyst True + false Exe maccatalyst-arm64 diff --git a/MyUnlinkedCatalystApp/MyUnlinkedCatalystApp.csproj b/MyUnlinkedCatalystApp/MyUnlinkedCatalystApp.csproj index 654ec44..fdd1dae 100644 --- a/MyUnlinkedCatalystApp/MyUnlinkedCatalystApp.csproj +++ b/MyUnlinkedCatalystApp/MyUnlinkedCatalystApp.csproj @@ -3,6 +3,7 @@ net$(BundledNETCoreAppTargetFrameworkVersion)-maccatalyst True + false Exe None diff --git a/ODRsTVOS_Extension/dotnet/ODRsTVOS/ODRsTVOS.csproj b/ODRsTVOS_Extension/dotnet/ODRsTVOS/ODRsTVOS.csproj index 548e1bc..1dd86b2 100644 --- a/ODRsTVOS_Extension/dotnet/ODRsTVOS/ODRsTVOS.csproj +++ b/ODRsTVOS_Extension/dotnet/ODRsTVOS/ODRsTVOS.csproj @@ -6,6 +6,7 @@ --> net$(BundledNETCoreAppTargetFrameworkVersion)-tvos True + false tvos-arm64 Exe ODRsTVOS diff --git a/ODRsTVOS_Extension/dotnet/ODRsTVOSExt/ODRsTVOSExt.csproj b/ODRsTVOS_Extension/dotnet/ODRsTVOSExt/ODRsTVOSExt.csproj index 0f44c91..4feb295 100644 --- a/ODRsTVOS_Extension/dotnet/ODRsTVOSExt/ODRsTVOSExt.csproj +++ b/ODRsTVOS_Extension/dotnet/ODRsTVOSExt/ODRsTVOSExt.csproj @@ -6,6 +6,7 @@ --> net$(BundledNETCoreAppTargetFrameworkVersion)-tvos True + false tvos-arm64 ODRsTVOSExt ODRsTVOSExt diff --git a/SceneKitGame/dotnet/SceneKitGame.csproj b/SceneKitGame/dotnet/SceneKitGame.csproj index f463610..f98f525 100644 --- a/SceneKitGame/dotnet/SceneKitGame.csproj +++ b/SceneKitGame/dotnet/SceneKitGame.csproj @@ -3,6 +3,7 @@ net$(BundledNETCoreAppTargetFrameworkVersion)-tvos True + false tvos-arm64 Exe SceneKitGame diff --git a/UICatalog/dotnet/UICatalog.csproj b/UICatalog/dotnet/UICatalog.csproj index 1febb9f..6ff36ec 100644 --- a/UICatalog/dotnet/UICatalog.csproj +++ b/UICatalog/dotnet/UICatalog.csproj @@ -6,6 +6,7 @@ --> net$(BundledNETCoreAppTargetFrameworkVersion)-tvos True + false tvos-arm64 Exe UICatalog diff --git a/iOSCoolApp/dotnet/iOSCoolApp.csproj b/iOSCoolApp/dotnet/iOSCoolApp.csproj index 6881611..feaa7fa 100644 --- a/iOSCoolApp/dotnet/iOSCoolApp.csproj +++ b/iOSCoolApp/dotnet/iOSCoolApp.csproj @@ -6,6 +6,7 @@ --> net$(BundledNETCoreAppTargetFrameworkVersion)-ios True + false ios-arm64;ios-arm Exe iOSCoolApp diff --git a/iTravel/dotnet/iTravel.csproj b/iTravel/dotnet/iTravel.csproj index 04b0ed6..e1a7981 100644 --- a/iTravel/dotnet/iTravel.csproj +++ b/iTravel/dotnet/iTravel.csproj @@ -8,6 +8,7 @@ --> net$(BundledNETCoreAppTargetFrameworkVersion)-ios True + false ios-arm64 Exe iTravel From 8853ce48602111bd5da9ba876817c020076eabda Mon Sep 17 00:00:00 2001 From: Haritha Mohan Date: Wed, 6 Sep 2023 14:37:19 -0400 Subject: [PATCH 5/5] remove ios-arm tfm --- FSharpiOSCoolApp/dotnet/FSharpiOSCoolApp.fsproj | 2 +- iOSCoolApp/dotnet/iOSCoolApp.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/FSharpiOSCoolApp/dotnet/FSharpiOSCoolApp.fsproj b/FSharpiOSCoolApp/dotnet/FSharpiOSCoolApp.fsproj index cd8746f..2374b65 100644 --- a/FSharpiOSCoolApp/dotnet/FSharpiOSCoolApp.fsproj +++ b/FSharpiOSCoolApp/dotnet/FSharpiOSCoolApp.fsproj @@ -7,7 +7,7 @@ net$(BundledNETCoreAppTargetFrameworkVersion)-ios True false - ios-arm64;ios-arm + ios-arm64 Exe FSharpiOSCoolApp FSharpiOSCoolApp diff --git a/iOSCoolApp/dotnet/iOSCoolApp.csproj b/iOSCoolApp/dotnet/iOSCoolApp.csproj index feaa7fa..a034ea7 100644 --- a/iOSCoolApp/dotnet/iOSCoolApp.csproj +++ b/iOSCoolApp/dotnet/iOSCoolApp.csproj @@ -7,7 +7,7 @@ net$(BundledNETCoreAppTargetFrameworkVersion)-ios True false - ios-arm64;ios-arm + ios-arm64 Exe iOSCoolApp iOSCoolApp