Skip to content

Commit

Permalink
Merge pull request #8398 from unoplatform/dev/jela/misc-4-1-backports
Browse files Browse the repository at this point in the history 
Misc backports
  • Loading branch information
@jeromelaban
jeromelaban authored Mar 21, 2022
2 parents 9995f80 + eef9075 commit 4f50459
Show file tree
Hide file tree
Showing 20 changed files with 356 additions and 84 deletions.
199 changes: 199 additions & 0 deletions build/PackageDiffIgnore.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8670,7 +8670,89 @@
reason="net6 macos remove deprecated API" />
</Properties>
</IgnoreSet>

<IgnoreSet baseVersion="4.1.8">
<Assemblies>
</Assemblies>
<Methods>
<Member
fullName="System.Boolean Windows.UI.Xaml.FrameworkElement.get_StretchAffectsMeasure()"
reason="False positive: added in an internal interface" />
<Member
fullName="System.Void Windows.UI.Core.Preview.SystemNavigationManagerPreview..ctor()"
reason="Not public in UWP" />
<Member
fullName="System.Void Windows.UI.Core.Preview.SystemNavigationCloseRequestedPreviewEventArgs..ctor()"
reason="Not public in UWP" />
<Member
fullName="System.Void Windows.UI.Core.Preview.SystemNavigationCloseRequestedPreviewEventArgs..ctor(System.Action`1&lt;Windows.UI.Core.Preview.SystemNavigationCloseRequestedPreviewEventArgs&gt; complete)"
reason="Should not be public" />

