From ff51cd228b7af3438a863e2b9a69a8f547f2f88a Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Thu, 29 Sep 2022 14:38:26 -0400 Subject: [PATCH 01/70] ci: Adjust for warnings as errors --- src/Uno.UI/UI/Xaml/Documents/Hyperlink.cs | 4 +++- src/Uno.UI/UI/Xaml/Documents/Hyperlink.mux.cs | 2 +- .../UI/Xaml/DragDrop/DragDropExtension.wasm.cs | 2 ++ src/Uno.UI/UI/Xaml/FontFamily.wasm.cs | 2 +- .../UI/Xaml/FrameworkElement.Interface.wasm.cs | 4 ++-- src/Uno.UI/UI/Xaml/IFrameworkElement.cs | 1 + src/Uno.UI/UI/Xaml/UIElement.Pointers.wasm.cs | 2 +- src/Uno.UI/UI/Xaml/UIElement.wasm.cs | 4 ++-- src/Uno.UI/UI/Xaml/VisualStateManager.wasm.cs | 2 +- src/Uno.UI/Uno.UI.Wasm.csproj | 1 + src/Uno.UWP/Collections/HashtableEx.cs | 4 +++- ...tureRecognizer.Manipulation.InertiaProcessor.cs | 14 +++++++------- 12 files changed, 25 insertions(+), 17 deletions(-) diff --git a/src/Uno.UI/UI/Xaml/Documents/Hyperlink.cs b/src/Uno.UI/UI/Xaml/Documents/Hyperlink.cs index 27e5fcb63918..59ba70f32167 100644 --- a/src/Uno.UI/UI/Xaml/Documents/Hyperlink.cs +++ b/src/Uno.UI/UI/Xaml/Documents/Hyperlink.cs @@ -17,8 +17,10 @@ namespace Windows.UI.Xaml.Documents { public sealed partial class Hyperlink : Span - { + { +#pragma warning disable CS0649 // error CS0649: Field '_focusableHelper' is never assigned to, and will always have its default value null private readonly IFocusable _focusableHelper; +#pragma warning restore CS0649 // error CS0649: Field '_focusableHelper' is never assigned to, and will always have its default value null #region Static private static Brush _defaultForeground; diff --git a/src/Uno.UI/UI/Xaml/Documents/Hyperlink.mux.cs b/src/Uno.UI/UI/Xaml/Documents/Hyperlink.mux.cs index c03a39006f55..cee89eebc6cf 100644 --- a/src/Uno.UI/UI/Xaml/Documents/Hyperlink.mux.cs +++ b/src/Uno.UI/UI/Xaml/Documents/Hyperlink.mux.cs @@ -10,7 +10,7 @@ namespace Windows.UI.Xaml.Documents { public partial class Hyperlink { - internal bool IsFocusable() + internal new bool IsFocusable() { var element = GetContainingFrameworkElement(); return diff --git a/src/Uno.UI/UI/Xaml/DragDrop/DragDropExtension.wasm.cs b/src/Uno.UI/UI/Xaml/DragDrop/DragDropExtension.wasm.cs index 88741ba2d5f3..041468fee513 100644 --- a/src/Uno.UI/UI/Xaml/DragDrop/DragDropExtension.wasm.cs +++ b/src/Uno.UI/UI/Xaml/DragDrop/DragDropExtension.wasm.cs @@ -477,6 +477,7 @@ IEnumerable GetModifiers(DragDropExtensionEventArgs that) [DataContract] private struct DataEntry { +#pragma warning disable CS0649 // error CS0649: Field 'DragDropExtension.DataEntry.kind' is never assigned to, and will always have its default value null [DataMember] public int id; @@ -485,6 +486,7 @@ private struct DataEntry [DataMember] public string type; +#pragma warning restore CS0649 // error CS0649: Field 'DragDropExtension.DataEntry.kind' is never assigned to, and will always have its default value null /// public override string ToString() diff --git a/src/Uno.UI/UI/Xaml/FontFamily.wasm.cs b/src/Uno.UI/UI/Xaml/FontFamily.wasm.cs index a27226061d8a..720842c25d8f 100644 --- a/src/Uno.UI/UI/Xaml/FontFamily.wasm.cs +++ b/src/Uno.UI/UI/Xaml/FontFamily.wasm.cs @@ -61,7 +61,7 @@ private static bool TryGetExternalUri(string? source, out Uri? uri) if (!uri.IsAbsoluteUri || source.StartsWith("/")) { // Support for implicit ms-appx resolution - var assetUri = AssetsPathBuilder.BuildAssetUri(Uri.EscapeUriString(source.TrimStart('/'))); + var assetUri = AssetsPathBuilder.BuildAssetUri(Uri.EscapeDataString(source.TrimStart('/'))); uri = new Uri(assetUri, UriKind.RelativeOrAbsolute); } diff --git a/src/Uno.UI/UI/Xaml/FrameworkElement.Interface.wasm.cs b/src/Uno.UI/UI/Xaml/FrameworkElement.Interface.wasm.cs index be4fdc0f98eb..2dce624a70c6 100644 --- a/src/Uno.UI/UI/Xaml/FrameworkElement.Interface.wasm.cs +++ b/src/Uno.UI/UI/Xaml/FrameworkElement.Interface.wasm.cs @@ -63,8 +63,8 @@ public FrameworkElement(string htmlTag, bool isSvg) : base(htmlTag, isSvg) _logDebug = _log.IsEnabled(LogLevel.Debug) ? _log : null; } - private protected readonly Logger _log; - private protected readonly Logger _logDebug; + private new protected readonly Logger _log; + private new protected readonly Logger _logDebug; private static readonly Uri DefaultBaseUri = new Uri("ms-appx://local"); public global::System.Uri BaseUri { get; internal set; } = DefaultBaseUri; diff --git a/src/Uno.UI/UI/Xaml/IFrameworkElement.cs b/src/Uno.UI/UI/Xaml/IFrameworkElement.cs index de22eba152ed..6f174f44886d 100644 --- a/src/Uno.UI/UI/Xaml/IFrameworkElement.cs +++ b/src/Uno.UI/UI/Xaml/IFrameworkElement.cs @@ -47,6 +47,7 @@ using ObjCRuntime; #endif #elif __WASM__ +#pragma warning disable CS8981 // The type name 'nint' only contains lower-cased ascii characters. Such names may become reserved for the language using nint = System.Int32; using nfloat = System.Double; using Point = Windows.Foundation.Point; diff --git a/src/Uno.UI/UI/Xaml/UIElement.Pointers.wasm.cs b/src/Uno.UI/UI/Xaml/UIElement.Pointers.wasm.cs index 885f202b2138..17cc9d9c12cd 100644 --- a/src/Uno.UI/UI/Xaml/UIElement.Pointers.wasm.cs +++ b/src/Uno.UI/UI/Xaml/UIElement.Pointers.wasm.cs @@ -328,7 +328,7 @@ private static PointerRoutedEventArgs ToPointerArgs( } #endregion - partial void OnManipulationModeChanged(ManipulationModes _, ManipulationModes newMode) + partial void OnManipulationModeChanged(ManipulationModes oldMode, ManipulationModes newMode) { if (newMode is ManipulationModes.None or ManipulationModes.System) { diff --git a/src/Uno.UI/UI/Xaml/UIElement.wasm.cs b/src/Uno.UI/UI/Xaml/UIElement.wasm.cs index c792165b0f99..3bc0df2975cf 100644 --- a/src/Uno.UI/UI/Xaml/UIElement.wasm.cs +++ b/src/Uno.UI/UI/Xaml/UIElement.wasm.cs @@ -406,12 +406,12 @@ public Rect Arranged public Func DesiredSizeSelector { get; set; } - partial void OnVisibilityChangedPartial(Visibility oldValue, Visibility newVisibility) + partial void OnVisibilityChangedPartial(Visibility oldValue, Visibility newValue) { InvalidateMeasure(); UpdateHitTest(); - WindowManagerInterop.SetVisibility(HtmlId, newVisibility == Visibility.Visible); + WindowManagerInterop.SetVisibility(HtmlId, newValue == Visibility.Visible); if (FeatureConfiguration.UIElement.AssignDOMXamlProperties) { diff --git a/src/Uno.UI/UI/Xaml/VisualStateManager.wasm.cs b/src/Uno.UI/UI/Xaml/VisualStateManager.wasm.cs index 048d05192f33..591d996218c7 100644 --- a/src/Uno.UI/UI/Xaml/VisualStateManager.wasm.cs +++ b/src/Uno.UI/UI/Xaml/VisualStateManager.wasm.cs @@ -18,7 +18,7 @@ private static void TryAssignDOMVisualStates(IList groups, IFr if (Uno.UI.FeatureConfiguration.UIElement.AssignDOMXamlProperties) { var sb = new StringBuilder(); - sb.Append("["); + sb.Append('['); foreach (var group in groups) { sb.Append($"{group}: {group.CurrentState}, "); diff --git a/src/Uno.UI/Uno.UI.Wasm.csproj b/src/Uno.UI/Uno.UI.Wasm.csproj index b8b748349ac5..f3348ab4e52a 100644 --- a/src/Uno.UI/Uno.UI.Wasm.csproj +++ b/src/Uno.UI/Uno.UI.Wasm.csproj @@ -16,6 +16,7 @@ Uno.UI Uno.UI true + true $(MSBuildThisFileDirectory)tsBindings Uno;Uno.UI diff --git a/src/Uno.UWP/Collections/HashtableEx.cs b/src/Uno.UWP/Collections/HashtableEx.cs index ed4733f1a3b9..3621ef9fbe5b 100644 --- a/src/Uno.UWP/Collections/HashtableEx.cs +++ b/src/Uno.UWP/Collections/HashtableEx.cs @@ -1,4 +1,6 @@ -#nullable enable +#pragma warning disable CS8981 + +#nullable enable // Based on https://github.com/dotnet/runtime/commit/bdc8e420aa75999021e06b85e2e1869962730a0f // Licensed to the .NET Foundation under one or more agreements. diff --git a/src/Uno.UWP/UI/Input/GestureRecognizer.Manipulation.InertiaProcessor.cs b/src/Uno.UWP/UI/Input/GestureRecognizer.Manipulation.InertiaProcessor.cs index 7903cc830219..3badf5bff936 100644 --- a/src/Uno.UWP/UI/Input/GestureRecognizer.Manipulation.InertiaProcessor.cs +++ b/src/Uno.UWP/UI/Input/GestureRecognizer.Manipulation.InertiaProcessor.cs @@ -54,10 +54,10 @@ public InertiaProcessor(Manipulation owner, Point position, ManipulationDelta cu _isTranslateInertiaXEnabled = _owner._isTranslateXEnabled && _owner._settings.HasFlag(Input.GestureSettings.ManipulationTranslateInertia) - && Abs(velocities.Linear.X) > _owner._inertiaThresholds.TranslateX; + && Math.Abs(velocities.Linear.X) > _owner._inertiaThresholds.TranslateX; _isTranslateInertiaYEnabled = _owner._isTranslateYEnabled && _owner._settings.HasFlag(Input.GestureSettings.ManipulationTranslateInertia) - && Abs(velocities.Linear.Y) > _owner._inertiaThresholds.TranslateY; + && Math.Abs(velocities.Linear.Y) > _owner._inertiaThresholds.TranslateY; _isRotateInertiaEnabled = _owner._isRotateEnabled && _owner._settings.HasFlag(Input.GestureSettings.ManipulationRotateInertia) && Abs(velocities.Angular) > _owner._inertiaThresholds.Rotate; @@ -93,7 +93,7 @@ public void Start() // As of 2021-07-21, according to test, Displacement takes over Deceleration. if (!IsNaN(DesiredDisplacement)) { - var v0 = (Abs(_velocities0.Linear.X) + Abs(_velocities0.Linear.Y)) / 2; + var v0 = (Math.Abs(_velocities0.Linear.X) + Math.Abs(_velocities0.Linear.Y)) / 2; DesiredDisplacementDeceleration = GetDecelerationFromDesiredDisplacement(v0, DesiredDisplacement); } if (!IsNaN(DesiredRotation)) @@ -184,14 +184,14 @@ private float GetValue(bool enabled, double v0, double d, double t, float lastVa // https://docs.microsoft.com/en-us/windows/win32/wintouch/inertia-mechanics#inertia-physics-overview private float GetValue(double v0, double d, double t) => v0 >= 0 - ? (float)(v0 * t - d * Pow(t, 2)) - : -(float)(-v0 * t - d * Pow(t, 2)); + ? (float)(v0 * t - d * Math.Pow(t, 2)) + : -(float)(-v0 * t - d * Math.Pow(t, 2)); private bool IsCompleted(double v0, double d, double t) - => Abs(v0) - d * 2 * t <= 0; // The derivative of the GetValue function + => Math.Abs(v0) - d * 2 * t <= 0; // The derivative of the GetValue function private double GetDecelerationFromDesiredDisplacement(double v0, double displacement, double durationMs = _defaultDurationMs) - => (v0 * durationMs - displacement) / Pow(_defaultDurationMs, 2); + => (v0 * durationMs - displacement) / Math.Pow(_defaultDurationMs, 2); /// public void Dispose() From 7e899a2ef15ca7458554895959f762b3e40c61d1 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Thu, 29 Sep 2022 15:45:29 -0400 Subject: [PATCH 02/70] feat: Build for wasm/skia net7 --- .vsts-ci.yml | 7 + build/Uno.UI.Build.csproj | 48 +++-- build/Uno.WinUI.nuspec | 182 +++++++++++++----- build/ci/.azure-devops-package-skia.yml | 66 +++++++ build/ci/.azure-devops-package-wasm.yml | 67 +++++++ build/ci/templates/dotnet-install.yml | 19 +- .../filters}/Uno.UI-packages-no-net6.slnf | 36 +--- build/filters/Uno.UI-packages-skia.slnf | 51 +++++ build/filters/Uno.UI-packages-wasm.slnf | 42 ++++ src/Directory.Build.targets | 4 +- src/PlatformItemGroups.props | 2 +- .../SamplesApp.Wasm/SamplesApp.Wasm.csproj | 5 +- .../Uno.Foundation.Logging.csproj | 6 +- .../Uno.Foundation.Runtime.WebAssembly.csproj | 2 +- src/Uno.Foundation/Uno.Foundation.Skia.csproj | 2 +- src/Uno.Foundation/Uno.Foundation.Wasm.csproj | 2 +- ...dapter.Microsoft.Extensions.Logging.csproj | 6 +- .../Uno.UI.Composition.Skia.csproj | 2 +- .../Uno.UI.Composition.Wasm.csproj | 2 +- .../Uno.UI.Dispatching.Skia.csproj | 2 +- .../Uno.UI.Dispatching.Wasm.csproj | 2 +- .../Uno.UI.FluentTheme.v1.Skia.csproj | 2 +- .../Uno.UI.FluentTheme.v1.Wasm.csproj | 2 +- .../Uno.UI.FluentTheme.v2.Skia.csproj | 2 +- .../Uno.UI.FluentTheme.v2.Wasm.csproj | 2 +- .../Uno.UI.FluentTheme.Skia.csproj | 2 +- .../Uno.UI.FluentTheme.Wasm.csproj | 2 +- .../Uno.UI.RemoteControl.Skia.csproj | 2 +- .../Uno.UI.RemoteControl.Wasm.csproj | 2 +- .../Uno.UI.Runtime.Skia.Gtk.csproj | 2 +- ...o.UI.Runtime.Skia.Linux.FrameBuffer.csproj | 2 +- .../Uno.UI.Runtime.Skia.Wpf.csproj | 2 +- ...I.Runtime.WebAssembly.Compatibility.csproj | 2 +- .../Uno.UI.Runtime.WebAssembly.csproj | 2 +- .../Uno.UI.RuntimeTests.Skia.csproj | 2 +- .../Uno.UI.RuntimeTests.Wasm.csproj | 2 +- src/Uno.UI.Toolkit/Uno.UI.Toolkit.Skia.csproj | 2 +- src/Uno.UI.Toolkit/Uno.UI.Toolkit.Wasm.csproj | 2 +- .../Tests/TSBindingsTests.cs | 39 ++++ .../Uno.UI.Wasm.Tests.csproj | 3 +- .../WasmScripts/UnitTests.d.ts | 1 + .../WasmScripts/UnitTests.js | 3 + src/Uno.UI.Wasm.Tests/ts/TSBindingsTests.ts | 4 + src/Uno.UI/Uno.UI.Skia.csproj | 2 +- src/Uno.UI/Uno.UI.Wasm.csproj | 2 +- src/Uno.UWP/Uno.Skia.csproj | 2 +- src/Uno.UWP/Uno.Wasm.csproj | 2 +- 47 files changed, 492 insertions(+), 155 deletions(-) create mode 100644 build/ci/.azure-devops-package-skia.yml create mode 100644 build/ci/.azure-devops-package-wasm.yml rename {src => build/filters}/Uno.UI-packages-no-net6.slnf (66%) create mode 100644 build/filters/Uno.UI-packages-skia.slnf create mode 100644 build/filters/Uno.UI-packages-wasm.slnf diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 8fe1ea227e7f..425dfd873cfd 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -78,6 +78,13 @@ jobs: parameters: poolName: '$(windowsScaledPool)' +- template: build/ci/.azure-devops-package-wasm.yml + parameters: + vmImage: '$(linuxVMImage)' + +- template: build/ci/.azure-devops-package-skia.yml + parameters: + poolName: '$(windowsScaledPool)' - template: build/ci/.azure-devops-package.yml parameters: poolName: '$(windowsScaledPool)' diff --git a/build/Uno.UI.Build.csproj b/build/Uno.UI.Build.csproj index c45d0f9afa44..589929295209 100644 --- a/build/Uno.UI.Build.csproj +++ b/build/Uno.UI.Build.csproj @@ -43,29 +43,22 @@ - - + - + + + + + - - - - - - - - - - - + @@ -222,15 +215,14 @@ - - - + + + + + + + + + + + + + + diff --git a/build/Uno.WinUI.nuspec b/build/Uno.WinUI.nuspec index 40904e44130e..1dce17629eb4 100644 --- a/build/Uno.WinUI.nuspec +++ b/build/Uno.WinUI.nuspec @@ -92,7 +92,18 @@ - + + + + + + + + + + + + @@ -133,6 +144,21 @@ + + + + + + + + + + + + + + + @@ -482,56 +508,108 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -573,6 +651,7 @@ + @@ -583,6 +662,7 @@ + @@ -593,6 +673,7 @@ + @@ -603,6 +684,7 @@ + @@ -613,6 +695,7 @@ + @@ -623,6 +706,7 @@ + diff --git a/build/ci/.azure-devops-package-skia.yml b/build/ci/.azure-devops-package-skia.yml new file mode 100644 index 000000000000..1794896360cb --- /dev/null +++ b/build/ci/.azure-devops-package-skia.yml @@ -0,0 +1,66 @@ +parameters: + poolName: '' + +jobs: +- job: wasm_package_build + displayName: 'Build WebAssembly Package Binaries' + container: nv-bionic-wasm + + dependsOn: winui_convert_tree + + pool: ${{ parameters.poolName }} + + strategy: + matrix: + UWP: + UNO_UWP_BUILD: true + XAML_FLAVOR_BUILD: UWP + + WinUI: + UNO_UWP_BUILD: false + XAML_FLAVOR_BUILD: WinUI + + variables: + CombinedConfiguration: Release|Any CPU + CI_Build: true + + # Disable .NET 5 build on CI for package generation + # Build validation is performed on other jobs + UnoUIDisableNetCoreBuild: true + + NUGET_PACKAGES: $(build.sourcesdirectory)/.nuget + + steps: + - checkout: self + clean: true + + - template: templates/download-winui-converted-tree.yml + + - template: templates/nuget-cache.yml + parameters: + nugetPackages: $(NUGET_PACKAGES) + + - template: templates/gitversion.yml + + - template: templates/dotnet-install.yml + + - powershell: | + Set-PSDebug -Trace 1 + dotnet build build/Uno.UI.Build.csproj /m /t:BuildCIWasm "/p:CombinedConfiguration=$(CombinedConfiguration)" /detailedsummary /bl:$(build.artifactstagingdirectory)/build-skia-$(XAML_FLAVOR_BUILD).binlog + displayName: Building Skia Binaries + + - template: templates/copy-package-assets.yml + + - task: ArchiveFiles@2 + inputs: + rootFolderOrFile: $(build.sourcesdirectory)\build-artifacts\bin-$(XAML_FLAVOR_BUILD) + includeRootFolder: false + archiveType: 'zip' + archiveFile: '$(Build.ArtifactStagingDirectory)/skia-bin-$(XAML_FLAVOR_BUILD).zip' + + - task: PublishBuildArtifacts@1 + condition: always() + inputs: + PathtoPublish: $(build.artifactstagingdirectory) + ArtifactName: NugetPackages-Artifacts + ArtifactType: Container diff --git a/build/ci/.azure-devops-package-wasm.yml b/build/ci/.azure-devops-package-wasm.yml new file mode 100644 index 000000000000..cdd0eeb3f45e --- /dev/null +++ b/build/ci/.azure-devops-package-wasm.yml @@ -0,0 +1,67 @@ +parameters: + poolName: '' + +jobs: +- job: wasm_package_build + displayName: 'Build WebAssembly Package Binaries' + container: nv-bionic-wasm + + dependsOn: winui_convert_tree + + pool: + vmImage: ${{ parameters.vmImage }} + + strategy: + matrix: + UWP: + UNO_UWP_BUILD: true + XAML_FLAVOR_BUILD: UWP + + WinUI: + UNO_UWP_BUILD: false + XAML_FLAVOR_BUILD: WinUI + + variables: + CombinedConfiguration: Release|Any CPU + CI_Build: true + + # Disable .NET 5 build on CI for package generation + # Build validation is performed on other jobs + UnoUIDisableNetCoreBuild: true + + NUGET_PACKAGES: $(build.sourcesdirectory)/.nuget + + steps: + - checkout: self + clean: true + + - template: templates/download-winui-converted-tree.yml + + - template: templates/nuget-cache.yml + parameters: + nugetPackages: $(NUGET_PACKAGES) + + - template: templates/gitversion.yml + + - template: templates/dotnet-install.yml + + - powershell: | + Set-PSDebug -Trace 1 + dotnet build build/Uno.UI.Build.csproj /m /t:BuildCIWasm "/p:CombinedConfiguration=$(CombinedConfiguration)" /detailedsummary /bl:$(build.artifactstagingdirectory)/build-wasm-$(XAML_FLAVOR_BUILD).binlog + displayName: Building Wasm Binaries + + - template: templates/copy-package-assets.yml + + - task: ArchiveFiles@2 + inputs: + rootFolderOrFile: $(build.sourcesdirectory)\build-artifacts\bin-$(XAML_FLAVOR_BUILD) + includeRootFolder: false + archiveType: 'zip' + archiveFile: '$(Build.ArtifactStagingDirectory)/wasm-bin-$(XAML_FLAVOR_BUILD).zip' + + - task: PublishBuildArtifacts@1 + condition: always() + inputs: + PathtoPublish: $(build.artifactstagingdirectory) + ArtifactName: NugetPackages-Artifacts + ArtifactType: Container diff --git a/build/ci/templates/dotnet-install.yml b/build/ci/templates/dotnet-install.yml index ab8d06037a38..ace7e37b9895 100644 --- a/build/ci/templates/dotnet-install.yml +++ b/build/ci/templates/dotnet-install.yml @@ -1,22 +1,9 @@ steps: - task: UseDotNet@2 - displayName: 'Use .NET Core SDK 6.0.300' + displayName: 'Use .NET Core SDK 7.0.100-rc.1.22431.12' retryCountOnTaskFailure: 3 inputs: packageType: sdk - version: 6.0.300 - - - task: UseDotNet@2 - displayName: 'Use .NET Core SDK 5.0.400' - retryCountOnTaskFailure: 3 - inputs: - packageType: sdk - version: 5.0.400 - - - task: UseDotNet@2 - displayName: 'Use .NET Core SDK 3.1.406' - retryCountOnTaskFailure: 3 - inputs: - packageType: sdk - version: 3.1.406 + includePreviewVersions: true + version: 7.0.100-rc.1.22431.12 diff --git a/src/Uno.UI-packages-no-net6.slnf b/build/filters/Uno.UI-packages-no-net6.slnf similarity index 66% rename from src/Uno.UI-packages-no-net6.slnf rename to build/filters/Uno.UI-packages-no-net6.slnf index f56da542eb91..63d0b38c0e52 100644 --- a/src/Uno.UI-packages-no-net6.slnf +++ b/build/filters/Uno.UI-packages-no-net6.slnf @@ -1,13 +1,9 @@ { "solution": { - "path": "Uno.UI.sln", + "path": "..\\..\\src\\Uno.UI.sln", "projects": [ "..\\build\\Uno.UI.Build.csproj", - "AddIns\\Uno.UI.Lottie\\Uno.UI.Lottie.Skia.csproj", - "AddIns\\Uno.UI.Lottie\\Uno.UI.Lottie.Wasm.csproj", "AddIns\\Uno.UI.Lottie\\Uno.UI.Lottie.csproj", - "AddIns\\Uno.UI.MSAL\\Uno.UI.MSAL.Skia.csproj", - "AddIns\\Uno.UI.MSAL\\Uno.UI.MSAL.Wasm.csproj", "AddIns\\Uno.UI.MSAL\\Uno.UI.MSAL.csproj", "ResourceConverter\\ResourceConverter.csproj", "SolutionTemplate\\Uno.ProjectTemplates.Dotnet\\Uno.ProjectTemplates.Dotnet.csproj", @@ -33,65 +29,35 @@ "Uno.Analyzers\\Uno.Analyzers.csproj", "Uno.Foundation.Logging\\Uno.Foundation.Logging.csproj", "Uno.Foundation.Runtime.WebAssembly\\Uno.Foundation.Runtime.WebAssembly.csproj", - "Uno.Foundation\\Uno.Foundation.Skia.csproj", - "Uno.Foundation\\Uno.Foundation.Wasm.csproj", "Uno.Foundation\\Uno.Foundation.csproj", "Uno.NUnitTransformTool\\Uno.NUnitTransformTool.csproj", "Uno.ReferenceImplComparer\\Uno.ReferenceImplComparer.csproj", "Uno.UI.Adapter.Microsoft.Extensions.Logging\\Uno.UI.Adapter.Microsoft.Extensions.Logging.csproj", "Uno.UI.AssemblyComparer\\Uno.UI.AssemblyComparer.csproj", "Uno.UI.BindingHelper.Android\\Uno.UI.BindingHelper.Android.csproj", - "Uno.UI.Composition\\Uno.UI.Composition.Skia.csproj", - "Uno.UI.Composition\\Uno.UI.Composition.Wasm.csproj", "Uno.UI.Composition\\Uno.UI.Composition.csproj", - "Uno.UI.Dispatching\\Uno.UI.Dispatching.Skia.csproj", - "Uno.UI.Dispatching\\Uno.UI.Dispatching.Wasm.csproj", "Uno.UI.Dispatching\\Uno.UI.Dispatching.csproj", - "Uno.UI.FluentTheme.v1\\Uno.UI.FluentTheme.v1.Skia.csproj", - "Uno.UI.FluentTheme.v1\\Uno.UI.FluentTheme.v1.Wasm.csproj", "Uno.UI.FluentTheme.v1\\Uno.UI.FluentTheme.v1.csproj", - "Uno.UI.FluentTheme.v2\\Uno.UI.FluentTheme.v2.Skia.csproj", - "Uno.UI.FluentTheme.v2\\Uno.UI.FluentTheme.v2.Wasm.csproj", "Uno.UI.FluentTheme.v2\\Uno.UI.FluentTheme.v2.csproj", "Uno.UI.Foldable\\Uno.UI.Foldable.csproj", - "Uno.UI.FluentTheme\\Uno.UI.FluentTheme.Skia.csproj", - "Uno.UI.FluentTheme\\Uno.UI.FluentTheme.Wasm.csproj", "Uno.UI.FluentTheme\\Uno.UI.FluentTheme.csproj", - "Uno.UI.XamlHost.Skia.Wpf\\Uno.UI.XamlHost.Skia.Wpf.csproj", "Uno.UI.XamlHost\\Uno.UI.XamlHost.csproj", - "Uno.UI.XamlHost\\Uno.UI.XamlHost.Skia.csproj", - "Uno.UI.XamlHost\\Uno.UI.XamlHost.Wasm.csproj", "Uno.UI.Maps\\Uno.UI.Maps.csproj", "Uno.UI.RemoteControl.Host\\Uno.UI.RemoteControl.Host.csproj", "Uno.UI.RemoteControl.VS\\Uno.UI.RemoteControl.VS.csproj", - "Uno.UI.RemoteControl\\Uno.UI.RemoteControl.Skia.csproj", - "Uno.UI.RemoteControl\\Uno.UI.RemoteControl.Wasm.csproj", "Uno.UI.RemoteControl\\Uno.UI.RemoteControl.csproj", - "Uno.UI.Runtime.Skia.Gtk\\Uno.UI.Runtime.Skia.Gtk.csproj", - "Uno.UI.Runtime.Skia.Linux.FrameBuffer\\Uno.UI.Runtime.Skia.Linux.FrameBuffer.csproj", - "Uno.UI.Runtime.Skia.Tizen\\Uno.UI.Runtime.Skia.Tizen.csproj", - "Uno.UI.Runtime.Skia.Wpf\\Uno.UI.Runtime.Skia.Wpf.csproj", "Uno.UI.Runtime.WebAssembly.Compatibility\\Uno.UI.Runtime.WebAssembly.Compatibility.csproj", "Uno.UI.Runtime.WebAssembly\\Uno.UI.Runtime.WebAssembly.csproj", - "Uno.UI.RuntimeTests\\Uno.UI.RuntimeTests.Skia.csproj", - "Uno.UI.RuntimeTests\\Uno.UI.RuntimeTests.Wasm.csproj", "Uno.UI.RuntimeTests\\Uno.UI.RuntimeTests.csproj", "Uno.UI.TestComparer\\Uno.UI.TestComparer.csproj", "Uno.UI.Tests.Performance\\Uno.UI.Tests.Performance.csproj", "Uno.UI.Tests.ViewLibraryProps\\Uno.UI.Tests.ViewLibraryProps.csproj", "Uno.UI.Tests.ViewLibrary\\Uno.UI.Tests.ViewLibrary.csproj", "Uno.UI.Tests\\Uno.UI.Tests.csproj", - "Uno.UI.Toolkit\\Uno.UI.Toolkit.Skia.csproj", - "Uno.UI.Toolkit\\Uno.UI.Toolkit.Wasm.csproj", "Uno.UI.Toolkit\\Uno.UI.Toolkit.csproj", - "Uno.UI.Wasm.Tests\\Uno.UI.Wasm.Tests.csproj", - "Uno.UI\\Uno.UI.Skia.csproj", - "Uno.UI\\Uno.UI.Wasm.csproj", "Uno.UI\\Uno.UI.csproj", "Uno.UWPSyncGenerator.Reference\\Uno.UWPSyncGenerator.Reference.csproj", "Uno.UWPSyncGenerator\\Uno.UWPSyncGenerator.csproj", - "Uno.UWP\\Uno.Skia.csproj", - "Uno.UWP\\Uno.Wasm.csproj", "Uno.UWP\\Uno.csproj", "Uno.WinUIRevert\\Uno.WinUIRevert.csproj", "UnoItemTemplate\\UnoItemTemplate.csproj" diff --git a/build/filters/Uno.UI-packages-skia.slnf b/build/filters/Uno.UI-packages-skia.slnf new file mode 100644 index 000000000000..109036e7daf5 --- /dev/null +++ b/build/filters/Uno.UI-packages-skia.slnf @@ -0,0 +1,51 @@ +{ + "solution": { + "path": "Uno.UI.sln", + "projects": [ + "AddIns\\Uno.UI.Lottie\\Uno.UI.Lottie.Skia.csproj", + "AddIns\\Uno.UI.MSAL\\Uno.UI.MSAL.Skia.csproj", + "SamplesApp\\Benchmarks.Shared\\SamplesApp.Benchmarks.shproj", + "SamplesApp\\SamplesApp.Shared\\SamplesApp.Shared.shproj", + "SamplesApp\\SamplesApp.Skia.Gtk\\SamplesApp.Skia.Gtk.csproj", + "SamplesApp\\SamplesApp.Skia.Linux.FrameBuffer\\SamplesApp.Skia.Linux.FrameBuffer.csproj", + "SamplesApp\\SamplesApp.Skia.Tizen\\SamplesApp.Skia.Tizen.csproj", + "SamplesApp\\SamplesApp.Skia.WPF\\SamplesApp.Skia.WPF.csproj", + "SamplesApp\\SamplesApp.Skia\\SamplesApp.Skia.csproj", + "SamplesApp\\SamplesApp.UITests.Generator\\Uno.Samples.UITest.Generator.csproj", + "SamplesApp\\SamplesApp.UITests\\SamplesApp.UITests.csproj", + "SamplesApp\\SamplesApp.UWP.Design\\SamplesApp.UWP.Design.csproj", + "SamplesApp\\SamplesApp.UnitTests.Shared\\SamplesApp.UnitTests.Shared.shproj", + "SamplesApp\\UITests.Shared\\UITests.Shared.shproj", + "SamplesApp\\UnoIslands.Shared\\UnoIslands.Shared.shproj", + "SamplesApp\\UnoIslands.Skia\\UnoIslands.Skia.csproj", + "SamplesApp\\UnoIslands.WPF\\UnoIslands.Skia.Wpf.csproj", + "SamplesApp\\UnoIslands.WinForms\\UnoIslands.WinForms.csproj", + "SolutionTemplate\\Uno.ProjectTemplates.Dotnet\\Uno.ProjectTemplates.Dotnet.csproj", + "SourceGenerators\\System.Xaml\\Uno.Xaml.csproj", + "SourceGenerators\\Uno.UI.SourceGenerators.Internal\\Uno.UI.SourceGenerators.Internal.csproj", + "SourceGenerators\\Uno.UI.SourceGenerators\\Uno.UI.SourceGenerators.csproj", + "SourceGenerators\\Uno.UI.Tasks\\Uno.UI.Tasks.csproj", + "T4Generator\\T4Generator.csproj", + "Uno.Foundation.Logging\\Uno.Foundation.Logging.csproj", + "Uno.Foundation\\Uno.Foundation.Skia.csproj", + "Uno.UI.Adapter.Microsoft.Extensions.Logging\\Uno.UI.Adapter.Microsoft.Extensions.Logging.csproj", + "Uno.UI.Composition\\Uno.UI.Composition.Skia.csproj", + "Uno.UI.Dispatching\\Uno.UI.Dispatching.Skia.csproj", + "Uno.UI.FluentTheme.v1\\Uno.UI.FluentTheme.v1.Skia.csproj", + "Uno.UI.FluentTheme.v2\\Uno.UI.FluentTheme.v2.Skia.csproj", + "Uno.UI.FluentTheme\\Uno.UI.FluentTheme.Skia.csproj", + "Uno.UI.RemoteControl.Server\\Uno.UI.RemoteControl.Server.csproj", + "Uno.UI.RemoteControl\\Uno.UI.RemoteControl.Skia.csproj", + "Uno.UI.Runtime.Skia.Gtk\\Uno.UI.Runtime.Skia.Gtk.csproj", + "Uno.UI.Runtime.Skia.Linux.FrameBuffer\\Uno.UI.Runtime.Skia.Linux.FrameBuffer.csproj", + "Uno.UI.Runtime.Skia.Tizen\\Uno.UI.Runtime.Skia.Tizen.csproj", + "Uno.UI.Runtime.Skia.Wpf\\Uno.UI.Runtime.Skia.Wpf.csproj", + "Uno.UI.RuntimeTests\\Uno.UI.RuntimeTests.Skia.csproj", + "Uno.UI.Toolkit\\Uno.UI.Toolkit.Skia.csproj", + "Uno.UI.XamlHost.Skia.Wpf\\Uno.UI.XamlHost.Skia.Wpf.csproj", + "Uno.UI.XamlHost\\Uno.UI.XamlHost.Skia.csproj", + "Uno.UI\\Uno.UI.Skia.csproj", + "Uno.UWP\\Uno.Skia.csproj" + ] + } +} diff --git a/build/filters/Uno.UI-packages-wasm.slnf b/build/filters/Uno.UI-packages-wasm.slnf new file mode 100644 index 000000000000..2d9858648691 --- /dev/null +++ b/build/filters/Uno.UI-packages-wasm.slnf @@ -0,0 +1,42 @@ +{ + "solution": { + "path": "..\\..\\src\\Uno.UI.sln", + "projects": [ + "AddIns\\Uno.UI.Lottie\\Uno.UI.Lottie.Wasm.csproj", + "AddIns\\Uno.UI.MSAL\\Uno.UI.MSAL.Wasm.csproj", + "SamplesApp\\Benchmarks.Shared\\SamplesApp.Benchmarks.shproj", + "SamplesApp\\SamplesApp.Shared\\SamplesApp.Shared.shproj", + "SamplesApp\\SamplesApp.UITests.Generator\\Uno.Samples.UITest.Generator.csproj", + "SamplesApp\\SamplesApp.UITests\\SamplesApp.UITests.csproj", + "SamplesApp\\SamplesApp.UnitTests.Shared\\SamplesApp.UnitTests.Shared.shproj", + "SamplesApp\\SamplesApp.Wasm\\SamplesApp.Wasm.csproj", + "SamplesApp\\UITests.Shared\\UITests.Shared.shproj", + "SourceGenerators\\System.Xaml\\Uno.Xaml.csproj", + "SourceGenerators\\Uno.UI.SourceGenerators.Internal\\Uno.UI.SourceGenerators.Internal.csproj", + "SourceGenerators\\Uno.UI.SourceGenerators\\Uno.UI.SourceGenerators.csproj", + "SourceGenerators\\Uno.UI.Tasks\\Uno.UI.Tasks.csproj", + "T4Generator\\T4Generator.csproj", + "Uno.Foundation.Logging\\Uno.Foundation.Logging.csproj", + "Uno.Foundation.Runtime.WebAssembly\\Uno.Foundation.Runtime.WebAssembly.csproj", + "Uno.Foundation\\Uno.Foundation.Wasm.csproj", + "Uno.UI.Adapter.Microsoft.Extensions.Logging\\Uno.UI.Adapter.Microsoft.Extensions.Logging.csproj", + "Uno.UI.Composition\\Uno.UI.Composition.Wasm.csproj", + "Uno.UI.Dispatching\\Uno.UI.Dispatching.Wasm.csproj", + "Uno.UI.FluentTheme.v1\\Uno.UI.FluentTheme.v1.Wasm.csproj", + "Uno.UI.FluentTheme.v2\\Uno.UI.FluentTheme.v2.Wasm.csproj", + "Uno.UI.FluentTheme\\Uno.UI.FluentTheme.Wasm.csproj", + "Uno.UI.RemoteControl.Host\\Uno.UI.RemoteControl.Host.csproj", + "Uno.UI.RemoteControl.Server.Processors\\Uno.UI.RemoteControl.Server.Processors.csproj", + "Uno.UI.RemoteControl.Server\\Uno.UI.RemoteControl.Server.csproj", + "Uno.UI.RemoteControl.VS\\Uno.UI.RemoteControl.VS.csproj", + "Uno.UI.RemoteControl\\Uno.UI.RemoteControl.Wasm.csproj", + "Uno.UI.Runtime.WebAssembly.Compatibility\\Uno.UI.Runtime.WebAssembly.Compatibility.csproj", + "Uno.UI.Runtime.WebAssembly\\Uno.UI.Runtime.WebAssembly.csproj", + "Uno.UI.RuntimeTests\\Uno.UI.RuntimeTests.Wasm.csproj", + "Uno.UI.Toolkit\\Uno.UI.Toolkit.Wasm.csproj", + "Uno.UI.Wasm.Tests\\Uno.UI.Wasm.Tests.csproj", + "Uno.UI\\Uno.UI.Wasm.csproj", + "Uno.UWP\\Uno.Wasm.csproj" + ] + } +} diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index e471f18581ef..dbc7b5a41969 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -50,8 +50,8 @@ - - + + diff --git a/src/PlatformItemGroups.props b/src/PlatformItemGroups.props index f702df5e5d90..815c555d9848 100644 --- a/src/PlatformItemGroups.props +++ b/src/PlatformItemGroups.props @@ -17,7 +17,7 @@ <_IsNet Condition="'$(TargetFramework)'=='net461'">true <_IsNetCore>false - <_IsNetCore Condition="'$(TargetFramework)'=='net5.0'">true + <_IsNetCore Condition="'$(TargetFramework)'=='net5.0' or '$(TargetFramework)'=='net6.0' or '$(TargetFramework)'=='net7.0'">true <_IsNetStd>false <_IsNetStd Condition="'$(TargetFramework)'=='netstandard2.0' or $(_IsNetCore)">true diff --git a/src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj b/src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj index b2216958fd9c..18deb4d7e857 100644 --- a/src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj +++ b/src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 $(DefineConstants);__WASM__;HAS_UNO;UNO_REFERENCE_API $(NoWarn);NU1701;CS1998;NU1504;UXAML0002 true @@ -62,7 +62,6 @@ - @@ -74,7 +73,7 @@ - + diff --git a/src/Uno.Foundation.Logging/Uno.Foundation.Logging.csproj b/src/Uno.Foundation.Logging/Uno.Foundation.Logging.csproj index 28cf194f576d..7bddf84f7a66 100644 --- a/src/Uno.Foundation.Logging/Uno.Foundation.Logging.csproj +++ b/src/Uno.Foundation.Logging/Uno.Foundation.Logging.csproj @@ -1,8 +1,12 @@  - + xamarinmac20;xamarinios10;MonoAndroid12.0;net461;netstandard2.0 MonoAndroid11.0;MonoAndroid12.0;xamarinios10;net461;netstandard2.0;xamarinmac20 + + + netstandard2.0;net7.0 + $(UnoTargetFrameworkOverride) diff --git a/src/Uno.Foundation.Runtime.WebAssembly/Uno.Foundation.Runtime.WebAssembly.csproj b/src/Uno.Foundation.Runtime.WebAssembly/Uno.Foundation.Runtime.WebAssembly.csproj index 895a38f7d8f1..f3ecb52c407e 100644 --- a/src/Uno.Foundation.Runtime.WebAssembly/Uno.Foundation.Runtime.WebAssembly.csproj +++ b/src/Uno.Foundation.Runtime.WebAssembly/Uno.Foundation.Runtime.WebAssembly.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.0;net7.0 diff --git a/src/Uno.Foundation/Uno.Foundation.Skia.csproj b/src/Uno.Foundation/Uno.Foundation.Skia.csproj index d6b8f76d4bef..103d6a290ede 100644 --- a/src/Uno.Foundation/Uno.Foundation.Skia.csproj +++ b/src/Uno.Foundation/Uno.Foundation.Skia.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.0;net7.0 diff --git a/src/Uno.Foundation/Uno.Foundation.Wasm.csproj b/src/Uno.Foundation/Uno.Foundation.Wasm.csproj index a9c47fe1eabd..85c0415af9a7 100644 --- a/src/Uno.Foundation/Uno.Foundation.Wasm.csproj +++ b/src/Uno.Foundation/Uno.Foundation.Wasm.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.0;net7.0 diff --git a/src/Uno.UI.Adapter.Microsoft.Extensions.Logging/Uno.UI.Adapter.Microsoft.Extensions.Logging.csproj b/src/Uno.UI.Adapter.Microsoft.Extensions.Logging/Uno.UI.Adapter.Microsoft.Extensions.Logging.csproj index 1add0dae5719..01b747361c4b 100644 --- a/src/Uno.UI.Adapter.Microsoft.Extensions.Logging/Uno.UI.Adapter.Microsoft.Extensions.Logging.csproj +++ b/src/Uno.UI.Adapter.Microsoft.Extensions.Logging/Uno.UI.Adapter.Microsoft.Extensions.Logging.csproj @@ -1,9 +1,13 @@  - + xamarinmac20;xamarinios10;MonoAndroid12.0;net461;netstandard2.0 MonoAndroid11.0;MonoAndroid12.0;xamarinios10;net461;netstandard2.0;xamarinmac20 + + netstandard2.0;net7.0 + + $(UnoTargetFrameworkOverride) diff --git a/src/Uno.UI.Composition/Uno.UI.Composition.Skia.csproj b/src/Uno.UI.Composition/Uno.UI.Composition.Skia.csproj index cf7f1ba0626a..05ba645809ce 100644 --- a/src/Uno.UI.Composition/Uno.UI.Composition.Skia.csproj +++ b/src/Uno.UI.Composition/Uno.UI.Composition.Skia.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.0;net7.0 diff --git a/src/Uno.UI.Composition/Uno.UI.Composition.Wasm.csproj b/src/Uno.UI.Composition/Uno.UI.Composition.Wasm.csproj index da432f986aef..1f41b592ab4c 100644 --- a/src/Uno.UI.Composition/Uno.UI.Composition.Wasm.csproj +++ b/src/Uno.UI.Composition/Uno.UI.Composition.Wasm.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + netstandard2.0;net7.0 diff --git a/src/Uno.UI.Dispatching/Uno.UI.Dispatching.Skia.csproj b/src/Uno.UI.Dispatching/Uno.UI.Dispatching.Skia.csproj index 3508ff636e78..c77818949e0d 100644 --- a/src/Uno.UI.Dispatching/Uno.UI.Dispatching.Skia.csproj +++ b/src/Uno.UI.Dispatching/Uno.UI.Dispatching.Skia.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.0;net7.0 diff --git a/src/Uno.UI.Dispatching/Uno.UI.Dispatching.Wasm.csproj b/src/Uno.UI.Dispatching/Uno.UI.Dispatching.Wasm.csproj index 765e8d4a9ea9..600437fb7063 100644 --- a/src/Uno.UI.Dispatching/Uno.UI.Dispatching.Wasm.csproj +++ b/src/Uno.UI.Dispatching/Uno.UI.Dispatching.Wasm.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + netstandard2.0;net7.0 diff --git a/src/Uno.UI.FluentTheme.v1/Uno.UI.FluentTheme.v1.Skia.csproj b/src/Uno.UI.FluentTheme.v1/Uno.UI.FluentTheme.v1.Skia.csproj index 0c2f14237d14..9387b947bdce 100644 --- a/src/Uno.UI.FluentTheme.v1/Uno.UI.FluentTheme.v1.Skia.csproj +++ b/src/Uno.UI.FluentTheme.v1/Uno.UI.FluentTheme.v1.Skia.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.0;net7.0 diff --git a/src/Uno.UI.FluentTheme.v1/Uno.UI.FluentTheme.v1.Wasm.csproj b/src/Uno.UI.FluentTheme.v1/Uno.UI.FluentTheme.v1.Wasm.csproj index f2f95f779f0a..47d725e21bf8 100644 --- a/src/Uno.UI.FluentTheme.v1/Uno.UI.FluentTheme.v1.Wasm.csproj +++ b/src/Uno.UI.FluentTheme.v1/Uno.UI.FluentTheme.v1.Wasm.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.0;net7.0 diff --git a/src/Uno.UI.FluentTheme.v2/Uno.UI.FluentTheme.v2.Skia.csproj b/src/Uno.UI.FluentTheme.v2/Uno.UI.FluentTheme.v2.Skia.csproj index 15511d41ed7c..a729ee6e444b 100644 --- a/src/Uno.UI.FluentTheme.v2/Uno.UI.FluentTheme.v2.Skia.csproj +++ b/src/Uno.UI.FluentTheme.v2/Uno.UI.FluentTheme.v2.Skia.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.0;net7.0 diff --git a/src/Uno.UI.FluentTheme.v2/Uno.UI.FluentTheme.v2.Wasm.csproj b/src/Uno.UI.FluentTheme.v2/Uno.UI.FluentTheme.v2.Wasm.csproj index 1b0e4a4db296..a15f0c1f7c83 100644 --- a/src/Uno.UI.FluentTheme.v2/Uno.UI.FluentTheme.v2.Wasm.csproj +++ b/src/Uno.UI.FluentTheme.v2/Uno.UI.FluentTheme.v2.Wasm.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.0;net7.0 diff --git a/src/Uno.UI.FluentTheme/Uno.UI.FluentTheme.Skia.csproj b/src/Uno.UI.FluentTheme/Uno.UI.FluentTheme.Skia.csproj index 8a542fb71ad3..ce3038540d26 100644 --- a/src/Uno.UI.FluentTheme/Uno.UI.FluentTheme.Skia.csproj +++ b/src/Uno.UI.FluentTheme/Uno.UI.FluentTheme.Skia.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.0;net7.0 diff --git a/src/Uno.UI.FluentTheme/Uno.UI.FluentTheme.Wasm.csproj b/src/Uno.UI.FluentTheme/Uno.UI.FluentTheme.Wasm.csproj index b0df499729df..8e1acfefc089 100644 --- a/src/Uno.UI.FluentTheme/Uno.UI.FluentTheme.Wasm.csproj +++ b/src/Uno.UI.FluentTheme/Uno.UI.FluentTheme.Wasm.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.0;net7.0 diff --git a/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Skia.csproj b/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Skia.csproj index 098b3071790c..d3ed5443080d 100644 --- a/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Skia.csproj +++ b/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Skia.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net5.0 + netstandard2.0;net5.0;net7.0 diff --git a/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Wasm.csproj b/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Wasm.csproj index fae2f0f32f14..5afd290c603a 100644 --- a/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Wasm.csproj +++ b/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Wasm.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net5.0 + netstandard2.0;net7.0 diff --git a/src/Uno.UI.Runtime.Skia.Gtk/Uno.UI.Runtime.Skia.Gtk.csproj b/src/Uno.UI.Runtime.Skia.Gtk/Uno.UI.Runtime.Skia.Gtk.csproj index f0452b94845a..bb3ff27de20b 100644 --- a/src/Uno.UI.Runtime.Skia.Gtk/Uno.UI.Runtime.Skia.Gtk.csproj +++ b/src/Uno.UI.Runtime.Skia.Gtk/Uno.UI.Runtime.Skia.Gtk.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + netcoreapp3.1;net7.0 diff --git a/src/Uno.UI.Runtime.Skia.Linux.FrameBuffer/Uno.UI.Runtime.Skia.Linux.FrameBuffer.csproj b/src/Uno.UI.Runtime.Skia.Linux.FrameBuffer/Uno.UI.Runtime.Skia.Linux.FrameBuffer.csproj index 7e330e56484c..0e2a5be3fec7 100644 --- a/src/Uno.UI.Runtime.Skia.Linux.FrameBuffer/Uno.UI.Runtime.Skia.Linux.FrameBuffer.csproj +++ b/src/Uno.UI.Runtime.Skia.Linux.FrameBuffer/Uno.UI.Runtime.Skia.Linux.FrameBuffer.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + netcoreapp3.1;net7.0 enable true diff --git a/src/Uno.UI.Runtime.Skia.Wpf/Uno.UI.Runtime.Skia.Wpf.csproj b/src/Uno.UI.Runtime.Skia.Wpf/Uno.UI.Runtime.Skia.Wpf.csproj index f1d2a95ae613..d7ce59f6e6a1 100644 --- a/src/Uno.UI.Runtime.Skia.Wpf/Uno.UI.Runtime.Skia.Wpf.csproj +++ b/src/Uno.UI.Runtime.Skia.Wpf/Uno.UI.Runtime.Skia.Wpf.csproj @@ -1,7 +1,7 @@  - net47;netcoreapp3.1 + net47;netcoreapp3.1;net7.0 diff --git a/src/Uno.UI.Runtime.WebAssembly.Compatibility/Uno.UI.Runtime.WebAssembly.Compatibility.csproj b/src/Uno.UI.Runtime.WebAssembly.Compatibility/Uno.UI.Runtime.WebAssembly.Compatibility.csproj index be6b0aa7e514..1b75965f9e8a 100644 --- a/src/Uno.UI.Runtime.WebAssembly.Compatibility/Uno.UI.Runtime.WebAssembly.Compatibility.csproj +++ b/src/Uno.UI.Runtime.WebAssembly.Compatibility/Uno.UI.Runtime.WebAssembly.Compatibility.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net5.0 + netstandard2.0;net7.0 diff --git a/src/Uno.UI.Runtime.WebAssembly/Uno.UI.Runtime.WebAssembly.csproj b/src/Uno.UI.Runtime.WebAssembly/Uno.UI.Runtime.WebAssembly.csproj index ac986f200cf6..3dcbdaad8073 100644 --- a/src/Uno.UI.Runtime.WebAssembly/Uno.UI.Runtime.WebAssembly.csproj +++ b/src/Uno.UI.Runtime.WebAssembly/Uno.UI.Runtime.WebAssembly.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.0;net7.0 diff --git a/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Skia.csproj b/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Skia.csproj index d3d7d3fc9b49..07c0e25f5add 100644 --- a/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Skia.csproj +++ b/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Skia.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + netstandard2.0;net7.0 diff --git a/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Wasm.csproj b/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Wasm.csproj index 837a88d5878a..b9d126f1e7da 100644 --- a/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Wasm.csproj +++ b/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Wasm.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + netstandard2.0;net7.0 diff --git a/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Skia.csproj b/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Skia.csproj index b6642f49f05f..132763706240 100644 --- a/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Skia.csproj +++ b/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Skia.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.0;net7.0 diff --git a/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Wasm.csproj b/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Wasm.csproj index 9400905b36e5..f990a8faeb7a 100644 --- a/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Wasm.csproj +++ b/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Wasm.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.0;net7.0 diff --git a/src/Uno.UI.Wasm.Tests/Tests/TSBindingsTests.cs b/src/Uno.UI.Wasm.Tests/Tests/TSBindingsTests.cs index 059e41beca30..17e227f92f26 100644 --- a/src/Uno.UI.Wasm.Tests/Tests/TSBindingsTests.cs +++ b/src/Uno.UI.Wasm.Tests/Tests/TSBindingsTests.cs @@ -7,6 +7,9 @@ using Uno; using Windows.Foundation; using Uno.Foundation.Interop; +using System.Runtime.InteropServices.JavaScript; +using System.Net.WebSockets; +using System.Diagnostics; namespace SamplesApp.UnitTests.TSBindings { @@ -15,6 +18,34 @@ namespace SamplesApp.UnitTests.TSBindings public class TSBindingsTests { +#if NET7_0_OR_GREATER + [TestMethod] + public void When_TestPerf() + { + var sw1 = Stopwatch.StartNew(); + for (int i = 0; i < 1000; i++) + { + string r = TestImport.When_SingleStringNet7(i.ToString()); + } + + Console.WriteLine($"net7 interop: {sw1.Elapsed}"); + + var sw2 = Stopwatch.StartNew(); + for (int i = 0; i < 1000; i++) + { + var param = new When_SingleStringParams() + { + MyString = "This is 42" + }; + + var ret = (GenericReturn)TSInteropMarshaller.InvokeJS("TSBindingsUnitTests:When_SingleString", param, typeof(GenericReturn)); + + } + + Console.WriteLine($"uno ts interop: {sw2.Elapsed}"); + } +#endif + [TestMethod] public void When_IntPtr() { @@ -165,6 +196,14 @@ public void When_ArrayOfNullStrings() } } +#if NET7_0_OR_GREATER + partial class TestImport + { + [JSImport("globalThis.TSBindingsTests.When_SingleStringNet7")] + internal static partial string When_SingleStringNet7(string value); + } +#endif + [TSInteropMessage] [StructLayout(LayoutKind.Sequential, Pack = 4)] public struct When_ArrayOfStringsParams diff --git a/src/Uno.UI.Wasm.Tests/Uno.UI.Wasm.Tests.csproj b/src/Uno.UI.Wasm.Tests/Uno.UI.Wasm.Tests.csproj index 08cf91f97d51..d3a98da52175 100644 --- a/src/Uno.UI.Wasm.Tests/Uno.UI.Wasm.Tests.csproj +++ b/src/Uno.UI.Wasm.Tests/Uno.UI.Wasm.Tests.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net5.0 + netstandard2.0;net7.0 $(MSBuildThisFileDirectory)tsbindings $(DefineConstants);__WASM__ @@ -10,6 +10,7 @@ true true + true diff --git a/src/Uno.UI.Wasm.Tests/WasmScripts/UnitTests.d.ts b/src/Uno.UI.Wasm.Tests/WasmScripts/UnitTests.d.ts index a044c32b47b3..8bde78da8d8e 100644 --- a/src/Uno.UI.Wasm.Tests/WasmScripts/UnitTests.d.ts +++ b/src/Uno.UI.Wasm.Tests/WasmScripts/UnitTests.d.ts @@ -1,5 +1,6 @@ declare class TSBindingsTests { TSBindingsTests(): void; + static When_SingleStringNet7(value: string): string; When_IntPtr(pParams: number, pReturn: number): boolean; When_IntPtr_Zero(pParams: number, pReturn: number): boolean; When_SingleString(pParams: number, pReturn: number): boolean; diff --git a/src/Uno.UI.Wasm.Tests/WasmScripts/UnitTests.js b/src/Uno.UI.Wasm.Tests/WasmScripts/UnitTests.js index d09f98b152db..a2e67a580483 100644 --- a/src/Uno.UI.Wasm.Tests/WasmScripts/UnitTests.js +++ b/src/Uno.UI.Wasm.Tests/WasmScripts/UnitTests.js @@ -4,6 +4,9 @@ require([`${config.uno_app_base}/Uno.UI`], () => { class TSBindingsTests { TSBindingsTests() { } + static When_SingleStringNet7(value) { + return value; + } When_IntPtr(pParams, pReturn) { var params = SamplesApp.UnitTests.TSBindings.When_IntPtrParams.unmarshal(pParams); var ret = new SamplesApp.UnitTests.TSBindings.GenericReturn(); diff --git a/src/Uno.UI.Wasm.Tests/ts/TSBindingsTests.ts b/src/Uno.UI.Wasm.Tests/ts/TSBindingsTests.ts index ee1534905149..8cdc673b9ba3 100644 --- a/src/Uno.UI.Wasm.Tests/ts/TSBindingsTests.ts +++ b/src/Uno.UI.Wasm.Tests/ts/TSBindingsTests.ts @@ -6,7 +6,11 @@ class TSBindingsTests { public TSBindingsTests() { + // https://github.com/dotnet/runtime/blob/a919d611e832bfee46fc34762f5ded2006c9f16d/src/mono/wasm/runtime/invoke-js.ts + } + public static When_SingleStringNet7(value: string): string { + return value; } public When_IntPtr(pParams: number, pReturn: number): boolean { diff --git a/src/Uno.UI/Uno.UI.Skia.csproj b/src/Uno.UI/Uno.UI.Skia.csproj index 14cc0cd5853d..cf714300aba2 100644 --- a/src/Uno.UI/Uno.UI.Skia.csproj +++ b/src/Uno.UI/Uno.UI.Skia.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.0;net7.0 diff --git a/src/Uno.UI/Uno.UI.Wasm.csproj b/src/Uno.UI/Uno.UI.Wasm.csproj index f3348ab4e52a..37a16cd02c8c 100644 --- a/src/Uno.UI/Uno.UI.Wasm.csproj +++ b/src/Uno.UI/Uno.UI.Wasm.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.0;net7.0 diff --git a/src/Uno.UWP/Uno.Skia.csproj b/src/Uno.UWP/Uno.Skia.csproj index f2c76a3c77f0..c3f2055b6682 100644 --- a/src/Uno.UWP/Uno.Skia.csproj +++ b/src/Uno.UWP/Uno.Skia.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.0;net7.0 diff --git a/src/Uno.UWP/Uno.Wasm.csproj b/src/Uno.UWP/Uno.Wasm.csproj index 339cf77ff510..1f29eb5fa3f8 100644 --- a/src/Uno.UWP/Uno.Wasm.csproj +++ b/src/Uno.UWP/Uno.Wasm.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + netstandard2.0;net7.0 From 958110f3cbf27861ce951cfd483228ce5c4e6123 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Thu, 29 Sep 2022 15:50:45 -0400 Subject: [PATCH 03/70] ci: Adjust dependencies --- build/ci/.azure-devops-package-skia.yml | 2 +- build/ci/.azure-devops-package.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build/ci/.azure-devops-package-skia.yml b/build/ci/.azure-devops-package-skia.yml index 1794896360cb..8fd8b91eef71 100644 --- a/build/ci/.azure-devops-package-skia.yml +++ b/build/ci/.azure-devops-package-skia.yml @@ -2,7 +2,7 @@ parameters: poolName: '' jobs: -- job: wasm_package_build +- job: skia_package_build displayName: 'Build WebAssembly Package Binaries' container: nv-bionic-wasm diff --git a/build/ci/.azure-devops-package.yml b/build/ci/.azure-devops-package.yml index 9095eaef1819..25b1c6316e15 100644 --- a/build/ci/.azure-devops-package.yml +++ b/build/ci/.azure-devops-package.yml @@ -9,6 +9,8 @@ jobs: dependsOn: - generic_win_build - net6_win_build + - skia_package_build + - wasm_package_build pool: ${{ parameters.poolName }} From a95f08ba173e9197c12b9c78115057447df0f1bf Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Thu, 29 Sep 2022 16:15:34 -0400 Subject: [PATCH 04/70] ci: Adjust sync generation nuget restore --- build/Uno.UI.Build.csproj | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build/Uno.UI.Build.csproj b/build/Uno.UI.Build.csproj index 589929295209..651274117e73 100644 --- a/build/Uno.UI.Build.csproj +++ b/build/Uno.UI.Build.csproj @@ -254,7 +254,12 @@ - + + From 860745ae1c47f60b00a816cfb534e8f8b619d292 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Thu, 29 Sep 2022 16:31:12 -0400 Subject: [PATCH 05/70] ci: Adjust filters --- build/Uno.UI.Build.csproj | 2 +- build/filters/Uno.UI-packages-skia.slnf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Uno.UI.Build.csproj b/build/Uno.UI.Build.csproj index 651274117e73..1ce6ee3a1e11 100644 --- a/build/Uno.UI.Build.csproj +++ b/build/Uno.UI.Build.csproj @@ -255,7 +255,7 @@ diff --git a/build/filters/Uno.UI-packages-skia.slnf b/build/filters/Uno.UI-packages-skia.slnf index 109036e7daf5..93c8100bc2a3 100644 --- a/build/filters/Uno.UI-packages-skia.slnf +++ b/build/filters/Uno.UI-packages-skia.slnf @@ -1,6 +1,6 @@ { "solution": { - "path": "Uno.UI.sln", + "path": "..\\..\\src\\Uno.UI.sln", "projects": [ "AddIns\\Uno.UI.Lottie\\Uno.UI.Lottie.Skia.csproj", "AddIns\\Uno.UI.MSAL\\Uno.UI.MSAL.Skia.csproj", From 853559bb47ded16c3f69d0584fd717a6900327af Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Thu, 29 Sep 2022 17:11:13 -0400 Subject: [PATCH 06/70] ci: Adjust .net install --- build/ci/.azure-devops-winui-convert.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/build/ci/.azure-devops-winui-convert.yml b/build/ci/.azure-devops-winui-convert.yml index 41cd5a29b6d7..764cd5a44b9d 100644 --- a/build/ci/.azure-devops-winui-convert.yml +++ b/build/ci/.azure-devops-winui-convert.yml @@ -29,6 +29,7 @@ jobs: nugetPackages: $(NUGET_PACKAGES) - template: templates/dotnet6-install-windows.yml + - template: templates/dotnet-install.yml - template: templates/install-windows-sdk.yml - powershell: | From a2887d47fa7ede9b5667a9744ce40ac5b9b6794a Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Fri, 30 Sep 2022 21:22:41 -0400 Subject: [PATCH 07/70] ci: Adjust for non-netcore msbuild --- .../Uno.Foundation.Runtime.WebAssembly.csproj | 6 +++++- src/Uno.Foundation/Uno.Foundation.Wasm.csproj | 6 +++++- src/Uno.UI.Composition/Uno.UI.Composition.Wasm.csproj | 10 +++++++--- src/Uno.UI.Dispatching/Uno.UI.Dispatching.Wasm.csproj | 10 +++++++--- .../Uno.UI.FluentTheme.v1.Wasm.csproj | 6 +++++- .../Uno.UI.FluentTheme.v2.Wasm.csproj | 6 +++++- src/Uno.UI.FluentTheme/Uno.UI.FluentTheme.Wasm.csproj | 6 +++++- .../Uno.UI.RemoteControl.Wasm.csproj | 8 ++++++-- .../Uno.UI.Runtime.WebAssembly.Compatibility.csproj | 6 +++++- .../Uno.UI.Runtime.WebAssembly.csproj | 6 +++++- .../Uno.UI.RuntimeTests.Wasm.csproj | 6 +++++- src/Uno.UI.Toolkit/Uno.UI.Toolkit.Wasm.csproj | 6 +++++- src/Uno.UI.Wasm.Tests/Uno.UI.Wasm.Tests.csproj | 6 +++++- src/Uno.UI/Uno.UI.Wasm.csproj | 6 +++++- src/Uno.UWP/Uno.Wasm.csproj | 10 +++++++--- 15 files changed, 82 insertions(+), 22 deletions(-) diff --git a/src/Uno.Foundation.Runtime.WebAssembly/Uno.Foundation.Runtime.WebAssembly.csproj b/src/Uno.Foundation.Runtime.WebAssembly/Uno.Foundation.Runtime.WebAssembly.csproj index f3ecb52c407e..fa0de4822ff5 100644 --- a/src/Uno.Foundation.Runtime.WebAssembly/Uno.Foundation.Runtime.WebAssembly.csproj +++ b/src/Uno.Foundation.Runtime.WebAssembly/Uno.Foundation.Runtime.WebAssembly.csproj @@ -1,8 +1,12 @@  - netstandard2.0;net7.0 + netstandard2.0 + + $(TargetFrameworks);net7.0 + + diff --git a/src/Uno.Foundation/Uno.Foundation.Wasm.csproj b/src/Uno.Foundation/Uno.Foundation.Wasm.csproj index 85c0415af9a7..6a7c98a2fd2c 100644 --- a/src/Uno.Foundation/Uno.Foundation.Wasm.csproj +++ b/src/Uno.Foundation/Uno.Foundation.Wasm.csproj @@ -1,6 +1,10 @@  - netstandard2.0;net7.0 + netstandard2.0 + + + + $(TargetFrameworks);net7.0 diff --git a/src/Uno.UI.Composition/Uno.UI.Composition.Wasm.csproj b/src/Uno.UI.Composition/Uno.UI.Composition.Wasm.csproj index 1f41b592ab4c..ea7c3c3d3ad3 100644 --- a/src/Uno.UI.Composition/Uno.UI.Composition.Wasm.csproj +++ b/src/Uno.UI.Composition/Uno.UI.Composition.Wasm.csproj @@ -1,7 +1,11 @@  - - - netstandard2.0;net7.0 + + + netstandard2.0 + + + + $(TargetFrameworks);net7.0 diff --git a/src/Uno.UI.Dispatching/Uno.UI.Dispatching.Wasm.csproj b/src/Uno.UI.Dispatching/Uno.UI.Dispatching.Wasm.csproj index 600437fb7063..0d5374546baa 100644 --- a/src/Uno.UI.Dispatching/Uno.UI.Dispatching.Wasm.csproj +++ b/src/Uno.UI.Dispatching/Uno.UI.Dispatching.Wasm.csproj @@ -1,7 +1,11 @@  - - - netstandard2.0;net7.0 + + + netstandard2.0 + + + + $(TargetFrameworks);net7.0 diff --git a/src/Uno.UI.FluentTheme.v1/Uno.UI.FluentTheme.v1.Wasm.csproj b/src/Uno.UI.FluentTheme.v1/Uno.UI.FluentTheme.v1.Wasm.csproj index 47d725e21bf8..5a1469fa291a 100644 --- a/src/Uno.UI.FluentTheme.v1/Uno.UI.FluentTheme.v1.Wasm.csproj +++ b/src/Uno.UI.FluentTheme.v1/Uno.UI.FluentTheme.v1.Wasm.csproj @@ -1,6 +1,10 @@  - netstandard2.0;net7.0 + netstandard2.0 + + + + $(TargetFrameworks);net7.0 diff --git a/src/Uno.UI.FluentTheme.v2/Uno.UI.FluentTheme.v2.Wasm.csproj b/src/Uno.UI.FluentTheme.v2/Uno.UI.FluentTheme.v2.Wasm.csproj index a15f0c1f7c83..38b27b908eb8 100644 --- a/src/Uno.UI.FluentTheme.v2/Uno.UI.FluentTheme.v2.Wasm.csproj +++ b/src/Uno.UI.FluentTheme.v2/Uno.UI.FluentTheme.v2.Wasm.csproj @@ -1,6 +1,10 @@  - netstandard2.0;net7.0 + netstandard2.0 + + + + $(TargetFrameworks);net7.0 diff --git a/src/Uno.UI.FluentTheme/Uno.UI.FluentTheme.Wasm.csproj b/src/Uno.UI.FluentTheme/Uno.UI.FluentTheme.Wasm.csproj index 8e1acfefc089..9da0330027db 100644 --- a/src/Uno.UI.FluentTheme/Uno.UI.FluentTheme.Wasm.csproj +++ b/src/Uno.UI.FluentTheme/Uno.UI.FluentTheme.Wasm.csproj @@ -1,6 +1,10 @@  - netstandard2.0;net7.0 + netstandard2.0 + + + + $(TargetFrameworks);net7.0 diff --git a/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Wasm.csproj b/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Wasm.csproj index 5afd290c603a..e6d9dfbde370 100644 --- a/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Wasm.csproj +++ b/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Wasm.csproj @@ -1,7 +1,11 @@  - + - netstandard2.0;net7.0 + netstandard2.0 + + + + $(TargetFrameworks);net7.0 diff --git a/src/Uno.UI.Runtime.WebAssembly.Compatibility/Uno.UI.Runtime.WebAssembly.Compatibility.csproj b/src/Uno.UI.Runtime.WebAssembly.Compatibility/Uno.UI.Runtime.WebAssembly.Compatibility.csproj index 1b75965f9e8a..7f7e526f6722 100644 --- a/src/Uno.UI.Runtime.WebAssembly.Compatibility/Uno.UI.Runtime.WebAssembly.Compatibility.csproj +++ b/src/Uno.UI.Runtime.WebAssembly.Compatibility/Uno.UI.Runtime.WebAssembly.Compatibility.csproj @@ -1,6 +1,10 @@  - netstandard2.0;net7.0 + netstandard2.0 + + + + $(TargetFrameworks);net7.0 diff --git a/src/Uno.UI.Runtime.WebAssembly/Uno.UI.Runtime.WebAssembly.csproj b/src/Uno.UI.Runtime.WebAssembly/Uno.UI.Runtime.WebAssembly.csproj index 3dcbdaad8073..c7e35c12faac 100644 --- a/src/Uno.UI.Runtime.WebAssembly/Uno.UI.Runtime.WebAssembly.csproj +++ b/src/Uno.UI.Runtime.WebAssembly/Uno.UI.Runtime.WebAssembly.csproj @@ -1,6 +1,10 @@  - netstandard2.0;net7.0 + netstandard2.0 + + + + $(TargetFrameworks);net7.0 diff --git a/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Wasm.csproj b/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Wasm.csproj index b9d126f1e7da..2c4a12b4aec8 100644 --- a/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Wasm.csproj +++ b/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Wasm.csproj @@ -1,7 +1,11 @@  - netstandard2.0;net7.0 + netstandard2.0 + + + + $(TargetFrameworks);net7.0 diff --git a/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Wasm.csproj b/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Wasm.csproj index f990a8faeb7a..fbb01eaf30b8 100644 --- a/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Wasm.csproj +++ b/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Wasm.csproj @@ -1,6 +1,10 @@  - netstandard2.0;net7.0 + netstandard2.0 + + + + $(TargetFrameworks);net7.0 diff --git a/src/Uno.UI.Wasm.Tests/Uno.UI.Wasm.Tests.csproj b/src/Uno.UI.Wasm.Tests/Uno.UI.Wasm.Tests.csproj index d3a98da52175..144d912b771a 100644 --- a/src/Uno.UI.Wasm.Tests/Uno.UI.Wasm.Tests.csproj +++ b/src/Uno.UI.Wasm.Tests/Uno.UI.Wasm.Tests.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net7.0 + netstandard2.0; $(MSBuildThisFileDirectory)tsbindings $(DefineConstants);__WASM__ @@ -12,6 +12,10 @@ true true + + + $(TargetFrameworks);net7.0 + $(UnoTargetFrameworkOverride) diff --git a/src/Uno.UI/Uno.UI.Wasm.csproj b/src/Uno.UI/Uno.UI.Wasm.csproj index 37a16cd02c8c..6b76c39f0959 100644 --- a/src/Uno.UI/Uno.UI.Wasm.csproj +++ b/src/Uno.UI/Uno.UI.Wasm.csproj @@ -1,6 +1,10 @@  - netstandard2.0;net7.0 + netstandard2.0 + + + + $(TargetFrameworks);net7.0 diff --git a/src/Uno.UWP/Uno.Wasm.csproj b/src/Uno.UWP/Uno.Wasm.csproj index 1f29eb5fa3f8..2cc92bca60b5 100644 --- a/src/Uno.UWP/Uno.Wasm.csproj +++ b/src/Uno.UWP/Uno.Wasm.csproj @@ -1,7 +1,11 @@  - - - netstandard2.0;net7.0 + + + netstandard2.0 + + + + $(TargetFrameworks);net7.0 From 74a3d757d3064c3ce9ab7228f99f488717e2ef8e Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Fri, 30 Sep 2022 21:50:46 -0400 Subject: [PATCH 08/70] ci: Adjust skia targets for net7 --- src/Uno.Foundation/Uno.Foundation.Skia.csproj | 6 +++++- src/Uno.UI.Composition/Uno.UI.Composition.Skia.csproj | 6 +++++- src/Uno.UI.Dispatching/Uno.UI.Dispatching.Skia.csproj | 6 +++++- .../Uno.UI.FluentTheme.v1.Skia.csproj | 6 +++++- .../Uno.UI.FluentTheme.v2.Skia.csproj | 6 +++++- src/Uno.UI.FluentTheme/Uno.UI.FluentTheme.Skia.csproj | 6 +++++- src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Skia.csproj | 6 +++++- .../Uno.UI.Runtime.Skia.Gtk.csproj | 6 +++++- .../Uno.UI.Runtime.Skia.Linux.FrameBuffer.csproj | 7 ++++++- .../Uno.UI.Runtime.Skia.Wpf.csproj | 6 +++++- src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Skia.csproj | 8 ++++++-- src/Uno.UI.Toolkit/Uno.UI.Toolkit.Skia.csproj | 6 +++++- src/Uno.UI/Uno.UI.Skia.csproj | 6 +++++- src/Uno.UWP/Uno.Skia.csproj | 6 +++++- 14 files changed, 72 insertions(+), 15 deletions(-) diff --git a/src/Uno.Foundation/Uno.Foundation.Skia.csproj b/src/Uno.Foundation/Uno.Foundation.Skia.csproj index 103d6a290ede..7ccb49105919 100644 --- a/src/Uno.Foundation/Uno.Foundation.Skia.csproj +++ b/src/Uno.Foundation/Uno.Foundation.Skia.csproj @@ -1,6 +1,10 @@  - netstandard2.0;net7.0 + netstandard2.0 + + + + $(TargetFrameworks);net7.0 diff --git a/src/Uno.UI.Composition/Uno.UI.Composition.Skia.csproj b/src/Uno.UI.Composition/Uno.UI.Composition.Skia.csproj index 05ba645809ce..38e4a8e18c0d 100644 --- a/src/Uno.UI.Composition/Uno.UI.Composition.Skia.csproj +++ b/src/Uno.UI.Composition/Uno.UI.Composition.Skia.csproj @@ -1,6 +1,10 @@  - netstandard2.0;net7.0 + netstandard2.0 + + + + $(TargetFrameworks);net7.0 diff --git a/src/Uno.UI.Dispatching/Uno.UI.Dispatching.Skia.csproj b/src/Uno.UI.Dispatching/Uno.UI.Dispatching.Skia.csproj index c77818949e0d..4e45a978e20c 100644 --- a/src/Uno.UI.Dispatching/Uno.UI.Dispatching.Skia.csproj +++ b/src/Uno.UI.Dispatching/Uno.UI.Dispatching.Skia.csproj @@ -1,6 +1,10 @@  - netstandard2.0;net7.0 + netstandard2.0 + + + + $(TargetFrameworks);net7.0 diff --git a/src/Uno.UI.FluentTheme.v1/Uno.UI.FluentTheme.v1.Skia.csproj b/src/Uno.UI.FluentTheme.v1/Uno.UI.FluentTheme.v1.Skia.csproj index 9387b947bdce..07e94051a51a 100644 --- a/src/Uno.UI.FluentTheme.v1/Uno.UI.FluentTheme.v1.Skia.csproj +++ b/src/Uno.UI.FluentTheme.v1/Uno.UI.FluentTheme.v1.Skia.csproj @@ -1,6 +1,10 @@  - netstandard2.0;net7.0 + netstandard2.0 + + + + $(TargetFrameworks);net7.0 diff --git a/src/Uno.UI.FluentTheme.v2/Uno.UI.FluentTheme.v2.Skia.csproj b/src/Uno.UI.FluentTheme.v2/Uno.UI.FluentTheme.v2.Skia.csproj index a729ee6e444b..8806b65f483c 100644 --- a/src/Uno.UI.FluentTheme.v2/Uno.UI.FluentTheme.v2.Skia.csproj +++ b/src/Uno.UI.FluentTheme.v2/Uno.UI.FluentTheme.v2.Skia.csproj @@ -1,6 +1,10 @@  - netstandard2.0;net7.0 + netstandard2.0 + + + + $(TargetFrameworks);net7.0 diff --git a/src/Uno.UI.FluentTheme/Uno.UI.FluentTheme.Skia.csproj b/src/Uno.UI.FluentTheme/Uno.UI.FluentTheme.Skia.csproj index ce3038540d26..1bfce2e0bcae 100644 --- a/src/Uno.UI.FluentTheme/Uno.UI.FluentTheme.Skia.csproj +++ b/src/Uno.UI.FluentTheme/Uno.UI.FluentTheme.Skia.csproj @@ -1,6 +1,10 @@  - netstandard2.0;net7.0 + netstandard2.0 + + + + $(TargetFrameworks);net7.0 diff --git a/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Skia.csproj b/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Skia.csproj index d3ed5443080d..a8316d685235 100644 --- a/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Skia.csproj +++ b/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Skia.csproj @@ -1,7 +1,11 @@  - netstandard2.0;net5.0;net7.0 + netstandard2.0;net5.0 + + + + $(TargetFrameworks);net7.0 diff --git a/src/Uno.UI.Runtime.Skia.Gtk/Uno.UI.Runtime.Skia.Gtk.csproj b/src/Uno.UI.Runtime.Skia.Gtk/Uno.UI.Runtime.Skia.Gtk.csproj index bb3ff27de20b..67aa1336f545 100644 --- a/src/Uno.UI.Runtime.Skia.Gtk/Uno.UI.Runtime.Skia.Gtk.csproj +++ b/src/Uno.UI.Runtime.Skia.Gtk/Uno.UI.Runtime.Skia.Gtk.csproj @@ -1,7 +1,11 @@  - netcoreapp3.1;net7.0 + netcoreapp3.1 + + + + $(TargetFrameworks);net7.0 diff --git a/src/Uno.UI.Runtime.Skia.Linux.FrameBuffer/Uno.UI.Runtime.Skia.Linux.FrameBuffer.csproj b/src/Uno.UI.Runtime.Skia.Linux.FrameBuffer/Uno.UI.Runtime.Skia.Linux.FrameBuffer.csproj index 0e2a5be3fec7..36f9a9d85ae4 100644 --- a/src/Uno.UI.Runtime.Skia.Linux.FrameBuffer/Uno.UI.Runtime.Skia.Linux.FrameBuffer.csproj +++ b/src/Uno.UI.Runtime.Skia.Linux.FrameBuffer/Uno.UI.Runtime.Skia.Linux.FrameBuffer.csproj @@ -1,11 +1,16 @@  - netcoreapp3.1;net7.0 + netcoreapp3.1 enable true + + $(TargetFrameworks);net7.0 + + + diff --git a/src/Uno.UI.Runtime.Skia.Wpf/Uno.UI.Runtime.Skia.Wpf.csproj b/src/Uno.UI.Runtime.Skia.Wpf/Uno.UI.Runtime.Skia.Wpf.csproj index d7ce59f6e6a1..0dfd820ee226 100644 --- a/src/Uno.UI.Runtime.Skia.Wpf/Uno.UI.Runtime.Skia.Wpf.csproj +++ b/src/Uno.UI.Runtime.Skia.Wpf/Uno.UI.Runtime.Skia.Wpf.csproj @@ -1,9 +1,13 @@  - net47;netcoreapp3.1;net7.0 + net47;netcoreapp3.1 + + $(TargetFrameworks);net7.0 + + diff --git a/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Skia.csproj b/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Skia.csproj index 07c0e25f5add..8e1965fa9278 100644 --- a/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Skia.csproj +++ b/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Skia.csproj @@ -1,9 +1,13 @@  - netstandard2.0;net7.0 + netstandard2.0 - + + + $(TargetFrameworks);net7.0 + + diff --git a/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Skia.csproj b/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Skia.csproj index 132763706240..2ef3b6a6cbd0 100644 --- a/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Skia.csproj +++ b/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Skia.csproj @@ -1,6 +1,10 @@  - netstandard2.0;net7.0 + netstandard2.0 + + + + $(TargetFrameworks);net7.0 diff --git a/src/Uno.UI/Uno.UI.Skia.csproj b/src/Uno.UI/Uno.UI.Skia.csproj index cf714300aba2..7b31deaf112d 100644 --- a/src/Uno.UI/Uno.UI.Skia.csproj +++ b/src/Uno.UI/Uno.UI.Skia.csproj @@ -1,6 +1,10 @@  - netstandard2.0;net7.0 + netstandard2.0 + + + + $(TargetFrameworks);net7.0 diff --git a/src/Uno.UWP/Uno.Skia.csproj b/src/Uno.UWP/Uno.Skia.csproj index c3f2055b6682..501c8a8b3d5d 100644 --- a/src/Uno.UWP/Uno.Skia.csproj +++ b/src/Uno.UWP/Uno.Skia.csproj @@ -1,6 +1,10 @@  - netstandard2.0;net7.0 + netstandard2.0 + + + + $(TargetFrameworks);net7.0 From 07141b09f2c941ec671f98666801383498c21c2f Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Fri, 30 Sep 2022 22:29:03 -0400 Subject: [PATCH 09/70] ci: Adjust wasm targets for msbuild --- .../SamplesApp.Skia.Gtk/SamplesApp.Skia.Gtk.csproj | 4 ++++ src/SamplesApp/SamplesApp.Skia/SamplesApp.Skia.csproj | 4 ++++ src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj | 9 ++++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/SamplesApp/SamplesApp.Skia.Gtk/SamplesApp.Skia.Gtk.csproj b/src/SamplesApp/SamplesApp.Skia.Gtk/SamplesApp.Skia.Gtk.csproj index 0b3241fdea10..7d611e5129f2 100644 --- a/src/SamplesApp/SamplesApp.Skia.Gtk/SamplesApp.Skia.Gtk.csproj +++ b/src/SamplesApp/SamplesApp.Skia.Gtk/SamplesApp.Skia.Gtk.csproj @@ -4,6 +4,10 @@ Major + + $(TargetFrameworks);net7.0 + + netcoreapp3.1 diff --git a/src/SamplesApp/SamplesApp.Skia/SamplesApp.Skia.csproj b/src/SamplesApp/SamplesApp.Skia/SamplesApp.Skia.csproj index d749cfb266d3..fdf8bb787852 100644 --- a/src/SamplesApp/SamplesApp.Skia/SamplesApp.Skia.csproj +++ b/src/SamplesApp/SamplesApp.Skia/SamplesApp.Skia.csproj @@ -3,6 +3,10 @@ netstandard2.0;net5.0 + + $(TargetFrameworks);net7.0 + + $(UnoTargetFrameworkOverride) diff --git a/src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj b/src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj index 18deb4d7e857..8f470c63dffb 100644 --- a/src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj +++ b/src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj @@ -1,8 +1,15 @@ + + net6.0 + + + + $(TargetFrameworks);net7.0 + + Exe - net7.0 $(DefineConstants);__WASM__;HAS_UNO;UNO_REFERENCE_API $(NoWarn);NU1701;CS1998;NU1504;UXAML0002 true From dbfc4d3ff2361717397ce0e117b3ca81d5b2d7d1 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Fri, 30 Sep 2022 22:29:15 -0400 Subject: [PATCH 10/70] ci: Adjust for missing 6.0.x SDK --- build/ci/templates/dotnet-install.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build/ci/templates/dotnet-install.yml b/build/ci/templates/dotnet-install.yml index ace7e37b9895..c1f52dae2dd3 100644 --- a/build/ci/templates/dotnet-install.yml +++ b/build/ci/templates/dotnet-install.yml @@ -1,5 +1,12 @@ steps: + - task: UseDotNet@2 + displayName: 'Use .NET Core SDK 6.0.401' + retryCountOnTaskFailure: 3 + inputs: + packageType: sdk + version: 6.0.401 + - task: UseDotNet@2 displayName: 'Use .NET Core SDK 7.0.100-rc.1.22431.12' retryCountOnTaskFailure: 3 From dde559d0b4c040b220c42be262777fa58a2b2fbb Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Fri, 30 Sep 2022 23:17:11 -0400 Subject: [PATCH 11/70] ci: adjust hyperlink for wasm --- src/Uno.UI/UI/Xaml/Documents/Hyperlink.mux.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Uno.UI/UI/Xaml/Documents/Hyperlink.mux.cs b/src/Uno.UI/UI/Xaml/Documents/Hyperlink.mux.cs index cee89eebc6cf..682777cb56fe 100644 --- a/src/Uno.UI/UI/Xaml/Documents/Hyperlink.mux.cs +++ b/src/Uno.UI/UI/Xaml/Documents/Hyperlink.mux.cs @@ -10,7 +10,11 @@ namespace Windows.UI.Xaml.Documents { public partial class Hyperlink { - internal new bool IsFocusable() + internal +#if __WASM__ + new +#endif + bool IsFocusable() { var element = GetContainingFrameworkElement(); return From 4c174eb87059bd4bbaff17cd5e7e081d9422d761 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Fri, 30 Sep 2022 23:56:31 -0400 Subject: [PATCH 12/70] ci: Adjust net6 build target name after reordering --- build/ci/.azure-devops-package-net6-win.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/build/ci/.azure-devops-package-net6-win.yml b/build/ci/.azure-devops-package-net6-win.yml index 55a3e1299e05..75af75f052a5 100644 --- a/build/ci/.azure-devops-package-net6-win.yml +++ b/build/ci/.azure-devops-package-net6-win.yml @@ -51,19 +51,6 @@ jobs: - template: templates/dotnet6-install-windows.yml - template: templates/install-windows-sdk.yml - # Required to build on net5 because of uwp compatibility (until 16.10 gets published) - - task: MSBuild@1 - inputs: - solution: Build/Uno.UI.Build.csproj - msbuildLocationMethod: version - msbuildVersion: latest - msbuildArchitecture: x86 - msbuildArguments: /r /m /t:BuildNet6 "/p:CombinedConfiguration=$(CombinedConfiguration)" /detailedsummary /bl:$(build.artifactstagingdirectory)\build-$(GitVersion.FullSemVer)-net6-$(UNO_UWP_BUILD).binlog - clean: false - restoreNugetPackages: false - logProjectEvents: false - createLogFile: false - - powershell: | cp $(build.sourcesdirectory)\src\global-net6.json $(build.sourcesdirectory)\src\global.json displayName: Change active .NET SDK From 34e70f8a86c517327578c913d76c8efab31c3a93 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Sat, 1 Oct 2022 15:05:19 -0400 Subject: [PATCH 13/70] ci: Adjust targetframeworks for samplesapp --- src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj b/src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj index 8f470c63dffb..6f86a1f8bfdb 100644 --- a/src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj +++ b/src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj @@ -1,11 +1,11 @@ - + net6.0 - $(TargetFrameworks);net7.0 + net7.0 From b7274efbc168b90268f1f4450c623af963be03df Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Sat, 1 Oct 2022 15:50:03 -0400 Subject: [PATCH 14/70] ci: Use scaled pool for winui conversion --- .vsts-ci.yml | 2 +- build/ci/.azure-devops-winui-convert.yml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 425dfd873cfd..bcfc13bf8a00 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -64,7 +64,7 @@ jobs: - template: build/ci/.azure-devops-winui-convert.yml parameters: - vmImage: '$(windows2022HostedVMImage)' + poolName: '$(windowsScaledPool)' - template: build/ci/.azure-devops-pipeline-validations.yml parameters: diff --git a/build/ci/.azure-devops-winui-convert.yml b/build/ci/.azure-devops-winui-convert.yml index 764cd5a44b9d..51bb074ee8ba 100644 --- a/build/ci/.azure-devops-winui-convert.yml +++ b/build/ci/.azure-devops-winui-convert.yml @@ -5,8 +5,7 @@ jobs: - job: winui_convert_tree displayName: 'WinUI Converted Tree Generation' - pool: - vmImage: ${{ parameters.vmImage }} + pool: ${{ parameters.poolName }} dependsOn: Pipeline_Validations From 5efe96ce035799552b33bc02509dad805284fb21 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Sat, 1 Oct 2022 17:54:48 -0400 Subject: [PATCH 15/70] ci: Adjust net7 wasm tests --- build/ci/.azure-devops-package-skia.yml | 5 ++- build/ci/.azure-devops-package-wasm.yml | 1 - build/ci/.azure-devops-wasm-uitests.yml | 32 +++++++++---------- .../Tests/TSBindingsTests.cs | 5 ++- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/build/ci/.azure-devops-package-skia.yml b/build/ci/.azure-devops-package-skia.yml index 8fd8b91eef71..9995b988409f 100644 --- a/build/ci/.azure-devops-package-skia.yml +++ b/build/ci/.azure-devops-package-skia.yml @@ -4,7 +4,6 @@ parameters: jobs: - job: skia_package_build displayName: 'Build WebAssembly Package Binaries' - container: nv-bionic-wasm dependsOn: winui_convert_tree @@ -28,7 +27,7 @@ jobs: # Build validation is performed on other jobs UnoUIDisableNetCoreBuild: true - NUGET_PACKAGES: $(build.sourcesdirectory)/.nuget + NUGET_PACKAGES: $(build.sourcesdirectory)\.nuget steps: - checkout: self @@ -46,7 +45,7 @@ jobs: - powershell: | Set-PSDebug -Trace 1 - dotnet build build/Uno.UI.Build.csproj /m /t:BuildCIWasm "/p:CombinedConfiguration=$(CombinedConfiguration)" /detailedsummary /bl:$(build.artifactstagingdirectory)/build-skia-$(XAML_FLAVOR_BUILD).binlog + dotnet build build\Uno.UI.Build.csproj /m /t:BuildCIWasm "/p:CombinedConfiguration=$(CombinedConfiguration)" /detailedsummary /bl:$(build.artifactstagingdirectory)/build-skia-$(XAML_FLAVOR_BUILD).binlog displayName: Building Skia Binaries - template: templates/copy-package-assets.yml diff --git a/build/ci/.azure-devops-package-wasm.yml b/build/ci/.azure-devops-package-wasm.yml index cdd0eeb3f45e..9a21b9fb5a12 100644 --- a/build/ci/.azure-devops-package-wasm.yml +++ b/build/ci/.azure-devops-package-wasm.yml @@ -4,7 +4,6 @@ parameters: jobs: - job: wasm_package_build displayName: 'Build WebAssembly Package Binaries' - container: nv-bionic-wasm dependsOn: winui_convert_tree diff --git a/build/ci/.azure-devops-wasm-uitests.yml b/build/ci/.azure-devops-wasm-uitests.yml index ec7daf18aa22..809a9a19121c 100644 --- a/build/ci/.azure-devops-wasm-uitests.yml +++ b/build/ci/.azure-devops-wasm-uitests.yml @@ -36,14 +36,14 @@ jobs: - bash: | dotnet msbuild /r /nr:false /p:Configuration=Release src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj /p:UnoSourceGeneratorUseGenerationHost=true /p:UnoSourceGeneratorUseGenerationController=false /bl:$(build.artifactstagingdirectory)/build-wasm-uitest-net6-$(GitVersion.FullSemVer).binlog - displayName: 'Build sample app (net6.0)' + displayName: 'Build sample app (net7.0)' - task: CopyFiles@2 - displayName: 'Publish Wasm Site (net6.0)' + displayName: 'Publish Wasm Site (net7.0)' inputs: - SourceFolder: $(build.sourcesdirectory)/src/SamplesApp/SamplesApp.Wasm/bin/Release/net6.0/dist + SourceFolder: $(build.sourcesdirectory)/src/SamplesApp/SamplesApp.Wasm/bin/Release/net7.0/dist Contents: '**/*.*' - TargetFolder: $(build.artifactstagingdirectory)/site-net6.0 + TargetFolder: $(build.artifactstagingdirectory)/site-net7.0 CleanTargetFolder: false OverWrite: false flattenFolders: false @@ -69,7 +69,7 @@ jobs: variables: NUGET_PACKAGES: $(build.sourcesdirectory)/.nuget - SITE_SUFFIX: 'net6.0' + SITE_SUFFIX: 'net7.0' steps: - checkout: self @@ -99,7 +99,7 @@ jobs: dotnet tool uninstall dotnet-serve --tool-path $BUILD_SOURCESDIRECTORY/build/tools || true dotnet tool install dotnet-serve --version 1.8.15 --tool-path $BUILD_SOURCESDIRECTORY/build/tools || true export PATH="$PATH:$BUILD_SOURCESDIRECTORY/build/tools" - $BUILD_SOURCESDIRECTORY/build/tools/dotnet-serve -p 8000 -d "$BUILD_SOURCESDIRECTORY/build/wasm-uitest-binaries/site-net6.0" & + $BUILD_SOURCESDIRECTORY/build/tools/dotnet-serve -p 8000 -d "$BUILD_SOURCESDIRECTORY/build/wasm-uitest-binaries/site-net7.0" & cd $BUILD_SOURCESDIRECTORY/src/SamplesApp/SamplesApp.Wasm.UITests npm install node app @@ -137,32 +137,32 @@ jobs: strategy: matrix: - net6_default: - SITE_SUFFIX: 'net6.0' + net7_default: + SITE_SUFFIX: 'net7.0' UITEST_AUTOMATED_GROUP: 'Default' UITEST_TEST_TIMEOUT: '120000' - net6_benchmarks: - SITE_SUFFIX: 'net6.0' + net7_benchmarks: + SITE_SUFFIX: 'net7.0' UITEST_AUTOMATED_GROUP: 'Benchmarks' UITEST_TEST_TIMEOUT: '120000' - net6_runtimetests_group_00: - SITE_SUFFIX: 'net6.0' + net7_runtimetests_group_00: + SITE_SUFFIX: 'net7.0' UITEST_AUTOMATED_GROUP: 'RuntimeTests' UITEST_TEST_TIMEOUT: '1800000' UITEST_RUNTIME_TEST_GROUP: 0 UITEST_RUNTIME_TEST_GROUP_COUNT: 3 - net6_runtimetests_group_01: - SITE_SUFFIX: 'net6.0' + net7_runtimetests_group_01: + SITE_SUFFIX: 'net7.0' UITEST_AUTOMATED_GROUP: 'RuntimeTests' UITEST_TEST_TIMEOUT: '1800000' UITEST_RUNTIME_TEST_GROUP: 1 UITEST_RUNTIME_TEST_GROUP_COUNT: 3 - net6_runtimetests_group_02: - SITE_SUFFIX: 'net6.0' + net7_runtimetests_group_02: + SITE_SUFFIX: 'net7.0' UITEST_AUTOMATED_GROUP: 'RuntimeTests' UITEST_TEST_TIMEOUT: '1800000' UITEST_RUNTIME_TEST_GROUP: 2 diff --git a/src/Uno.UI.Wasm.Tests/Tests/TSBindingsTests.cs b/src/Uno.UI.Wasm.Tests/Tests/TSBindingsTests.cs index 17e227f92f26..95e135f207b9 100644 --- a/src/Uno.UI.Wasm.Tests/Tests/TSBindingsTests.cs +++ b/src/Uno.UI.Wasm.Tests/Tests/TSBindingsTests.cs @@ -7,10 +7,13 @@ using Uno; using Windows.Foundation; using Uno.Foundation.Interop; -using System.Runtime.InteropServices.JavaScript; using System.Net.WebSockets; using System.Diagnostics; +#if NET7_0_OR_GREATER +using System.Runtime.InteropServices.JavaScript; +#endif + namespace SamplesApp.UnitTests.TSBindings { [TestClass] From 89ec5f254b4ab0d97e62e95e65db209fc052ece2 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Sat, 1 Oct 2022 20:21:15 -0400 Subject: [PATCH 16/70] ci: bump nunit transform tool --- .../Uno.NUnitTransformTool.csproj | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Uno.NUnitTransformTool/Uno.NUnitTransformTool.csproj b/src/Uno.NUnitTransformTool/Uno.NUnitTransformTool.csproj index af111be3c72c..014b89aebaae 100644 --- a/src/Uno.NUnitTransformTool/Uno.NUnitTransformTool.csproj +++ b/src/Uno.NUnitTransformTool/Uno.NUnitTransformTool.csproj @@ -1,13 +1,14 @@ - - Exe - net5.0 + + Exe + net6.0 false + major - - - + + + From 728ae521b38403a2946672570ccd03b805e77823 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Sat, 1 Oct 2022 22:25:39 -0400 Subject: [PATCH 17/70] ci: Adjust t4 install --- build/Uno.UI.Build.csproj | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/build/Uno.UI.Build.csproj b/build/Uno.UI.Build.csproj index 1ce6ee3a1e11..2e8ac7c9ed10 100644 --- a/build/Uno.UI.Build.csproj +++ b/build/Uno.UI.Build.csproj @@ -45,9 +45,8 @@ - - - + + @@ -251,8 +250,7 @@ - - + - + + + + Date: Sat, 1 Oct 2022 22:25:49 -0400 Subject: [PATCH 18/70] ci: Adjust dotnet-serve version for net6 --- build/ci/.azure-devops-wasm-uitests.yml | 2 +- build/test-scripts/wasm-run-automated-uitests.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/ci/.azure-devops-wasm-uitests.yml b/build/ci/.azure-devops-wasm-uitests.yml index 809a9a19121c..91b743c6f597 100644 --- a/build/ci/.azure-devops-wasm-uitests.yml +++ b/build/ci/.azure-devops-wasm-uitests.yml @@ -97,7 +97,7 @@ jobs: IFS=$'\n\t' dotnet tool uninstall dotnet-serve -g || true dotnet tool uninstall dotnet-serve --tool-path $BUILD_SOURCESDIRECTORY/build/tools || true - dotnet tool install dotnet-serve --version 1.8.15 --tool-path $BUILD_SOURCESDIRECTORY/build/tools || true + dotnet tool install dotnet-serve --version 1.10.140 --tool-path $BUILD_SOURCESDIRECTORY/build/tools || true export PATH="$PATH:$BUILD_SOURCESDIRECTORY/build/tools" $BUILD_SOURCESDIRECTORY/build/tools/dotnet-serve -p 8000 -d "$BUILD_SOURCESDIRECTORY/build/wasm-uitest-binaries/site-net7.0" & cd $BUILD_SOURCESDIRECTORY/src/SamplesApp/SamplesApp.Wasm.UITests diff --git a/build/test-scripts/wasm-run-automated-uitests.sh b/build/test-scripts/wasm-run-automated-uitests.sh index e6f24ae5844f..ab101c1df689 100755 --- a/build/test-scripts/wasm-run-automated-uitests.sh +++ b/build/test-scripts/wasm-run-automated-uitests.sh @@ -11,7 +11,7 @@ npm i puppeteer@14.1.0 # install dotnet serve / Remove as needed dotnet tool uninstall dotnet-serve -g || true dotnet tool uninstall dotnet-serve --tool-path $BUILD_SOURCESDIRECTORY/build/tools || true -dotnet tool install dotnet-serve --version 1.8.15 --tool-path $BUILD_SOURCESDIRECTORY/build/tools || true +dotnet tool install dotnet-serve --version 1.10.140 --tool-path $BUILD_SOURCESDIRECTORY/build/tools || true export PATH="$PATH:$BUILD_SOURCESDIRECTORY/build/tools" export UNO_UITEST_TARGETURI=http://localhost:8000 From cb498ace3aaa9eb9238db1d952895c06d63227f1 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Sun, 2 Oct 2022 13:35:11 -0400 Subject: [PATCH 19/70] ci: adjust skia build name --- .vsts-ci.yml | 1 + build/ci/.azure-devops-package-skia.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index bcfc13bf8a00..56d9a8795cec 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -85,6 +85,7 @@ jobs: - template: build/ci/.azure-devops-package-skia.yml parameters: poolName: '$(windowsScaledPool)' + - template: build/ci/.azure-devops-package.yml parameters: poolName: '$(windowsScaledPool)' diff --git a/build/ci/.azure-devops-package-skia.yml b/build/ci/.azure-devops-package-skia.yml index 9995b988409f..f7d2296bbada 100644 --- a/build/ci/.azure-devops-package-skia.yml +++ b/build/ci/.azure-devops-package-skia.yml @@ -3,7 +3,7 @@ parameters: jobs: - job: skia_package_build - displayName: 'Build WebAssembly Package Binaries' + displayName: 'Build Skia Package Binaries' dependsOn: winui_convert_tree From c69bd6e4b8ebf709976ee04db114b7b4f5859748 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Sun, 2 Oct 2022 13:35:47 -0400 Subject: [PATCH 20/70] ci: Adjust skia build target --- build/ci/.azure-devops-package-skia.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/.azure-devops-package-skia.yml b/build/ci/.azure-devops-package-skia.yml index f7d2296bbada..f0f40eb085c5 100644 --- a/build/ci/.azure-devops-package-skia.yml +++ b/build/ci/.azure-devops-package-skia.yml @@ -45,7 +45,7 @@ jobs: - powershell: | Set-PSDebug -Trace 1 - dotnet build build\Uno.UI.Build.csproj /m /t:BuildCIWasm "/p:CombinedConfiguration=$(CombinedConfiguration)" /detailedsummary /bl:$(build.artifactstagingdirectory)/build-skia-$(XAML_FLAVOR_BUILD).binlog + dotnet build build\Uno.UI.Build.csproj /m /t:BuildCISkia "/p:CombinedConfiguration=$(CombinedConfiguration)" /detailedsummary /bl:$(build.artifactstagingdirectory)/build-skia-$(XAML_FLAVOR_BUILD).binlog displayName: Building Skia Binaries - template: templates/copy-package-assets.yml From ccf3302cd09de2a450caa3813ae03c1e7e03d1d3 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Sun, 2 Oct 2022 16:23:07 -0400 Subject: [PATCH 21/70] ci: Add reference target projects --- build/filters/Uno.UI-packages-reference.slnf | 29 + build/filters/Uno.UI-packages-skia.slnf | 1 - .../Uno.UI.Lottie.Reference.csproj | 91 + .../Uno.UI.MSAL/Uno.UI.MSAL.Reference.csproj | 92 + src/Directory.Build.props | 14 + .../SamplesApp.Skia.Gtk.csproj | 4 + .../SamplesApp.Skia.WPF.csproj | 4 + .../System.Xaml/Uno.Xaml.Reference.csproj | 36 + .../Uno.Foundation.Reference.csproj | 53 + src/Uno.UI-Reference-Only.slnf | 28 + .../Uno.UI.Composition.Reference.csproj | 39 + .../Uno.UI.Dispatching.Reference.csproj | 42 + .../Uno.UI.FluentTheme.v1.Reference.csproj | 41 + .../Uno.UI.FluentTheme.v2.Reference.csproj | 41 + .../Uno.UI.FluentTheme.Reference.csproj | 43 + .../Uno.UI.RemoteControl.Reference.csproj | 89 + .../Uno.UI.Toolkit.Reference.csproj | 86 + .../Uno.UI.XamlHost.Reference.csproj | 42 + src/Uno.UI.sln | 630 + src/Uno.UI/UI/Xaml/IFrameworkElement.cs | 1 + src/Uno.UI/UI/Xaml/Style/mergedstyles.xaml | 19912 +--------------- src/Uno.UI/Uno.UI.Reference.csproj | 186 + src/Uno.UWP/Uno.Reference.csproj | 50 + src/crosstargeting_override.props.sample | 29 +- 24 files changed, 1657 insertions(+), 19926 deletions(-) create mode 100644 build/filters/Uno.UI-packages-reference.slnf create mode 100644 src/AddIns/Uno.UI.Lottie/Uno.UI.Lottie.Reference.csproj create mode 100644 src/AddIns/Uno.UI.MSAL/Uno.UI.MSAL.Reference.csproj create mode 100644 src/SourceGenerators/System.Xaml/Uno.Xaml.Reference.csproj create mode 100644 src/Uno.Foundation/Uno.Foundation.Reference.csproj create mode 100644 src/Uno.UI-Reference-Only.slnf create mode 100644 src/Uno.UI.Composition/Uno.UI.Composition.Reference.csproj create mode 100644 src/Uno.UI.Dispatching/Uno.UI.Dispatching.Reference.csproj create mode 100644 src/Uno.UI.FluentTheme.v1/Uno.UI.FluentTheme.v1.Reference.csproj create mode 100644 src/Uno.UI.FluentTheme.v2/Uno.UI.FluentTheme.v2.Reference.csproj create mode 100644 src/Uno.UI.FluentTheme/Uno.UI.FluentTheme.Reference.csproj create mode 100644 src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Reference.csproj create mode 100644 src/Uno.UI.Toolkit/Uno.UI.Toolkit.Reference.csproj create mode 100644 src/Uno.UI.XamlHost/Uno.UI.XamlHost.Reference.csproj create mode 100644 src/Uno.UI/Uno.UI.Reference.csproj create mode 100644 src/Uno.UWP/Uno.Reference.csproj diff --git a/build/filters/Uno.UI-packages-reference.slnf b/build/filters/Uno.UI-packages-reference.slnf new file mode 100644 index 000000000000..83ea1a325c8c --- /dev/null +++ b/build/filters/Uno.UI-packages-reference.slnf @@ -0,0 +1,29 @@ +{ + "solution": { + "path": "..\\..\\src\\Uno.UI.sln", + "projects": [ + "AddIns\\Uno.UI.Lottie\\Uno.UI.Lottie.csproj", + "AddIns\\Uno.UI.MSAL\\Uno.UI.MSAL.csproj", + "SourceGenerators\\System.Xaml\\Uno.Xaml.csproj", + "SourceGenerators\\SourceGeneratorHelpers\\SourceGeneratorHelpers.shproj", + "SourceGenerators\\Uno.UI.SourceGenerators.Internal\\Uno.UI.SourceGenerators.Internal.csproj", + "SourceGenerators\\Uno.UI.SourceGenerators\\Uno.UI.SourceGenerators.csproj", + "SourceGenerators\\Uno.UI.Tasks\\Uno.UI.Tasks.csproj", + "T4Generator\\T4Generator.csproj", + "Uno.Foundation.Logging\\Uno.Foundation.Logging.csproj", + "Uno.Foundation\\Uno.Foundation.csproj", + "Uno.UI.Adapter.Microsoft.Extensions.Logging\\Uno.UI.Adapter.Microsoft.Extensions.Logging.csproj", + "Uno.UI.BindingHelper.Android\\Uno.UI.BindingHelper.Android.csproj", + "Uno.UI.Composition\\Uno.UI.Composition.csproj", + "Uno.UI.Dispatching\\Uno.UI.Dispatching.csproj", + "Uno.UI.FluentTheme.v1\\Uno.UI.FluentTheme.v1.csproj", + "Uno.UI.FluentTheme.v2\\Uno.UI.FluentTheme.v2.csproj", + "Uno.UI.FluentTheme\\Uno.UI.FluentTheme.csproj", + "Uno.UI.Maps\\Uno.UI.Maps.csproj", + "Uno.UI.RemoteControl\\Uno.UI.RemoteControl.csproj", + "Uno.UI.Toolkit\\Uno.UI.Toolkit.csproj", + "Uno.UI\\Uno.UI.csproj", + "Uno.UWP\\Uno.csproj" + ] + } +} diff --git a/build/filters/Uno.UI-packages-skia.slnf b/build/filters/Uno.UI-packages-skia.slnf index 93c8100bc2a3..83fe4595edf2 100644 --- a/build/filters/Uno.UI-packages-skia.slnf +++ b/build/filters/Uno.UI-packages-skia.slnf @@ -20,7 +20,6 @@ "SamplesApp\\UnoIslands.Skia\\UnoIslands.Skia.csproj", "SamplesApp\\UnoIslands.WPF\\UnoIslands.Skia.Wpf.csproj", "SamplesApp\\UnoIslands.WinForms\\UnoIslands.WinForms.csproj", - "SolutionTemplate\\Uno.ProjectTemplates.Dotnet\\Uno.ProjectTemplates.Dotnet.csproj", "SourceGenerators\\System.Xaml\\Uno.Xaml.csproj", "SourceGenerators\\Uno.UI.SourceGenerators.Internal\\Uno.UI.SourceGenerators.Internal.csproj", "SourceGenerators\\Uno.UI.SourceGenerators\\Uno.UI.SourceGenerators.csproj", diff --git a/src/AddIns/Uno.UI.Lottie/Uno.UI.Lottie.Reference.csproj b/src/AddIns/Uno.UI.Lottie/Uno.UI.Lottie.Reference.csproj new file mode 100644 index 000000000000..30c0bd63e30d --- /dev/null +++ b/src/AddIns/Uno.UI.Lottie/Uno.UI.Lottie.Reference.csproj @@ -0,0 +1,91 @@ + + + + netstandard2.0 + + + + $(TargetFrameworks);net7.0 + + + + $(UnoTargetFrameworkOverride) + + + + $(NoWarn);NU1701;Uno0001 + true + true + enable + Uno.UI.Lottie + Uno.UI.Lottie + + $(DefineConstants);HAS_SKOTTIE + + Reference + + + + + + + + + build + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_OverrideTargetFramework>$(TargetFramework) + <_baseNugetPath Condition="'$(USERPROFILE)'!=''">$(USERPROFILE) + <_baseNugetPath Condition="'$(HOME)'!=''">$(HOME) + <_TargetNugetFolder>$(_baseNugetPath)\.nuget\packages\Uno.UI.Lottie\$(UnoNugetOverrideVersion)\lib\$(_OverrideTargetFramework) + + + <_OutputFiles Include="$(TargetDir)**" /> + + + + + + + + + diff --git a/src/AddIns/Uno.UI.MSAL/Uno.UI.MSAL.Reference.csproj b/src/AddIns/Uno.UI.MSAL/Uno.UI.MSAL.Reference.csproj new file mode 100644 index 000000000000..bd4e4d1a6eb4 --- /dev/null +++ b/src/AddIns/Uno.UI.MSAL/Uno.UI.MSAL.Reference.csproj @@ -0,0 +1,92 @@ + + + + netstandard2.0 + + + + $(TargetFrameworks);net7.0 + + + + $(UnoTargetFrameworkOverride) + + + + $(NoWarn);NU1701;NU5100;NU5118;NU5128 + true + true + Uno.UI.MSAL + Uno.UI.MSAL + + + $(NoWarn);NU1703 + + + + nventive + https://github.com/unoplatform/uno + uno.png + https://github.com/unoplatform/uno + This package provides the extensions to MSAL (Microsoft.Identity.Client) for an Uno Platform application. + Copyright (C) 2015-2020 nventive inc. - all rights reserved + + Uno.UI.MSAL + Uno.WinUI.MSAL + + Reference + + + + + + + + + + + + + true + buildTransitive + + + + + + + + + + + + + + + + + + + <_OverrideTargetFramework>$(TargetFramework) + <_baseNugetPath Condition="'$(USERPROFILE)'!=''">$(USERPROFILE) + <_baseNugetPath Condition="'$(HOME)'!=''">$(HOME) + <_TargetNugetFolder>$(_baseNugetPath)\.nuget\packages\Uno.UI.MSAL\$(UnoNugetOverrideVersion)\lib\$(_OverrideTargetFramework) + + + <_OutputFiles Include="$(TargetDir)**" /> + + + + + + + + + + + + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 3a94091e9704..9e043fe9f4cd 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -64,43 +64,54 @@ <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.Foundation.Skia.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.Foundation.Wasm.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.Foundation.net6.csproj + <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.Foundation.Reference.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.Skia.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.Wasm.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.net6.csproj + <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.Reference.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Skia.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Wasm.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.net6.csproj + <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Reference.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.RuntimeTests.Wasm.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.RuntimeTests.Skia.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.RuntimeTests.net6.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.MSAL.Wasm.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.MSAL.Skia.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.MSAL.net6.csproj + <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.MSAL.Reference.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Lottie.Wasm.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Lottie.Skia.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Lottie.net6.csproj + <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Lottie.Reference.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.RemoteControl.Wasm.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.RemoteControl.Skia.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.RemoteControl.net6.csproj + <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.RemoteControl.Reference.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Toolkit.Wasm.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Toolkit.Skia.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Toolkit.net6.csproj + <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Toolkit.Reference.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Foldable.net6.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.Wasm.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.Skia.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.net6.csproj + <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.Reference.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.v1.Wasm.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.v1.Skia.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.v1.net6.csproj + <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.v1.Reference.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.v2.Wasm.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.v2.Skia.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.v2.net6.csproj + <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.v2.Reference.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.Xaml.net6.csproj + <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.Xaml.Reference.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Adapter.Microsoft.Extensions.Logging.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Adapter.Microsoft.Extensions.Logging.net6.csproj @@ -112,16 +123,19 @@ <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Dispatching.net6.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Dispatching.Skia.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Dispatching.Wasm.csproj + <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Dispatching.Reference.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Composition.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Composition.net6.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Composition.Skia.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Composition.Wasm.csproj + <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Composition.Reference.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.XamlHost.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.XamlHost.net6.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.XamlHost.Skia.csproj <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.XamlHost.Wasm.csproj + <_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.XamlHost.Reference.csproj diff --git a/src/SamplesApp/SamplesApp.Skia.Gtk/SamplesApp.Skia.Gtk.csproj b/src/SamplesApp/SamplesApp.Skia.Gtk/SamplesApp.Skia.Gtk.csproj index 7d611e5129f2..82e1023e1db0 100644 --- a/src/SamplesApp/SamplesApp.Skia.Gtk/SamplesApp.Skia.Gtk.csproj +++ b/src/SamplesApp/SamplesApp.Skia.Gtk/SamplesApp.Skia.Gtk.csproj @@ -12,6 +12,10 @@ netcoreapp3.1 + + net7.0 + + $(UnoTargetFrameworkOverride) diff --git a/src/SamplesApp/SamplesApp.Skia.WPF/SamplesApp.Skia.WPF.csproj b/src/SamplesApp/SamplesApp.Skia.WPF/SamplesApp.Skia.WPF.csproj index 6fecb7566ed4..d2206f543a21 100644 --- a/src/SamplesApp/SamplesApp.Skia.WPF/SamplesApp.Skia.WPF.csproj +++ b/src/SamplesApp/SamplesApp.Skia.WPF/SamplesApp.Skia.WPF.csproj @@ -8,6 +8,10 @@ Major + + net7.0-windows + + <_Parameter1>false diff --git a/src/SourceGenerators/System.Xaml/Uno.Xaml.Reference.csproj b/src/SourceGenerators/System.Xaml/Uno.Xaml.Reference.csproj new file mode 100644 index 000000000000..ef2f36d73404 --- /dev/null +++ b/src/SourceGenerators/System.Xaml/Uno.Xaml.Reference.csproj @@ -0,0 +1,36 @@ + + + netstandard2.0 + + + + $(TargetFrameworks);net7.0 + + + + true + Uno.Xaml + + false + true + bin\$(Configuration)\$(TargetFramework)\ + $(BaseIntermediateOutputPath)$(Configuration)\$(TargetFramework)\ + false + + Reference + + + + + + $(DefineConstants);NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS + true + full + true + + + + + + + diff --git a/src/Uno.Foundation/Uno.Foundation.Reference.csproj b/src/Uno.Foundation/Uno.Foundation.Reference.csproj new file mode 100644 index 000000000000..6aa89127e3b0 --- /dev/null +++ b/src/Uno.Foundation/Uno.Foundation.Reference.csproj @@ -0,0 +1,53 @@ + + + + netstandard2.0 + + + + $(TargetFrameworks);net7.0 + + + + $(UnoTargetFrameworkOverride) + + + + Uno.Foundation + Windows.Foundation + $(NoWarn);NU1701;1572;1712;1711;1574 + true + + false + true + + Reference + + + + + + + + + + + + + + + + + + + $(AssemblyName).xml + + + + + + + + + + diff --git a/src/Uno.UI-Reference-Only.slnf b/src/Uno.UI-Reference-Only.slnf new file mode 100644 index 000000000000..9cd2b7b0f810 --- /dev/null +++ b/src/Uno.UI-Reference-Only.slnf @@ -0,0 +1,28 @@ +{ + "solution": { + "path": "Uno.UI.sln", + "projects": [ + "AddIns\\Uno.UI.Lottie\\Uno.UI.Lottie.Reference.csproj", + "AddIns\\Uno.UI.MSAL\\Uno.UI.MSAL.Reference.csproj", + "SourceGenerators\\SourceGeneratorHelpers\\SourceGeneratorHelpers.shproj", + "SourceGenerators\\System.Xaml\\Uno.Xaml.Reference.csproj", + "SourceGenerators\\System.Xaml\\Uno.Xaml.csproj", + "SourceGenerators\\Uno.UI.SourceGenerators.Internal\\Uno.UI.SourceGenerators.Internal.csproj", + "SourceGenerators\\Uno.UI.SourceGenerators\\Uno.UI.SourceGenerators.csproj", + "SourceGenerators\\Uno.UI.Tasks\\Uno.UI.Tasks.csproj", + "T4Generator\\T4Generator.csproj", + "Uno.Foundation.Logging\\Uno.Foundation.Logging.csproj", + "Uno.Foundation\\Uno.Foundation.Reference.csproj", + "Uno.UI.Composition\\Uno.UI.Composition.Reference.csproj", + "Uno.UI.Dispatching\\Uno.UI.Dispatching.Reference.csproj", + "Uno.UI.FluentTheme.v1\\Uno.UI.FluentTheme.v1.Reference.csproj", + "Uno.UI.FluentTheme.v2\\Uno.UI.FluentTheme.v2.Reference.csproj", + "Uno.UI.FluentTheme\\Uno.UI.FluentTheme.Reference.csproj", + "Uno.UI.RemoteControl\\Uno.UI.RemoteControl.Reference.csproj", + "Uno.UI.Toolkit\\Uno.UI.Toolkit.Reference.csproj", + "Uno.UI.XamlHost\\Uno.UI.XamlHost.Reference.csproj", + "Uno.UI\\Uno.UI.Reference.csproj", + "Uno.UWP\\Uno.Reference.csproj" + ] + } +} \ No newline at end of file diff --git a/src/Uno.UI.Composition/Uno.UI.Composition.Reference.csproj b/src/Uno.UI.Composition/Uno.UI.Composition.Reference.csproj new file mode 100644 index 000000000000..71a8c961d49c --- /dev/null +++ b/src/Uno.UI.Composition/Uno.UI.Composition.Reference.csproj @@ -0,0 +1,39 @@ + + + + netstandard2.0 + + + + $(TargetFrameworks);net7.0 + + + + $(UnoTargetFrameworkOverride) + + + + Uno.UI.Composition + Uno.UI.Composition + $(DefineConstants);XAMARIN;IS_UNO + true + + $(NoWarn);NU1701 + + false + true + + Reference + + + + + + + + + + + + + diff --git a/src/Uno.UI.Dispatching/Uno.UI.Dispatching.Reference.csproj b/src/Uno.UI.Dispatching/Uno.UI.Dispatching.Reference.csproj new file mode 100644 index 000000000000..7354d573e73d --- /dev/null +++ b/src/Uno.UI.Dispatching/Uno.UI.Dispatching.Reference.csproj @@ -0,0 +1,42 @@ + + + + netstandard2.0 + + + + $(TargetFrameworks);net7.0 + + + + $(UnoTargetFrameworkOverride) + + + + Uno.UI.Dispatching + Uno.UI.Dispatching + $(DefineConstants);XAMARIN;IS_UNO;IS_UNO_UI_DISPATCHING_PROJECT + true + + $(NoWarn);NU1701 + + false + true + + Reference + + + + + + + + + + + + + + + + diff --git a/src/Uno.UI.FluentTheme.v1/Uno.UI.FluentTheme.v1.Reference.csproj b/src/Uno.UI.FluentTheme.v1/Uno.UI.FluentTheme.v1.Reference.csproj new file mode 100644 index 000000000000..e73677bcf273 --- /dev/null +++ b/src/Uno.UI.FluentTheme.v1/Uno.UI.FluentTheme.v1.Reference.csproj @@ -0,0 +1,41 @@ + + + netstandard2.0 + + + + $(TargetFrameworks);net7.0 + + + + $(UnoTargetFrameworkOverride) + + + + $(NoWarn);NU1701 + true + Uno.UI.FluentTheme.v1 + Uno.UI.FluentTheme.v1 + + false + true + + true + Uno.UI + + Reference + + + + + + + + + + + + + + + diff --git a/src/Uno.UI.FluentTheme.v2/Uno.UI.FluentTheme.v2.Reference.csproj b/src/Uno.UI.FluentTheme.v2/Uno.UI.FluentTheme.v2.Reference.csproj new file mode 100644 index 000000000000..a41800b69d2b --- /dev/null +++ b/src/Uno.UI.FluentTheme.v2/Uno.UI.FluentTheme.v2.Reference.csproj @@ -0,0 +1,41 @@ + + + netstandard2.0 + + + + $(TargetFrameworks);net7.0 + + + + $(UnoTargetFrameworkOverride) + + + + $(NoWarn);NU1701 + true + Uno.UI.FluentTheme.v2 + Uno.UI.FluentTheme.v2 + + false + true + + true + Uno.UI + + Reference + + + + + + + + + + + + + + + diff --git a/src/Uno.UI.FluentTheme/Uno.UI.FluentTheme.Reference.csproj b/src/Uno.UI.FluentTheme/Uno.UI.FluentTheme.Reference.csproj new file mode 100644 index 000000000000..7b4524c756b3 --- /dev/null +++ b/src/Uno.UI.FluentTheme/Uno.UI.FluentTheme.Reference.csproj @@ -0,0 +1,43 @@ + + + netstandard2.0 + + + + $(TargetFrameworks);net7.0 + + + + $(UnoTargetFrameworkOverride) + + + + $(NoWarn);NU1701 + true + Uno.UI.FluentTheme + Uno.UI.FluentTheme + + false + true + + true + Uno.UI + + Reference + + + + + + + + + + + + + + + + + diff --git a/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Reference.csproj b/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Reference.csproj new file mode 100644 index 000000000000..3c0488441199 --- /dev/null +++ b/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Reference.csproj @@ -0,0 +1,89 @@ + + + + netstandard2.0 + + + + $(TargetFrameworks);net7.0 + + + + $(UnoTargetFrameworkOverride) + + + + Uno.UI.RemoteControl + Uno.UI.RemoteControl + + true + + $(NoWarn);NU1701 + + false + true + + Uno.UI.RemoteControl + Uno.WinUI.RemoteControl + + Reference + + + + + + + + + + + build + true + + + + + + + + + + + + + + + + + false + true + TargetFramework + + + + + + false + true + TargetFramework + + + + + + + <_OverrideTargetFramework>$(TargetFramework) + <_baseNugetPath Condition="'$(USERPROFILE)'!=''">$(USERPROFILE) + <_baseNugetPath Condition="'$(HOME)'!=''">$(HOME) + <_TargetNugetFolder>$(_baseNugetPath)\.nuget\packages\uno.ui\$(UnoNugetOverrideVersion)\lib\$(_OverrideTargetFramework) + + + <_OutputFiles Include="$(TargetDir)\*.*" /> + + + + + + + + diff --git a/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Reference.csproj b/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Reference.csproj new file mode 100644 index 000000000000..3782bd724fef --- /dev/null +++ b/src/Uno.UI.Toolkit/Uno.UI.Toolkit.Reference.csproj @@ -0,0 +1,86 @@ + + + netstandard2.0 + + + + $(TargetFrameworks);net7.0 + + + + $(UnoTargetFrameworkOverride) + + + + Uno.UI.Toolkit + Uno.UI.Toolkit + $(AssemblyName) ($(TargetFramework)) + en-US + + false + true + + Reference + + true + Uno.UI + + Reference + + + + + + + + + + + + + + $(MSBuildThisFileDirectory)..\SourceGenerators\Uno.UI.Tasks\bin\$(Configuration)_Shadow + + + + + + + Uno.UI + + + Uno + + + Uno.Foundation + + + + + + + + + + + + + + + <_OverrideTargetFramework>$(TargetFramework) + <_OverrideTargetFramework Condition="'$(_OverrideTargetFramework)' == 'uap10.0.18362'">UAP + <_baseNugetPath Condition="'$(USERPROFILE)'!=''">$(USERPROFILE) + <_baseNugetPath Condition="'$(HOME)'!=''">$(HOME) + <_TargetNugetFolder>$(_baseNugetPath)\.nuget\packages\Uno.UI\$(UnoNugetOverrideVersion)\lib\$(_OverrideTargetFramework) + + + <_OutputFiles Include="$(TargetDir)**" /> + + + + + + + + + diff --git a/src/Uno.UI.XamlHost/Uno.UI.XamlHost.Reference.csproj b/src/Uno.UI.XamlHost/Uno.UI.XamlHost.Reference.csproj new file mode 100644 index 000000000000..a3b9e9013afa --- /dev/null +++ b/src/Uno.UI.XamlHost/Uno.UI.XamlHost.Reference.csproj @@ -0,0 +1,42 @@ + + + netstandard2.0 + + + + $(TargetFrameworks);net7.0 + + + + $(UnoTargetFrameworkOverride) + + + + Uno.UI.XamlHost + Uno.UI.XamlHost + $(DefineConstants);XAMARIN;IS_UNO;IS_UNO_UI_XamlHost_PROJECT + true + + $(NoWarn);NU1701 + + false + true + + Reference + + + + + + + + + + + + + + + + + diff --git a/src/Uno.UI.sln b/src/Uno.UI.sln index 85885d5477f6..fd6070d9b6ee 100644 --- a/src/Uno.UI.sln +++ b/src/Uno.UI.sln @@ -224,28 +224,46 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.RemoteControl.Server EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Foundation.net6", "Uno.Foundation\Uno.Foundation.net6.csproj", "{C473858B-8ECF-4476-8CBA-05EA456FFE0E}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Foundation.Reference", "Uno.Foundation\Uno.Foundation.Reference.csproj", "{0473858B-8ECF-4476-8CBA-05EA456FFE0E}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.net6", "Uno.UWP\Uno.net6.csproj", "{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Reference", "Uno.UWP\Uno.Reference.csproj", "{0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.net6", "Uno.UI\Uno.UI.net6.csproj", "{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.Reference", "Uno.UI\Uno.UI.Reference.csproj", "{01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.BindingHelper.Android.net6", "Uno.UI.BindingHelper.Android\Uno.UI.BindingHelper.Android.net6.csproj", "{1EC49129-3FB1-4045-9859-03F72CAD2913}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Xaml.net6", "SourceGenerators\System.Xaml\Uno.Xaml.net6.csproj", "{4DB56B75-B691-4F8B-879F-D7F36EEE6187}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Xaml.Reference", "SourceGenerators\System.Xaml\Uno.Xaml.Reference.csproj", "{0DB56B75-B691-4F8B-879F-D7F36EEE6187}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SamplesApp.net6mobile", "SamplesApp\SamplesApp.net6mobile\SamplesApp.net6mobile.csproj", "{3C272635-C7D1-444C-86C2-CB95E367D13D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.Toolkit.net6", "Uno.UI.Toolkit\Uno.UI.Toolkit.net6.csproj", "{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.Toolkit.Reference", "Uno.UI.Toolkit\Uno.UI.Toolkit.Reference.csproj", "{0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.Lottie.net6", "AddIns\Uno.UI.Lottie\Uno.UI.Lottie.net6.csproj", "{CA07C58C-D4E6-4432-8241-55FA016DEA41}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.Lottie.Reference", "AddIns\Uno.UI.Lottie\Uno.UI.Lottie.Reference.csproj", "{57EBE08D-75E9-4024-A7F6-C67752B1DCA0}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.RuntimeTests.net6", "Uno.UI.RuntimeTests\Uno.UI.RuntimeTests.net6.csproj", "{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.FluentTheme.net6", "Uno.UI.FluentTheme\Uno.UI.FluentTheme.net6.csproj", "{17802FE5-5A70-42DE-816A-FCC5776A3E02}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.FluentTheme.Reference", "Uno.UI.FluentTheme\Uno.UI.FluentTheme.Reference.csproj", "{07802FE5-5A70-42DE-816A-FCC5776A3E02}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.MSAL.net6", "AddIns\Uno.UI.MSAL\Uno.UI.MSAL.net6.csproj", "{17BB7190-F406-4A26-9C44-4F494B24CF83}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.MSAL.Reference", "AddIns\Uno.UI.MSAL\Uno.UI.MSAL.Reference.csproj", "{07BB7190-F406-4A26-9C44-4F494B24CF83}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.RemoteControl.net6", "Uno.UI.RemoteControl\Uno.UI.RemoteControl.net6.csproj", "{717B3451-3CE4-4FF3-9D7E-3E90348214EA}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.RemoteControl.Reference", "Uno.UI.RemoteControl\Uno.UI.RemoteControl.Reference.csproj", "{017B3451-3CE4-4FF3-9D7E-3E90348214EA}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.Runtime.Skia.Linux.FrameBuffer", "Uno.UI.Runtime.Skia.Linux.FrameBuffer\Uno.UI.Runtime.Skia.Linux.FrameBuffer.csproj", "{AA89E8AC-40EF-4911-99B5-55228188446A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SamplesApp.Skia.Linux.FrameBuffer", "SamplesApp\SamplesApp.Skia.Linux.FrameBuffer\SamplesApp.Skia.Linux.FrameBuffer.csproj", "{76EBBF09-F39F-48C2-BEE9-9DF5F8EC6A49}" @@ -264,6 +282,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.FluentTheme.v1", "Un EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.FluentTheme.v1.net6", "Uno.UI.FluentTheme.v1\Uno.UI.FluentTheme.v1.net6.csproj", "{34833538-6378-4592-B8DD-929C9F4B0E5C}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.FluentTheme.v1.Reference", "Uno.UI.FluentTheme.v1\Uno.UI.FluentTheme.v1.Reference.csproj", "{04833538-6378-4592-B8DD-929C9F4B0E5C}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.FluentTheme.v1.Skia", "Uno.UI.FluentTheme.v1\Uno.UI.FluentTheme.v1.Skia.csproj", "{8F85881F-05D5-46C8-BBA8-C1CA740C74E6}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.FluentTheme.v1.Wasm", "Uno.UI.FluentTheme.v1\Uno.UI.FluentTheme.v1.Wasm.csproj", "{D297142A-6F19-476F-B6FF-552FC57E1A9A}" @@ -272,6 +292,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.FluentTheme.v2", "Un EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.FluentTheme.v2.net6", "Uno.UI.FluentTheme.v2\Uno.UI.FluentTheme.v2.net6.csproj", "{CDE9C243-5CDC-4DF6-B82F-B9AF4B35A284}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.FluentTheme.v2.Reference", "Uno.UI.FluentTheme.v2\Uno.UI.FluentTheme.v2.Reference.csproj", "{0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.FluentTheme.v2.Skia", "Uno.UI.FluentTheme.v2\Uno.UI.FluentTheme.v2.Skia.csproj", "{54E27C52-4157-4585-B03F-184D8FBCAE3F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.FluentTheme.v2.Wasm", "Uno.UI.FluentTheme.v2\Uno.UI.FluentTheme.v2.Wasm.csproj", "{AD35E340-34DF-4FA9-B545-B9FBB72D3A2E}" @@ -292,6 +314,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.Composition", "Uno.U EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.Composition.net6", "Uno.UI.Composition\Uno.UI.Composition.net6.csproj", "{1DC9D120-524B-41E5-8988-B4763F6244A1}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.Composition.Reference", "Uno.UI.Composition\Uno.UI.Composition.Reference.csproj", "{0DC9D120-524B-41E5-8988-B4763F6244A1}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.Composition.Wasm", "Uno.UI.Composition\Uno.UI.Composition.Wasm.csproj", "{1E649F79-45AB-402A-A7DE-D4F2D0BBF1E5}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.Dispatching.Skia", "Uno.UI.Dispatching\Uno.UI.Dispatching.Skia.csproj", "{8386DF84-BB52-425F-A36F-E966865D7096}" @@ -300,6 +324,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.Dispatching.Wasm", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.Dispatching.net6", "Uno.UI.Dispatching\Uno.UI.Dispatching.net6.csproj", "{45C0AAC5-6797-4E22-9A4C-C7EE6369A53F}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.Dispatching.Reference", "Uno.UI.Dispatching\Uno.UI.Dispatching.Reference.csproj", "{05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.Dispatching", "Uno.UI.Dispatching\Uno.UI.Dispatching.csproj", "{AC6E2BD5-3902-46F4-8EA9-9BEF09D8B39C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnoSolutionTemplate.Wizard.2022", "SolutionTemplate\UnoSolutionTemplate.Wizard.2022\UnoSolutionTemplate.Wizard.2022.csproj", "{138FF660-5EE6-475B-828C-81F96E9BE142}" @@ -324,6 +350,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.XamlHost", "Uno.UI.X EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.XamlHost.net6", "Uno.UI.XamlHost\Uno.UI.XamlHost.net6.csproj", "{2CA6C2AE-BC23-435D-B81D-58C315EEB709}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.XamlHost.Reference", "Uno.UI.XamlHost\Uno.UI.XamlHost.Reference.csproj", "{0CA6C2AE-BC23-435D-B81D-58C315EEB709}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.XamlHost.Skia", "Uno.UI.XamlHost\Uno.UI.XamlHost.Skia.csproj", "{F4C7902D-5143-4351-8C0E-0C4527C52735}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.XamlHost.Wasm", "Uno.UI.XamlHost\Uno.UI.XamlHost.Wasm.csproj", "{F1F1BBD7-93D0-4EFE-82A0-AD4EEDD229D0}" @@ -3788,6 +3816,48 @@ Global {C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|x64.Build.0 = Release|Any CPU {C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|x86.ActiveCfg = Release|Any CPU {C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|x86.Build.0 = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|ARM.ActiveCfg = Debug|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|ARM.Build.0 = Debug|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|ARM64.Build.0 = Debug|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|iPhone.Build.0 = Debug|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|x64.ActiveCfg = Debug|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|x64.Build.0 = Debug|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|x86.ActiveCfg = Debug|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|x86.Build.0 = Debug|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|Any CPU.ActiveCfg = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|Any CPU.Build.0 = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|ARM.ActiveCfg = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|ARM.Build.0 = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|ARM64.ActiveCfg = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|ARM64.Build.0 = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|iPhone.ActiveCfg = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|iPhone.Build.0 = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|iPhoneSimulator.ActiveCfg = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|iPhoneSimulator.Build.0 = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|x64.ActiveCfg = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|x64.Build.0 = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|x86.ActiveCfg = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|x86.Build.0 = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|Any CPU.Build.0 = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|ARM.ActiveCfg = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|ARM.Build.0 = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|ARM64.ActiveCfg = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|ARM64.Build.0 = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|iPhone.ActiveCfg = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|iPhone.Build.0 = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|x64.ActiveCfg = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|x64.Build.0 = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|x86.ActiveCfg = Release|Any CPU + {0473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|x86.Build.0 = Release|Any CPU {2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|Any CPU.Build.0 = Debug|Any CPU {2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -3830,6 +3900,48 @@ Global {2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|x64.Build.0 = Release|Any CPU {2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|x86.ActiveCfg = Release|Any CPU {2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|x86.Build.0 = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|ARM.ActiveCfg = Debug|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|ARM.Build.0 = Debug|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|ARM64.Build.0 = Debug|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|iPhone.Build.0 = Debug|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|x64.ActiveCfg = Debug|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|x64.Build.0 = Debug|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|x86.ActiveCfg = Debug|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|x86.Build.0 = Debug|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|Any CPU.ActiveCfg = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|Any CPU.Build.0 = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|ARM.ActiveCfg = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|ARM.Build.0 = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|ARM64.ActiveCfg = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|ARM64.Build.0 = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|iPhone.ActiveCfg = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|iPhone.Build.0 = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|iPhoneSimulator.ActiveCfg = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|iPhoneSimulator.Build.0 = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|x64.ActiveCfg = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|x64.Build.0 = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|x86.ActiveCfg = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|x86.Build.0 = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|Any CPU.Build.0 = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|ARM.ActiveCfg = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|ARM.Build.0 = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|ARM64.ActiveCfg = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|ARM64.Build.0 = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|iPhone.ActiveCfg = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|iPhone.Build.0 = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|x64.ActiveCfg = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|x64.Build.0 = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|x86.ActiveCfg = Release|Any CPU + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|x86.Build.0 = Release|Any CPU {C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|Any CPU.Build.0 = Debug|Any CPU {C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -3872,6 +3984,48 @@ Global {C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|x64.Build.0 = Release|Any CPU {C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|x86.ActiveCfg = Release|Any CPU {C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|x86.Build.0 = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|ARM.ActiveCfg = Debug|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|ARM.Build.0 = Debug|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|ARM64.Build.0 = Debug|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|iPhone.Build.0 = Debug|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|x64.ActiveCfg = Debug|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|x64.Build.0 = Debug|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|x86.ActiveCfg = Debug|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|x86.Build.0 = Debug|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|Any CPU.ActiveCfg = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|Any CPU.Build.0 = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|ARM.ActiveCfg = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|ARM.Build.0 = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|ARM64.ActiveCfg = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|ARM64.Build.0 = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|iPhone.ActiveCfg = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|iPhone.Build.0 = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|iPhoneSimulator.ActiveCfg = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|iPhoneSimulator.Build.0 = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|x64.ActiveCfg = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|x64.Build.0 = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|x86.ActiveCfg = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|x86.Build.0 = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|Any CPU.Build.0 = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|ARM.ActiveCfg = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|ARM.Build.0 = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|ARM64.ActiveCfg = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|ARM64.Build.0 = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|iPhone.ActiveCfg = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|iPhone.Build.0 = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|x64.ActiveCfg = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|x64.Build.0 = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|x86.ActiveCfg = Release|Any CPU + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|x86.Build.0 = Release|Any CPU {1EC49129-3FB1-4045-9859-03F72CAD2913}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1EC49129-3FB1-4045-9859-03F72CAD2913}.Debug|Any CPU.Build.0 = Debug|Any CPU {1EC49129-3FB1-4045-9859-03F72CAD2913}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -3956,6 +4110,48 @@ Global {4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|x64.Build.0 = Release|Any CPU {4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|x86.ActiveCfg = Release|Any CPU {4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|x86.Build.0 = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|ARM.ActiveCfg = Debug|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|ARM.Build.0 = Debug|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|ARM64.Build.0 = Debug|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|iPhone.Build.0 = Debug|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|x64.ActiveCfg = Debug|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|x64.Build.0 = Debug|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|x86.ActiveCfg = Debug|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|x86.Build.0 = Debug|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|Any CPU.ActiveCfg = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|Any CPU.Build.0 = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|ARM.ActiveCfg = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|ARM.Build.0 = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|ARM64.ActiveCfg = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|ARM64.Build.0 = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|iPhone.ActiveCfg = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|iPhone.Build.0 = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|iPhoneSimulator.ActiveCfg = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|iPhoneSimulator.Build.0 = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|x64.ActiveCfg = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|x64.Build.0 = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|x86.ActiveCfg = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|x86.Build.0 = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|Any CPU.Build.0 = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|ARM.ActiveCfg = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|ARM.Build.0 = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|ARM64.ActiveCfg = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|ARM64.Build.0 = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|iPhone.ActiveCfg = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|iPhone.Build.0 = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|x64.ActiveCfg = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|x64.Build.0 = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|x86.ActiveCfg = Release|Any CPU + {0DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|x86.Build.0 = Release|Any CPU {3C272635-C7D1-444C-86C2-CB95E367D13D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3C272635-C7D1-444C-86C2-CB95E367D13D}.Debug|Any CPU.Build.0 = Debug|Any CPU {3C272635-C7D1-444C-86C2-CB95E367D13D}.Debug|Any CPU.Deploy.0 = Debug|Any CPU @@ -4042,6 +4238,48 @@ Global {7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|x64.Build.0 = Release|Any CPU {7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|x86.ActiveCfg = Release|Any CPU {7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|x86.Build.0 = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|ARM.ActiveCfg = Debug|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|ARM.Build.0 = Debug|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|ARM64.Build.0 = Debug|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|iPhone.Build.0 = Debug|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|x64.ActiveCfg = Debug|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|x64.Build.0 = Debug|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|x86.ActiveCfg = Debug|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|x86.Build.0 = Debug|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|Any CPU.ActiveCfg = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|Any CPU.Build.0 = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|ARM.ActiveCfg = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|ARM.Build.0 = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|ARM64.ActiveCfg = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|ARM64.Build.0 = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|iPhone.ActiveCfg = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|iPhone.Build.0 = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|iPhoneSimulator.ActiveCfg = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|iPhoneSimulator.Build.0 = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|x64.ActiveCfg = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|x64.Build.0 = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|x86.ActiveCfg = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|x86.Build.0 = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|Any CPU.Build.0 = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|ARM.ActiveCfg = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|ARM.Build.0 = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|ARM64.ActiveCfg = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|ARM64.Build.0 = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|iPhone.ActiveCfg = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|iPhone.Build.0 = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|x64.ActiveCfg = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|x64.Build.0 = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|x86.ActiveCfg = Release|Any CPU + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|x86.Build.0 = Release|Any CPU {CA07C58C-D4E6-4432-8241-55FA016DEA41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CA07C58C-D4E6-4432-8241-55FA016DEA41}.Debug|Any CPU.Build.0 = Debug|Any CPU {CA07C58C-D4E6-4432-8241-55FA016DEA41}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -4084,6 +4322,48 @@ Global {CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release|x64.Build.0 = Release|Any CPU {CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release|x86.ActiveCfg = Release|Any CPU {CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release|x86.Build.0 = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Debug|ARM.ActiveCfg = Debug|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Debug|ARM.Build.0 = Debug|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Debug|ARM64.Build.0 = Debug|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Debug|iPhone.Build.0 = Debug|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Debug|x64.ActiveCfg = Debug|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Debug|x64.Build.0 = Debug|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Debug|x86.ActiveCfg = Debug|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Debug|x86.Build.0 = Debug|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release_NoSamples|Any CPU.ActiveCfg = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release_NoSamples|Any CPU.Build.0 = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release_NoSamples|ARM.ActiveCfg = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release_NoSamples|ARM.Build.0 = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release_NoSamples|ARM64.ActiveCfg = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release_NoSamples|ARM64.Build.0 = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release_NoSamples|iPhone.ActiveCfg = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release_NoSamples|iPhone.Build.0 = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release_NoSamples|iPhoneSimulator.ActiveCfg = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release_NoSamples|iPhoneSimulator.Build.0 = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release_NoSamples|x64.ActiveCfg = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release_NoSamples|x64.Build.0 = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release_NoSamples|x86.ActiveCfg = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release_NoSamples|x86.Build.0 = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release|Any CPU.Build.0 = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release|ARM.ActiveCfg = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release|ARM.Build.0 = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release|ARM64.ActiveCfg = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release|ARM64.Build.0 = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release|iPhone.ActiveCfg = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release|iPhone.Build.0 = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release|x64.ActiveCfg = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release|x64.Build.0 = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release|x86.ActiveCfg = Release|Any CPU + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0}.Release|x86.Build.0 = Release|Any CPU {4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Debug|Any CPU.Build.0 = Debug|Any CPU {4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -4168,6 +4448,48 @@ Global {17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|x64.Build.0 = Release|Any CPU {17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|x86.ActiveCfg = Release|Any CPU {17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|x86.Build.0 = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|Any CPU.Build.0 = Debug|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|ARM.ActiveCfg = Debug|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|ARM.Build.0 = Debug|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|ARM64.Build.0 = Debug|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|iPhone.Build.0 = Debug|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|x64.ActiveCfg = Debug|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|x64.Build.0 = Debug|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|x86.ActiveCfg = Debug|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|x86.Build.0 = Debug|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|Any CPU.ActiveCfg = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|Any CPU.Build.0 = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|ARM.ActiveCfg = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|ARM.Build.0 = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|ARM64.ActiveCfg = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|ARM64.Build.0 = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|iPhone.ActiveCfg = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|iPhone.Build.0 = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|iPhoneSimulator.ActiveCfg = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|iPhoneSimulator.Build.0 = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|x64.ActiveCfg = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|x64.Build.0 = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|x86.ActiveCfg = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|x86.Build.0 = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|Any CPU.ActiveCfg = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|Any CPU.Build.0 = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|ARM.ActiveCfg = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|ARM.Build.0 = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|ARM64.ActiveCfg = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|ARM64.Build.0 = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|iPhone.ActiveCfg = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|iPhone.Build.0 = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|x64.ActiveCfg = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|x64.Build.0 = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|x86.ActiveCfg = Release|Any CPU + {07802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|x86.Build.0 = Release|Any CPU {17BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {17BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|Any CPU.Build.0 = Debug|Any CPU {17BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -4210,6 +4532,48 @@ Global {17BB7190-F406-4A26-9C44-4F494B24CF83}.Release|x64.Build.0 = Release|Any CPU {17BB7190-F406-4A26-9C44-4F494B24CF83}.Release|x86.ActiveCfg = Release|Any CPU {17BB7190-F406-4A26-9C44-4F494B24CF83}.Release|x86.Build.0 = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|Any CPU.Build.0 = Debug|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|ARM.ActiveCfg = Debug|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|ARM.Build.0 = Debug|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|ARM64.Build.0 = Debug|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|iPhone.Build.0 = Debug|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|x64.ActiveCfg = Debug|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|x64.Build.0 = Debug|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|x86.ActiveCfg = Debug|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|x86.Build.0 = Debug|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|Any CPU.ActiveCfg = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|Any CPU.Build.0 = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|ARM.ActiveCfg = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|ARM.Build.0 = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|ARM64.ActiveCfg = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|ARM64.Build.0 = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|iPhone.ActiveCfg = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|iPhone.Build.0 = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|iPhoneSimulator.ActiveCfg = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|iPhoneSimulator.Build.0 = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|x64.ActiveCfg = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|x64.Build.0 = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|x86.ActiveCfg = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|x86.Build.0 = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release|Any CPU.ActiveCfg = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release|Any CPU.Build.0 = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release|ARM.ActiveCfg = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release|ARM.Build.0 = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release|ARM64.ActiveCfg = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release|ARM64.Build.0 = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release|iPhone.ActiveCfg = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release|iPhone.Build.0 = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release|x64.ActiveCfg = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release|x64.Build.0 = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release|x86.ActiveCfg = Release|Any CPU + {07BB7190-F406-4A26-9C44-4F494B24CF83}.Release|x86.Build.0 = Release|Any CPU {717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|Any CPU.Build.0 = Debug|Any CPU {717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -4252,6 +4616,48 @@ Global {717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|x64.Build.0 = Release|Any CPU {717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|x86.ActiveCfg = Release|Any CPU {717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|x86.Build.0 = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|ARM.ActiveCfg = Debug|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|ARM.Build.0 = Debug|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|ARM64.Build.0 = Debug|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|iPhone.Build.0 = Debug|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|x64.ActiveCfg = Debug|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|x64.Build.0 = Debug|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|x86.ActiveCfg = Debug|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|x86.Build.0 = Debug|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|Any CPU.ActiveCfg = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|Any CPU.Build.0 = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|ARM.ActiveCfg = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|ARM.Build.0 = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|ARM64.ActiveCfg = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|ARM64.Build.0 = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|iPhone.ActiveCfg = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|iPhone.Build.0 = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|iPhoneSimulator.ActiveCfg = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|iPhoneSimulator.Build.0 = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|x64.ActiveCfg = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|x64.Build.0 = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|x86.ActiveCfg = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|x86.Build.0 = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|Any CPU.Build.0 = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|ARM.ActiveCfg = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|ARM.Build.0 = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|ARM64.ActiveCfg = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|ARM64.Build.0 = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|iPhone.ActiveCfg = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|iPhone.Build.0 = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|x64.ActiveCfg = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|x64.Build.0 = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|x86.ActiveCfg = Release|Any CPU + {017B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|x86.Build.0 = Release|Any CPU {AA89E8AC-40EF-4911-99B5-55228188446A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AA89E8AC-40EF-4911-99B5-55228188446A}.Debug|Any CPU.Build.0 = Debug|Any CPU {AA89E8AC-40EF-4911-99B5-55228188446A}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -4588,6 +4994,48 @@ Global {34833538-6378-4592-B8DD-929C9F4B0E5C}.Release|x64.Build.0 = Release|Any CPU {34833538-6378-4592-B8DD-929C9F4B0E5C}.Release|x86.ActiveCfg = Release|Any CPU {34833538-6378-4592-B8DD-929C9F4B0E5C}.Release|x86.Build.0 = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Debug|ARM.ActiveCfg = Debug|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Debug|ARM.Build.0 = Debug|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Debug|ARM64.Build.0 = Debug|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Debug|iPhone.Build.0 = Debug|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Debug|x64.ActiveCfg = Debug|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Debug|x64.Build.0 = Debug|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Debug|x86.ActiveCfg = Debug|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Debug|x86.Build.0 = Debug|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release_NoSamples|Any CPU.ActiveCfg = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release_NoSamples|Any CPU.Build.0 = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release_NoSamples|ARM.ActiveCfg = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release_NoSamples|ARM.Build.0 = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release_NoSamples|ARM64.ActiveCfg = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release_NoSamples|ARM64.Build.0 = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release_NoSamples|iPhone.ActiveCfg = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release_NoSamples|iPhone.Build.0 = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release_NoSamples|iPhoneSimulator.ActiveCfg = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release_NoSamples|iPhoneSimulator.Build.0 = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release_NoSamples|x64.ActiveCfg = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release_NoSamples|x64.Build.0 = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release_NoSamples|x86.ActiveCfg = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release_NoSamples|x86.Build.0 = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release|Any CPU.Build.0 = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release|ARM.ActiveCfg = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release|ARM.Build.0 = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release|ARM64.ActiveCfg = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release|ARM64.Build.0 = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release|iPhone.ActiveCfg = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release|iPhone.Build.0 = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release|x64.ActiveCfg = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release|x64.Build.0 = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release|x86.ActiveCfg = Release|Any CPU + {04833538-6378-4592-B8DD-929C9F4B0E5C}.Release|x86.Build.0 = Release|Any CPU {8F85881F-05D5-46C8-BBA8-C1CA740C74E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8F85881F-05D5-46C8-BBA8-C1CA740C74E6}.Debug|Any CPU.Build.0 = Debug|Any CPU {8F85881F-05D5-46C8-BBA8-C1CA740C74E6}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -4756,6 +5204,48 @@ Global {CDE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release|x64.Build.0 = Release|Any CPU {CDE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release|x86.ActiveCfg = Release|Any CPU {CDE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release|x86.Build.0 = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Debug|ARM.ActiveCfg = Debug|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Debug|ARM.Build.0 = Debug|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Debug|ARM64.Build.0 = Debug|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Debug|iPhone.Build.0 = Debug|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Debug|x64.ActiveCfg = Debug|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Debug|x64.Build.0 = Debug|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Debug|x86.ActiveCfg = Debug|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Debug|x86.Build.0 = Debug|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release_NoSamples|Any CPU.ActiveCfg = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release_NoSamples|Any CPU.Build.0 = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release_NoSamples|ARM.ActiveCfg = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release_NoSamples|ARM.Build.0 = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release_NoSamples|ARM64.ActiveCfg = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release_NoSamples|ARM64.Build.0 = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release_NoSamples|iPhone.ActiveCfg = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release_NoSamples|iPhone.Build.0 = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release_NoSamples|iPhoneSimulator.ActiveCfg = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release_NoSamples|iPhoneSimulator.Build.0 = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release_NoSamples|x64.ActiveCfg = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release_NoSamples|x64.Build.0 = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release_NoSamples|x86.ActiveCfg = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release_NoSamples|x86.Build.0 = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release|Any CPU.Build.0 = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release|ARM.ActiveCfg = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release|ARM.Build.0 = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release|ARM64.ActiveCfg = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release|ARM64.Build.0 = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release|iPhone.ActiveCfg = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release|iPhone.Build.0 = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release|x64.ActiveCfg = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release|x64.Build.0 = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release|x86.ActiveCfg = Release|Any CPU + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284}.Release|x86.Build.0 = Release|Any CPU {54E27C52-4157-4585-B03F-184D8FBCAE3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {54E27C52-4157-4585-B03F-184D8FBCAE3F}.Debug|Any CPU.Build.0 = Debug|Any CPU {54E27C52-4157-4585-B03F-184D8FBCAE3F}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -5176,6 +5666,48 @@ Global {1DC9D120-524B-41E5-8988-B4763F6244A1}.Release|x64.Build.0 = Release|Any CPU {1DC9D120-524B-41E5-8988-B4763F6244A1}.Release|x86.ActiveCfg = Release|Any CPU {1DC9D120-524B-41E5-8988-B4763F6244A1}.Release|x86.Build.0 = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Debug|ARM.ActiveCfg = Debug|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Debug|ARM.Build.0 = Debug|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Debug|ARM64.Build.0 = Debug|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Debug|iPhone.Build.0 = Debug|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Debug|x64.ActiveCfg = Debug|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Debug|x64.Build.0 = Debug|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Debug|x86.ActiveCfg = Debug|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Debug|x86.Build.0 = Debug|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release_NoSamples|Any CPU.ActiveCfg = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release_NoSamples|Any CPU.Build.0 = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release_NoSamples|ARM.ActiveCfg = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release_NoSamples|ARM.Build.0 = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release_NoSamples|ARM64.ActiveCfg = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release_NoSamples|ARM64.Build.0 = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release_NoSamples|iPhone.ActiveCfg = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release_NoSamples|iPhone.Build.0 = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release_NoSamples|iPhoneSimulator.ActiveCfg = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release_NoSamples|iPhoneSimulator.Build.0 = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release_NoSamples|x64.ActiveCfg = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release_NoSamples|x64.Build.0 = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release_NoSamples|x86.ActiveCfg = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release_NoSamples|x86.Build.0 = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release|Any CPU.Build.0 = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release|ARM.ActiveCfg = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release|ARM.Build.0 = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release|ARM64.ActiveCfg = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release|ARM64.Build.0 = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release|iPhone.ActiveCfg = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release|iPhone.Build.0 = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release|x64.ActiveCfg = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release|x64.Build.0 = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release|x86.ActiveCfg = Release|Any CPU + {0DC9D120-524B-41E5-8988-B4763F6244A1}.Release|x86.Build.0 = Release|Any CPU {1E649F79-45AB-402A-A7DE-D4F2D0BBF1E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1E649F79-45AB-402A-A7DE-D4F2D0BBF1E5}.Debug|Any CPU.Build.0 = Debug|Any CPU {1E649F79-45AB-402A-A7DE-D4F2D0BBF1E5}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -5344,6 +5876,48 @@ Global {45C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release|x64.Build.0 = Release|Any CPU {45C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release|x86.ActiveCfg = Release|Any CPU {45C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release|x86.Build.0 = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Debug|ARM.ActiveCfg = Debug|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Debug|ARM.Build.0 = Debug|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Debug|ARM64.Build.0 = Debug|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Debug|iPhone.Build.0 = Debug|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Debug|x64.ActiveCfg = Debug|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Debug|x64.Build.0 = Debug|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Debug|x86.ActiveCfg = Debug|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Debug|x86.Build.0 = Debug|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release_NoSamples|Any CPU.ActiveCfg = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release_NoSamples|Any CPU.Build.0 = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release_NoSamples|ARM.ActiveCfg = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release_NoSamples|ARM.Build.0 = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release_NoSamples|ARM64.ActiveCfg = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release_NoSamples|ARM64.Build.0 = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release_NoSamples|iPhone.ActiveCfg = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release_NoSamples|iPhone.Build.0 = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release_NoSamples|iPhoneSimulator.ActiveCfg = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release_NoSamples|iPhoneSimulator.Build.0 = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release_NoSamples|x64.ActiveCfg = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release_NoSamples|x64.Build.0 = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release_NoSamples|x86.ActiveCfg = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release_NoSamples|x86.Build.0 = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release|Any CPU.Build.0 = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release|ARM.ActiveCfg = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release|ARM.Build.0 = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release|ARM64.ActiveCfg = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release|ARM64.Build.0 = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release|iPhone.ActiveCfg = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release|iPhone.Build.0 = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release|x64.ActiveCfg = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release|x64.Build.0 = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release|x86.ActiveCfg = Release|Any CPU + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F}.Release|x86.Build.0 = Release|Any CPU {AC6E2BD5-3902-46F4-8EA9-9BEF09D8B39C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AC6E2BD5-3902-46F4-8EA9-9BEF09D8B39C}.Debug|Any CPU.Build.0 = Debug|Any CPU {AC6E2BD5-3902-46F4-8EA9-9BEF09D8B39C}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -5722,6 +6296,48 @@ Global {2CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release|x64.Build.0 = Release|Any CPU {2CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release|x86.ActiveCfg = Release|Any CPU {2CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release|x86.Build.0 = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Debug|ARM.ActiveCfg = Debug|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Debug|ARM.Build.0 = Debug|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Debug|ARM64.Build.0 = Debug|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Debug|iPhone.Build.0 = Debug|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Debug|x64.ActiveCfg = Debug|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Debug|x64.Build.0 = Debug|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Debug|x86.ActiveCfg = Debug|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Debug|x86.Build.0 = Debug|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release_NoSamples|Any CPU.ActiveCfg = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release_NoSamples|Any CPU.Build.0 = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release_NoSamples|ARM.ActiveCfg = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release_NoSamples|ARM.Build.0 = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release_NoSamples|ARM64.ActiveCfg = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release_NoSamples|ARM64.Build.0 = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release_NoSamples|iPhone.ActiveCfg = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release_NoSamples|iPhone.Build.0 = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release_NoSamples|iPhoneSimulator.ActiveCfg = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release_NoSamples|iPhoneSimulator.Build.0 = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release_NoSamples|x64.ActiveCfg = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release_NoSamples|x64.Build.0 = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release_NoSamples|x86.ActiveCfg = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release_NoSamples|x86.Build.0 = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release|Any CPU.Build.0 = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release|ARM.ActiveCfg = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release|ARM.Build.0 = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release|ARM64.ActiveCfg = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release|ARM64.Build.0 = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release|iPhone.ActiveCfg = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release|iPhone.Build.0 = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release|x64.ActiveCfg = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release|x64.Build.0 = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release|x86.ActiveCfg = Release|Any CPU + {0CA6C2AE-BC23-435D-B81D-58C315EEB709}.Release|x86.Build.0 = Release|Any CPU {F4C7902D-5143-4351-8C0E-0C4527C52735}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F4C7902D-5143-4351-8C0E-0C4527C52735}.Debug|Any CPU.Build.0 = Debug|Any CPU {F4C7902D-5143-4351-8C0E-0C4527C52735}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -6027,17 +6643,26 @@ Global {0C43E58D-3A77-4F2C-A2D3-08F98759AEE8} = {E8E628C1-3BAF-4C67-AF41-78B1B30AC8CC} {D590CED3-7306-447A-A7BF-034777E4F1C1} = {E8E628C1-3BAF-4C67-AF41-78B1B30AC8CC} {C473858B-8ECF-4476-8CBA-05EA456FFE0E} = {416684CF-A4E3-4079-B380-3FF0B00E433C} + {0473858B-8ECF-4476-8CBA-05EA456FFE0E} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C} = {416684CF-A4E3-4079-B380-3FF0B00E433C} + {0C4D969A-AF2B-4C78-AF04-5ECE47F7D14C} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D} = {416684CF-A4E3-4079-B380-3FF0B00E433C} + {01AF1FBC-D11D-441D-AD07-5FF2FE295C0D} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {1EC49129-3FB1-4045-9859-03F72CAD2913} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {4DB56B75-B691-4F8B-879F-D7F36EEE6187} = {02DF1FE3-A56C-4F96-95D8-42B55D2A8988} + {0DB56B75-B691-4F8B-879F-D7F36EEE6187} = {02DF1FE3-A56C-4F96-95D8-42B55D2A8988} {3C272635-C7D1-444C-86C2-CB95E367D13D} = {995C1054-AB61-42EE-9A17-C32155BD6D13} {7B3AC6D8-2660-4FC2-9633-F8DFC0F32012} = {416684CF-A4E3-4079-B380-3FF0B00E433C} + {0B3AC6D8-2660-4FC2-9633-F8DFC0F32012} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {CA07C58C-D4E6-4432-8241-55FA016DEA41} = {E872CD33-A455-4DC4-8A87-5FEEC1C39A44} + {57EBE08D-75E9-4024-A7F6-C67752B1DCA0} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {4A5E7CC0-881A-450F-91E0-F5D66F559ADF} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {17802FE5-5A70-42DE-816A-FCC5776A3E02} = {416684CF-A4E3-4079-B380-3FF0B00E433C} + {07802FE5-5A70-42DE-816A-FCC5776A3E02} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {17BB7190-F406-4A26-9C44-4F494B24CF83} = {E872CD33-A455-4DC4-8A87-5FEEC1C39A44} + {07BB7190-F406-4A26-9C44-4F494B24CF83} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {717B3451-3CE4-4FF3-9D7E-3E90348214EA} = {416684CF-A4E3-4079-B380-3FF0B00E433C} + {017B3451-3CE4-4FF3-9D7E-3E90348214EA} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {AA89E8AC-40EF-4911-99B5-55228188446A} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {76EBBF09-F39F-48C2-BEE9-9DF5F8EC6A49} = {995C1054-AB61-42EE-9A17-C32155BD6D13} {13B713F7-4F6C-4205-BDDA-487CA528B499} = {FCBC6D7C-8F07-4C07-9802-0E2B5B72391D} @@ -6047,10 +6672,12 @@ Global {E0F1F702-6061-49BC-83C0-2BF3B9CDCF30} = {FCBC6D7C-8F07-4C07-9802-0E2B5B72391D} {A5B7419A-CAF2-4901-AAED-FF394B9AB8B8} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {34833538-6378-4592-B8DD-929C9F4B0E5C} = {416684CF-A4E3-4079-B380-3FF0B00E433C} + {04833538-6378-4592-B8DD-929C9F4B0E5C} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {8F85881F-05D5-46C8-BBA8-C1CA740C74E6} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {D297142A-6F19-476F-B6FF-552FC57E1A9A} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {F40CB5E3-4D70-424E-937E-FCBB2A47BBA4} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {CDE9C243-5CDC-4DF6-B82F-B9AF4B35A284} = {416684CF-A4E3-4079-B380-3FF0B00E433C} + {0DE9C243-5CDC-4DF6-B82F-B9AF4B35A284} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {54E27C52-4157-4585-B03F-184D8FBCAE3F} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {AD35E340-34DF-4FA9-B545-B9FBB72D3A2E} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {CC0AF5E6-FA87-4A09-958A-95ADE1E5B946} = {416684CF-A4E3-4079-B380-3FF0B00E433C} @@ -6061,10 +6688,12 @@ Global {94415375-1CDD-4FEC-ACBC-5D92E182FF87} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {39C20EBB-59D8-43E5-9CF6-390521C0C82A} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {1DC9D120-524B-41E5-8988-B4763F6244A1} = {416684CF-A4E3-4079-B380-3FF0B00E433C} + {0DC9D120-524B-41E5-8988-B4763F6244A1} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {1E649F79-45AB-402A-A7DE-D4F2D0BBF1E5} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {8386DF84-BB52-425F-A36F-E966865D7096} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {1E3CF690-9F3D-45DA-95D3-51910CFB1B80} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {45C0AAC5-6797-4E22-9A4C-C7EE6369A53F} = {416684CF-A4E3-4079-B380-3FF0B00E433C} + {05C0AAC5-6797-4E22-9A4C-C7EE6369A53F} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {AC6E2BD5-3902-46F4-8EA9-9BEF09D8B39C} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {138FF660-5EE6-475B-828C-81F96E9BE142} = {FCBC6D7C-8F07-4C07-9802-0E2B5B72391D} {042F79A0-E0BB-4DED-8BC8-419700B9EE30} = {FCBC6D7C-8F07-4C07-9802-0E2B5B72391D} @@ -6077,6 +6706,7 @@ Global {31B0EFDC-94D6-4599-B9BD-DECEA44FA3FE} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {270CF773-1F7B-4C8D-A4AD-46B8D08F3A38} = {31B0EFDC-94D6-4599-B9BD-DECEA44FA3FE} {2CA6C2AE-BC23-435D-B81D-58C315EEB709} = {31B0EFDC-94D6-4599-B9BD-DECEA44FA3FE} + {0CA6C2AE-BC23-435D-B81D-58C315EEB709} = {416684CF-A4E3-4079-B380-3FF0B00E433C} {F4C7902D-5143-4351-8C0E-0C4527C52735} = {31B0EFDC-94D6-4599-B9BD-DECEA44FA3FE} {F1F1BBD7-93D0-4EFE-82A0-AD4EEDD229D0} = {31B0EFDC-94D6-4599-B9BD-DECEA44FA3FE} {1AB2D0BF-DF3C-44F4-88B7-334CC41C2988} = {31B0EFDC-94D6-4599-B9BD-DECEA44FA3FE} diff --git a/src/Uno.UI/UI/Xaml/IFrameworkElement.cs b/src/Uno.UI/UI/Xaml/IFrameworkElement.cs index 6f174f44886d..72df4540eca7 100644 --- a/src/Uno.UI/UI/Xaml/IFrameworkElement.cs +++ b/src/Uno.UI/UI/Xaml/IFrameworkElement.cs @@ -56,6 +56,7 @@ using NMath = System.Math; using View = Windows.UI.Xaml.UIElement; #else +#pragma warning disable CS8981 // The type name 'nint' only contains lower-cased ascii characters. Such names may become reserved for the language using nint = System.Int32; using nfloat = System.Double; using CGSize = Windows.Foundation.Size; diff --git a/src/Uno.UI/UI/Xaml/Style/mergedstyles.xaml b/src/Uno.UI/UI/Xaml/Style/mergedstyles.xaml index 9840469f23a5..26507bfd0dab 100644 --- a/src/Uno.UI/UI/Xaml/Style/mergedstyles.xaml +++ b/src/Uno.UI/UI/Xaml/Style/mergedstyles.xaml @@ -1,19911 +1 @@ - - - - - - 2,0 - Normal - - - - - - - - - - - - - - - - - - - - - - - 1 - - 12 - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - 0 - - - - - 4 - 4 - 16 - 11 - 8 - 12 - 0,0,0,0 - 4,0,4,2 - 4,0,4,2 - 4,4,4,4 - - - - - - - - - - - - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2,2,2,2 - 4,4,4,4 - #33FFFFFF - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 32 - - - - - - - - - - - #FF323232 - #CC1F1F1F - #FF1C1C1C - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #FFFFFF - #C5FFFFFF - #87FFFFFF - #5DFFFFFF - #E4000000 - #5DFFFFFF - #FFFFFF - #000000 - #80000000 - #87FFFFFF - #0FFFFFFF - #15FFFFFF - #08FFFFFF - #0BFFFFFF - #00FFFFFF - #B31E1E1E - #8BFFFFFF - #3FFFFFFF - #454545 - #00FFFFFF - #0FFFFFFF - #0AFFFFFF - #00FFFFFF - #00FFFFFF - #19000000 - #0BFFFFFF - #12FFFFFF - #00FFFFFF - #B31C1C1C - #1A1A1A - #131313 - #1E1E1E - #28FFFFFF - #12FFFFFF - #18FFFFFF - #14FFFFFF - #23000000 - #37000000 - #33000000 - #6B000000 - #19000000 - #1C1C1C - #8BFFFFFF - #28FFFFFF - #66757575 - #33000000 - #0F000000 - #15FFFFFF - #FFFFFF - #B3000000 - #0DFFFFFF - #08FFFFFF - #4D000000 - #4C3A3A3A - #0DFFFFFF - #09FFFFFF - #09FFFFFF - #202020 - #1C1C1C - #282828 - #2C2C2C - #00202020 - #6CCB5F - #FCE100 - #FF99A4 - #8BFFFFFF - #9D9D9D - #08FFFFFF - #393D1B - #433519 - #442726 - #08FFFFFF - #2E2E2E - #2E2E2E - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 24 - 48 - 56 - 24 - 40 - 3 - 0,0,0,0 - 0,0,0,0 - 0,0,0,0 - 0,0,0,0 - 3,0,3,0 - 48 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 160 - 240 - 480 - 198 - - - - - - - 1 - 0,0,0,1 - 0,1,0,0 - 0 - 0 - 0 - - 1 - 1,1,1,0 - 1,0,1,1 - 80 - 1 - 20 - 20 - 0,0,0,4 - Normal - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - 0 - - - - - 44,0,0,0 - 12,11,0,13 - 24,0,0,0 - 28,0,0,0 - 12,4,12,4 - - - - - - - - - - - - - - - - - - - - - - - 56,0,0,0 - - - - - - 1 - 11,9,11,10 - 11,4,11,7 - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.8 - 1.0 - 0 - 2 - - - - - - - - - - - - 2,0 - Normal - - - - - - - - - - - - - - - - - - - - - - - 1 - - 12 - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - 0 - - - - - 4 - 4 - 16 - 11 - 9 - 12 - 0,0,0,0 - 4,0,4,2 - 4,0,4,2 - 4,4,4,4 - - - - - - - - - - - - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2,2,2,2 - 4,4,4,4 - #29C50500 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 32 - - - - - - - - - - - #FFE6E6E6 - #CCFFFFFF - #FFFFFFFF - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #E4000000 - #9E000000 - #72000000 - #5C000000 - #FFFFFF - #5C000000 - #FFFFFF - #FFFFFF - #B3FFFFFF - #FFFFFF - #B3FFFFFF - #80F9F9F9 - #4DF9F9F9 - #4DF9F9F9 - #00FFFFFF - #FFFFFF - #72000000 - #51000000 - #FFFFFF - #00FFFFFF - #09000000 - #06000000 - #00FFFFFF - #00FFFFFF - #06000000 - #0F000000 - #18000000 - #00FFFFFF - #C9FFFFFF - #F3F3F3 - #EBEBEB - #00FFFFFF - #37000000 - #0F000000 - #29000000 - #14FFFFFF - #66000000 - #37000000 - #0F000000 - #59FFFFFF - #0F000000 - #EBEBEB - #72000000 - #37000000 - #66757575 - #0F000000 - #15FFFFFF - #0F000000 - #E4000000 - #B3FFFFFF - #B3FFFFFF - #80F6F6F6 - #4D000000 - #80FFFFFF - #FFFFFF - #40FFFFFF - #40FFFFFF - #F3F3F3 - #EEEEEE - #F9F9F9 - #FFFFFF - #00F3F3F3 - #0F7B0F - #9D5D00 - #C42B1C - #72000000 - #8A8A8A - #80F6F6F6 - #DFF6DD - #FFF4CE - #FDE7E9 - #06000000 - #F7F7F7 - #F3F3F3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 24 - 48 - 56 - 24 - 40 - 3 - 0,0,0,0 - 0,0,0,0 - 0,0,0,0 - 0,0,0,0 - 3,0,3,0 - 48 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 160 - 240 - 480 - 198 - - - - - - - 1 - 0,0,0,1 - 0,1,0,0 - 0 - 0 - 0 - - 1 - 1,1,1,0 - 1,0,1,1 - 80 - 1 - 20 - 20 - 0,0,0,4 - Normal - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - 0 - - - - - 44,0,0,0 - 12,11,0,13 - 24,0,0,0 - 28,0,0,0 - 12,4,12,4 - - - - - - - - - - - - - - - - - - - - - - - 56,0,0,0 - - - - - - 1 - 11,9,11,10 - 11,4,11,7 - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.8 - 1.0 - 0 - 2 - - - - - - - - - - - - 2,0 - Normal - - - - - - - - - - - - - - - - - - - - - - - 2 - - 12 - - - - - - - - - - - - - - - - - 2 - - - - - - - - - - 2 - - - - - 4 - 4 - 16 - 11 - 9 - 12 - 0,0,0,0 - 4,0,4,2 - 4,0,4,2 - 4,4,4,4 - - - - - - - - - - - - - 2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - 2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2,2,2,2 - 4,4,4,4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 32 - - - - - - - - - - - #FF323232 - #CC1F1F1F - #FF1F1F1F - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - #FF0000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 24 - 48 - 56 - 24 - 40 - 3 - 0,2,0,0 - 0,0,0,0 - 0,0,0,2 - 0,0,0,0 - 3,0,3,0 - 48 - - - - - - - - - - - - - - - - - - - - - - 0 - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 160 - 240 - 480 - 198 - - - - - - - 1 - 0,0,0,1 - 0,1,0,0 - 0 - 0 - 0 - - 1 - 1,1,1,0 - 1,0,1,1 - - - - - - - - - - - - - - - - - - - - - - - - 80 - 1 - 20 - 20 - 0,0,0,4 - Normal - - - 1 - - - - - - - - - - - - - - - 2 - - - - - 44,0,0,0 - - - - - - - - - - - - - - - - - - - - - - - 12,11,0,13 - 24,0,0,0 - 28,0,0,0 - 12,4,12,4 - 56,0,0,0 - - - - - - - 1 - 1 - 11,9,11,10 - 11,4,11,7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.0 - 1.0 - 1 - 2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 312 - 392 - 312 - 392 - 122 - - - 6 - 10 - 10 - - - - - - - 48 - Stretch - Center - 16,0,0,0 - 20,0,8,0 - - - 32 - 12 - 16 - 1,0,1,1 - 1,1,1,0 - - - - - - - - - - - - - - - - 14 - SemiBold - 14 - Normal - 40 - 32 - 16 - - - - - 12,0,0,0 - 0,10,10,10 - 20 - 0,0,12,0 - 0,0,0,0 - 0,10,0,10 - 0,10,0,0 - 0,10,0,0 - 8,10,0,0 - 0,4,0,0 - 12,8,0,0 - 0,12,0,0 - 96 - 24 - 8,0,8,1 - 2 - 14 - 24 - 0,0,0,1 - Cancel - - - - - - - - - - - - - - - - - 40 - 40 - - - - - 10,0,16,0 - 12,0,12,0 - 40 - 40 - 40 - 40 - 40 - 48 - 48 - 40 - 40 - 4 - 1 - 1 - 1 - 1 - 12,0,12,0 - 10,0,0,0 - 8,5,0,0 - 12,5,0,11 - 8,4,0,0 - 0 - 0 - 16,10 - 16,10 - 10,0 - 0 - 0,0,20,0 - 0,0,0,0 - 8,0,16,0 - 12,0 - -20,0,6,0 - -16,0,0,0 - 0,0,0,0 - -12,0,0,0 - 12,0,20,0 - 16,0,20,0 - -4,0,6,0 - 12,0,12,0 - 0,8 - 0,8 - 12.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Visible - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 40 - - - - - - - - - - 1 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Visible - - - - - - - - - - - Visible - - - - - - - - - - - - - Visible - - - - - - - - - - - - - - - - - - Visible - - - - - - - - - - - - - - - - Visible - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Collapsed - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 312 + 392 + 312 + 392 + 122 + + + 6 + 10 + 10 + + + + + + + 48 + Stretch + Center + 16,0,0,0 + 20,0,8,0 + + + 32 + 12 + 16 + 1,0,1,1 + 1,1,1,0 + + + + + + + + + + + + + + + + 14 + SemiBold + 14 + Normal + 40 + 32 + 16 + + + + + 12,0,0,0 + 0,10,10,10 + 20 + 0,0,12,0 + 0,0,0,0 + 0,10,0,10 + 0,10,0,0 + 0,10,0,0 + 8,10,0,0 + 0,4,0,0 + 12,8,0,0 + 0,12,0,0 + 96 + 24 + 8,0,8,1 + 2 + 14 + 24 + 0,0,0,1 + Cancel + + + + + + + + + + + + + + + + + 40 + 40 + + + + + 10,0,16,0 + 12,0,12,0 + 40 + 40 + 40 + 40 + 40 + 48 + 48 + 40 + 40 + 4 + 1 + 1 + 1 + 1 + 12,0,12,0 + 10,0,0,0 + 8,5,0,0 + 12,5,0,11 + 8,4,0,0 + 0 + 0 + 16,10 + 16,10 + 10,0 + 0 + 0,0,20,0 + 0,0,0,0 + 8,0,16,0 + 12,0 + -20,0,6,0 + -16,0,0,0 + 0,0,0,0 + -12,0,0,0 + 12,0,20,0 + 16,0,20,0 + -4,0,6,0 + 12,0,12,0 + 0,8 + 0,8 + 12.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Visible + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 40 + + + + + + + + + + 1 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Visible + + + + + + + + + + + Visible + + + + + + + + + + + + + Visible + + + + + + + + + + + + + + + + + + Visible + + + + + + + + + + + + + + + + Visible + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Collapsed + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/SamplesApp/UITests.Shared/Msal/MsalLoginAndGraph.xaml.cs b/src/SamplesApp/UITests.Shared/Msal/MsalLoginAndGraph.xaml.cs index ed96bbf46741..68b1bde4aa3f 100644 --- a/src/SamplesApp/UITests.Shared/Msal/MsalLoginAndGraph.xaml.cs +++ b/src/SamplesApp/UITests.Shared/Msal/MsalLoginAndGraph.xaml.cs @@ -62,11 +62,7 @@ private async void SignIn(object sender, RoutedEventArgs e) private async void LoadFromGraph(object sender, RoutedEventArgs e) { -#if __WASM__ - var http = new HttpClient(new Uno.UI.Wasm.WasmHttpHandler()); -#else var http = new HttpClient(); -#endif var httpClient = http; var client = new GraphServiceClient(httpClient); client.AuthenticationProvider = this; diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/ImageTests/BitmapImage_vs_SvgImageSource.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/ImageTests/BitmapImage_vs_SvgImageSource.cs index c560f4765a25..c28424394b96 100644 --- a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/ImageTests/BitmapImage_vs_SvgImageSource.cs +++ b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/ImageTests/BitmapImage_vs_SvgImageSource.cs @@ -140,11 +140,7 @@ void Log(string msg) private async Task GetStream() { -#if __WASM__ - using var httpClient = new HttpClient(new Uno.UI.Wasm.WasmHttpHandler()); -#else using var httpClient = new HttpClient(); -#endif var data = await httpClient.GetByteArrayAsync(url.Text); return new MemoryStream(data).AsRandomAccessStream(); diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/ImageTests/ImageSourceStream.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/ImageTests/ImageSourceStream.xaml.cs index f9c925bbb859..c504f13ede8c 100644 --- a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/ImageTests/ImageSourceStream.xaml.cs +++ b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/ImageTests/ImageSourceStream.xaml.cs @@ -35,11 +35,7 @@ private async void OnLoaded(object sender, RoutedEventArgs e) private static async Task GetStream(string url) { -#if __WASM__ - using var httpClient = new HttpClient(new Uno.UI.Wasm.WasmHttpHandler()); -#else using var httpClient = new HttpClient(); -#endif var data = await httpClient.GetByteArrayAsync(url); return new MemoryStream(data).AsRandomAccessStream(); diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Media/ImageBrushTests/ImageBrush_StreamSource.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Media/ImageBrushTests/ImageBrush_StreamSource.xaml.cs index dcd0c424d4fe..164e5388fa9f 100644 --- a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Media/ImageBrushTests/ImageBrush_StreamSource.xaml.cs +++ b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Media/ImageBrushTests/ImageBrush_StreamSource.xaml.cs @@ -37,11 +37,7 @@ public ImageBrush_StreamSource() this.RunWhileLoaded(async ct => { -#if __WASM__ - using var httpClient = new HttpClient(new Uno.UI.Wasm.WasmHttpHandler()); -#else using var httpClient = new HttpClient(); -#endif const string imageUrl = "https://nv-assets.azurewebsites.net/tests/images/uno-overalls.jpg"; var data = await httpClient.GetByteArrayAsync(imageUrl); diff --git a/src/Uno.ReferenceImplComparer/Properties/launchSettings.json b/src/Uno.ReferenceImplComparer/Properties/launchSettings.json index d93d473c14fe..4112c44d34e2 100644 --- a/src/Uno.ReferenceImplComparer/Properties/launchSettings.json +++ b/src/Uno.ReferenceImplComparer/Properties/launchSettings.json @@ -2,7 +2,7 @@ "profiles": { "Uno.ReferenceImplComparer": { "commandName": "Project", - "commandLineArgs": "\"C:\\Temp\\nuget-local\\Uno.UI.3.0.0-dev.wasm-separation.682.nupkg\"" + "commandLineArgs": "\"C:\\temp\\nuget-local\\57728-vslatest\\vslatest\\Uno.UI.4.6.0-PullRequest-10019-57728-10019.nupkg\"" } } } \ No newline at end of file diff --git a/src/Uno.UI/ts/HttpClient.ts b/src/Uno.UI/ts/HttpClient.ts index 555a5eed1e66..6b51813b5ce6 100644 --- a/src/Uno.UI/ts/HttpClient.ts +++ b/src/Uno.UI/ts/HttpClient.ts @@ -64,21 +64,13 @@ private static dispatchResponse(requestId: string, status: number, headers: string, payload: string) { this.initMethods(); - - const requestIdStr = MonoRuntime.mono_string(requestId); - const statusStr = MonoRuntime.mono_string("" + status); - const headersStr = MonoRuntime.mono_string(headers); - const payloadStr = MonoRuntime.mono_string(payload); - MonoRuntime.call_method(this.dispatchResponseMethod, null, [requestIdStr, statusStr, headersStr, payloadStr]); + this.dispatchResponseMethod("" + requestId, "" + status, headers, payload); } private static dispatchError(requestId: string, error: string) { this.initMethods(); - - const requestIdStr = MonoRuntime.mono_string(requestId); - const errorStr = MonoRuntime.mono_string(error); - MonoRuntime.call_method(this.dispatchErrorMethod, null, [requestIdStr, errorStr]); + this.dispatchErrorMethod(requestId, error); } private static dispatchResponseMethod: any; @@ -89,10 +81,8 @@ return; // already initialized. } - const asm = MonoRuntime.assembly_load("Uno.UI.Runtime.WebAssembly"); - const httpClass = MonoRuntime.find_class(asm, "Uno.UI.Wasm", "WasmHttpHandler"); - this.dispatchResponseMethod = MonoRuntime.find_method(httpClass, "DispatchResponse", -1); - this.dispatchErrorMethod = MonoRuntime.find_method(httpClass, "DispatchError", -1); + this.dispatchResponseMethod = (Module).mono_bind_static_method("[Uno.UI.Runtime.WebAssembly] Uno.UI.Wasm.WasmHttpHandler:DispatchResponse"); + this.dispatchErrorMethod = (Module).mono_bind_static_method("[Uno.UI.Runtime.WebAssembly] Uno.UI.Wasm.WasmHttpHandler:DispatchError"); } } } From 3c65abeb14e9c33de71563fc8bd10103967cf565 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Thu, 6 Oct 2022 16:16:39 -0400 Subject: [PATCH 57/70] ci: adjust runtime replace --- build/Uno.WinUI.RemoteControl.nuspec | 5 +-- build/uno.winui.runtime-replace.targets | 32 +++++++++++++++++-- .../Uno.UI.RemoteControl.Host.csproj | 2 +- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/build/Uno.WinUI.RemoteControl.nuspec b/build/Uno.WinUI.RemoteControl.nuspec index 1df0a2c7cb80..8f9ece4694f3 100644 --- a/build/Uno.WinUI.RemoteControl.nuspec +++ b/build/Uno.WinUI.RemoteControl.nuspec @@ -186,10 +186,10 @@ - + - + @@ -200,6 +200,7 @@ + diff --git a/build/uno.winui.runtime-replace.targets b/build/uno.winui.runtime-replace.targets index cab70c6e183c..378130ea292b 100644 --- a/build/uno.winui.runtime-replace.targets +++ b/build/uno.winui.runtime-replace.targets @@ -5,6 +5,11 @@ + + <_UnoRuntimeTargetFramework>netstandard2.0 + <_UnoRuntimeTargetFramework Condition="'$(TargetFrameworkVersion)'!='' and '$(TargetFrameworkVersion.Substring(1))'>='7.0'">net7.0 + + @@ -18,12 +23,15 @@ Include="@(UnoRuntimeEnabledPackage)" Condition="'%(UnoRuntimeEnabledPackage.PackageBasePath)'==''" /> + - + + + + + + + + + + + - + Exe - netcoreapp3.1;net6.0 + netcoreapp3.1;net6.0;net7.0 true Major From 59d072b4408cee9ecdfefc6111aa2206555eeab3 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Thu, 6 Oct 2022 19:19:04 -0400 Subject: [PATCH 58/70] ci: Adjust removecontrol host build --- build/Uno.UI.Build.csproj | 6 +++--- build/Uno.WinUI.RemoteControl.nuspec | 2 ++ build/filters/Uno.UI-packages-skia.slnf | 2 ++ src/Uno.UI.RemoteControl.Host/RemoteControlServer.cs | 4 +++- .../Uno.UI.RemoteControl.Host.csproj | 3 ++- .../Uno.UI.RemoteControl.Server.Processors.csproj | 5 +++-- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/build/Uno.UI.Build.csproj b/build/Uno.UI.Build.csproj index e6808a61c714..8577d3ca0144 100644 --- a/build/Uno.UI.Build.csproj +++ b/build/Uno.UI.Build.csproj @@ -233,7 +233,7 @@ - - - + + diff --git a/build/filters/Uno.UI-packages-skia.slnf b/build/filters/Uno.UI-packages-skia.slnf index 7e212e4fa877..b5b3d7d4c988 100644 --- a/build/filters/Uno.UI-packages-skia.slnf +++ b/build/filters/Uno.UI-packages-skia.slnf @@ -33,6 +33,8 @@ "Uno.UI.FluentTheme.v2\\Uno.UI.FluentTheme.v2.Skia.csproj", "Uno.UI.FluentTheme\\Uno.UI.FluentTheme.Skia.csproj", "Uno.UI.RemoteControl\\Uno.UI.RemoteControl.Skia.csproj", + "Uno.UI.RemoteControl.Host\\Uno.UI.RemoteControl.Host.csproj", + "Uno.UI.RemoteControl.VS\\Uno.UI.RemoteControl.VS.csproj", "Uno.UI.Runtime.Skia.Gtk\\Uno.UI.Runtime.Skia.Gtk.csproj", "Uno.UI.Runtime.Skia.Linux.FrameBuffer\\Uno.UI.Runtime.Skia.Linux.FrameBuffer.csproj", "Uno.UI.Runtime.Skia.Tizen\\Uno.UI.Runtime.Skia.Tizen.csproj", diff --git a/src/Uno.UI.RemoteControl.Host/RemoteControlServer.cs b/src/Uno.UI.RemoteControl.Host/RemoteControlServer.cs index 09c7bc7f0279..fac06f52cc0d 100644 --- a/src/Uno.UI.RemoteControl.Host/RemoteControlServer.cs +++ b/src/Uno.UI.RemoteControl.Host/RemoteControlServer.cs @@ -101,7 +101,9 @@ private void ProcessDiscoveryFrame(Frame frame) var basePath = msg.BasePath.Replace('/', Path.DirectorySeparatorChar); -#if NET6_0_OR_GREATER +#if NET7_0_OR_GREATER + basePath = Path.Combine(basePath, "net7.0"); +#elif NET6_0_OR_GREATER basePath = Path.Combine(basePath, "net6.0"); #else basePath = Path.Combine(basePath, "netcoreapp3.1"); diff --git a/src/Uno.UI.RemoteControl.Host/Uno.UI.RemoteControl.Host.csproj b/src/Uno.UI.RemoteControl.Host/Uno.UI.RemoteControl.Host.csproj index fbeeac49e919..c5bbfddf94b1 100644 --- a/src/Uno.UI.RemoteControl.Host/Uno.UI.RemoteControl.Host.csproj +++ b/src/Uno.UI.RemoteControl.Host/Uno.UI.RemoteControl.Host.csproj @@ -8,8 +8,9 @@ - netcoreapp3.1 + netcoreapp3.1 net6.0 + net6.0;net7.0 diff --git a/src/Uno.UI.RemoteControl.Server.Processors/Uno.UI.RemoteControl.Server.Processors.csproj b/src/Uno.UI.RemoteControl.Server.Processors/Uno.UI.RemoteControl.Server.Processors.csproj index 7dce0cd76915..b1983c76f335 100644 --- a/src/Uno.UI.RemoteControl.Server.Processors/Uno.UI.RemoteControl.Server.Processors.csproj +++ b/src/Uno.UI.RemoteControl.Server.Processors/Uno.UI.RemoteControl.Server.Processors.csproj @@ -8,8 +8,9 @@ - netcoreapp3.1 + netcoreapp3.1 net6.0 + net6.0;net7.0 @@ -24,7 +25,7 @@ - + From b5b50e64f0c14e1f8a4426a97ab8fda0b3b2ed87 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Fri, 7 Oct 2022 08:08:56 -0400 Subject: [PATCH 59/70] ci: Adjust skia/wasm packages copy --- build/ci/.azure-devops-package.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/build/ci/.azure-devops-package.yml b/build/ci/.azure-devops-package.yml index 3623c14d69c5..d61687088746 100644 --- a/build/ci/.azure-devops-package.yml +++ b/build/ci/.azure-devops-package.yml @@ -99,6 +99,32 @@ jobs: OverWrite: false flattenFolders: false + - task: CopyFiles@2 + displayName: Copy generic build packages + condition: always() + inputs: + SourceFolder: $(Agent.WorkFolder)/NugetPackages-Artifacts/vslatest-skia + Contents: | + *.nupkg + *.vsix + TargetFolder: $(build.artifactstagingdirectory)\vslatest + CleanTargetFolder: false + OverWrite: false + flattenFolders: false + + - task: CopyFiles@2 + displayName: Copy generic build packages + condition: always() + inputs: + SourceFolder: $(Agent.WorkFolder)/NugetPackages-Artifacts/vslatest-wasm + Contents: | + *.nupkg + *.vsix + TargetFolder: $(build.artifactstagingdirectory)\vslatest + CleanTargetFolder: false + OverWrite: false + flattenFolders: false + - task: PowerShell@2 displayName: Authenticode Sign Packages inputs: From 36525e639c6299389e85dc2b354077ee51c422bd Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Fri, 7 Oct 2022 08:09:30 -0400 Subject: [PATCH 60/70] ci: Add net7 template tests --- .../.azure-devops-project-template-tests.yml | 32 ++++++++- ...ps1 => run-net6-mobile-template-tests.ps1} | 0 .../test-scripts/run-net7-template-linux.ps1 | 68 +++++++++++++++++++ 3 files changed, 99 insertions(+), 1 deletion(-) rename build/test-scripts/{run-net6-template-tests.ps1 => run-net6-mobile-template-tests.ps1} (100%) create mode 100644 build/test-scripts/run-net7-template-linux.ps1 diff --git a/build/ci/.azure-devops-project-template-tests.yml b/build/ci/.azure-devops-project-template-tests.yml index 351cb995a968..7b97dac66b33 100644 --- a/build/ci/.azure-devops-project-template-tests.yml +++ b/build/ci/.azure-devops-project-template-tests.yml @@ -65,7 +65,7 @@ jobs: - script: dotnet new -i $(System.ArtifactsDirectory)\NugetPackages\vslatest\Uno.ProjectTemplates.Dotnet*.nupkg displayName: Install Project Templates - - powershell: build\test-scripts\run-net6-template-tests.ps1 + - powershell: build\test-scripts\run-net6-mobile-template-tests.ps1 displayName: Run Project Templates Tests env: NUGET_CI_CONFIG: $(Build.SourcesDirectory)\src\nuget.ci.net6.config @@ -103,3 +103,33 @@ jobs: displayName: Run Project Templates Tests env: NUGET_CI_CONFIG: $(Build.SourcesDirectory)/src/nuget.ci.config + +- job: Dotnet_Template_Tests_net7_Linux + displayName: 'dotnet new Templates Tests - Linux (net7)' + + pool: + vmImage: ${{ parameters.vmImageLinux }} + + container: unoplatform/wasm-build:2.3 + + dependsOn: Generate_Packages + + steps: + - task: DownloadBuildArtifacts@0 + inputs: + artifactName: NugetPackages + + - template: templates/gitversion.yml + + - script: cp $(System.ArtifactsDirectory)/NugetPackages/vslatest/*.nupkg $(Build.SourcesDirectory)/src/PackageCache + displayName: Copy Artifacts to PackageCache + + - template: templates/dotnet-install.yml + + - script: dotnet new -i $(System.ArtifactsDirectory)/NugetPackages/vslatest/Uno.ProjectTemplates.Dotnet*.nupkg + displayName: Install Project Templates + + - pwsh: build/test-scripts/run-net7-template-linux.ps1 + displayName: Run Project Templates Tests + env: + NUGET_CI_CONFIG: $(Build.SourcesDirectory)/src/nuget.ci.config diff --git a/build/test-scripts/run-net6-template-tests.ps1 b/build/test-scripts/run-net6-mobile-template-tests.ps1 similarity index 100% rename from build/test-scripts/run-net6-template-tests.ps1 rename to build/test-scripts/run-net6-mobile-template-tests.ps1 diff --git a/build/test-scripts/run-net7-template-linux.ps1 b/build/test-scripts/run-net7-template-linux.ps1 new file mode 100644 index 000000000000..15d038798b1b --- /dev/null +++ b/build/test-scripts/run-net7-template-linux.ps1 @@ -0,0 +1,68 @@ +Set-PSDebug -Trace 1 + +$ErrorActionPreference = 'Stop' + +function Assert-ExitCodeIsZero() +{ + if ($LASTEXITCODE -ne 0) + { + throw "Exit code must be zero." + } +} + +function Get-TemplateConfiguration( + [bool]$android = $false, + [bool]$iOS = $false, + [bool]$macOS = $false, + [bool]$wasm = $false, + [bool]$skiaGtk = $false, + [bool]$skiaWpf = $false, + [bool]$skiaLinuxFB = $false, + [bool]$wasmVsCode = $false) +{ + $androidFlag = '-android' + $iOSFlag = '-ios' + $macOSFlag = '-macos' + $wasmFlag = '-wasm' + $wasmVsCodeFlag = '--vscode' + $skiaWpfFlag = '--skia-wpf' + $skiaGtkFlag = '--skia-gtk' + $skiaLinuxFBFlag = '--skia-linux-fb' + + $a = If ($android) { $androidFlag } Else { $androidFlag + '=false' } + $b = If ($iOS) { $iOSFlag } Else { $iOSFlag + '=false' } + $c = If ($macOS) { $macOSFlag } Else { $macOSFlag + '=false' } + $d = If ($wasm) { $wasmFlag } Else { $wasmFlag + '=false' } + $e = If ($wasmVsCode) { $wasmVsCodeFlag } Else { $wasmVsCodeFlag + '=false' } + $f = If ($skiaWpf) { $skiaWpfFlag } Else { $skiaWpfFlag + '=false' } + $g = If ($skiaGtk) { $skiaGtkFlag } Else { $skiaGtkFlag + '=false' } + $h = If ($skiaLinuxFB) { $skiaLinuxFB } Else { $skiaLinuxFBFlag + '=false' } + + @($a, $b, $c, $d, $e, $f, $g, $h) +} + +$default = @('-v', 'detailed', "-p:RestoreConfigFile=$env:NUGET_CI_CONFIG") + +$debug = $default + '-c' + 'Debug' +$release = $default + '-c' + 'Release' + +# WinUI +dotnet new unoapp -n UnoAppWinUI --framework net7.0 (Get-TemplateConfiguration -wasm 1 -wasmVsCode 1 -skiaGtk 1 -skiaLinuxFB 1) + +dotnet build $debug UnoAppWinUI/UnoAppWinUI.Wasm/UnoAppWinUI.Wasm.csproj +Assert-ExitCodeIsZero + +dotnet build $release UnoAppWinUI/UnoAppWinUI.Wasm/UnoAppWinUI.Wasm.csproj +Assert-ExitCodeIsZero + +dotnet build $debug UnoAppWinUI/UnoAppWinUI.Skia.Gtk/UnoAppWinUI.Skia.Gtk.csproj +Assert-ExitCodeIsZero + +dotnet build $release UnoAppWinUI/UnoAppWinUI.Skia.Gtk/UnoAppWinUI.Skia.Gtk.csproj +Assert-ExitCodeIsZero + +dotnet build $debug UnoAppWinUI/UnoAppWinUI.Skia.Linux.FrameBuffer/UnoAppWinUI.Skia.Linux.FrameBuffer.csproj +Assert-ExitCodeIsZero + +dotnet build $release UnoAppWinUI/UnoAppWinUI.Skia.Linux.FrameBuffer/UnoAppWinUI.Skia.Linux.FrameBuffer.csproj +Assert-ExitCodeIsZero From d2a876b44efcd5715ede810888e9557d1f2a1c16 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Fri, 7 Oct 2022 15:19:07 -0400 Subject: [PATCH 61/70] ci: Adjust template creation parameters --- build/test-scripts/run-net7-template-linux.ps1 | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/build/test-scripts/run-net7-template-linux.ps1 b/build/test-scripts/run-net7-template-linux.ps1 index 15d038798b1b..bf82cb7faf88 100644 --- a/build/test-scripts/run-net7-template-linux.ps1 +++ b/build/test-scripts/run-net7-template-linux.ps1 @@ -11,16 +11,14 @@ function Assert-ExitCodeIsZero() } function Get-TemplateConfiguration( - [bool]$android = $false, - [bool]$iOS = $false, - [bool]$macOS = $false, + [bool]$mobile = $false, [bool]$wasm = $false, [bool]$skiaGtk = $false, [bool]$skiaWpf = $false, [bool]$skiaLinuxFB = $false, [bool]$wasmVsCode = $false) { - $androidFlag = '-android' + $mobileFlag = '-mobile' $iOSFlag = '-ios' $macOSFlag = '-macos' $wasmFlag = '-wasm' @@ -29,14 +27,12 @@ function Get-TemplateConfiguration( $skiaGtkFlag = '--skia-gtk' $skiaLinuxFBFlag = '--skia-linux-fb' - $a = If ($android) { $androidFlag } Else { $androidFlag + '=false' } - $b = If ($iOS) { $iOSFlag } Else { $iOSFlag + '=false' } - $c = If ($macOS) { $macOSFlag } Else { $macOSFlag + '=false' } - $d = If ($wasm) { $wasmFlag } Else { $wasmFlag + '=false' } + $a = If ($mobile) { $mobileFlag } Else { $mobileFlag + '=false' } + $d = If ($wasm) { $wasmFlag } Else { $wasmFlag + '=false' } $e = If ($wasmVsCode) { $wasmVsCodeFlag } Else { $wasmVsCodeFlag + '=false' } $f = If ($skiaWpf) { $skiaWpfFlag } Else { $skiaWpfFlag + '=false' } $g = If ($skiaGtk) { $skiaGtkFlag } Else { $skiaGtkFlag + '=false' } - $h = If ($skiaLinuxFB) { $skiaLinuxFB } Else { $skiaLinuxFBFlag + '=false' } + $h = If ($skiaLinuxFB) { $skiaLinuxFBFlag} Else { $skiaLinuxFBFlag + '=false' } @($a, $b, $c, $d, $e, $f, $g, $h) } @@ -47,7 +43,8 @@ $debug = $default + '-c' + 'Debug' $release = $default + '-c' + 'Release' # WinUI -dotnet new unoapp -n UnoAppWinUI --framework net7.0 (Get-TemplateConfiguration -wasm 1 -wasmVsCode 1 -skiaGtk 1 -skiaLinuxFB 1) +$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.Wasm/UnoAppWinUI.Wasm.csproj Assert-ExitCodeIsZero From 3c636230bef66f148b9e4c09397dff6e7fb2f461 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Fri, 7 Oct 2022 17:13:46 -0400 Subject: [PATCH 62/70] ci: Adjust for missing Microsoft.Windows.Compatibility in net7.0 --- .../Wasm/UnoQuickStart.Wasm.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.net6/Wasm/UnoQuickStart.Wasm.csproj b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.net6/Wasm/UnoQuickStart.Wasm.csproj index c0ce6a879bad..2e844cad5376 100644 --- a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.net6/Wasm/UnoQuickStart.Wasm.csproj +++ b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.net6/Wasm/UnoQuickStart.Wasm.csproj @@ -49,7 +49,8 @@ - + + From 9da21607eedb5435672695ee75eeb0342bff83a8 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Fri, 7 Oct 2022 20:14:04 -0400 Subject: [PATCH 63/70] ci: Adjust invalid lottie file path --- build/Uno.WinUI.Lottie.nuspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/Uno.WinUI.Lottie.nuspec b/build/Uno.WinUI.Lottie.nuspec index 337a7b09a36e..7efb6138f0c8 100644 --- a/build/Uno.WinUI.Lottie.nuspec +++ b/build/Uno.WinUI.Lottie.nuspec @@ -141,13 +141,13 @@ - + - + - + From dd4f8205ca37b556588bafb3e7cf8d281ecb1255 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Fri, 7 Oct 2022 20:14:34 -0400 Subject: [PATCH 64/70] ci: Adjust exclude pngs and other csproj --- .../Uno.ProjectTemplates.Dotnet.csproj | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/Uno.ProjectTemplates.Dotnet.csproj b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/Uno.ProjectTemplates.Dotnet.csproj index b4d8f5ed9f4a..4150150d5868 100644 --- a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/Uno.ProjectTemplates.Dotnet.csproj +++ b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/Uno.ProjectTemplates.Dotnet.csproj @@ -88,7 +88,7 @@ <_UnoAppTemplateFilesExclude Include="..\UnoSolutionTemplate\**\*.vstemplate" /> - <_UnoAppTemplateFilesExclude Include="..\UnoSolutionTemplate\__*.png" /> + <_UnoAppTemplateFilesExclude Include="..\UnoSolutionTemplate\**\__*.png" /> <_UnoAppTemplateFilesExclude Include="..\UnoSolutionTemplate\**\obj\**" /> <_UnoAppTemplateFilesExclude Include="..\UnoSolutionTemplate\**\bin\**" /> <_UnoAppTemplateFilesExclude Include="..\UnoSolutionTemplate\Properties\**" /> @@ -99,7 +99,7 @@ <_UnoAppnet6UWPTemplateFilesExclude Include="..\UnoSolutionTemplate.net6\**\*.vstemplate" /> - <_UnoAppnet6UWPTemplateFilesExclude Include="..\UnoSolutionTemplate.net6\__*.png" /> + <_UnoAppnet6UWPTemplateFilesExclude Include="..\UnoSolutionTemplate.net6\**\__*.png" /> <_UnoAppnet6UWPTemplateFilesExclude Include="..\UnoSolutionTemplate.net6\**\obj\**" /> <_UnoAppnet6UWPTemplateFilesExclude Include="..\UnoSolutionTemplate.net6\**\bin\**" /> <_UnoAppnet6UWPTemplateFilesExclude Include="..\UnoSolutionTemplate.net6\Properties\**" /> @@ -110,18 +110,18 @@ <_UnoAppnet6WinUITemplateFilesExclude Include="..\UnoSolutionTemplate.WinUI.net6\**\*.vstemplate" /> - <_UnoAppnet6WinUITemplateFilesExclude Include="..\UnoSolutionTemplate.WinUI.net6\__*.png" /> + <_UnoAppnet6WinUITemplateFilesExclude Include="..\UnoSolutionTemplate.WinUI.net6\**\__*.png" /> <_UnoAppnet6WinUITemplateFilesExclude Include="..\UnoSolutionTemplate.WinUI.net6\**\obj\**" /> <_UnoAppnet6WinUITemplateFilesExclude Include="..\UnoSolutionTemplate.WinUI.net6\**\bin\**" /> <_UnoAppnet6WinUITemplateFilesExclude Include="..\UnoSolutionTemplate.WinUI.net6\Properties\**" /> - <_UnoAppnet6WinUITemplateFilesExclude Include="..\UnoSolutionTemplate.WinUI.net6\UnoSolutionTemplate.csproj" /> + <_UnoAppnet6WinUITemplateFilesExclude Include="..\UnoSolutionTemplate.WinUI.net6\UnoSolutionTemplate.WinUI.net6.csproj" /> <_UnoAppnet6WinUITemplateFiles Include="..\UnoSolutionTemplate.WinUI.net6\**" Exclude="@(_UnoAppnet6WinUITemplateFilesExclude)" /> <_UnoLibTemplateFilesExclude Include="..\UnoLibraryTemplate\*.vstemplate" /> - <_UnoLibTemplateFilesExclude Include="..\UnoLibraryTemplate\__*.png" /> + <_UnoLibTemplateFilesExclude Include="..\UnoLibraryTemplate\**\__*.png" /> <_UnoLibTemplateFilesExclude Include="..\UnoLibraryTemplate\obj\**" /> <_UnoLibTemplateFilesExclude Include="..\UnoLibraryTemplate\bin\**" /> <_UnoLibTemplateFilesExclude Include="..\UnoLibraryTemplate\Properties\**" /> @@ -132,7 +132,7 @@ <_UnoUITestTemplateFilesExclude Include="..\UnoUITestTemplate\*.vstemplate" /> - <_UnoUITestTemplateFilesExclude Include="..\UnoUITestTemplate\__*.png" /> + <_UnoUITestTemplateFilesExclude Include="..\UnoUITestTemplate\**\__*.png" /> <_UnoUITestTemplateFilesExclude Include="..\UnoUITestTemplate\obj\**" /> <_UnoUITestTemplateFilesExclude Include="..\UnoUITestTemplate\bin\**" /> <_UnoUITestTemplateFilesExclude Include="..\UnoUITestTemplate\Properties\**" /> @@ -296,7 +296,7 @@ Directory.EnumerateFiles(SourcePath, f, SearchOption.AllDirectories))) { From f0d6d4263fd26913befd9ebd362218c272f0cac6 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Fri, 7 Oct 2022 20:14:47 -0400 Subject: [PATCH 65/70] ci: Use latest bootstrapper --- .../Wasm/UnoQuickStart.Wasm.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.net6/Wasm/UnoQuickStart.Wasm.csproj b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.net6/Wasm/UnoQuickStart.Wasm.csproj index 2e844cad5376..4e3dcccdfc35 100644 --- a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.net6/Wasm/UnoQuickStart.Wasm.csproj +++ b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.net6/Wasm/UnoQuickStart.Wasm.csproj @@ -55,8 +55,8 @@ - - + + From 667dc07d9d0c51a47bd2722c0825cc193e4c56eb Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Fri, 7 Oct 2022 20:15:09 -0400 Subject: [PATCH 66/70] ci: Adjust linker hints for new folder structure --- .../Uno.UI.Tasks/Content/Uno.UI.Tasks.targets | 2 ++ .../LinkerHintsGenerator/LinkerHintGeneratorTask.cs | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) 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 f6a33c80fcb2..75ac669f8f24 100644 --- a/src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets +++ b/src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets @@ -163,6 +163,8 @@ OutputPath="$(ProjectDir)$(IntermediateOutputPath)/linkerhints" ReferencePath="@(_UnoLinkerHintsPass1AssembliesForReferencePaths)" ILLinkerPath="$(_UnoLinkerHintGeneratorILLinkerPath)" + TargetFramework="$(TargetFramework)" + TargetFrameworkVersion="$(TargetFrameworkVersion.Substring(1))" UnoUIPackageBasePath="$(_UnoUIPackageBasePath)" UnoRuntimeIdentifier="$(UnoRuntimeIdentifier)"> = new Version("7.0") + ? "net7.0" + : "netstandard2.0"; + return (unoRuntimeIdentifier == "skia" || unoRuntimeIdentifier == "webassembly") && referencePath.StartsWith(unoUIPackageBasePath) ? - referencePath.Replace($"lib{separator}netstandard2.0", $"uno-runtime{separator}{unoRuntimeIdentifier}") : + referencePath.Replace($"lib{separator}{runtimeTargetFramework}", $"uno-runtime{separator}{runtimeTargetFramework}{separator}{unoRuntimeIdentifier}") : referencePath; } } From 4fed4c81091f273aa37275f754796e4f307f29b0 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Sat, 8 Oct 2022 21:42:42 -0400 Subject: [PATCH 67/70] ci: Adjust warnings as errors --- .../Uno.UI.SourceGenerators.Internal.csproj | 1 - .../Uno.UI.Runtime.Skia.Linux.FrameBuffer.csproj | 1 - src/Uno.UI/Uno.UI.Skia.csproj | 2 -- 3 files changed, 4 deletions(-) diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators.Internal/Uno.UI.SourceGenerators.Internal.csproj b/src/SourceGenerators/Uno.UI.SourceGenerators.Internal/Uno.UI.SourceGenerators.Internal.csproj index e2216f240854..78fd04d2e844 100644 --- a/src/SourceGenerators/Uno.UI.SourceGenerators.Internal/Uno.UI.SourceGenerators.Internal.csproj +++ b/src/SourceGenerators/Uno.UI.SourceGenerators.Internal/Uno.UI.SourceGenerators.Internal.csproj @@ -3,7 +3,6 @@ netstandard2.0 Uno.UI.SourceGenerators.Internal true - true true true diff --git a/src/Uno.UI.Runtime.Skia.Linux.FrameBuffer/Uno.UI.Runtime.Skia.Linux.FrameBuffer.csproj b/src/Uno.UI.Runtime.Skia.Linux.FrameBuffer/Uno.UI.Runtime.Skia.Linux.FrameBuffer.csproj index 62ceac896797..6b76d32e9add 100644 --- a/src/Uno.UI.Runtime.Skia.Linux.FrameBuffer/Uno.UI.Runtime.Skia.Linux.FrameBuffer.csproj +++ b/src/Uno.UI.Runtime.Skia.Linux.FrameBuffer/Uno.UI.Runtime.Skia.Linux.FrameBuffer.csproj @@ -3,7 +3,6 @@ netcoreapp3.1 enable - true diff --git a/src/Uno.UI/Uno.UI.Skia.csproj b/src/Uno.UI/Uno.UI.Skia.csproj index 1e06b56b565e..5ff679ed160d 100644 --- a/src/Uno.UI/Uno.UI.Skia.csproj +++ b/src/Uno.UI/Uno.UI.Skia.csproj @@ -24,8 +24,6 @@ Skia .\ - - true true From cbeee7684a138772ca71132f25e88d640741bc45 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Sat, 8 Oct 2022 21:44:02 -0400 Subject: [PATCH 68/70] ci: Adjust comment on Skia.WPF head --- src/SamplesApp/SamplesApp.Skia.WPF/SamplesApp.Skia.WPF.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SamplesApp/SamplesApp.Skia.WPF/SamplesApp.Skia.WPF.csproj b/src/SamplesApp/SamplesApp.Skia.WPF/SamplesApp.Skia.WPF.csproj index 73e0eea68ab4..6b4e708bd318 100644 --- a/src/SamplesApp/SamplesApp.Skia.WPF/SamplesApp.Skia.WPF.csproj +++ b/src/SamplesApp/SamplesApp.Skia.WPF/SamplesApp.Skia.WPF.csproj @@ -2,8 +2,8 @@ net6.0-windows Major From 5bb6909c001d647ed75efcc152d7929cc5f54647 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Sat, 8 Oct 2022 22:02:52 -0400 Subject: [PATCH 69/70] ci: Adjust tasks names --- build/ci/.azure-devops-package.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/ci/.azure-devops-package.yml b/build/ci/.azure-devops-package.yml index d61687088746..f41d74d780df 100644 --- a/build/ci/.azure-devops-package.yml +++ b/build/ci/.azure-devops-package.yml @@ -100,7 +100,7 @@ jobs: flattenFolders: false - task: CopyFiles@2 - displayName: Copy generic build packages + displayName: Copy Skia build packages condition: always() inputs: SourceFolder: $(Agent.WorkFolder)/NugetPackages-Artifacts/vslatest-skia @@ -113,7 +113,7 @@ jobs: flattenFolders: false - task: CopyFiles@2 - displayName: Copy generic build packages + displayName: Copy Wasm build packages condition: always() inputs: SourceFolder: $(Agent.WorkFolder)/NugetPackages-Artifacts/vslatest-wasm From 8b36a15eb7280a23bbdc60665683518a09c3b346 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Sat, 8 Oct 2022 22:09:37 -0400 Subject: [PATCH 70/70] docs: Adjust for net7.0 reference update --- doc/articles/uno-development/building-uno-ui.md | 4 ++-- doc/articles/uno-development/creating-ui-tests.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/articles/uno-development/building-uno-ui.md b/doc/articles/uno-development/building-uno-ui.md index fbb598f7fba9..c79b5b36da01 100644 --- a/doc/articles/uno-development/building-uno-ui.md +++ b/doc/articles/uno-development/building-uno-ui.md @@ -92,11 +92,11 @@ Here are some tips when building the Uno solution and failures happen: ### Building the reference assemblies for Skia and WebAssembly -Skia and WebAssembly use a custom bait-and-switch technique for assemblies for which the `netstandard2.0` target framework assemblies (called reference assemblies) found in nuget packages (`lib` folder) are only used for building applications. At the end of a head build, those referene assemblies are replaced by public API compatible assemblies located in the `uno-runtime` folder of nuget packages. +Skia and WebAssembly use a custom bait-and-switch technique for assemblies for which the `net7.0` and `netstandard2.0` target framework assemblies (called reference assemblies) found in nuget packages (`lib` folder) are only used for building applications. At the end of a head build, those referene assemblies are replaced by public API compatible assemblies located in the `uno-runtime\[target-framework]` folder of nuget packages. When developing a feature using solution filters, if new public APIs are added, building the Uno.UI solution will not update the reference assemblies, causing applications or libraries using the overriden nuget cache to be unable to use those newly added APIs. -In order to update those reference assemblies, set `netstandard2.0`, then open either the android or iOS solution filters, then build the `Uno.UI` project (and only this one, the other projects in the solution will fail to build). Doing this will generate the proper assemblies with the new APIs to be used in application or libraries using the cache override. +In order to update those reference assemblies, set `...` to `net7.0` or `netstandard2.0`, then open the `Uno.UI-Reference-Only.slnf` filter. You can now build the `Uno.UI` project. Doing this will generate the proper assemblies with the new APIs to be used in application or libraries using the nuget cache override. ### Using the Package Diff tool diff --git a/doc/articles/uno-development/creating-ui-tests.md b/doc/articles/uno-development/creating-ui-tests.md index 505478cc20e2..c868cff17a2b 100644 --- a/doc/articles/uno-development/creating-ui-tests.md +++ b/doc/articles/uno-development/creating-ui-tests.md @@ -17,7 +17,7 @@ UI tests contribute significantly to the CI build time, and for many purposes a ## Running UI tests locally 1. Ensure [your environment is configured](../get-started-vs.md) for the platform you want to run on. -1. Ensure `UnoTargetFrameworkOverride` is set to `MonoAndroid11.0` or `net6.0-android` for testing on Android, `xamarinios` or `net6.0-ios` for testing on iOS, and `netstandard2.0` for testing on Wasm. +1. Ensure `UnoTargetFrameworkOverride` is set to `MonoAndroid11.0` or `net6.0-android` for testing on Android, `xamarinios` or `net6.0-ios` for testing on iOS, and `net7.0` or `netstandard2.0` for testing on Wasm. 1. Open Uno.UI with the [correct target override and solution filter](building-uno-ui.md) for the platform you want to run on. 1. [Build and run the SamplesApp](working-with-the-samples-apps.md) at least once. 1. Only Android and WASM are supported from Visual Studio for Windows. (Running tests on iOS using a Mac is possible, see additional instructions below.)