fix(winui): Adjust winui-net6 template startup

unoplatform · Feb 8, 2022 · 8869d0d · 8869d0d
1 parent eda8d86
commit 8869d0d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/...noapp-winui-net6/UnoWinUIQuickStart.Windows/Properties/PublishProfiles/win10-arm64.pubxml b/...noapp-winui-net6/UnoWinUIQuickStart.Windows/Properties/PublishProfiles/win10-arm64.pubxml
@@ -10,7 +10,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun>True</PublishReadyToRun>
+    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
+    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
     <!--
     See https://github.com/microsoft/CsWinRT/issues/373
     <PublishTrimmed>True</PublishTrimmed>

diff --git a/.../unoapp-winui-net6/UnoWinUIQuickStart.Windows/Properties/PublishProfiles/win10-x64.pubxml b/.../unoapp-winui-net6/UnoWinUIQuickStart.Windows/Properties/PublishProfiles/win10-x64.pubxml
@@ -10,7 +10,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun>True</PublishReadyToRun>
+    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
+    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
     <!--
     See https://github.com/microsoft/CsWinRT/issues/373
     <PublishTrimmed>True</PublishTrimmed>

diff --git a/.../unoapp-winui-net6/UnoWinUIQuickStart.Windows/Properties/PublishProfiles/win10-x86.pubxml b/.../unoapp-winui-net6/UnoWinUIQuickStart.Windows/Properties/PublishProfiles/win10-x86.pubxml
@@ -10,7 +10,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun>True</PublishReadyToRun>
+    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
+    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
     <!--
     See https://github.com/microsoft/CsWinRT/issues/373
     <PublishTrimmed>True</PublishTrimmed>

diff --git a/...otnet/content/unoapp-winui-net6/UnoWinUIQuickStart.Windows/Properties/launchSettings.json b/...otnet/content/unoapp-winui-net6/UnoWinUIQuickStart.Windows/Properties/launchSettings.json
@@ -1,9 +1,9 @@
 {
 	"profiles": {
-		"UnoWinUIQuickStart (Package)": {
+		"UnoWinUIQuickStart.Windows (Package)": {
 			"commandName": "MsixPackage"
 		},
-		"UnoWinUIQuickStart (Unpackaged)": {
+		"UnoWinUIQuickStart.Windows (Unpackaged)": {
 			"commandName": "Project"
 		}
 	}

diff --git a/...et/content/unoapp-winui-net6/UnoWinUIQuickStart.Windows/UnoWinUIQuickStart.Windows.csproj b/...et/content/unoapp-winui-net6/UnoWinUIQuickStart.Windows/UnoWinUIQuickStart.Windows.csproj
@@ -10,8 +10,13 @@
 		<PublishProfile>win10-$(Platform).pubxml</PublishProfile>
 		<UseWinUI>true</UseWinUI>
 		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-		<!-- Bundles the WinAppSDK binaries -->
-		<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<!-- Bundles the WinAppSDK binaries (Uncomment for unpackaged builds) -->
+		<!-- <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained> -->
+		<!-- This bundles the .NET Core libraries (Uncomment for packaged builds)  -->
+		<SelfContained>true</SelfContained>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/...ProjectTemplates.Dotnet/content/unoapp-winui-net6/UnoWinUIQuickStart.Windows/app.manifest b/...ProjectTemplates.Dotnet/content/unoapp-winui-net6/UnoWinUIQuickStart.Windows/app.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="$projectname$.app"/>
+  <assemblyIdentity version="1.0.0.0" name="UnoWinUIQuickStart.Windows.app"/>
 
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
     <windowsSettings>