diff --git a/.nuspec/Microsoft.Maui.Resizetizer.targets b/.nuspec/Microsoft.Maui.Resizetizer.targets index d64b414ba3f6..623b723a166a 100644 --- a/.nuspec/Microsoft.Maui.Resizetizer.targets +++ b/.nuspec/Microsoft.Maui.Resizetizer.targets @@ -84,7 +84,7 @@ <_ResizetizerIsiOSApp Condition="('$(TargetPlatformIdentifier)' == 'ios' Or '$(TargetPlatformIdentifier)' == 'maccatalyst') And ('$(OutputType)' == 'Exe' Or '$(IsAppExtension)' == 'True')">True <_ResizetizerIsUWPApp Condition="'$(TargetPlatformIdentifier)'=='UAP' And '$(OutputType)' == 'AppContainerExe'">True <_ResizetizerIsWPFApp Condition="'$(IsApplication)' == 'True' And '$(NuGetRuntimeIdentifier)' == 'win' And '$(TargetPlatformIdentifier)'=='Windows'">True - <_ResizetizerIsWindowsAppSdk Condition="'$(ProjectReunionWinUI)'=='True' And '$(TargetPlatformIdentifier)'=='Windows' And ('$(OutputType)' == 'WinExe' Or '$(OutputType)' == 'Exe')">True + <_ResizetizerIsWindowsAppSdk Condition="('$(ProjectReunionWinUI)'=='True' Or '$(WindowsAppSDKWinUI)'=='True') And '$(TargetPlatformIdentifier)'=='Windows' And ('$(OutputType)' == 'WinExe' Or '$(OutputType)' == 'Exe')">True diff --git a/eng/Microsoft.Extensions.targets b/eng/Microsoft.Extensions.targets index d71fb9a26ed9..b23650497f38 100644 --- a/eng/Microsoft.Extensions.targets +++ b/eng/Microsoft.Extensions.targets @@ -13,7 +13,7 @@ <_MicrosoftWindowsAppSdkVersion>1.0.0-preview3 - <_MicrosoftWindowsAppSdkVersion Condition="'$(UseInternalWinUIPackages)' == 'true'">1.0.0-20211012.0-CI-experimental + <_MicrosoftWindowsAppSdkVersion Condition="'$(UseInternalWinUIPackages)' == 'true'">1.0.0-20211030.0-CI-experimental <_MicrosoftWebWebView2Version>1.0.961.33 diff --git a/src/Controls/samples/Controls.Sample.SingleProject/Platforms/MacCatalyst/Info.plist b/src/Controls/samples/Controls.Sample.SingleProject/Platforms/MacCatalyst/Info.plist index 971e1199c9b8..df0002495f1e 100644 --- a/src/Controls/samples/Controls.Sample.SingleProject/Platforms/MacCatalyst/Info.plist +++ b/src/Controls/samples/Controls.Sample.SingleProject/Platforms/MacCatalyst/Info.plist @@ -26,5 +26,26 @@ XSAppIconAssets Assets.xcassets/appicon.appiconset + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneConfigurationName + __MAUI_DEFAULT_SCENE_CONFIGURATION__ + UISceneDelegateClassName + SceneDelegate + + + + + NSUserActivityTypes + + com.microsoft.maui.sample + diff --git a/src/Controls/samples/Controls.Sample.SingleProject/Platforms/MacCatalyst/SceneDelegate.cs b/src/Controls/samples/Controls.Sample.SingleProject/Platforms/MacCatalyst/SceneDelegate.cs new file mode 100644 index 000000000000..ccad3c518248 --- /dev/null +++ b/src/Controls/samples/Controls.Sample.SingleProject/Platforms/MacCatalyst/SceneDelegate.cs @@ -0,0 +1,13 @@ +using Foundation; +using UIKit; +using Microsoft.Maui; + +namespace Maui.Controls.Sample +{ + [Register("SceneDelegate")] + public class SceneDelegate : MauiUISceneDelegate + { + + + } +} \ No newline at end of file diff --git a/src/Controls/samples/Controls.Sample.SingleProject/Platforms/iOS/Info.plist b/src/Controls/samples/Controls.Sample.SingleProject/Platforms/iOS/Info.plist index b721905f96a2..e1d70019230f 100644 --- a/src/Controls/samples/Controls.Sample.SingleProject/Platforms/iOS/Info.plist +++ b/src/Controls/samples/Controls.Sample.SingleProject/Platforms/iOS/Info.plist @@ -30,5 +30,26 @@ Assets.xcassets/appicon.appiconset NSLocationWhenInUseUsageDescription Access to your location is required for cool things to happen! + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneConfigurationName + __MAUI_DEFAULT_SCENE_CONFIGURATION__ + UISceneDelegateClassName + SceneDelegate + + + + + NSUserActivityTypes + + com.microsoft.maui.sample.default + diff --git a/src/Controls/samples/Controls.Sample.SingleProject/Platforms/iOS/SceneDelegate.cs b/src/Controls/samples/Controls.Sample.SingleProject/Platforms/iOS/SceneDelegate.cs index d8ef5560eb29..ccad3c518248 100644 --- a/src/Controls/samples/Controls.Sample.SingleProject/Platforms/iOS/SceneDelegate.cs +++ b/src/Controls/samples/Controls.Sample.SingleProject/Platforms/iOS/SceneDelegate.cs @@ -1,59 +1,13 @@ using Foundation; using UIKit; +using Microsoft.Maui; namespace Maui.Controls.Sample { [Register("SceneDelegate")] - public class SceneDelegate : UIResponder, IUIWindowSceneDelegate + public class SceneDelegate : MauiUISceneDelegate { - [Export("window")] - public UIWindow Window { get; set; } - - [Export("scene:willConnectToSession:options:")] - public void WillConnect(UIScene scene, UISceneSession session, UISceneConnectionOptions connectionOptions) - { - // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`. - // If using a storyboard, the `window` property will automatically be initialized and attached to the scene. - // This delegate does not imply the connecting scene or session are new (see UIApplicationDelegate `GetConfiguration` instead). - } - - [Export("sceneDidDisconnect:")] - public void DidDisconnect(UIScene scene) - { - // Called as the scene is being released by the system. - // This occurs shortly after the scene enters the background, or when its session is discarded. - // Release any resources associated with this scene that can be re-created the next time the scene connects. - // The scene may re-connect later, as its session was not neccessarily discarded (see UIApplicationDelegate `DidDiscardSceneSessions` instead). - } - - [Export("sceneDidBecomeActive:")] - public void DidBecomeActive(UIScene scene) - { - // Called when the scene has moved from an inactive state to an active state. - // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive. - } - - [Export("sceneWillResignActive:")] - public void WillResignActive(UIScene scene) - { - // Called when the scene will move from an active state to an inactive state. - // This may occur due to temporary interruptions (ex. an incoming phone call). - } - - [Export("sceneWillEnterForeground:")] - public void WillEnterForeground(UIScene scene) - { - // Called as the scene transitions from the background to the foreground. - // Use this method to undo the changes made on entering the background. - } - - [Export("sceneDidEnterBackground:")] - public void DidEnterBackground(UIScene scene) - { - // Called as the scene transitions from the foreground to the background. - // Use this method to save data, release shared resources, and store enough scene-specific state information - // to restore the scene back to its current state. - } + } } \ No newline at end of file diff --git a/src/Controls/samples/Controls.Sample/Pages/MainPage.xaml b/src/Controls/samples/Controls.Sample/Pages/MainPage.xaml index 1d7103423b18..e02285c12b4f 100644 --- a/src/Controls/samples/Controls.Sample/Pages/MainPage.xaml +++ b/src/Controls/samples/Controls.Sample/Pages/MainPage.xaml @@ -67,11 +67,8 @@ Source="header_background"/> - - - - + Grid.Row="0" + RowDefinitions="Auto,*,Auto">