Merge pull request #2977 from PrismLibrary/dev/ds/uno-updates

.github/workflows/ci.yml

@@ -134,19 +134,12 @@ jobs:
         run: build\consolidate-artifacts.ps1
         shell: powershell
 
-
       - name: Upload Consolidated NuGets
         uses: actions/upload-artifact@v3
         with:
           name: NuGet
           path: .\artifacts\nuget
 
-      - name: Upload Consolidated Binaries
-        uses: actions/upload-artifact@v3
-        with:
-          name: Binaries
-          path: .\artifacts\binaries
-
   deploy-internal:
     uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget.yml@master
     needs: generate-consolidated-artifacts
@@ -157,6 +150,16 @@ jobs:
       feedUrl: ${{ secrets.IN_HOUSE_NUGET_FEED }}
       apiKey: ${{ secrets.IN_HOUSE_API_KEY }}
 
+  deploy-prism-ci:
+    uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget.yml@master
+    needs: generate-consolidated-artifacts
+    if: ${{ github.event_name == 'push' }}
+    with:
+      name: Deploy Internal
+    secrets:
+      feedUrl: ${{ secrets.PRISM_CI_NUGET_FEED }}
+      apiKey: ${{ secrets.PRISM_CI_NUGET_TOKEN }}
+
   deploy-sponsors:
     uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget.yml@master
     needs: generate-consolidated-artifacts

Directory.Build.targets

@@ -11,22 +11,13 @@
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
 
-  <Choose>
+  <!-- <Choose>
     <When Condition="$(IsUnoProject)">
       <ItemGroup>
-        <!--
-        If you encounter this error message:
-
-          error NETSDK1148: A referenced assembly was compiled using a newer version of Microsoft.Windows.SDK.NET.dll. Please update to a newer .NET SDK in order to reference this assembly.
-
-        This means that the two packages below must be aligned with the "build" version number of
-        the "Microsoft.Windows.SDK.BuildTools" package above, and the "revision" version number
-        must be the highest found in https://www.nuget.org/packages/Microsoft.Windows.SDK.NET.Ref.
-        -->
         <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22621.28" />
         <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22621.28" />
       </ItemGroup>
     </When>
-  </Choose>
+  </Choose> -->
 
 </Project>

e2e/Uno/HelloWorld-vsmac.slnf

@@ -4,7 +4,8 @@
     "projects": [
       "HelloWorld.Mobile\\HelloWorld.Mobile.csproj",
       "HelloWorld.Skia.Gtk\\HelloWorld.Skia.Gtk.csproj",
-      "HelloWorld.Wasm\\HelloWorld.Wasm.csproj",
+      "HelloWorld.Wasm\\HelloWorld.Wasm.csproj",,
+      "HelloWorld.Base\\HelloWorld.Base.csproj",
       "HelloWorld\\HelloWorld.csproj"
     ]
   }

e2e/Uno/HelloWorld.Base/HelloWorld.Base.csproj

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.Build.NoTargets/3.7.0">
+  <PropertyGroup>
+    <!-- NOTE: The TargetFramework is required by MSBuild but not used as this project is not built. -->
+    <TargetFramework>net7.0</TargetFramework>
+    <EnableDefaultItems>false</EnableDefaultItems>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="**\*" Exclude="obj\**;bin\**;*.csproj" />
+    <None Update="AppHead.xaml.cs" DependentUpon="AppHead.xaml" />
+  </ItemGroup>
+</Project>

e2e/Uno/HelloWorld.Base/base.props

@@ -1,21 +1,30 @@
 <Project>
-	<ItemGroup>
-		<PackageReference Include="Uno.Resizetizer" />
-	</ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Uno.Resizetizer" />
+  </ItemGroup>
 
-	<ItemGroup>
-		<None Include="$(MSBuildThisFileDirectory)AppHead.xaml" />
-		<ApplicationDefinition Include="$(MSBuildThisFileDirectory)AppHead.xaml"
-								SubType="Designer"
-								XamlRuntime="WinUI"
-								Generator="MSBuild:Compile"
-								Link="AppHead.xaml" />
-		<Compile Include="$(MSBuildThisFileDirectory)AppHead.xaml.cs"
-				XamlRuntime="WinUI"
-				DependentUpon="AppHead.xaml"
-				Link="AppHead.xaml.cs" />
-		<UnoIcon Include="$(MSBuildThisFileDirectory)Icons\iconapp.svg"
-				ForegroundFile="$(MSBuildThisFileDirectory)Icons\iconapp.svg"
-				Color="#00000000" />
-	</ItemGroup>
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)AppHead.xaml" />
+    <ApplicationDefinition Include="$(MSBuildThisFileDirectory)AppHead.xaml"
+                SubType="Designer"
+                XamlRuntime="WinUI"
+                Generator="MSBuild:Compile"
+                Link="AppHead.xaml" />
+    <Compile Include="$(MSBuildThisFileDirectory)AppHead.xaml.cs"
+        XamlRuntime="WinUI"
+        DependentUpon="AppHead.xaml"
+        Link="AppHead.xaml.cs" />
+    <UnoIcon Include="$(MSBuildThisFileDirectory)Icons\iconapp.svg"
+        ForegroundFile="$(MSBuildThisFileDirectory)Icons\appconfig.svg"
+        ForegroundScale="0.65"
+        Color="#00000000" />
+    <UnoSplashScreen
+      Include="$(MSBuildThisFileDirectory)Splash\splash_screen.svg"
+      BaseSize="128,128"
+      Color="#FFFFFF" />
+    <!-- NOTE: Files explicitly linked to display in the head projects for clarity. -->
+    <None Include="$(MSBuildThisFileDirectory)Icons\iconapp.svg" Link="Icons\iconapp.svg" />
+    <None Include="$(MSBuildThisFileDirectory)Icons\appconfig.svg" Link="Icons\appconfig.svg" />
+    <None Include="$(MSBuildThisFileDirectory)Splash\splash_screen.svg" Link="Splash\splash_screen.svg" />
+  </ItemGroup>
 </Project>

e2e/Uno/HelloWorld.Skia.Gtk/Program.cs

@@ -1,21 +1,20 @@
-using System;
 using GLib;
-using Uno.UI.Runtime.Skia;
+using Uno.UI.Runtime.Skia.Gtk;
 
 namespace HelloWorld.Skia.Gtk;
 
 public class Program
 {
-	public static void Main(string[] args)
-	{
-		ExceptionManager.UnhandledException += delegate (UnhandledExceptionArgs expArgs)
-		{
-			Console.WriteLine("GLIB UNHANDLED EXCEPTION" + expArgs.ExceptionObject.ToString());
-			expArgs.ExitApplication = true;
-		};
+    public static void Main(string[] args)
+    {
+        ExceptionManager.UnhandledException += delegate (UnhandledExceptionArgs expArgs)
+        {
+            Console.WriteLine("GLIB UNHANDLED EXCEPTION" + expArgs.ExceptionObject.ToString());
+            expArgs.ExitApplication = true;
+        };
 
-		var host = new GtkHost(() => new AppHead(), args);
+        var host = new GtkHost(() => new AppHead());
 
-		host.Run();
-	}
+        host.Run();
+    }
 }