Merge branch 'PrismLibrary:master' into master

PrismLibrary · Jan 9, 2024 · b14c667 · b14c667
2 parents b990294 + 722952d
commit b14c667
Show file tree

Hide file tree

Showing 247 changed files with 2,202 additions and 5,740 deletions.
diff --git a/.github/workflows/build_uno.yml b/.github/workflows/build_uno.yml
@@ -25,7 +25,7 @@ jobs:
     with:
       name: Build Prism.Uno
       solution-path: PrismLibrary_Uno.slnf
-      dotnet-version: 7.0.400
+      dotnet-version: 8.0.x
       windows-sdk-version: 18362
       uno-check: true
       uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip vsmac'

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -63,7 +63,7 @@ jobs:
     with:
       name: Build Prism.Uno
       solution-path: PrismLibrary_Uno.slnf
-      dotnet-version: 7.0.400
+      dotnet-version: 8.0.x
       windows-sdk-version: 18362
       uno-check: true
       uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip vsmac'
@@ -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

diff --git a/.github/workflows/start-release.yml b/.github/workflows/start-release.yml
@@ -126,7 +126,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: NuGet
-          path: .\artifacts
+          path: .\artifacts\nuget
 
   release:
     uses: avantipoint/workflow-templates/.github/workflows/generate-release.yml@master
@@ -135,4 +135,3 @@ jobs:
       contents: write
     with:
       package-name: Prism.Core
-      artifacts: "Artifacts/*.nupkg,Artifacts/*.snupkg,Artifacts/*.zip"
diff --git a/.gitignore b/.gitignore
@@ -204,4 +204,7 @@ FakesAssemblies/
 .mfractor/
 
 # Jetbrains files
-.idea*
+.idea*
+
+# Binlog
+*.binlog
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,12 +1,9 @@
 {
   "recommendations": [
     "ms-dotnettools.csharp",
-    "ms-azure-devops.azure-pipelines",
     "ms-vscode.powershell",
     "editorconfig.editorconfig",
     "shd101wyy.markdown-preview-enhanced",
-    "streetsidesoftware.code-spell-checker",
-    "clancey.comet-debug",
-    "cschleiden.vscode-github-actions"
+    "streetsidesoftware.code-spell-checker"
   ]
 }