<!-- BEGIN .NET 6 RC 1 -->
<Member fullName="System.Void UIKit.UIViewExtensions.SetDimensions(UIKit.UIView view, System.Nullable`1&lt;ObjCRuntime.nfloat&gt; width, System.Nullable`1&lt;ObjCRuntime.nfloat&gt; height)" reason="net6 preview 14 breaking changes" />
<Member fullName="ObjCRuntime.nfloat UIKit.UIViewExtensions.StackSubViews(UIKit.UIView thisView)" reason="net6 preview 14 breaking changes" />
<Member fullName="ObjCRuntime.nfloat UIKit.UIViewExtensions.StackSubViews(UIKit.UIView thisView, System.Single topPadding, System.Single spaceBetweenElements)" reason="net6 preview 14 breaking changes" />
<Member fullName="ObjCRuntime.nfloat UIKit.UIViewExtensions.GetNativeAlpha(UIKit.UIView view)" reason="net6 preview 14 breaking changes" />
<Member fullName="System.Void Windows.UI.Xaml.Controls.ListViewBaseScrollContentPresenter.SetZoomScale(ObjCRuntime.nfloat scale, System.Boolean animated)" reason="net6 preview 14 breaking changes" />
<Member fullName="ObjCRuntime.nfloat Windows.UI.Xaml.Controls.VirtualizingPanelLayout.LayoutItemsInGroup(System.Int32 group, ObjCRuntime.nfloat availableBreadth, CoreGraphics.CGRect&amp; frame, System.Boolean createLayoutInfo, System.Collections.Generic.Dictionary`2&lt;Foundation.NSIndexPath,System.Nullable`1&lt;CoreGraphics.CGSize&gt;&gt; oldItemSizes)" reason="net6 preview 14 breaking changes" />
<Member fullName="System.Void Windows.UI.Xaml.Controls.VirtualizingPanelLayout.UpdateLayoutAttributesForGroupHeader(UIKit.UICollectionViewLayoutAttributes groupHeaderLayout, ObjCRuntime.nfloat extentDifference, System.Boolean applyOffsetToThis)" reason="net6 preview 14 breaking changes" />
<Member fullName="CoreGraphics.CGRect Windows.UI.Xaml.Controls.VirtualizingPanelLayout.AdjustExtentOffset(CoreGraphics.CGRect frame, ObjCRuntime.nfloat adjustment)" reason="net6 preview 14 breaking changes" />
<Member fullName="CoreGraphics.CGPoint Windows.UI.Xaml.Controls.VirtualizingPanelLayout.AdjustExtentOffset(CoreGraphics.CGPoint point, ObjCRuntime.nfloat adjustment)" reason="net6 preview 14 breaking changes" />
<Member fullName="ObjCRuntime.nfloat Windows.UI.Xaml.Controls.VirtualizingPanelLayout.GetExtentStart(CoreGraphics.CGRect frame)" reason="net6 preview 14 breaking changes" />
<Member fullName="ObjCRuntime.nfloat Windows.UI.Xaml.Controls.VirtualizingPanelLayout.GetExtentEnd(CoreGraphics.CGRect frame)" reason="net6 preview 14 breaking changes" />
<Member fullName="ObjCRuntime.nfloat Windows.UI.Xaml.Controls.VirtualizingPanelLayout.GetBreadth(CoreGraphics.CGSize size)" reason="net6 preview 14 breaking changes" />
<Member fullName="ObjCRuntime.nfloat Windows.UI.Xaml.Controls.VirtualizingPanelLayout.GetBreadthStart(CoreGraphics.CGRect frame)" reason="net6 preview 14 breaking changes" />
<Member fullName="ObjCRuntime.nfloat Windows.UI.Xaml.Controls.VirtualizingPanelLayout.GetBreadthEnd(CoreGraphics.CGRect frame)" reason="net6 preview 14 breaking changes" />
<Member fullName="System.Void Windows.UI.Xaml.Controls.VirtualizingPanelLayout.SetBreadthStart(CoreGraphics.CGRect&amp; frame, ObjCRuntime.nfloat breadthStart)" reason="net6 preview 14 breaking changes" />
<Member fullName="System.Void Windows.UI.Xaml.Controls.VirtualizingPanelLayout.SetBreadth(CoreGraphics.CGRect&amp; frame, ObjCRuntime.nfloat breadth)" reason="net6 preview 14 breaking changes" />
<Member fullName="System.Void Windows.UI.Xaml.Controls.VirtualizingPanelLayout.SetExtentStart(CoreGraphics.CGRect&amp; frame, ObjCRuntime.nfloat extentStart)" reason="net6 preview 14 breaking changes" />
<Member fullName="System.Void Windows.UI.Xaml.Controls.VirtualizingPanelLayout.SetExtent(CoreGraphics.CGSize&amp; size, ObjCRuntime.nfloat extent)" reason="net6 preview 14 breaking changes" />
<Member fullName="CoreGraphics.CGPoint Windows.UI.Xaml.Controls.VirtualizingPanelLayout.SetExtentOffset(CoreGraphics.CGPoint point, ObjCRuntime.nfloat newOffset)" reason="net6 preview 14 breaking changes" />
<Member fullName="ObjCRuntime.nfloat Uno.UI.ViewHelper.get_OnePixel()" reason="net6 preview 14 breaking changes" />
<Member fullName="ObjCRuntime.nfloat Uno.UI.ViewHelper.GetConvertedPixel(System.Single thickness)" reason="net6 preview 14 breaking changes" />
<Member fullName="ObjCRuntime.nfloat Uno.UI.ViewHelper.StackSubViews(System.Collections.Generic.IEnumerable`1&lt;UIKit.UIView&gt; views)" reason="net6 preview 14 breaking changes" />
<Member fullName="ObjCRuntime.nfloat Uno.UI.ViewHelper.StackSubViews(UIKit.UIView thisView, System.Single topPadding, System.Single spaceBetweenElements)" reason="net6 preview 14 breaking changes" />
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.IncrementX(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat delta)" reason="net6 preview 14 breaking changes" />
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.IncrementY(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat delta)" reason="net6 preview 14 breaking changes" />
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.SetX(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat value)" reason="net6 preview 14 breaking changes" />
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.SetY(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat value)" reason="net6 preview 14 breaking changes" />
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.SetBottom(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat value)" reason="net6 preview 14 breaking changes" />
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.SetRight(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat value)" reason="net6 preview 14 breaking changes" />
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.SetRightRespectWidth(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat value)" reason="net6 preview 14 breaking changes" />
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.SetHorizontalCenter(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat value)" reason="net6 preview 14 breaking changes" />
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.SetVerticalCenter(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat value)" reason="net6 preview 14 breaking changes" />
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.Shrink(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat numberOfPixels)" reason="net6 preview 14 breaking changes" />
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.Shrink(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat left, ObjCRuntime.nfloat top, ObjCRuntime.nfloat right, ObjCRuntime.nfloat bottom)" reason="net6 preview 14 breaking changes" />
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.IncrementHeight(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat delta)" reason="net6 preview 14 breaking changes" />
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.IncrementWidth(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat delta)" reason="net6 preview 14 breaking changes" />
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.SetWidth(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat value)" reason="net6 preview 14 breaking changes" />
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.SetHeight(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat value)" reason="net6 preview 14 breaking changes" />
<Member fullName="ObjCRuntime.nfloat Uno.UI.Extensions.CGRectExtensions.GetXOrY(CoreGraphics.CGRect rect, System.Int32 axisIndex)" reason="net6 preview 14 breaking changes" />
<Member fullName="ObjCRuntime.nfloat Uno.UI.Extensions.CGRectExtensions.GetWidthOrHeight(CoreGraphics.CGRect rect, System.Int32 axisIndex)" reason="net6 preview 14 breaking changes" />
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.SetXOrY(CoreGraphics.CGRect rect, System.Int32 axisIndex, ObjCRuntime.nfloat newXYValue)" reason="net6 preview 14 breaking changes" />
<Member fullName="ObjCRuntime.nfloat Uno.UI.Extensions.CGPointExtensions.GetXOrY(CoreGraphics.CGPoint point, System.Int32 axisIndex)" reason="net6 preview 14 breaking changes" />
<Member fullName="T Uno.UI.Extensions.UIViewPositioningExtensions.SetY(T thisView, ObjCRuntime.nfloat value)" reason="net6 preview 14 breaking changes" />
<Member fullName="System.Void AppKit.UIViewExtensions.SetDimensions(AppKit.NSView view, System.Nullable`1&lt;ObjCRuntime.nfloat&gt; width, System.Nullable`1&lt;ObjCRuntime.nfloat&gt; height)" reason="net6 preview 14 breaking changes" />
<Member fullName="ObjCRuntime.nfloat AppKit.UIViewExtensions.StackSubViews(AppKit.NSView thisView)" reason="net6 preview 14 breaking changes" />
<Member fullName="ObjCRuntime.nfloat AppKit.UIViewExtensions.StackSubViews(AppKit.NSView thisView, System.Single topPadding, System.Single spaceBetweenElements)" reason="net6 preview 14 breaking changes" />
<Member fullName="ObjCRuntime.nfloat AppKit.UIViewExtensions.GetNativeAlpha(AppKit.NSView view)" reason="net6 preview 14 breaking changes" />
<Member fullName="ObjCRuntime.nfloat Uno.UI.ViewHelper.StackSubViews(System.Collections.Generic.IEnumerable`1&lt;AppKit.NSView&gt; views)" reason="net6 preview 14 breaking changes" />
<Member fullName="ObjCRuntime.nfloat Uno.UI.ViewHelper.StackSubViews(AppKit.NSView thisView, System.Single topPadding, System.Single spaceBetweenElements)" reason="net6 preview 14 breaking changes" />
<Member fullName="ObjCRuntime.nfloat Uno.UI.Extensions.FontWeightExtensions.ToNSFontWeight(Windows.UI.Text.FontWeight fontWeight)" reason="net6 preview 14 breaking changes" />
<!-- END .NET 6 RC 1 -->
</Methods>
<Properties>
<!-- BEGIN .NET 6 RC 1 -->
<Member fullName="ObjCRuntime.nfloat Uno.UI.ViewHelper::OnePixel()" reason="net6 preview 14 breaking changes" />
<!-- END .NET 6 RC 1 -->
</Properties>
<Fields>
<!-- BEGIN .NET 6 RC 1 -->
<Member fullName="System.Collections.Generic.Dictionary`2&lt;System.Int32,ObjCRuntime.nfloat&gt; Windows.UI.Xaml.Controls.VirtualizingPanelLayout::_sectionEnd" reason="net6 preview 14 breaking changes" />
<Member fullName="ObjCRuntime.nfloat Uno.UI.ViewHelper::MainScreenScale" reason="net6 preview 14 breaking changes" />
<!-- END .NET 6 RC 1 -->
</Fields>
</IgnoreSet>
<!--
Supported nodes (please keep at the bottom of this file):
<IgnoreSet baseVersion="0.0.0">
Expand All @@ -8692,3 +8774,120 @@
-->
</IgnoreSets>
</DiffIgnore>





















































































































