Merge pull request #3029 from PrismLibrary/dev/ds/net8-winui

chore: enable net8.0 windows build
PrismLibrary · Dec 14, 2023 · fe5d323 · fe5d323
2 parents 8e90927 + 797b639
commit fe5d323
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 4 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -87,7 +87,7 @@
     </When>
     <When Condition="$(TargetFramework.Contains('windows10'))">
       <PropertyGroup>
-        <UseRidGraph Condition=" $(TargetFramework.Contains('net8.0')) ">true</UseRidGraph>
+        <UseRidGraph>true</UseRidGraph>
         <SupportedOSPlatformVersion>10.0.18362.0</SupportedOSPlatformVersion>
         <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
       </PropertyGroup>

diff --git a/e2e/Uno/.gitignore b/e2e/Uno/.gitignore
@@ -0,0 +1 @@
+!*.pubxml
diff --git a/e2e/Uno/Directory.Build.props b/e2e/Uno/Directory.Build.props
@@ -56,6 +56,7 @@
     <When Condition="$(TargetFramework.Contains('windows10'))">
       <PropertyGroup>
         <IsWinAppSdk>true</IsWinAppSdk>
+        <UseRidGraph>true</UseRidGraph>
         <SupportedOSPlatformVersion>10.0.18362.0</SupportedOSPlatformVersion>
         <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
       </PropertyGroup>

diff --git a/e2e/Uno/HelloWorld.Windows/Properties/PublishProfiles/win-arm64.pubxml b/e2e/Uno/HelloWorld.Windows/Properties/PublishProfiles/win-arm64.pubxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<PropertyGroup>
+		<PublishProtocol>FileSystem</PublishProtocol>
+		<Platform>arm64</Platform>
+		<RuntimeIdentifier>win-arm64</RuntimeIdentifier>
+		<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
+		<SelfContained>true</SelfContained>
+		<PublishSingleFile>False</PublishSingleFile>
+		<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
+		<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
+		<!-- Note: Trimming disabled by default as there may still be an issues with PublishTrimmed support: https://github.com/microsoft/CsWinRT/issues/373 -->
+		<!--
+		<PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
+		<TrimMode>partial</TrimMode>
+		<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
+		-->
+	</PropertyGroup>
+</Project>
diff --git a/e2e/Uno/HelloWorld.Windows/Properties/PublishProfiles/win-x64.pubxml b/e2e/Uno/HelloWorld.Windows/Properties/PublishProfiles/win-x64.pubxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<PropertyGroup>
+		<PublishProtocol>FileSystem</PublishProtocol>
+		<Platform>x64</Platform>
+		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
+		<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
+		<SelfContained>true</SelfContained>
+		<PublishSingleFile>False</PublishSingleFile>
+		<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
+		<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
+		<!-- Note: Trimming disabled by default as there may still be an issues with PublishTrimmed support: https://github.com/microsoft/CsWinRT/issues/373 -->
+		<!--
+		<PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
+		<TrimMode>partial</TrimMode>
+		<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
+		-->
+	</PropertyGroup>
+</Project>
diff --git a/e2e/Uno/HelloWorld.Windows/Properties/PublishProfiles/win-x86.pubxml b/e2e/Uno/HelloWorld.Windows/Properties/PublishProfiles/win-x86.pubxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<PropertyGroup>
+		<PublishProtocol>FileSystem</PublishProtocol>
+		<Platform>x86</Platform>
+		<RuntimeIdentifier>win-x86</RuntimeIdentifier>
+		<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
+		<SelfContained>true</SelfContained>
+		<PublishSingleFile>False</PublishSingleFile>
+		<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
+		<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
+		<!-- Note: Trimming disabled by default as there may still be an issues with PublishTrimmed support: https://github.com/microsoft/CsWinRT/issues/373 -->
+		<!--
+		<PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
+		<TrimMode>partial</TrimMode>
+		<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
+		-->
+	</PropertyGroup>
+</Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <Choose>
-    <When Condition=" $(IsUnoProject) AND '$(TargetFramework)' == 'net7.0' ">
+    <When Condition=" $(IsUnoProject) AND '$(TargetFramework)' == 'net8.0' ">
       <PropertyGroup>
         <DefineConstants>$(DefineConstants);__WASM__</DefineConstants>
       </PropertyGroup>
@@ -25,7 +25,8 @@
 
   <PropertyGroup Condition=" $(IsUnoProject) ">
     <UnoTargetFrameworks>net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-macos</UnoTargetFrameworks>
-    <UnoTargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(UnoTargetFrameworks);net7.0-windows10.0.19041</UnoTargetFrameworks>
+    <UnoTargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(UnoTargetFrameworks);net8.0-windows10.0.19041</UnoTargetFrameworks>
+    <RuntimeIdentifiers Condition="$(TargetFramework.Contains('windows10'))">win-x64;win-x86;win-arm64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj b/src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj
@@ -8,7 +8,6 @@
     <DefineConstants>$(DefineConstants);HAS_WINUI</DefineConstants>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <PackageId>Prism.Uno.WinUI</PackageId>
-    <GenerateLibraryLayout>true</GenerateLibraryLayout>
     <ImplicitUsings>true</ImplicitUsings>
     <Description>
       Prism provides an implementation of a collection of design patterns that are helpful in writing well structured, maintainable, and testable XAML applications, including MVVM, dependency injection, commanding, event aggregation, and more. Prism's core functionality is a shared library targeting the .NET Framework and .NET. Features that need to be platform specific are implemented in the respective libraries for the target platform (WPF, Uno Platform, .NET MAUI and Xamarin Forms).