diff --git a/e2e/Uno/.vscode/launch.json → .vscode/launch.json b/e2e/Uno/.vscode/launch.json → .vscode/launch.json
@@ -4,6 +4,13 @@
   // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
   "version": "0.2.0",
   "configurations": [
+    {
+      "name": "Uno Platform Mobile",
+      "type": "Uno",
+      "request": "launch",
+      // any Uno* task will do, this is simply to satisfy vscode requirement when a launch.json is present
+      "preLaunchTask": "Uno: android | Debug | android-x64"
+    },
     {
       // Use IntelliSense to find out which attributes exist for C# debugging
       // Use hover for the description of the existing attributes
@@ -12,15 +19,15 @@
       "type": "chrome",
       "request": "launch",
       "url": "http://localhost:5000",
-      "webRoot": "${workspaceFolder}/HelloWorld.Wasm",
+      "webRoot": "${workspaceFolder}/e2e/Uno/HelloWorld.Wasm",
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
       "timeout": 30000,
       "server": {
         "runtimeExecutable": "dotnet",
         "program": "run",
         "outputCapture": "std",
         "timeout": 30000,
-        "cwd": "${workspaceFolder}/HelloWorld.Wasm"
+        "cwd": "${workspaceFolder}/e2e/Uno/HelloWorld.Wasm"
       }
     },
     {
@@ -32,12 +39,12 @@
       "request": "launch",
       "preLaunchTask": "build-skia-gtk",
       // If you have changed target frameworks, make sure to update the program path.
-      "program": "${workspaceFolder}/HelloWorld.Skia.Gtk/bin/Debug/net7.0/HelloWorld.Skia.Gtk.dll",
+      "program": "${workspaceFolder}/e2e/Uno/HelloWorld.Skia.Gtk/bin/Debug/net7.0/HelloWorld.Skia.Gtk.dll",
       "args": [],
       "env": {
         "DOTNET_MODIFIABLE_ASSEMBLIES": "debug"
       },
-      "cwd": "${workspaceFolder}/HelloWorld.Skia.Gtk",
+      "cwd": "${workspaceFolder}/e2e/Uno/HelloWorld.Skia.Gtk",
       // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
       "console": "internalConsole",
       "stopAtEntry": false

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,4 +1,15 @@
 {
+  "explorer.fileNesting.enabled": true,
+  "explorer.fileNesting.expand": false,
+  "explorer.fileNesting.patterns": {
+    "*.xaml": "$(capture).xaml.cs",
+    "*.ts": "${capture}.js",
+    "*.js": "${capture}.js.map, ${capture}.min.js, ${capture}.d.ts",
+    "*.jsx": "${capture}.js",
+    "*.tsx": "${capture}.ts",
+    "tsconfig.json": "tsconfig.*.json",
+    "package.json": "package-lock.json, yarn.lock, pnpm-lock.yaml"
+  },
   "[azure-pipelines]": {
     "editor.insertSpaces": true,
     "editor.tabSize": 2,

diff --git a/e2e/Uno/.vscode/tasks.json → .vscode/tasks.json b/e2e/Uno/.vscode/tasks.json → .vscode/tasks.json
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -6,19 +6,23 @@
     <PackageProjectUrl>https://github.com/PrismLibrary/Prism</PackageProjectUrl>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageIcon>prism-logo.png</PackageIcon>
-    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/PrismLibrary/Prism</RepositoryUrl>
     <IncludeSymbols>True</IncludeSymbols>
     <IncludeSource>True</IncludeSource>
-    <ArtifactStagingRoot>$(MSBuildThisFileDirectory)Artifacts</ArtifactStagingRoot>
-    <ArtifactStagingRoot Condition=" '$(BUILD_ARTIFACTSTAGINGDIRECTORY)' != '' ">$(BUILD_ARTIFACTSTAGINGDIRECTORY)</ArtifactStagingRoot>
-    <PackageOutputPath>$([System.IO.Path]::Combine('$(ArtifactStagingRoot)', 'NuGet'))</PackageOutputPath>
+    <PackageOutputPath>$(MSBuildThisFileDirectory)Artifacts</PackageOutputPath>
     <EscapedCurrentDirectory>$([System.Text.RegularExpressions.Regex]::Escape('$(MSBuildThisFileDirectory)'))</EscapedCurrentDirectory>
     <RelativeProjectPath>$([System.Text.RegularExpressions.Regex]::Replace('$(MSBuildProjectFullPath)', '$(EscapedCurrentDirectory)', ''))</RelativeProjectPath>
     <PrismPackageIcon>$(MSBuildThisFileDirectory)images/prism-logo.png</PrismPackageIcon>
     <PrismLicenseFile>$(MSBuildThisFileDirectory)LICENSE</PrismLicenseFile>
     <LangVersion>latest</LangVersion>
+    <PolySharpIncludeGeneratedTypes>
+      System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute;
+      System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes;
+      System.Diagnostics.CodeAnalysis.MaybeNullWhenAttribute;
+      System.Runtime.CompilerServices.IsExternalInit;
+    </PolySharpIncludeGeneratedTypes>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -89,6 +93,7 @@
     </When>
     <When Condition="$(TargetFramework.Contains('windows10'))">
       <PropertyGroup>
+        <UseRidGraph>true</UseRidGraph>
         <SupportedOSPlatformVersion>10.0.18362.0</SupportedOSPlatformVersion>
         <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
       </PropertyGroup>

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,4 +1,5 @@
 <Project>
+  <Import Project="winappsdk-workarounds.targets" Condition=" $(IsUnoProject) == 'true' " />
   <PropertyGroup>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
   </PropertyGroup>
@@ -11,51 +12,27 @@
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
 
-  <Target Name="_ReleaseBinaryCopy"
-          Condition=" !'$(IsTestProject)' And '$(IsPackable)' "
-          BeforeTargets="AfterBuild;WpfPack">
-
+  <!-- Generate the NotTrimmable.cs file -->
+  <Target Name="AddNotTrimmableFile" BeforeTargets="BeforeCompile" Condition=" $(IsPackable) ">
     <PropertyGroup>
-      <BinariesFolderName Condition=" '$(IsCoreProject)' ">Core</BinariesFolderName>
-      <BinariesFolderName Condition=" '$(IsFormsProject)' ">Forms</BinariesFolderName>
-      <BinariesFolderName Condition=" '$(IsWpfProject)' ">WPF</BinariesFolderName>
-      <BinariesFolderName Condition=" '$(IsUnoProject)' ">Uno</BinariesFolderName>
-      <BinariesFolderName Condition=" '$(IsMauiProject)' ">Maui</BinariesFolderName>
-      <ArtifactStaging>$([System.IO.Path]::Combine('$(ArtifactStagingRoot)', $(Configuration), '$(BinariesFolderName)', '$(TargetFramework)'))</ArtifactStaging>
+      <!-- Define the file path -->
+      <NotTrimmableFilePath>$(IntermediateOutputPath)NotTrimmable.g.cs</NotTrimmableFilePath>
     </PropertyGroup>
 
-    <Copy SourceFiles="$(OutputPath)$(AssemblyName).dll"
-          DestinationFolder="$(ArtifactStaging)"
-          Condition=" Exists('$(OutputPath)$(AssemblyName).dll') " />
-    <Copy SourceFiles="$(OutputPath)$(AssemblyName).xml"
-          DestinationFolder="$(ArtifactStaging)"
-          Condition=" Exists('$(OutputPath)$(AssemblyName).xml') " />
-    <Copy SourceFiles="$(OutputPath)$(AssemblyName).pdb"
-          DestinationFolder="$(ArtifactStaging)"
-          Condition=" Exists('$(OutputPath)$(AssemblyName).pdb') " />
-    <Copy SourceFiles="$(OutputPath)$(AssemblyName).pri"
-          DestinationFolder="$(ArtifactStaging)"
-          Condition=" Exists('$(OutputPath)$(AssemblyName).pri') " />
-
-  </Target>
-
-
-  <Choose>
-    <When Condition="$(IsUnoProject)">
-      <ItemGroup>
-        <!--
-        If you encounter this error message:
+    <!-- Ensure the intermediate output directory exists -->
+    <MakeDir Directories="$(IntermediateOutputPath)" />
 
-          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.
+    <!-- Write the contents to the file -->
+    <WriteLinesToFile
+      File="$(NotTrimmableFilePath)"
+      Lines="[assembly: System.Reflection.AssemblyMetadata(&quot;IsTrimmable&quot;, &quot;False&quot;)]"
+      Overwrite="true"
+      Encoding="UTF-8" />
 
-        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>
+    <!-- Include the generated file in the compilation -->
+    <ItemGroup>
+      <Compile Include="$(NotTrimmableFilePath)" />
+    </ItemGroup>
+  </Target>
 
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,9 +1,13 @@
 <Project>
   <ItemGroup>
-    <PackageVersion Include="DryIoc.dll" Version="5.4.1" />
-    <PackageVersion Include="Unity.Container" Version="5.11.11" />
+    <PackageVersion Include="PolySharp" Version="1.14.1" />
+    <PackageVersion Include="Prism.Container.Abstractions" Version="9.0.80-pre" />
+    <PackageVersion Include="Prism.Container.DryIoc" Version="9.0.80-pre" />
+    <PackageVersion Include="Prism.Container.Unity" Version="9.0.80-pre" />
     <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
     <PackageVersion Include="System.Reactive" Version="6.0.0" />
+    <PackageVersion Include="Uno.Extensions.Markup.Generators" Version="5.0.13" />
+    <PackageVersion Include="Uno.WinUI.Markup" Version="5.0.13" />
     <PackageVersion Include="Xamarin.Forms" Version="5.0.0.2401" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
   </ItemGroup>
@@ -14,52 +18,50 @@
   </ItemGroup>
   <!-- Uno -->
   <ItemGroup Condition=" $(IsUnoProject) == 'true' ">
-    <PackageVersion Include="Uno.WinUI" Version="4.9.45" />
-    <PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="4.9.45" />
-    <PackageVersion Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="4.9.45" />
-    <PackageVersion Include="Uno.WinUI.Skia.Wpf" Version="4.9.45" />
-    <PackageVersion Include="Uno.Wasm.Bootstrap" Version="7.0.27" />
-    <PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.27" />
-    <PackageVersion Include="Uno.WinUI.WebAssembly" Version="4.9.45" />
-    <PackageVersion Include="Uno.WinUI.RemoteControl" Version="4.9.45" />
-    <PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.45" />
+    <PackageVersion Include="Uno.WinUI" Version="5.0.48" />
+    <PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="5.0.48" />
+    <PackageVersion Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="5.0.48" />
+    <PackageVersion Include="Uno.WinUI.Skia.Wpf" Version="5.0.48" />
+    <PackageVersion Include="Uno.Wasm.Bootstrap" Version="8.0.4" />
+    <PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.4" />
+    <PackageVersion Include="Uno.WinUI.WebAssembly" Version="5.0.48" />
+    <PackageVersion Include="Uno.WinUI.DevServer" Version="5.0.48" />
+    <PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.48" />
     <PackageVersion Include="Uno.Core" Version="4.0.1" />
     <PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
-    <PackageVersion Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.3.0" />
-    <PackageVersion Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.3.0" />
-    <PackageVersion Include="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.1" />
+    <PackageVersion Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.4.2" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.2.221109.1" Condition="$(MSBuildProjectName.Contains('Prism'))" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.3.230724000" Condition="!$(MSBuildProjectName.Contains('Prism'))" />
-    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
-    <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.5" />
-    <PackageVersion Include="SkiaSharp.Skottie" Version="2.88.5" />
-    <PackageVersion Include="Uno.Resizetizer" Version="1.1.2" />
-    <PackageVersion Include="Uno.Extensions.Core" Version="2.4.2" />
-    <PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
-    <PackageVersion Include="Uno.Extensions.Logging.WinUI" Version="2.4.2" />
-    <PackageVersion Include="Uno.Extensions.Logging.Serilog" Version="2.4.2" />
-    <PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.4.0" />
-    <PackageVersion Include="Uno.Material.WinUI" Version="2.6.1" />
-    <PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="3.0.5" />
-    <PackageVersion Include="Uno.Toolkit.WinUI" Version="3.0.5" />
-    <PackageVersion Include="Uno.Extensions.Hosting.WinUI" Version="2.4.2" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
-    <PackageVersion Include="Xamarin.Google.Android.Material" Version="1.7.0.2" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" Condition="!$(MSBuildProjectName.Contains('Prism'))" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
+    <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
+    <PackageVersion Include="SkiaSharp.Skottie" Version="2.88.6" />
+    <PackageVersion Include="Uno.Resizetizer" Version="1.2.1" />
+    <PackageVersion Include="Uno.Extensions.Core" Version="3.0.10" />
+    <PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
+    <PackageVersion Include="Uno.Extensions.Logging.WinUI" Version="3.0.11" />
+    <PackageVersion Include="Uno.Extensions.Logging.Serilog" Version="3.0.11" />
+    <PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.7.0" />
+    <PackageVersion Include="Uno.Material.WinUI" Version="4.0.6" />
+    <PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="5.0.17" />
+    <PackageVersion Include="Uno.Toolkit.WinUI" Version="5.0.17" />
+    <PackageVersion Include="Uno.Extensions.Hosting.WinUI" Version="3.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+    <PackageVersion Include="Xamarin.Google.Android.Material" Version="1.10.0.1" />
     <PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
-    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="7.0.0" />
+    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="8.0.0" />
   </ItemGroup>
   <!-- Tests -->
   <ItemGroup>
     <PackageVersion Include="coverlet.collector" Version="6.0.0" />
-    <PackageVersion Include="GitHubActionsTestLogger" Version="2.3.2" />
+    <PackageVersion Include="GitHubActionsTestLogger" Version="2.3.3" />
     <PackageVersion Include="Xamarin.Forms.Mocks" Version="4.7.0.1" />
     <PackageVersion Include="Humanizer.Core" Version="2.14.1" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-    <PackageVersion Include="Moq" Version="4.18.4" />
-    <PackageVersion Include="xunit" Version="2.5.0" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageVersion Include="Moq" Version="4.20.69" />
+    <PackageVersion Include="xunit" Version="2.6.1" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.3" />
     <PackageVersion Include="Xunit.StaFact" Version="1.1.11" />
   </ItemGroup>
   <ItemGroup Condition=" $(UseMaui) != 'true' ">
@@ -78,6 +80,6 @@
     <!-- Global Packages -->
     <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
     <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133" />
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
   </ItemGroup>
-</Project>
+</Project>