18 changes: 9 additions & 9 deletions build/Uno.WinUI.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,28 @@
<dependency id="Xamarin.AndroidX.AppCompat" version="1.3.1.3" />
<dependency id="Xamarin.AndroidX.RecyclerView" version="1.2.1.3" />
<dependency id="Xamarin.AndroidX.Activity" version="1.3.1.2" />
<dependency id="Uno.SourceGenerationTasks" version="4.0.0" />
<dependency id="Uno.SourceGenerationTasks" version="4.0.2" />
<dependency id="Uno.Foundation.Logging" version="0.0.0" />
<dependency id="Uno.Diagnostics.Eventing" version="2.0.1" />
</group>

<!-- net6.0-ios -->
<group targetFramework="net6.0-ios">
<dependency id="Uno.SourceGenerationTasks" version="4.0.0" />
<dependency id="Uno.SourceGenerationTasks" version="4.0.2" />
<dependency id="Uno.Foundation.Logging" version="0.0.0" />
<dependency id="Uno.Diagnostics.Eventing" version="2.0.1" />
</group>

<!-- net6.0-maccatalyst -->
<group targetFramework="net6.0-maccatalyst">
<dependency id="Uno.SourceGenerationTasks" version="4.0.0" />
<dependency id="Uno.SourceGenerationTasks" version="4.0.2" />
<dependency id="Uno.Foundation.Logging" version="0.0.0" />
<dependency id="Uno.Diagnostics.Eventing" version="2.0.1" />
</group>

