From a6ef125036201ad7da44a8b66b138465c041649c Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Sun, 11 Dec 2022 22:30:07 -0500 Subject: [PATCH] fix(reg): Restore multi-folder project structure --- .../test-scripts/run-net7-template-linux.ps1 | 12 +- .../run-netcore-mobile-template-tests.ps1 | 5 +- .../Uno.ProjectTemplates.Dotnet.csproj | 22 +- .../unoapp/.template.config/template.json | 69 +++-- .../unoapp/UnoWinUIQuickStart-vsmac.slnf | 6 +- .../content/unoapp/UnoWinUIQuickStart.sln | 44 ++- .../{Shared => Base}/App.xaml | 0 .../{Shared => Base}/App.xaml.cs | 0 .../Base/Base.winui.netcore.vstemplate | 27 ++ .../UnoQuickStart.Base.shproj} | 0 .../{WinUI => Base}/__PreviewImage.png | Bin .../{WinUI => Base}/__TemplateIcon.png | Bin .../Base/base.props | 16 + .../Android/AndroidManifest.xml | 0 .../Android/Assets/AboutAssets.txt | 0 .../Assets/Fonts/uno-fluentui-assets.ttf | Bin .../{Platforms => }/Android/Main.Android.cs | 0 .../Android/MainActivity.Android.cs | 0 .../Android/Resources/AboutResources.txt | 0 .../Android/Resources/mipmap-hdpi/icon.png | Bin .../Android/Resources/mipmap-ldpi/icon.png | Bin .../Android/Resources/mipmap-mdpi/icon.png | Bin .../Android/Resources/mipmap-tvdpi/icon.png | Bin .../Android/Resources/mipmap-xhdpi/icon.png | Bin .../Android/Resources/mipmap-xxhdpi/icon.png | Bin .../Android/Resources/mipmap-xxxhdpi/icon.png | Bin .../Android/Resources/values/Strings.xml | 0 .../Android/Resources/values/Styles.xml | 0 .../{Platforms => }/Android/environment.conf | 0 .../MacCatalyst/Entitlements.plist | 0 .../{Platforms => }/MacCatalyst/Info.plist | 0 .../MacCatalyst/LaunchScreen.storyboard | 0 .../MacCatalyst/Main.maccatalyst.cs | 0 .../AppIcons.appiconset/Contents.json | 0 .../AppIcons.appiconset/Icon1024.png | Bin .../AppIcons.appiconset/Icon120.png | Bin .../AppIcons.appiconset/Icon152.png | Bin .../AppIcons.appiconset/Icon167.png | Bin .../AppIcons.appiconset/Icon180.png | Bin .../AppIcons.appiconset/Icon20.png | Bin .../AppIcons.appiconset/Icon29.png | Bin .../AppIcons.appiconset/Icon40.png | Bin .../AppIcons.appiconset/Icon58.png | Bin .../AppIcons.appiconset/Icon60.png | Bin .../AppIcons.appiconset/Icon76.png | Bin .../AppIcons.appiconset/Icon80.png | Bin .../AppIcons.appiconset/Icon87.png | Bin .../MacCatalyst/Resources/Default-568h@2x.png | Bin .../Resources/Fonts/uno-fluentui-assets.ttf | Bin .../MacCatalyst/Resources/SplashScreen@2x.png | Bin .../MacCatalyst/Resources/SplashScreen@3x.png | Bin .../Mobile/Mobile.winui.netcore.vstemplate | 276 +++++++++--------- .../Mobile/UnoQuickStart.Mobile.csproj | 9 +- .../{Platforms => }/iOS/Entitlements.plist | 0 .../Mobile/{Platforms => }/iOS/Info.plist | 0 .../iOS/LaunchScreen.storyboard | 0 .../Mobile/{Platforms => }/iOS/Main.iOS.cs | 0 .../AppIcons.appiconset/Contents.json | 0 .../AppIcons.appiconset/Icon1024.png | Bin .../AppIcons.appiconset/Icon120.png | Bin .../AppIcons.appiconset/Icon152.png | Bin .../AppIcons.appiconset/Icon167.png | Bin .../AppIcons.appiconset/Icon180.png | Bin .../AppIcons.appiconset/Icon20.png | Bin .../AppIcons.appiconset/Icon29.png | Bin .../AppIcons.appiconset/Icon40.png | Bin .../AppIcons.appiconset/Icon58.png | Bin .../AppIcons.appiconset/Icon60.png | Bin .../AppIcons.appiconset/Icon76.png | Bin .../AppIcons.appiconset/Icon80.png | Bin .../AppIcons.appiconset/Icon87.png | Bin .../LaunchImages.launchimage/Contents.json | 0 .../iOS/Resources/Default-568h@2x.png | Bin .../Resources/Fonts/uno-fluentui-assets.ttf | Bin .../iOS/Resources/SplashScreen@2x.png | Bin .../iOS/Resources/SplashScreen@3x.png | Bin .../AppIcon.appiconset/AppIcon-128.png | Bin .../AppIcon.appiconset/AppIcon-128@2x.png | Bin .../AppIcon.appiconset/AppIcon-16.png | Bin .../AppIcon.appiconset/AppIcon-16@2x.png | Bin .../AppIcon.appiconset/AppIcon-256.png | Bin .../AppIcon.appiconset/AppIcon-256@2x.png | Bin .../AppIcon.appiconset/AppIcon-32.png | Bin .../AppIcon.appiconset/AppIcon-32@2x.png | Bin .../AppIcon.appiconset/AppIcon-512.png | Bin .../AppIcon.appiconset/AppIcon-512@2x.png | Bin .../AppIcon.appiconset/Contents.json | 0 .../macOS/Assets.xcassets/Contents.json | 0 .../unologo.imageset/Contents.json | 0 .../unologo.imageset/unoplatform.jpg | Bin .../{Platforms => }/macOS/Entitlements.plist | 0 .../Mobile/{Platforms => }/macOS/Info.plist | 0 .../{Platforms => }/macOS/Main.macOS.cs | 0 .../Resources/Fonts/uno-fluentui-assets.ttf | Bin .../{Platforms/Skia.Gtk => }/Program.cs | 0 .../Skia.Gtk/SkiaGtk.winui.netcore.vstemplate | 6 +- .../Skia.Gtk/UnoQuickStart.Skia.Gtk.csproj | 13 +- .../Skia.Framebuffer => }/Program.cs | 0 ...aLinuxFrameBuffer.winui.netcore.vstemplate | 6 +- ...noQuickStart.Skia.Linux.FrameBuffer.csproj | 13 +- .../Skia.WPF/SkiaWpf.winui.netcore.vstemplate | 12 +- .../Skia.WPF/UnoQuickStart.Skia.WPF.csproj | 12 +- .../{Platforms/Skia.Wpf => Wpf}/App.xaml | 2 +- .../{Platforms/Skia.Wpf => Wpf}/App.xaml.cs | 0 .../Skia.Wpf => Wpf}/MainWindow.xaml | 0 .../Skia.Wpf => Wpf}/MainWindow.xaml.cs | 0 .../UnoApp.netcore.vstemplate | 2 +- .../UnoSolutionTemplate.WinUI.netcore.csproj | 246 ++++++++-------- .../Assets/Fonts/uno-fluentui-assets.ttf | Bin .../{Shared => Views}/MainPage.xaml | 0 .../{Shared => Views}/MainPage.xaml.cs | 0 .../Strings/en/Resources.resw | 0 .../Views/UnoQuickStart.csproj | 35 +++ .../Views.netcore.vstemplate} | 10 +- .../Views/__PreviewImage.png | Bin 0 -> 20819 bytes .../Views/__TemplateIcon.png | Bin 0 -> 2015 bytes .../WebAssembly => }/Assets/AppIcon-128.png | Bin .../WebAssembly => }/Assets/AppIcon-16.png | Bin .../WebAssembly => }/Assets/AppIcon-256.png | Bin .../WebAssembly => }/Assets/AppIcon-32.png | Bin .../WebAssembly => }/Assets/AppIcon-512.png | Bin .../WebAssembly => }/Assets/SplashScreen.png | Bin .../WebAssembly => }/LinkerConfig.xml | 0 .../{Platforms/WebAssembly => }/Program.cs | 0 .../Properties/launchSettings.json | 0 .../Wasm/UnoQuickStart.Wasm.csproj | 30 +- .../Wasm/Wasm.winui.netcore.vstemplate | 48 ++- .../WebAssembly => }/WasmCSS/Fonts.css | 0 .../WasmScripts/AppManifest.js | 0 .../WebAssembly => }/manifest.webmanifest | 0 .../WebAssembly => }/wwwroot/web.config | 0 .../WinUI/WinUI.netcore.vstemplate | 50 ---- .../Images/LockScreenLogo.scale-200.png | Bin .../Windows/Images/SplashScreen.scale-200.png | Bin .../Images/Square150x150Logo.scale-200.png | Bin .../Images/Square44x44Logo.scale-200.png | Bin ...x44Logo.targetsize-24_altform-unplated.png | Bin .../Windows/Images/StoreLogo.png | Bin .../Images/Wide310x150Logo.scale-200.png | Bin .../Windows/Package.appxmanifest | 0 .../PublishProfiles/win10-arm64.pubxml | 0 .../PublishProfiles/win10-x64.pubxml | 0 .../PublishProfiles/win10-x86.pubxml | 0 .../Windows/Properties/launchSettings.json | 0 .../UnoQuickStart.Windows.csproj | 12 +- .../Windows/WinUI.netcore.vstemplate | 46 +++ .../Windows/__PreviewImage.png | Bin 0 -> 20819 bytes .../Windows/__TemplateIcon.png | Bin 0 -> 2015 bytes .../Platforms => }/Windows/app.manifest | 0 .../Directory.Build-netcore.props | 11 - .../UnoSolutionTemplate.Wizard.2022.csproj | 1 - .../UnoSolutionWizard.cs | 43 +-- .../Uno.UI.Tasks/Content/Uno.UI.Tasks.targets | 33 ++- 153 files changed, 615 insertions(+), 502 deletions(-) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/{Shared => Base}/App.xaml (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/{Shared => Base}/App.xaml.cs (100%) create mode 100644 src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Base/Base.winui.netcore.vstemplate rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/{Shared/UnoQuickStart.Shared.shproj => Base/UnoQuickStart.Base.shproj} (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/{WinUI => Base}/__PreviewImage.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/{WinUI => Base}/__TemplateIcon.png (100%) create mode 100644 src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Base/base.props rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/Android/AndroidManifest.xml (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/Android/Assets/AboutAssets.txt (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/Android/Assets/Fonts/uno-fluentui-assets.ttf (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/Android/Main.Android.cs (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/Android/MainActivity.Android.cs (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/Android/Resources/AboutResources.txt (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/Android/Resources/mipmap-hdpi/icon.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/Android/Resources/mipmap-ldpi/icon.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/Android/Resources/mipmap-mdpi/icon.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/Android/Resources/mipmap-tvdpi/icon.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/Android/Resources/mipmap-xhdpi/icon.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/Android/Resources/mipmap-xxhdpi/icon.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/Android/Resources/mipmap-xxxhdpi/icon.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/Android/Resources/values/Strings.xml (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/Android/Resources/values/Styles.xml (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/Android/environment.conf (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/MacCatalyst/Entitlements.plist (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/MacCatalyst/Info.plist (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/MacCatalyst/LaunchScreen.storyboard (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/MacCatalyst/Main.maccatalyst.cs (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/MacCatalyst/Media.xcassets/AppIcons.appiconset/Contents.json (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon1024.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon120.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon152.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon167.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon180.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon20.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon29.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon40.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon58.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon60.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon76.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon80.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon87.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/MacCatalyst/Resources/Default-568h@2x.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/MacCatalyst/Resources/Fonts/uno-fluentui-assets.ttf (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/MacCatalyst/Resources/SplashScreen@2x.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/MacCatalyst/Resources/SplashScreen@3x.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/iOS/Entitlements.plist (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/iOS/Info.plist (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/iOS/LaunchScreen.storyboard (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/iOS/Main.iOS.cs (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/iOS/Media.xcassets/AppIcons.appiconset/Contents.json (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/iOS/Media.xcassets/AppIcons.appiconset/Icon1024.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/iOS/Media.xcassets/AppIcons.appiconset/Icon120.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/iOS/Media.xcassets/AppIcons.appiconset/Icon152.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/iOS/Media.xcassets/AppIcons.appiconset/Icon167.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/iOS/Media.xcassets/AppIcons.appiconset/Icon180.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/iOS/Media.xcassets/AppIcons.appiconset/Icon20.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/iOS/Media.xcassets/AppIcons.appiconset/Icon29.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/iOS/Media.xcassets/AppIcons.appiconset/Icon40.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/iOS/Media.xcassets/AppIcons.appiconset/Icon58.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/iOS/Media.xcassets/AppIcons.appiconset/Icon60.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/iOS/Media.xcassets/AppIcons.appiconset/Icon76.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/iOS/Media.xcassets/AppIcons.appiconset/Icon80.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/iOS/Media.xcassets/AppIcons.appiconset/Icon87.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/iOS/Resources/Default-568h@2x.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/iOS/Resources/Fonts/uno-fluentui-assets.ttf (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/iOS/Resources/SplashScreen@2x.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/iOS/Resources/SplashScreen@3x.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/macOS/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/macOS/Assets.xcassets/Contents.json (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/macOS/Assets.xcassets/unologo.imageset/Contents.json (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/macOS/Assets.xcassets/unologo.imageset/unoplatform.jpg (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/macOS/Entitlements.plist (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/macOS/Info.plist (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/macOS/Main.macOS.cs (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/{Platforms => }/macOS/Resources/Fonts/uno-fluentui-assets.ttf (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Gtk/{Platforms/Skia.Gtk => }/Program.cs (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Linux.FrameBuffer/{Platforms/Skia.Framebuffer => }/Program.cs (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/{Platforms/Skia.Wpf => Wpf}/App.xaml (85%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/{Platforms/Skia.Wpf => Wpf}/App.xaml.cs (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/{Platforms/Skia.Wpf => Wpf}/MainWindow.xaml (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/{Platforms/Skia.Wpf => Wpf}/MainWindow.xaml.cs (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/{Shared => Views}/Assets/Fonts/uno-fluentui-assets.ttf (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/{Shared => Views}/MainPage.xaml (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/{Shared => Views}/MainPage.xaml.cs (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/{Shared => Views}/Strings/en/Resources.resw (100%) create mode 100644 src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Views/UnoQuickStart.csproj rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/{Shared/Shared.netcore.vstemplate => Views/Views.netcore.vstemplate} (74%) create mode 100644 src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Views/__PreviewImage.png create mode 100644 src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Views/__TemplateIcon.png rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/{Platforms/WebAssembly => }/Assets/AppIcon-128.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/{Platforms/WebAssembly => }/Assets/AppIcon-16.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/{Platforms/WebAssembly => }/Assets/AppIcon-256.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/{Platforms/WebAssembly => }/Assets/AppIcon-32.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/{Platforms/WebAssembly => }/Assets/AppIcon-512.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/{Platforms/WebAssembly => }/Assets/SplashScreen.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/{Platforms/WebAssembly => }/LinkerConfig.xml (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/{Platforms/WebAssembly => }/Program.cs (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/{Platforms/WebAssembly => }/Properties/launchSettings.json (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/{Platforms/WebAssembly => }/WasmCSS/Fonts.css (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/{Platforms/WebAssembly => }/WasmScripts/AppManifest.js (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/{Platforms/WebAssembly => }/manifest.webmanifest (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/{Platforms/WebAssembly => }/wwwroot/web.config (100%) delete mode 100644 src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/WinUI.netcore.vstemplate rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/{WinUI/Platforms => }/Windows/Images/LockScreenLogo.scale-200.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/{WinUI/Platforms => }/Windows/Images/SplashScreen.scale-200.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/{WinUI/Platforms => }/Windows/Images/Square150x150Logo.scale-200.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/{WinUI/Platforms => }/Windows/Images/Square44x44Logo.scale-200.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/{WinUI/Platforms => }/Windows/Images/Square44x44Logo.targetsize-24_altform-unplated.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/{WinUI/Platforms => }/Windows/Images/StoreLogo.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/{WinUI/Platforms => }/Windows/Images/Wide310x150Logo.scale-200.png (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/{WinUI/Platforms => }/Windows/Package.appxmanifest (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/{WinUI/Platforms => }/Windows/Properties/PublishProfiles/win10-arm64.pubxml (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/{WinUI/Platforms => }/Windows/Properties/PublishProfiles/win10-x64.pubxml (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/{WinUI/Platforms => }/Windows/Properties/PublishProfiles/win10-x86.pubxml (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/{WinUI/Platforms => }/Windows/Properties/launchSettings.json (100%) rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/{WinUI => Windows}/UnoQuickStart.Windows.csproj (87%) create mode 100644 src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/WinUI.netcore.vstemplate create mode 100644 src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/__PreviewImage.png create mode 100644 src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/__TemplateIcon.png rename src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/{WinUI/Platforms => }/Windows/app.manifest (100%) delete mode 100644 src/SolutionTemplate/UnoSolutionTemplate.Wizard.2022/Directory.Build-netcore.props diff --git a/build/test-scripts/run-net7-template-linux.ps1 b/build/test-scripts/run-net7-template-linux.ps1 index c902dcb518..bf82cb7faf 100644 --- a/build/test-scripts/run-net7-template-linux.ps1 +++ b/build/test-scripts/run-net7-template-linux.ps1 @@ -46,20 +46,20 @@ $release = $default + '-c' + 'Release' $createParams=(Get-TemplateConfiguration -wasm 1 -wasmVsCode 1 -skiaGtk 1 -skiaLinuxFB 1) dotnet new unoapp -n UnoAppWinUI --framework net7.0 $createParams -dotnet build $debug UnoAppWinUI/UnoAppWinUI.App/UnoAppWinUI.Wasm.csproj +dotnet build $debug UnoAppWinUI/UnoAppWinUI.Wasm/UnoAppWinUI.Wasm.csproj Assert-ExitCodeIsZero -dotnet build $release UnoAppWinUI/UnoAppWinUI.App/UnoAppWinUI.Wasm.csproj +dotnet build $release UnoAppWinUI/UnoAppWinUI.Wasm/UnoAppWinUI.Wasm.csproj Assert-ExitCodeIsZero -dotnet build $debug UnoAppWinUI/UnoAppWinUI.App/UnoAppWinUI.Skia.Gtk.csproj +dotnet build $debug UnoAppWinUI/UnoAppWinUI.Skia.Gtk/UnoAppWinUI.Skia.Gtk.csproj Assert-ExitCodeIsZero -dotnet build $release UnoAppWinUI/UnoAppWinUI.App/UnoAppWinUI.Skia.Gtk.csproj +dotnet build $release UnoAppWinUI/UnoAppWinUI.Skia.Gtk/UnoAppWinUI.Skia.Gtk.csproj Assert-ExitCodeIsZero -dotnet build $debug UnoAppWinUI/UnoAppWinUI.App/UnoAppWinUI.Skia.Linux.FrameBuffer.csproj +dotnet build $debug UnoAppWinUI/UnoAppWinUI.Skia.Linux.FrameBuffer/UnoAppWinUI.Skia.Linux.FrameBuffer.csproj Assert-ExitCodeIsZero -dotnet build $release UnoAppWinUI/UnoAppWinUI.App/UnoAppWinUI.Skia.Linux.FrameBuffer.csproj +dotnet build $release UnoAppWinUI/UnoAppWinUI.Skia.Linux.FrameBuffer/UnoAppWinUI.Skia.Linux.FrameBuffer.csproj Assert-ExitCodeIsZero diff --git a/build/test-scripts/run-netcore-mobile-template-tests.ps1 b/build/test-scripts/run-netcore-mobile-template-tests.ps1 index 9fa12d8a50..25a1772caa 100644 --- a/build/test-scripts/run-netcore-mobile-template-tests.ps1 +++ b/build/test-scripts/run-netcore-mobile-template-tests.ps1 @@ -75,7 +75,7 @@ pushd UnoAppWinUI for($i = 0; $i -lt $dotnetBuildNet6Configurations.Length; $i++) { $platform=$dotnetBuildNet6Configurations[$i][0]; - & dotnet build -c Debug $default $dotnetBuildNet6Configurations[$i][1] $dotnetBuildNet6Configurations[$i][2] "UnoAppWinUI.App\UnoAppWinUI.$platform.csproj" + & dotnet build -c Debug $default $dotnetBuildNet6Configurations[$i][1] $dotnetBuildNet6Configurations[$i][2] "UnoAppWinUI.$platform\UnoAppWinUI.$platform.csproj" Assert-ExitCodeIsZero } @@ -83,7 +83,8 @@ for($i = 0; $i -lt $dotnetBuildNet6Configurations.Length; $i++) & dotnet build -c Debug $default "UnoAppWinUI.Server\UnoAppWinUI.Server.csproj" # Build with msbuild because of https://github.com/microsoft/WindowsAppSDK/issues/1652 - & $msbuild $debug "/p:Platform=x86" "UnoAppWinUI.App\UnoAppWinUI.Windows.csproj" + # force targetframeworks until we can get WinAppSDK to build with `dotnet build` + & $msbuild $debug "/p:Platform=x86" "/p:TargetFrameworks=net6.0-windows10.0.18362;TargetFramework=net6.0-windows10.0.18362" "UnoAppWinUI.Windows\UnoAppWinUI.Windows.csproj" Assert-ExitCodeIsZero popd diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/Uno.ProjectTemplates.Dotnet.csproj b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/Uno.ProjectTemplates.Dotnet.csproj index 3059aebd0c..9c581ee903 100644 --- a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/Uno.ProjectTemplates.Dotnet.csproj +++ b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/Uno.ProjectTemplates.Dotnet.csproj @@ -120,15 +120,7 @@ <_UnoAppnet6WinUITemplateFilesExclude Include="..\UnoSolutionTemplate.WinUI.netcore\Properties\**" /> <_UnoAppnet6WinUITemplateFilesExclude Include="..\UnoSolutionTemplate.WinUI.netcore\UnoSolutionTemplate.WinUI.netcore.csproj" /> - <_UnoAppnet6WinUITemplateSingleLocationFiles Include="..\UnoSolutionTemplate.WinUI.netcore\Shared\**" Exclude="@(_UnoAppnet6WinUITemplateFilesExclude)"/> - <_UnoAppnet6WinUITemplateSingleLocationFiles Include="..\UnoSolutionTemplate.WinUI.netcore\Mobile\**" Exclude="@(_UnoAppnet6WinUITemplateFilesExclude)"/> - <_UnoAppnet6WinUITemplateSingleLocationFiles Include="..\UnoSolutionTemplate.WinUI.netcore\Skia.Gtk\**" Exclude="@(_UnoAppnet6WinUITemplateFilesExclude)"/> - <_UnoAppnet6WinUITemplateSingleLocationFiles Include="..\UnoSolutionTemplate.WinUI.netcore\Skia.Linux.FrameBuffer\**" Exclude="@(_UnoAppnet6WinUITemplateFilesExclude)"/> - <_UnoAppnet6WinUITemplateSingleLocationFiles Include="..\UnoSolutionTemplate.WinUI.netcore\Skia.WPF\**" Exclude="@(_UnoAppnet6WinUITemplateFilesExclude)"/> - <_UnoAppnet6WinUITemplateSingleLocationFiles Include="..\UnoSolutionTemplate.WinUI.netcore\Wasm\**" Exclude="@(_UnoAppnet6WinUITemplateFilesExclude)"/> - <_UnoAppnet6WinUITemplateSingleLocationFiles Include="..\UnoSolutionTemplate.WinUI.netcore\WinUI\**" Exclude="@(_UnoAppnet6WinUITemplateFilesExclude)"/> - - <_UnoAppnet6WinUITemplateFiles Include="..\UnoSolutionTemplate.WinUI.netcore\**" Exclude="@(_UnoAppnet6WinUITemplateFilesExclude);@(_UnoAppnet6WinUITemplateSingleLocationFiles)"/> + <_UnoAppnet6WinUITemplateFiles Include="..\UnoSolutionTemplate.WinUI.netcore\**" Exclude="@(_UnoAppnet6WinUITemplateFilesExclude)"/> @@ -271,9 +263,7 @@ - - @@ -344,9 +334,9 @@ { // Avoid value replacement with msbuild's CodeTaskFactory expansion string pattern = string.Format("^{0}\\$if\\$\\(\\${0}\\${0} == True\\)", "(.*?)"); - + s = Regex.Replace(s, pattern, @"$1"); ; @@ -397,7 +387,7 @@ } - var platforms = new string[] { "iOS", "UWP", "Wasm", "Server", "Droid", "macOS", "Mobile", "Shared", "Skia.Gtk", "Skia.WPF", "Skia.WPF.Host", "Skia.Tizen", "Skia.Linux.FrameBuffer" }; + var platforms = new string[] { "iOS", "UWP", "Wasm", "Server", "Droid", "macOS", "Mobile", "Shared", "Views", "Base", "Windows", "Skia.Gtk", "Skia.WPF", "Skia.WPF.Host", "Skia.Tizen", "Skia.Linux.FrameBuffer" }; foreach(var platform in platforms) { @@ -405,7 +395,9 @@ if(Directory.Exists(source)) { - Directory.Move(Path.Combine(SourcePath, platform), Path.Combine(SourcePath, SafeProjectName + "." + platform)); + var targetName = platform == "Views" ? SafeProjectName : SafeProjectName + "." + platform; + + Directory.Move(Path.Combine(SourcePath, platform), Path.Combine(SourcePath, targetName)); } } ]]> diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp/.template.config/template.json b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp/.template.config/template.json index d93bb25bdd..339956a40d 100644 --- a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp/.template.config/template.json +++ b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp/.template.config/template.json @@ -157,34 +157,30 @@ }, "android": { "type": "generated", - "generator": "constant", - "dataType": "bool", + "generator": "casing", "parameters": { - "value": "True" + "source": "mobile" } }, "ios": { "type": "generated", - "generator": "constant", - "dataType": "bool", + "generator": "casing", "parameters": { - "value": "True" + "source": "mobile" } }, "macos": { "type": "generated", - "generator": "constant", - "dataType": "bool", + "generator": "casing", "parameters": { - "value": "True" + "source": "mobile" } }, "maccatalyst": { "type": "generated", - "generator": "constant", - "dataType": "bool", + "generator": "casing", "parameters": { - "value": "True" + "source": "mobile" } }, "hosted": { @@ -211,12 +207,31 @@ ], "replaces": "net6.0", "defaultValue": "net6.0" + }, + "libarybasetargetframework": { + "type": "generated", + "generator": "switch", + "replaces": "$libarybasetargetframework$", + "parameters": { + "evaluator": "C++", + "datatype": "string", + "cases": [ + { + "condition": "(Framework == 'net6.0')", + "value": "netstandard2.0" + }, + { + "condition": "(Framework != 'net6.0')", + "value": "net7.0" + } + ] + } } }, "primaryOutputs": [ { "condition": "mobile", - "path": "UnoWinUIQuickStart.App\\UnoWinUIQuickStart.Mobile.csproj" + "path": "UnoWinUIQuickStart.Mobile\\UnoWinUIQuickStart.Mobile.csproj" }, { "condition": "hosted", @@ -224,23 +239,23 @@ }, { "condition": "winui-desktop", - "path": "UnoWinUIQuickStart.App\\UnoWinUIQuickStart.Windows.csproj" + "path": "UnoWinUIQuickStart.Windows\\UnoWinUIQuickStart.Windows.csproj" }, { "condition": "Wasm", - "path": "UnoWinUIQuickStart.App\\UnoWinUIQuickStart.Wasm.csproj" + "path": "UnoWinUIQuickStart.Wasm\\UnoWinUIQuickStart.Wasm.csproj" }, { "condition": "skia-gtk", - "path": "UnoWinUIQuickStart.App\\UnoWinUIQuickStart.Skia.Gtk.csproj" + "path": "UnoWinUIQuickStart.Skia.Gtk\\UnoWinUIQuickStart.Skia.Gtk.csproj" }, { "condition": "skia-wpf", - "path": "UnoWinUIQuickStart.App\\UnoWinUIQuickStart.Skia.WPF.csproj" + "path": "UnoWinUIQuickStart.Skia.WPF\\UnoWinUIQuickStart.Skia.WPF.csproj" }, { "condition": "skia-linux-fb", - "path": "UnoWinUIQuickStart.App\\UnoWinUIQuickStart.Skia.Linux.FrameBuffer.csproj" + "path": "UnoWinUIQuickStart.Skia.Linux.FrameBuffer\\UnoWinUIQuickStart.Skia.Linux.FrameBuffer.csproj" } ], "sources": [ @@ -258,40 +273,32 @@ { "condition": "(!mobile)", "exclude": [ - "UnoWinUIQuickStart.App/Platforms/Android/**", - "UnoWinUIQuickStart.App/Platforms/iOS/**", - "UnoWinUIQuickStart.App/Platforms/MacCatalyst/**", - "UnoWinUIQuickStart.App/Platforms/macOS/**", - "UnoWinUIQuickStart.App/UnoWinUIQuickStart.Mobile.csproj" + "UnoWinUIQuickStart.Mobile/**" ] }, { "condition": "(!WebAssembly)", "exclude": [ "UnoWinUIQuickStart.Server/**", - "UnoWinUIQuickStart.App/Platforms/WebAssembly/**", - "UnoWinUIQuickStart.App/UnoWinUIQuickStart.Mobile.csproj" + "UnoWinUIQuickStart.Wasm/**", ] }, { "condition": "(!skia-gtk)", "exclude": [ - "UnoWinUIQuickStart.App/Platforms/Skia.Gtk/**", - "UnoWinUIQuickStart.App/UnoWinUIQuickStart.Skia.Gtk.csproj" + "UnoWinUIQuickStart.Skia.Gtk/**", ] }, { "condition": "(!skia-wpf)", "exclude": [ - "UnoWinUIQuickStart/Platforms/Skia.WPF/**", - "UnoWinUIQuickStart.App/UnoWinUIQuickStart.Skia.WPF.csproj" + "UnoWinUIQuickStart.Skia.WPF/UnoWinUIQuickStart.Skia.WPF.csproj" ] }, { "condition": "(!skia-linux-fb)", "exclude": [ - "UnoWinUIQuickStart/Platforms/Skia.Linux.FrameBuffer/**", - "UnoWinUIQuickStart.App/UnoWinUIQuickStart.Skia.Linux.FrameBuffer.csproj" + "UnoWinUIQuickStart.Skia.Linux.FrameBuffer/**" ] }, { diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp/UnoWinUIQuickStart-vsmac.slnf b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp/UnoWinUIQuickStart-vsmac.slnf index edda82052f..92fb9c80dd 100644 --- a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp/UnoWinUIQuickStart-vsmac.slnf +++ b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp/UnoWinUIQuickStart-vsmac.slnf @@ -3,15 +3,15 @@ "path": "UnoWinUIQuickStart.sln", "projects": [ #//#if (mobile) - "UnoWinUIQuickStart.App\\UnoWinUIQuickStart.Mobile.csproj", + "UnoWinUIQuickStart.Mobile\\UnoWinUIQuickStart.Mobile.csproj", #//#endif #//#if (WebAssembly) - "UnoWinUIQuickStart.App\\UnoWinUIQuickStart.Wasm.csproj", + "UnoWinUIQuickStart.Wasm\\UnoWinUIQuickStart.Wasm.csproj", #//#endif #//#if (skia-gtk) - "UnoWinUIQuickStart.App\\UnoWinUIQuickStart.Skia.Gtk.csproj", + "UnoWinUIQuickStart.Skia.Gtk\\UnoWinUIQuickStart.Skia.Gtk.csproj", #//#endif ] } diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp/UnoWinUIQuickStart.sln b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp/UnoWinUIQuickStart.sln index 3b48a86e59..edbaf46b5b 100644 --- a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp/UnoWinUIQuickStart.sln +++ b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp/UnoWinUIQuickStart.sln @@ -3,13 +3,16 @@ Microsoft Visual Studio Solution File, Format Version 12.00 VisualStudioVersion = 16.0.29920.165 MinimumVisualStudioVersion = 15.0.26124.0 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart", "UnoWinUIQuickStart\UnoWinUIQuickStart.csproj", "{A5B8155A-119F-4794-B551-C6F3CF7E5411}" +EndProject + #//#if (mobile) -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnoWinUIQuickStart.Mobile", "UnoWinUIQuickStart.App\UnoWinUIQuickStart.Mobile.csproj", "{$guid2$}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnoWinUIQuickStart.Mobile", "UnoWinUIQuickStart.Mobile\UnoWinUIQuickStart.Mobile.csproj", "{$guid2$}" EndProject #//#endif #//#if (WebAssembly) -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart.Wasm", "UnoWinUIQuickStart.App\UnoWinUIQuickStart.Wasm.csproj", "{40EA03F7-8A22-4143-B251-79BAC3EB13D2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart.Wasm", "UnoWinUIQuickStart.Wasm\UnoWinUIQuickStart.Wasm.csproj", "{40EA03F7-8A22-4143-B251-79BAC3EB13D2}" EndProject #//#endif @@ -19,22 +22,22 @@ EndProject #//#endif #//#if (skia-gtk) -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart.Skia.Gtk", "UnoWinUIQuickStart.App\UnoWinUIQuickStart.Skia.Gtk.csproj", "{A5B8155A-118F-4794-B551-C6F3CF7E5411}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart.Skia.Gtk", "UnoWinUIQuickStart.Skia.Gtk\UnoWinUIQuickStart.Skia.Gtk.csproj", "{A5B8155A-118F-4794-B551-C6F3CF7E5411}" EndProject #//#endif #//#if (skia-wpf) -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart.Skia.WPF", "UnoWinUIQuickStart.App\UnoWinUIQuickStart.Skia.WPF.csproj", "{$guid5$}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart.Skia.WPF", "UnoWinUIQuickStart.Skia.WPF\UnoWinUIQuickStart.Skia.WPF.csproj", "{$guid5$}" EndProject #//#endif #//#if (winui-desktop) -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart.Windows", "UnoWinUIQuickStart.App\UnoWinUIQuickStart.Windows.csproj", "{1AA13270-F438-4864-9435-54FD806E10EA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart.Windows", "UnoWinUIQuickStart.Windows\UnoWinUIQuickStart.Windows.csproj", "{1AA13270-F438-4864-9435-54FD806E10EA}" EndProject #//#endif #//#if (skia-linux-fb) -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart.Skia.Linux.FrameBuffer", "UnoWinUIQuickStart.App\UnoWinUIQuickStart.Skia.Linux.FrameBuffer.csproj", "{761D821E-9905-4444-9ADF-76C995FE5427}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart.Skia.Linux.FrameBuffer", "UnoWinUIQuickStart.Skia.Linux.FrameBuffer\UnoWinUIQuickStart.Skia.Linux.FrameBuffer.csproj", "{761D821E-9905-4444-9ADF-76C995FE5427}" EndProject #//#endif @@ -310,6 +313,35 @@ Global {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Release|x86.ActiveCfg = Release|Any CPU {40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Release|x86.Build.0 = Release|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|ARM.ActiveCfg = Debug|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|ARM.Build.0 = Debug|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|ARM64.Build.0 = Debug|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|iPhone.Build.0 = Debug|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|x64.ActiveCfg = Debug|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|x64.Build.0 = Debug|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|x86.ActiveCfg = Debug|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|x86.Build.0 = Debug|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|Any CPU.Build.0 = Release|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|ARM.ActiveCfg = Release|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|ARM.Build.0 = Release|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|ARM64.ActiveCfg = Release|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|ARM64.Build.0 = Release|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|iPhone.ActiveCfg = Release|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|iPhone.Build.0 = Release|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|x64.ActiveCfg = Release|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|x64.Build.0 = Release|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|x86.ActiveCfg = Release|Any CPU + {A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|x86.Build.0 = Release|Any CPU + {40EA03F7-8A22-1234-B251-79BAC3EB13D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {40EA03F7-8A22-1234-B251-79BAC3EB13D2}.Debug|Any CPU.Build.0 = Debug|Any CPU {40EA03F7-8A22-1234-B251-79BAC3EB13D2}.Debug|ARM.ActiveCfg = Debug|Any CPU diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Shared/App.xaml b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Base/App.xaml similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Shared/App.xaml rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Base/App.xaml diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Shared/App.xaml.cs b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Base/App.xaml.cs similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Shared/App.xaml.cs rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Base/App.xaml.cs diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Base/Base.winui.netcore.vstemplate b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Base/Base.winui.netcore.vstemplate new file mode 100644 index 0000000000..2315242698 --- /dev/null +++ b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Base/Base.winui.netcore.vstemplate @@ -0,0 +1,27 @@ + + + UnoQuickStart.Base + + + CSharp + + + 1000 + true + UnoQuickStart.Base + true + Enabled + true + __TemplateIcon.png + __PreviewImage.png + true + true + + + + App.xaml.cs + App.xaml + base.props + + + diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Shared/UnoQuickStart.Shared.shproj b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Base/UnoQuickStart.Base.shproj similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Shared/UnoQuickStart.Shared.shproj rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Base/UnoQuickStart.Base.shproj diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/__PreviewImage.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Base/__PreviewImage.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/__PreviewImage.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Base/__PreviewImage.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/__TemplateIcon.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Base/__TemplateIcon.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/__TemplateIcon.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Base/__TemplateIcon.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Base/base.props b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Base/base.props new file mode 100644 index 0000000000..fa5476e28a --- /dev/null +++ b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Base/base.props @@ -0,0 +1,16 @@ + + + + + + + diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/AndroidManifest.xml b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/AndroidManifest.xml similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/AndroidManifest.xml rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/AndroidManifest.xml diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/Assets/AboutAssets.txt b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/Assets/AboutAssets.txt similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/Assets/AboutAssets.txt rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/Assets/AboutAssets.txt diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/Assets/Fonts/uno-fluentui-assets.ttf b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/Assets/Fonts/uno-fluentui-assets.ttf similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/Assets/Fonts/uno-fluentui-assets.ttf rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/Assets/Fonts/uno-fluentui-assets.ttf diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/Main.Android.cs b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/Main.Android.cs similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/Main.Android.cs rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/Main.Android.cs diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/MainActivity.Android.cs b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/MainActivity.Android.cs similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/MainActivity.Android.cs rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/MainActivity.Android.cs diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/Resources/AboutResources.txt b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/Resources/AboutResources.txt similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/Resources/AboutResources.txt rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/Resources/AboutResources.txt diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/Resources/mipmap-hdpi/icon.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/Resources/mipmap-hdpi/icon.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/Resources/mipmap-hdpi/icon.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/Resources/mipmap-hdpi/icon.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/Resources/mipmap-ldpi/icon.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/Resources/mipmap-ldpi/icon.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/Resources/mipmap-ldpi/icon.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/Resources/mipmap-ldpi/icon.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/Resources/mipmap-mdpi/icon.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/Resources/mipmap-mdpi/icon.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/Resources/mipmap-mdpi/icon.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/Resources/mipmap-mdpi/icon.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/Resources/mipmap-tvdpi/icon.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/Resources/mipmap-tvdpi/icon.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/Resources/mipmap-tvdpi/icon.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/Resources/mipmap-tvdpi/icon.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/Resources/mipmap-xhdpi/icon.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/Resources/mipmap-xhdpi/icon.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/Resources/mipmap-xhdpi/icon.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/Resources/mipmap-xhdpi/icon.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/Resources/mipmap-xxhdpi/icon.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/Resources/mipmap-xxhdpi/icon.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/Resources/mipmap-xxhdpi/icon.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/Resources/mipmap-xxhdpi/icon.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/Resources/mipmap-xxxhdpi/icon.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/Resources/mipmap-xxxhdpi/icon.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/Resources/mipmap-xxxhdpi/icon.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/Resources/mipmap-xxxhdpi/icon.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/Resources/values/Strings.xml b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/Resources/values/Strings.xml similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/Resources/values/Strings.xml rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/Resources/values/Strings.xml diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/Resources/values/Styles.xml b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/Resources/values/Styles.xml similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/Resources/values/Styles.xml rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/Resources/values/Styles.xml diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/environment.conf b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/environment.conf similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/Android/environment.conf rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Android/environment.conf diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Entitlements.plist b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Entitlements.plist similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Entitlements.plist rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Entitlements.plist diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Info.plist b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Info.plist similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Info.plist rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Info.plist diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/LaunchScreen.storyboard b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/LaunchScreen.storyboard similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/LaunchScreen.storyboard rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/LaunchScreen.storyboard diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Main.maccatalyst.cs b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Main.maccatalyst.cs similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Main.maccatalyst.cs rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Main.maccatalyst.cs diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Contents.json b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Contents.json similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Contents.json rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Contents.json diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon1024.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon1024.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon1024.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon1024.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon120.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon120.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon120.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon120.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon152.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon152.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon152.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon152.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon167.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon167.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon167.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon167.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon180.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon180.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon180.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon180.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon20.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon20.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon20.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon20.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon29.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon29.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon29.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon29.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon40.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon40.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon40.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon40.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon58.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon58.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon58.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon58.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon60.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon60.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon60.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon60.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon76.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon76.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon76.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon76.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon80.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon80.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon80.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon80.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon87.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon87.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon87.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Media.xcassets/AppIcons.appiconset/Icon87.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Resources/Default-568h@2x.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Resources/Default-568h@2x.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Resources/Default-568h@2x.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Resources/Default-568h@2x.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Resources/Fonts/uno-fluentui-assets.ttf b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Resources/Fonts/uno-fluentui-assets.ttf similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Resources/Fonts/uno-fluentui-assets.ttf rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Resources/Fonts/uno-fluentui-assets.ttf diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Resources/SplashScreen@2x.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Resources/SplashScreen@2x.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Resources/SplashScreen@2x.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Resources/SplashScreen@2x.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Resources/SplashScreen@3x.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Resources/SplashScreen@3x.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/MacCatalyst/Resources/SplashScreen@3x.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/MacCatalyst/Resources/SplashScreen@3x.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Mobile.winui.netcore.vstemplate b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Mobile.winui.netcore.vstemplate index bb7783b252..28b5b7352e 100644 --- a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Mobile.winui.netcore.vstemplate +++ b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Mobile.winui.netcore.vstemplate @@ -19,148 +19,146 @@ - - - Entitlements.plist - Info.plist - Main.iOS.cs - LaunchScreen.storyboard - - - Contents.json - Icon20.png - Icon29.png - Icon40.png - Icon58.png - Icon60.png - Icon76.png - Icon80.png - Icon87.png - Icon120.png - Icon152.png - Icon167.png - Icon180.png - Icon1024.png - - - Contents.json - - - - Default-568h@2x.png - SplashScreen@2x.png - SplashScreen@3x.png - - uno-fluentui-assets.ttf - - - - - - - MainActivity.Android.cs - Main.Android.cs - environment.conf - - AboutAssets.txt - - uno-fluentui-assets.ttf - - - AndroidManifest.xml - - AboutResources.txt - - icon.png - - - icon.png - - - icon.png - - - icon.png - - - icon.png - - - icon.png - - - icon.png - - - Strings.xml - Styles.xml - - - - - - Entitlements.plist - Info.plist - Main.maccatalyst.cs - LaunchScreen.storyboard - - - Contents.json - Icon20.png - Icon29.png - Icon40.png - Icon58.png - Icon60.png - Icon76.png - Icon80.png - Icon87.png - Icon120.png - Icon152.png - Icon167.png - Icon180.png - Icon1024.png - - - - Default-568h@2x.png - SplashScreen@2x.png - SplashScreen@3x.png - - uno-fluentui-assets.ttf - - - - - - - Entitlements.plist - Info.plist - Main.macOS.cs - + + Entitlements.plist + Info.plist + Main.iOS.cs + LaunchScreen.storyboard + + Contents.json - - Contents.json - AppIcon-128.png - AppIcon-128@2x.png - AppIcon-16.png - AppIcon-16@2x.png - AppIcon-256.png - AppIcon-256@2x.png - AppIcon-32.png - AppIcon-32@2x.png - AppIcon-512.png - AppIcon-512@2x.png - - - unoplatform.jpg - Contents.json - + Icon20.png + Icon29.png + Icon40.png + Icon58.png + Icon60.png + Icon76.png + Icon80.png + Icon87.png + Icon120.png + Icon152.png + Icon167.png + Icon180.png + Icon1024.png + + Contents.json - - - uno-fluentui-assets.ttf - + + + Default-568h@2x.png + SplashScreen@2x.png + SplashScreen@3x.png + + uno-fluentui-assets.ttf + + + + + + + MainActivity.Android.cs + Main.Android.cs + environment.conf + + AboutAssets.txt + + uno-fluentui-assets.ttf + + + AndroidManifest.xml + + AboutResources.txt + + icon.png + + + icon.png + + + icon.png + + + icon.png + + + icon.png + + + icon.png + + + icon.png + + + Strings.xml + Styles.xml + + + + + + Entitlements.plist + Info.plist + Main.maccatalyst.cs + LaunchScreen.storyboard + + + Contents.json + Icon20.png + Icon29.png + Icon40.png + Icon58.png + Icon60.png + Icon76.png + Icon80.png + Icon87.png + Icon120.png + Icon152.png + Icon167.png + Icon180.png + Icon1024.png + + + + Default-568h@2x.png + SplashScreen@2x.png + SplashScreen@3x.png + + uno-fluentui-assets.ttf + + + + + + + Entitlements.plist + Info.plist + Main.macOS.cs + + Contents.json + + Contents.json + AppIcon-128.png + AppIcon-128@2x.png + AppIcon-16.png + AppIcon-16@2x.png + AppIcon-256.png + AppIcon-256@2x.png + AppIcon-32.png + AppIcon-32@2x.png + AppIcon-512.png + AppIcon-512@2x.png + + + unoplatform.jpg + Contents.json + + Contents.json + + + + uno-fluentui-assets.ttf diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/UnoQuickStart.Mobile.csproj b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/UnoQuickStart.Mobile.csproj index a386a19e20..62891e394b 100644 --- a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/UnoQuickStart.Mobile.csproj +++ b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/UnoQuickStart.Mobile.csproj @@ -32,7 +32,6 @@ true - true 14.2 14.0 @@ -63,7 +62,7 @@ - + @@ -108,4 +107,10 @@ + + + + + + diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Entitlements.plist b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Entitlements.plist similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Entitlements.plist rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Entitlements.plist diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Info.plist b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Info.plist similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Info.plist rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Info.plist diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/LaunchScreen.storyboard b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/LaunchScreen.storyboard similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/LaunchScreen.storyboard rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/LaunchScreen.storyboard diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Main.iOS.cs b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Main.iOS.cs similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Main.iOS.cs rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Main.iOS.cs diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Contents.json b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Contents.json similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Contents.json rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Contents.json diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Icon1024.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon1024.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Icon1024.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon1024.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Icon120.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon120.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Icon120.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon120.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Icon152.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon152.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Icon152.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon152.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Icon167.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon167.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Icon167.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon167.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Icon180.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon180.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Icon180.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon180.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Icon20.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon20.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Icon20.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon20.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Icon29.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon29.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Icon29.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon29.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Icon40.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon40.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Icon40.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon40.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Icon58.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon58.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Icon58.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon58.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Icon60.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon60.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Icon60.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon60.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Icon76.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon76.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Icon76.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon76.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Icon80.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon80.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Icon80.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon80.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Icon87.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon87.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/AppIcons.appiconset/Icon87.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/AppIcons.appiconset/Icon87.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Resources/Default-568h@2x.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Resources/Default-568h@2x.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Resources/Default-568h@2x.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Resources/Default-568h@2x.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Resources/Fonts/uno-fluentui-assets.ttf b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Resources/Fonts/uno-fluentui-assets.ttf similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Resources/Fonts/uno-fluentui-assets.ttf rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Resources/Fonts/uno-fluentui-assets.ttf diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Resources/SplashScreen@2x.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Resources/SplashScreen@2x.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Resources/SplashScreen@2x.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Resources/SplashScreen@2x.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Resources/SplashScreen@3x.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Resources/SplashScreen@3x.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/iOS/Resources/SplashScreen@3x.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/iOS/Resources/SplashScreen@3x.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/AppIcon.appiconset/Contents.json rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/Contents.json b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/Contents.json similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/Contents.json rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/Contents.json diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/unologo.imageset/Contents.json b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/unologo.imageset/Contents.json similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/unologo.imageset/Contents.json rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/unologo.imageset/Contents.json diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/unologo.imageset/unoplatform.jpg b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/unologo.imageset/unoplatform.jpg similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Assets.xcassets/unologo.imageset/unoplatform.jpg rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Assets.xcassets/unologo.imageset/unoplatform.jpg diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Entitlements.plist b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Entitlements.plist similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Entitlements.plist rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Entitlements.plist diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Info.plist b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Info.plist similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Info.plist rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Info.plist diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Main.macOS.cs b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Main.macOS.cs similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Main.macOS.cs rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Main.macOS.cs diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Resources/Fonts/uno-fluentui-assets.ttf b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Resources/Fonts/uno-fluentui-assets.ttf similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/Platforms/macOS/Resources/Fonts/uno-fluentui-assets.ttf rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Resources/Fonts/uno-fluentui-assets.ttf diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Gtk/Platforms/Skia.Gtk/Program.cs b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Gtk/Program.cs similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Gtk/Platforms/Skia.Gtk/Program.cs rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Gtk/Program.cs diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Gtk/SkiaGtk.winui.netcore.vstemplate b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Gtk/SkiaGtk.winui.netcore.vstemplate index 1c6c0bbc35..e69cdc2343 100644 --- a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Gtk/SkiaGtk.winui.netcore.vstemplate +++ b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Gtk/SkiaGtk.winui.netcore.vstemplate @@ -16,11 +16,7 @@ - - - Program.cs - - + Program.cs diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Gtk/UnoQuickStart.Skia.Gtk.csproj b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Gtk/UnoQuickStart.Skia.Gtk.csproj index 51e197cc00..025dd36c0d 100644 --- a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Gtk/UnoQuickStart.Skia.Gtk.csproj +++ b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Gtk/UnoQuickStart.Skia.Gtk.csproj @@ -4,13 +4,11 @@ WinExe Exe $basetargetframework$ - - true - - - + + + @@ -22,5 +20,10 @@ + + + + + diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Linux.FrameBuffer/Platforms/Skia.Framebuffer/Program.cs b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Linux.FrameBuffer/Program.cs similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Linux.FrameBuffer/Platforms/Skia.Framebuffer/Program.cs rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Linux.FrameBuffer/Program.cs diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Linux.FrameBuffer/SkiaLinuxFrameBuffer.winui.netcore.vstemplate b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Linux.FrameBuffer/SkiaLinuxFrameBuffer.winui.netcore.vstemplate index 95360ad2b3..cbdbd4575a 100644 --- a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Linux.FrameBuffer/SkiaLinuxFrameBuffer.winui.netcore.vstemplate +++ b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Linux.FrameBuffer/SkiaLinuxFrameBuffer.winui.netcore.vstemplate @@ -16,11 +16,7 @@ - - - Program.cs - - + Program.cs diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Linux.FrameBuffer/UnoQuickStart.Skia.Linux.FrameBuffer.csproj b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Linux.FrameBuffer/UnoQuickStart.Skia.Linux.FrameBuffer.csproj index b558c37e29..937de3c1b0 100644 --- a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Linux.FrameBuffer/UnoQuickStart.Skia.Linux.FrameBuffer.csproj +++ b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Linux.FrameBuffer/UnoQuickStart.Skia.Linux.FrameBuffer.csproj @@ -4,13 +4,11 @@ WinExe Exe $basetargetframework$ - - true - - - + + + @@ -22,5 +20,10 @@ + + + + + diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/SkiaWpf.winui.netcore.vstemplate b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/SkiaWpf.winui.netcore.vstemplate index 5fea5576a5..51540fb0a1 100644 --- a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/SkiaWpf.winui.netcore.vstemplate +++ b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/SkiaWpf.winui.netcore.vstemplate @@ -16,13 +16,11 @@ - - - App.xaml - App.xaml.cs - MainWindow.xaml - MainWindow.xaml.cs - + + App.xaml + App.xaml.cs + MainWindow.xaml + MainWindow.xaml.cs diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/UnoQuickStart.Skia.WPF.csproj b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/UnoQuickStart.Skia.WPF.csproj index f0584483b0..8f0f6107b8 100644 --- a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/UnoQuickStart.Skia.WPF.csproj +++ b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/UnoQuickStart.Skia.WPF.csproj @@ -5,8 +5,6 @@ Exe $basetargetframework$-windows true - - true @@ -30,4 +28,14 @@ + + + + + + + + + + diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/Platforms/Skia.Wpf/App.xaml b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/Wpf/App.xaml similarity index 85% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/Platforms/Skia.Wpf/App.xaml rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/Wpf/App.xaml index bdb64ae969..519a47ca90 100644 --- a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/Platforms/Skia.Wpf/App.xaml +++ b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/Wpf/App.xaml @@ -2,7 +2,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:$ext_safeprojectname$.WPF" - StartupUri="Platforms/Skia.Wpf/MainWindow.xaml"> + StartupUri="Wpf/MainWindow.xaml"> diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/Platforms/Skia.Wpf/App.xaml.cs b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/Wpf/App.xaml.cs similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/Platforms/Skia.Wpf/App.xaml.cs rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/Wpf/App.xaml.cs diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/Platforms/Skia.Wpf/MainWindow.xaml b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/Wpf/MainWindow.xaml similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/Platforms/Skia.Wpf/MainWindow.xaml rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/Wpf/MainWindow.xaml diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/Platforms/Skia.Wpf/MainWindow.xaml.cs b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/Wpf/MainWindow.xaml.cs similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/Platforms/Skia.Wpf/MainWindow.xaml.cs rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/Wpf/MainWindow.xaml.cs diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/UnoApp.netcore.vstemplate b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/UnoApp.netcore.vstemplate index 327ee5cbca..2cfa3a15c8 100644 --- a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/UnoApp.netcore.vstemplate +++ b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/UnoApp.netcore.vstemplate @@ -32,7 +32,7 @@ - Shared\Shared.netcore.vstemplate + Base\Base.winui.netcore.vstemplate diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/UnoSolutionTemplate.WinUI.netcore.csproj b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/UnoSolutionTemplate.WinUI.netcore.csproj index 9bdc2ba501..f51b13749d 100644 --- a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/UnoSolutionTemplate.WinUI.netcore.csproj +++ b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/UnoSolutionTemplate.WinUI.netcore.csproj @@ -66,95 +66,94 @@ 4 - - False - + + - + App.xaml - + MainWindow.xaml - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - - - - - - - + + + + + + + - + Designer - - - - - - + + + + + + Designer - - - - - + + + + + Designer Uno Platform - - + + Designer - + - + MSBuild:Compile Designer - + MSBuild:Compile Designer @@ -178,62 +177,65 @@ Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -246,34 +248,36 @@ - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - + MSBuild:Compile Designer - + MSBuild:Compile Designer diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Shared/Assets/Fonts/uno-fluentui-assets.ttf b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Views/Assets/Fonts/uno-fluentui-assets.ttf similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Shared/Assets/Fonts/uno-fluentui-assets.ttf rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Views/Assets/Fonts/uno-fluentui-assets.ttf diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Shared/MainPage.xaml b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Views/MainPage.xaml similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Shared/MainPage.xaml rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Views/MainPage.xaml diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Shared/MainPage.xaml.cs b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Views/MainPage.xaml.cs similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Shared/MainPage.xaml.cs rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Views/MainPage.xaml.cs diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Shared/Strings/en/Resources.resw b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Views/Strings/en/Resources.resw similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Shared/Strings/en/Resources.resw rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Views/Strings/en/Resources.resw diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Views/UnoQuickStart.csproj b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Views/UnoQuickStart.csproj new file mode 100644 index 0000000000..3a6edbf60d --- /dev/null +++ b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Views/UnoQuickStart.csproj @@ -0,0 +1,35 @@ + + + + $if$($UseWinUI$ == True)$basetargetframework$-windows10.0.18362$endif$ + $if$($UseAndroid$ == True)$basetargetframework$-android$endif$ + $if$($UseIOS$ == True)$(TargetFrameworks);$basetargetframework$-ios$endif$ + $if$($UseCatalyst$ == True)$(TargetFrameworks);$basetargetframework$-maccatalyst$endif$ + $if$($UseAppKit$ == True)$(TargetFrameworks);$basetargetframework$-macos$endif$ + $(TargetFrameworks);$libarybasetargetframework$ + + + true + + + + + + + + + + + + + + + + + %(Filename) + + + + + + diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Shared/Shared.netcore.vstemplate b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Views/Views.netcore.vstemplate similarity index 74% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Shared/Shared.netcore.vstemplate rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Views/Views.netcore.vstemplate index fddf9c587b..f5d6168ab7 100644 --- a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Shared/Shared.netcore.vstemplate +++ b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Views/Views.netcore.vstemplate @@ -1,14 +1,14 @@ - UnoQuickStart.Shared + UnoQuickStart - Code Sharing Projects + CSharp 1000 true - UnoQuickStart.Shared + UnoQuickStart true Enabled true @@ -18,7 +18,7 @@ __PreviewImage.png - + uno-fluentui-assets.ttf @@ -29,8 +29,6 @@ Resources.resw - app.xaml - app.xaml.cs mainpage.xaml mainpage.xaml.cs diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Views/__PreviewImage.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Views/__PreviewImage.png new file mode 100644 index 0000000000000000000000000000000000000000..41da112c542dd2a34e7177ae211846f82041a861 GIT binary patch literal 20819 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 xXX8OF1;JyO2k^GNA0x-S{)X$hApExe $basetargetframework$ NU1701 - $if$($UseWebAssemblyManifestJson$ == True)Platforms\WebAssembly\manifest.webmanifest$endif$ - - true - - Platforms\WebAssembly\Properties + $if$($UseWebAssemblyManifestJson$ == True)manifest.webmanifest$endif$ @@ -25,20 +21,20 @@ - + $if$($UseWebAssemblyManifestJson$ == True) - - + + $endif$ - - + + - + @@ -48,9 +44,9 @@ You can safely remove this ItemGroup completely. --> - - - + + + @@ -64,4 +60,10 @@ + + + + + + diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/Wasm.winui.netcore.vstemplate b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/Wasm.winui.netcore.vstemplate index d0571f53a1..98273353fd 100644 --- a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/Wasm.winui.netcore.vstemplate +++ b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/Wasm.winui.netcore.vstemplate @@ -19,33 +19,29 @@ - - - - launchSettings.json - - - AppIcon-16.png - AppIcon-32.png - AppIcon-128.png - AppIcon-256.png - AppIcon-512.png - SplashScreen.png - - - web.config - - - Fonts.css - - - AppManifest.js - - Program.cs - LinkerConfig.xml - manifest.webmanifest - + + launchSettings.json + + AppIcon-16.png + AppIcon-32.png + AppIcon-128.png + AppIcon-256.png + AppIcon-512.png + SplashScreen.png + + + web.config + + + Fonts.css + + + AppManifest.js + + Program.cs + LinkerConfig.xml + manifest.webmanifest diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/Platforms/WebAssembly/WasmCSS/Fonts.css b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/WasmCSS/Fonts.css similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/Platforms/WebAssembly/WasmCSS/Fonts.css rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/WasmCSS/Fonts.css diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/Platforms/WebAssembly/WasmScripts/AppManifest.js b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/WasmScripts/AppManifest.js similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/Platforms/WebAssembly/WasmScripts/AppManifest.js rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/WasmScripts/AppManifest.js diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/Platforms/WebAssembly/manifest.webmanifest b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/manifest.webmanifest similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/Platforms/WebAssembly/manifest.webmanifest rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/manifest.webmanifest diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/Platforms/WebAssembly/wwwroot/web.config b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/wwwroot/web.config similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/Platforms/WebAssembly/wwwroot/web.config rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/wwwroot/web.config diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/WinUI.netcore.vstemplate b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/WinUI.netcore.vstemplate deleted file mode 100644 index 8fbe6e87a3..0000000000 --- a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/WinUI.netcore.vstemplate +++ /dev/null @@ -1,50 +0,0 @@ - - - UnoQuickStart.Uwp - No Description - __TemplateIcon.png - __PreviewImage.png - CSharp - - 1000 - UnoQuickStart.Uwp - true - true - Enabled - true - true - - - - - - - - LockScreenLogo.scale-200.png - SplashScreen.scale-200.png - Square150x150Logo.scale-200.png - Square44x44Logo.scale-200.png - Square44x44Logo.targetsize-24_altform-unplated.png - StoreLogo.png - Wide310x150Logo.scale-200.png - - - launchSettings.json - - win10-arm64.pubxml - win10-x86.pubxml - win10-x64.pubxml - - - - Package.appxmanifest - app.manifest - - - - - - Microsoft.VisualStudio.WinRT.TemplateWizards, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Microsoft.VisualStudio.WinRT.TemplateWizards.CreateProjectCertificate.Wizard - - diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/Platforms/Windows/Images/LockScreenLogo.scale-200.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/Images/LockScreenLogo.scale-200.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/Platforms/Windows/Images/LockScreenLogo.scale-200.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/Images/LockScreenLogo.scale-200.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/Platforms/Windows/Images/SplashScreen.scale-200.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/Images/SplashScreen.scale-200.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/Platforms/Windows/Images/SplashScreen.scale-200.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/Images/SplashScreen.scale-200.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/Platforms/Windows/Images/Square150x150Logo.scale-200.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/Images/Square150x150Logo.scale-200.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/Platforms/Windows/Images/Square150x150Logo.scale-200.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/Images/Square150x150Logo.scale-200.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/Platforms/Windows/Images/Square44x44Logo.scale-200.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/Images/Square44x44Logo.scale-200.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/Platforms/Windows/Images/Square44x44Logo.scale-200.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/Images/Square44x44Logo.scale-200.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/Platforms/Windows/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/Images/Square44x44Logo.targetsize-24_altform-unplated.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/Platforms/Windows/Images/Square44x44Logo.targetsize-24_altform-unplated.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/Images/Square44x44Logo.targetsize-24_altform-unplated.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/Platforms/Windows/Images/StoreLogo.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/Images/StoreLogo.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/Platforms/Windows/Images/StoreLogo.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/Images/StoreLogo.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/Platforms/Windows/Images/Wide310x150Logo.scale-200.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/Images/Wide310x150Logo.scale-200.png similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/Platforms/Windows/Images/Wide310x150Logo.scale-200.png rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/Images/Wide310x150Logo.scale-200.png diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/Platforms/Windows/Package.appxmanifest b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/Package.appxmanifest similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/Platforms/Windows/Package.appxmanifest rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/Package.appxmanifest diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/Platforms/Windows/Properties/PublishProfiles/win10-arm64.pubxml b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/Properties/PublishProfiles/win10-arm64.pubxml similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/Platforms/Windows/Properties/PublishProfiles/win10-arm64.pubxml rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/Properties/PublishProfiles/win10-arm64.pubxml diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/Platforms/Windows/Properties/PublishProfiles/win10-x64.pubxml b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/Properties/PublishProfiles/win10-x64.pubxml similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/Platforms/Windows/Properties/PublishProfiles/win10-x64.pubxml rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/Properties/PublishProfiles/win10-x64.pubxml diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/Platforms/Windows/Properties/PublishProfiles/win10-x86.pubxml b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/Properties/PublishProfiles/win10-x86.pubxml similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/Platforms/Windows/Properties/PublishProfiles/win10-x86.pubxml rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/Properties/PublishProfiles/win10-x86.pubxml diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/Platforms/Windows/Properties/launchSettings.json b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/Properties/launchSettings.json similarity index 100% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/Platforms/Windows/Properties/launchSettings.json rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/Properties/launchSettings.json diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/UnoQuickStart.Windows.csproj b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/UnoQuickStart.Windows.csproj similarity index 87% rename from src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/UnoQuickStart.Windows.csproj rename to src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/UnoQuickStart.Windows.csproj index 20f28df226..9d5d42d138 100644 --- a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/WinUI/UnoQuickStart.Windows.csproj +++ b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/UnoQuickStart.Windows.csproj @@ -12,12 +12,10 @@ true MSIX true - - true - + @@ -27,7 +25,7 @@ - + @@ -43,4 +41,10 @@ + + + + + + diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/WinUI.netcore.vstemplate b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/WinUI.netcore.vstemplate new file mode 100644 index 0000000000..3bc31d8082 --- /dev/null +++ b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/WinUI.netcore.vstemplate @@ -0,0 +1,46 @@ + + + UnoQuickStart.Uwp + No Description + __TemplateIcon.png + __PreviewImage.png + CSharp + + 1000 + UnoQuickStart.Uwp + true + true + Enabled + true + true + + + + + + LockScreenLogo.scale-200.png + SplashScreen.scale-200.png + Square150x150Logo.scale-200.png + Square44x44Logo.scale-200.png + Square44x44Logo.targetsize-24_altform-unplated.png + StoreLogo.png + Wide310x150Logo.scale-200.png + + + launchSettings.json + + win10-arm64.pubxml + win10-x86.pubxml + win10-x64.pubxml + + + + Package.appxmanifest + app.manifest + + + + Microsoft.VisualStudio.WinRT.TemplateWizards, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Microsoft.VisualStudio.WinRT.TemplateWizards.CreateProjectCertificate.Wizard + + diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/__PreviewImage.png b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Windows/__PreviewImage.png new file mode 100644 index 0000000000000000000000000000000000000000..41da112c542dd2a34e7177ae211846f82041a861 GIT binary patch literal 20819 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 xXX8OF1;JyO2k^GNA0x-S{)X$hAp - - - bin\$(MSBuildProjectName) - obj\$(MSBuildProjectName) - $(DefaultItemExcludes);obj/**;bin/** - - diff --git a/src/SolutionTemplate/UnoSolutionTemplate.Wizard.2022/UnoSolutionTemplate.Wizard.2022.csproj b/src/SolutionTemplate/UnoSolutionTemplate.Wizard.2022/UnoSolutionTemplate.Wizard.2022.csproj index 90e839977c..8809b90e90 100644 --- a/src/SolutionTemplate/UnoSolutionTemplate.Wizard.2022/UnoSolutionTemplate.Wizard.2022.csproj +++ b/src/SolutionTemplate/UnoSolutionTemplate.Wizard.2022/UnoSolutionTemplate.Wizard.2022.csproj @@ -66,7 +66,6 @@ - diff --git a/src/SolutionTemplate/UnoSolutionTemplate.Wizard.2022/UnoSolutionWizard.cs b/src/SolutionTemplate/UnoSolutionTemplate.Wizard.2022/UnoSolutionWizard.cs index 0a59daf858..aee519f0ee 100644 --- a/src/SolutionTemplate/UnoSolutionTemplate.Wizard.2022/UnoSolutionWizard.cs +++ b/src/SolutionTemplate/UnoSolutionTemplate.Wizard.2022/UnoSolutionWizard.cs @@ -80,18 +80,20 @@ namespace UnoSolutionTemplate.Wizard var platforms = solution.Projects.OfType().FirstOrDefault(p => p.Name == "Platforms"); if (platforms.Object is SolutionFolder platformsFolder) { - var sharedProject = GetAllProjects().FirstOrDefault(p => p.Name == $"{_projectName}.Shared"); - solution.Remove(sharedProject); + var baseProject = GetAllProjects().FirstOrDefault(p => p.Name == $"{_projectName}.Base"); + solution.Remove(baseProject); - Directory.Move(Path.Combine(_targetPath, $"{_projectName}.Shared"), Path.Combine(_targetPath, _projectName)); + File.Delete(Path.Combine(_targetPath, $"{_projectName}.Base", $"{_projectName}.Base.shproj")); + + GenerateProject(solution, null, $"{_projectName}", $"{_projectName}", "Views.netcore.vstemplate"); if (_useWebAssembly) { - GenerateProject(solution, platformsFolder, $"{_projectName}.Wasm", _projectName, "Wasm.winui.netcore.vstemplate"); + GenerateProject(solution, platformsFolder, $"{_projectName}.Wasm", $"{_projectName}.Wasm", "Wasm.winui.netcore.vstemplate"); if (!_useWebAssemblyManifestJson) { - var webAssemblyManifestJsonPath = Path.Combine(_targetPath, _projectName, "manifest.webmanifest"); + var webAssemblyManifestJsonPath = Path.Combine(_targetPath, $"{_projectName}.Wasm", "manifest.webmanifest"); File.Delete(webAssemblyManifestJsonPath); } } @@ -103,27 +105,27 @@ namespace UnoSolutionTemplate.Wizard if (_useiOS || _useCatalyst || _useAndroid || _useAppKit) { - GenerateProject(solution, platformsFolder, $"{_projectName}.Mobile", _projectName, "Mobile.winui.netcore.vstemplate"); + GenerateProject(solution, platformsFolder, $"{_projectName}.Mobile", $"{_projectName}.Mobile", "Mobile.winui.netcore.vstemplate"); } if (_useGtk) { - GenerateProject(solution, platformsFolder, $"{_projectName}.Skia.Gtk", _projectName, "SkiaGtk.winui.netcore.vstemplate"); + GenerateProject(solution, platformsFolder, $"{_projectName}.Skia.Gtk", $"{_projectName}.Skia.Gtk", "SkiaGtk.winui.netcore.vstemplate"); } if (_useFramebuffer) { - GenerateProject(solution, platformsFolder, $"{_projectName}.Skia.Linux.FrameBuffer", _projectName, "SkiaLinuxFrameBuffer.winui.netcore.vstemplate"); + GenerateProject(solution, platformsFolder, $"{_projectName}.Skia.Linux.FrameBuffer", $"{_projectName}.Skia.Linux.FrameBuffer", "SkiaLinuxFrameBuffer.winui.netcore.vstemplate"); } if (_useWinUI) { - GenerateProject(solution, platformsFolder, $"{_projectName}.Windows", _projectName, "WinUI.netcore.vstemplate"); + GenerateProject(solution, platformsFolder, $"{_projectName}.Windows", $"{_projectName}.Windows", "WinUI.netcore.vstemplate"); } if (_useWpf) { - GenerateProject(solution, platformsFolder, $"{_projectName}.Skia.Wpf", _projectName, "SkiaWpf.winui.netcore.vstemplate"); + GenerateProject(solution, platformsFolder, $"{_projectName}.Skia.Wpf", $"{_projectName}.Skia.Wpf", "SkiaWpf.winui.netcore.vstemplate"); } } else @@ -133,7 +135,7 @@ namespace UnoSolutionTemplate.Wizard } } - private void GenerateProject(Solution2 solution, SolutionFolder platformsFolder, string projectFullName, string folderName, string templateName) + private void GenerateProject(Solution2 solution, SolutionFolder? platformsFolder, string projectFullName, string folderName, string templateName) { if (_projectName != null) { @@ -148,7 +150,14 @@ namespace UnoSolutionTemplate.Wizard var workTemplateFilePath = DuplicateTemplate(solution, templateName); AdjustCustomParameters(workTemplateFilePath, _projectName); - platformsFolder.AddFromTemplate(workTemplateFilePath, targetPath, projectFullName); + if (platformsFolder != null) + { + platformsFolder.AddFromTemplate(workTemplateFilePath, targetPath, projectFullName); + } + else + { + solution.AddFromTemplate(workTemplateFilePath, targetPath, projectFullName); + } } else { @@ -226,14 +235,6 @@ namespace UnoSolutionTemplate.Wizard File.WriteAllText(nugetConfigPath, reader.ReadToEnd()); } - var directoryBuildPropsPath = Path.Combine(_targetPath, "..\\Directory.Build.props"); - - if (!File.Exists(directoryBuildPropsPath)) - { - using var reader = new StreamReader(GetType().Assembly.GetManifestResourceStream(FindManifestFileName("Directory.Build-netcore.props"))); - File.WriteAllText(directoryBuildPropsPath, reader.ReadToEnd()); - } - OpenWelcomePage(); SetStartupProject(); SetBuildableAndDeployable(); @@ -291,6 +292,8 @@ namespace UnoSolutionTemplate.Wizard replacementsDictionary["$basetargetframework$"] = _baseTargetFramework.ToString(); replacementsDictionary["$UseWebAssemblyManifestJson$"] = _useWebAssemblyManifestJson.ToString(); + replacementsDictionary["$libarybasetargetframework$"] = _baseTargetFramework == "net6.0" ? "netstandard2.0" : _baseTargetFramework; + var version = GetVisualStudioReleaseVersion(); if(version < new Version(17, 3) && (_useiOS || _useAndroid || _useCatalyst || _useAppKit)) diff --git a/src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets b/src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets index 2dbb039eae..1e83f1f429 100644 --- a/src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets +++ b/src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets @@ -17,25 +17,30 @@ - - - - - + $(DefaultApplicationLanguage) en + + + + + + + + +