<!-- net6.0-macos -->
<group targetFramework="net6.0-macos">
<dependency id="Uno.SourceGenerationTasks" version="4.0.0" />
<dependency id="Uno.SourceGenerationTasks" version="4.0.2" />
<dependency id="Uno.Foundation.Logging" version="0.0.0" />
<dependency id="Uno.Diagnostics.Eventing" version="2.0.1" />
</group>
Expand All @@ -55,7 +55,7 @@
<dependency id="Xamarin.AndroidX.RecyclerView" version="1.1.0" />
<dependency id="Xamarin.AndroidX.Fragment" version="1.1.0" />
<dependency id="Xamarin.AndroidX.Activity" version="1.1.0" />
<dependency id="Uno.SourceGenerationTasks" version="4.0.0" />
<dependency id="Uno.SourceGenerationTasks" version="4.0.2" />
<dependency id="Uno.Foundation.Logging" version="0.0.0" />
<dependency id="Uno.Diagnostics.Eventing" version="2.0.1" />
<dependency id="System.Collections.Immutable" version="1.3.1" />
Expand All @@ -67,31 +67,31 @@
<dependency id="Xamarin.AndroidX.AppCompat" version="1.3.1.3" />
<dependency id="Xamarin.AndroidX.RecyclerView" version="1.2.1.3" />
<dependency id="Xamarin.AndroidX.Activity" version="1.3.1.2" />
<dependency id="Uno.SourceGenerationTasks" version="4.0.0" />
<dependency id="Uno.SourceGenerationTasks" version="4.0.2" />
<dependency id="Uno.Foundation.Logging" version="0.0.0" />
<dependency id="Uno.Diagnostics.Eventing" version="2.0.1" />
<dependency id="System.Collections.Immutable" version="1.3.1" />
</group>

<!-- iOS -->
<group targetFramework="xamarinios10">
<dependency id="Uno.SourceGenerationTasks" version="4.0.0" />
<dependency id="Uno.SourceGenerationTasks" version="4.0.2" />
<dependency id="Uno.Foundation.Logging" version="0.0.0" />
<dependency id="Uno.Diagnostics.Eventing" version="2.0.1" />
<dependency id="System.Collections.Immutable" version="1.3.1" />
</group>

<!-- macOS -->
<group targetFramework="xamarinmac20">
<dependency id="Uno.SourceGenerationTasks" version="4.0.0" />
<dependency id="Uno.SourceGenerationTasks" version="4.0.2" />
<dependency id="Uno.Foundation.Logging" version="0.0.0" />
<dependency id="Uno.Diagnostics.Eventing" version="2.0.1" />
<dependency id="System.Collections.Immutable" version="1.3.1" />
</group>

<!-- .NET Standard 2.0 -->
<group targetFramework="netstandard2.0">
<dependency id="Uno.SourceGenerationTasks" version="4.0.0" />
<dependency id="Uno.SourceGenerationTasks" version="4.0.2" />
<dependency id="Uno.Foundation.Logging" version="0.0.0" />
<dependency id="System.Numerics.Vectors" version="4.5.0" />
<dependency id="System.Runtime.InteropServices.WindowsRuntime" version="4.3.0" />
Expand Down
4 changes: 2 additions & 2 deletions build/ci/.azure-devops-ios-tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@ jobs:
nugetPackages: $(NUGET_PACKAGES)
JobName: 'iOS_Automated_Tests_Runtime_Tests'
JobDisplayName: 'iOS Automated Runtime Tests'
JobTimeoutInMinutes: 90
JobTimeoutInMinutes: 60
vmImage: ${{ parameters.vmImageTest }}
UITEST_SNAPSHOTS_ONLY: false
UITEST_TEST_TIMEOUT: '5400000'
UITEST_TEST_TIMEOUT: '3600000'
UITEST_AUTOMATED_GROUP: 4
UITEST_ALLOW_RERUN: 'false'
xCodeRoot: ${{ parameters.xCodeRootTest }}
Expand Down
37 changes: 19 additions & 18 deletions build/ci/templates/dotnet6-install-mac.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
parameters:
DotNetVersion: '6.0.200'
DotNetVersion: '6.0.300-preview.22154.4'
UnoCheck_Version: '1.1.0-dev.22'
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/90603a57991621c9998fa66534a14e5bf470acc4/manifests/uno.ui-preview.manifest.json'
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/d14571a546b55f58e51e392c04cf098168d6fe2d/manifests/uno.ui-preview.manifest.json'
Dotnet_Root: '/usr/local/share/dotnet/'
Dotnet_Tools: '~/.dotnet/tools'

Expand All @@ -20,23 +20,24 @@ steps:
version: 3.1.x
installationPath: ${{ parameters.Dotnet_Root }}

## Required until .NET 6 installs properly using UseDotnet
## using preview builds
# - bash: |
# export PATH="${{ parameters.Dotnet_Root }}:${{ parameters.Dotnet_Tools }}:$PATH"
# curl -L https://raw.githubusercontent.com/dotnet/install-scripts/11b4eebe23d871c074364940d301c3eb53e7c7ec/src/dotnet-install.sh > dotnet-install.sh
# sh dotnet-install.sh --version ${{ parameters.DotNetVersion }} --install-dir $DOTNET_ROOT --verbose
# dotnet --list-sdks
# echo "##vso[task.setvariable variable=PATH]$PATH"
# displayName: install .NET ${{ parameters.DotNetVersion }}
# retryCountOnTaskFailure: 3

- task: UseDotNet@2
displayName: 'Use .NET Core SDK ${{ parameters.DotNetVersion }}'
# Required until .NET 6 installs properly using UseDotnet
# using preview builds
- bash: |
export PATH="${{ parameters.Dotnet_Root }}:${{ parameters.Dotnet_Tools }}:$PATH"
curl -L https://raw.githubusercontent.com/dotnet/install-scripts/11b4eebe23d871c074364940d301c3eb53e7c7ec/src/dotnet-install.sh > dotnet-install.sh
sh dotnet-install.sh --version ${{ parameters.DotNetVersion }} --install-dir $DOTNET_ROOT --verbose
dotnet --list-sdks
echo "##vso[task.setvariable variable=PATH]$PATH"
displayName: install .NET ${{ parameters.DotNetVersion }}
retryCountOnTaskFailure: 3
inputs:
packageType: sdk
version: ${{ parameters.DotNetVersion }}
#- task: UseDotNet@2
# displayName: 'Use .NET Core SDK ${{ parameters.DotNetVersion }}'
# retryCountOnTaskFailure: 3
# inputs:
# packageType: sdk
# version: ${{ parameters.DotNetVersion }}
# includePreviewVersions: true

- template: jdk-setup.yml

Expand Down
Loading

0 comments on commit 4f50459

Please sign in to comment.