Skip to content

Commit 4f50459

Browse files
jeromelabanjeromelaban
authored
Merge pull request #8398 from unoplatform/dev/jela/misc-4-1-backports
Misc backports
2 parents 9995f80 + eef9075 commit 4f50459

File tree

20 files changed

+356
-84
lines changed

20 files changed

+356
-84
lines changed

‎build/PackageDiffIgnore.xml

Lines changed: 199 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8670,7 +8670,89 @@
86708670
reason="net6 macos remove deprecated API" />
86718671
</Properties>
86728672
</IgnoreSet>
8673+
8674+
<IgnoreSet baseVersion="4.1.8">
8675+
<Assemblies>
8676+
</Assemblies>
8677+
<Methods>
8678+
<Member
8679+
fullName="System.Boolean Windows.UI.Xaml.FrameworkElement.get_StretchAffectsMeasure()"
8680+
reason="False positive: added in an internal interface" />
8681+
<Member
8682+
fullName="System.Void Windows.UI.Core.Preview.SystemNavigationManagerPreview..ctor()"
8683+
reason="Not public in UWP" />
8684+
<Member
8685+
fullName="System.Void Windows.UI.Core.Preview.SystemNavigationCloseRequestedPreviewEventArgs..ctor()"
8686+
reason="Not public in UWP" />
8687+
<Member
8688+
fullName="System.Void Windows.UI.Core.Preview.SystemNavigationCloseRequestedPreviewEventArgs..ctor(System.Action`1&lt;Windows.UI.Core.Preview.SystemNavigationCloseRequestedPreviewEventArgs&gt; complete)"
8689+
reason="Should not be public" />
86738690

8691+
<!-- BEGIN .NET 6 RC 1 -->
8692+
<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" />
8693+
<Member fullName="ObjCRuntime.nfloat UIKit.UIViewExtensions.StackSubViews(UIKit.UIView thisView)" reason="net6 preview 14 breaking changes" />
8694+
<Member fullName="ObjCRuntime.nfloat UIKit.UIViewExtensions.StackSubViews(UIKit.UIView thisView, System.Single topPadding, System.Single spaceBetweenElements)" reason="net6 preview 14 breaking changes" />
8695+
<Member fullName="ObjCRuntime.nfloat UIKit.UIViewExtensions.GetNativeAlpha(UIKit.UIView view)" reason="net6 preview 14 breaking changes" />
8696+
<Member fullName="System.Void Windows.UI.Xaml.Controls.ListViewBaseScrollContentPresenter.SetZoomScale(ObjCRuntime.nfloat scale, System.Boolean animated)" reason="net6 preview 14 breaking changes" />
8697+
<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" />
8698+
<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" />
8699+
<Member fullName="CoreGraphics.CGRect Windows.UI.Xaml.Controls.VirtualizingPanelLayout.AdjustExtentOffset(CoreGraphics.CGRect frame, ObjCRuntime.nfloat adjustment)" reason="net6 preview 14 breaking changes" />
8700+
<Member fullName="CoreGraphics.CGPoint Windows.UI.Xaml.Controls.VirtualizingPanelLayout.AdjustExtentOffset(CoreGraphics.CGPoint point, ObjCRuntime.nfloat adjustment)" reason="net6 preview 14 breaking changes" />
8701+
<Member fullName="ObjCRuntime.nfloat Windows.UI.Xaml.Controls.VirtualizingPanelLayout.GetExtentStart(CoreGraphics.CGRect frame)" reason="net6 preview 14 breaking changes" />
8702+
<Member fullName="ObjCRuntime.nfloat Windows.UI.Xaml.Controls.VirtualizingPanelLayout.GetExtentEnd(CoreGraphics.CGRect frame)" reason="net6 preview 14 breaking changes" />
8703+
<Member fullName="ObjCRuntime.nfloat Windows.UI.Xaml.Controls.VirtualizingPanelLayout.GetBreadth(CoreGraphics.CGSize size)" reason="net6 preview 14 breaking changes" />
8704+
<Member fullName="ObjCRuntime.nfloat Windows.UI.Xaml.Controls.VirtualizingPanelLayout.GetBreadthStart(CoreGraphics.CGRect frame)" reason="net6 preview 14 breaking changes" />
8705+
<Member fullName="ObjCRuntime.nfloat Windows.UI.Xaml.Controls.VirtualizingPanelLayout.GetBreadthEnd(CoreGraphics.CGRect frame)" reason="net6 preview 14 breaking changes" />
8706+
<Member fullName="System.Void Windows.UI.Xaml.Controls.VirtualizingPanelLayout.SetBreadthStart(CoreGraphics.CGRect&amp; frame, ObjCRuntime.nfloat breadthStart)" reason="net6 preview 14 breaking changes" />
8707+
<Member fullName="System.Void Windows.UI.Xaml.Controls.VirtualizingPanelLayout.SetBreadth(CoreGraphics.CGRect&amp; frame, ObjCRuntime.nfloat breadth)" reason="net6 preview 14 breaking changes" />
8708+
<Member fullName="System.Void Windows.UI.Xaml.Controls.VirtualizingPanelLayout.SetExtentStart(CoreGraphics.CGRect&amp; frame, ObjCRuntime.nfloat extentStart)" reason="net6 preview 14 breaking changes" />
8709+
<Member fullName="System.Void Windows.UI.Xaml.Controls.VirtualizingPanelLayout.SetExtent(CoreGraphics.CGSize&amp; size, ObjCRuntime.nfloat extent)" reason="net6 preview 14 breaking changes" />
8710+
<Member fullName="CoreGraphics.CGPoint Windows.UI.Xaml.Controls.VirtualizingPanelLayout.SetExtentOffset(CoreGraphics.CGPoint point, ObjCRuntime.nfloat newOffset)" reason="net6 preview 14 breaking changes" />
8711+
<Member fullName="ObjCRuntime.nfloat Uno.UI.ViewHelper.get_OnePixel()" reason="net6 preview 14 breaking changes" />
8712+
<Member fullName="ObjCRuntime.nfloat Uno.UI.ViewHelper.GetConvertedPixel(System.Single thickness)" reason="net6 preview 14 breaking changes" />
8713+
<Member fullName="ObjCRuntime.nfloat Uno.UI.ViewHelper.StackSubViews(System.Collections.Generic.IEnumerable`1&lt;UIKit.UIView&gt; views)" reason="net6 preview 14 breaking changes" />
8714+
<Member fullName="ObjCRuntime.nfloat Uno.UI.ViewHelper.StackSubViews(UIKit.UIView thisView, System.Single topPadding, System.Single spaceBetweenElements)" reason="net6 preview 14 breaking changes" />
8715+
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.IncrementX(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat delta)" reason="net6 preview 14 breaking changes" />
8716+
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.IncrementY(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat delta)" reason="net6 preview 14 breaking changes" />
8717+
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.SetX(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat value)" reason="net6 preview 14 breaking changes" />
8718+
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.SetY(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat value)" reason="net6 preview 14 breaking changes" />
8719+
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.SetBottom(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat value)" reason="net6 preview 14 breaking changes" />
8720+
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.SetRight(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat value)" reason="net6 preview 14 breaking changes" />
8721+
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.SetRightRespectWidth(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat value)" reason="net6 preview 14 breaking changes" />
8722+
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.SetHorizontalCenter(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat value)" reason="net6 preview 14 breaking changes" />
8723+
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.SetVerticalCenter(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat value)" reason="net6 preview 14 breaking changes" />
8724+
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.Shrink(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat numberOfPixels)" reason="net6 preview 14 breaking changes" />
8725+
<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" />
8726+
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.IncrementHeight(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat delta)" reason="net6 preview 14 breaking changes" />
8727+
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.IncrementWidth(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat delta)" reason="net6 preview 14 breaking changes" />
8728+
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.SetWidth(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat value)" reason="net6 preview 14 breaking changes" />
8729+
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.SetHeight(CoreGraphics.CGRect thisCGRect, ObjCRuntime.nfloat value)" reason="net6 preview 14 breaking changes" />
8730+
<Member fullName="ObjCRuntime.nfloat Uno.UI.Extensions.CGRectExtensions.GetXOrY(CoreGraphics.CGRect rect, System.Int32 axisIndex)" reason="net6 preview 14 breaking changes" />
8731+
<Member fullName="ObjCRuntime.nfloat Uno.UI.Extensions.CGRectExtensions.GetWidthOrHeight(CoreGraphics.CGRect rect, System.Int32 axisIndex)" reason="net6 preview 14 breaking changes" />
8732+
<Member fullName="CoreGraphics.CGRect Uno.UI.Extensions.CGRectExtensions.SetXOrY(CoreGraphics.CGRect rect, System.Int32 axisIndex, ObjCRuntime.nfloat newXYValue)" reason="net6 preview 14 breaking changes" />
8733+
<Member fullName="ObjCRuntime.nfloat Uno.UI.Extensions.CGPointExtensions.GetXOrY(CoreGraphics.CGPoint point, System.Int32 axisIndex)" reason="net6 preview 14 breaking changes" />
8734+
<Member fullName="T Uno.UI.Extensions.UIViewPositioningExtensions.SetY(T thisView, ObjCRuntime.nfloat value)" reason="net6 preview 14 breaking changes" />
8735+
<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" />
8736+
<Member fullName="ObjCRuntime.nfloat AppKit.UIViewExtensions.StackSubViews(AppKit.NSView thisView)" reason="net6 preview 14 breaking changes" />
8737+
<Member fullName="ObjCRuntime.nfloat AppKit.UIViewExtensions.StackSubViews(AppKit.NSView thisView, System.Single topPadding, System.Single spaceBetweenElements)" reason="net6 preview 14 breaking changes" />
8738+
<Member fullName="ObjCRuntime.nfloat AppKit.UIViewExtensions.GetNativeAlpha(AppKit.NSView view)" reason="net6 preview 14 breaking changes" />
8739+
<Member fullName="ObjCRuntime.nfloat Uno.UI.ViewHelper.StackSubViews(System.Collections.Generic.IEnumerable`1&lt;AppKit.NSView&gt; views)" reason="net6 preview 14 breaking changes" />
8740+
<Member fullName="ObjCRuntime.nfloat Uno.UI.ViewHelper.StackSubViews(AppKit.NSView thisView, System.Single topPadding, System.Single spaceBetweenElements)" reason="net6 preview 14 breaking changes" />
8741+
<Member fullName="ObjCRuntime.nfloat Uno.UI.Extensions.FontWeightExtensions.ToNSFontWeight(Windows.UI.Text.FontWeight fontWeight)" reason="net6 preview 14 breaking changes" />
8742+
<!-- END .NET 6 RC 1 -->
8743+
</Methods>
8744+
<Properties>
8745+
<!-- BEGIN .NET 6 RC 1 -->
8746+
<Member fullName="ObjCRuntime.nfloat Uno.UI.ViewHelper::OnePixel()" reason="net6 preview 14 breaking changes" />
8747+
<!-- END .NET 6 RC 1 -->
8748+
</Properties>
8749+
<Fields>
8750+
<!-- BEGIN .NET 6 RC 1 -->
8751+
<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" />
8752+
<Member fullName="ObjCRuntime.nfloat Uno.UI.ViewHelper::MainScreenScale" reason="net6 preview 14 breaking changes" />
8753+
<!-- END .NET 6 RC 1 -->
8754+
</Fields>
8755+
</IgnoreSet>
86748756
<!--
86758757
Supported nodes (please keep at the bottom of this file):
86768758
<IgnoreSet baseVersion="0.0.0">
@@ -8692,3 +8774,120 @@
86928774
-->
86938775
</IgnoreSets>
86948776
</DiffIgnore>
8777+
8778+
8779+
8780+
8781+
8782+
8783+
8784+
8785+
8786+
8787+
8788+
8789+
8790+
8791+
8792+
8793+
8794+
8795+
8796+
8797+
8798+
8799+
8800+
8801+
8802+
8803+
8804+
8805+
8806+
8807+
8808+
8809+
8810+
8811+
8812+
8813+
8814+
8815+
8816+
8817+
8818+
8819+
8820+
8821+
8822+
8823+
8824+
8825+
8826+
8827+
8828+
8829+
8830+
8831+
8832+
8833+
8834+
8835+
8836+
8837+
8838+
8839+
8840+
8841+
8842+
8843+
8844+
8845+
8846+
8847+
8848+
8849+
8850+
8851+
8852+
8853+
8854+
8855+
8856+
8857+
8858+
8859+
8860+
8861+
8862+
8863+
8864+
8865+
8866+
8867+
8868+
8869+
8870+
8871+
8872+
8873+
8874+
8875+
8876+
8877+
8878+
8879+
8880+
8881+
8882+
8883+
8884+
8885+
8886+
8887+
8888+
8889+
8890+
8891+
8892+
8893+

‎build/Uno.WinUI.nuspec

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,28 @@
2222
<dependency id="Xamarin.AndroidX.AppCompat" version="1.3.1.3" />
2323
<dependency id="Xamarin.AndroidX.RecyclerView" version="1.2.1.3" />
2424
<dependency id="Xamarin.AndroidX.Activity" version="1.3.1.2" />
25-
<dependency id="Uno.SourceGenerationTasks" version="4.0.0" />
25+
<dependency id="Uno.SourceGenerationTasks" version="4.0.2" />
2626
<dependency id="Uno.Foundation.Logging" version="0.0.0" />
2727
<dependency id="Uno.Diagnostics.Eventing" version="2.0.1" />
2828
</group>
2929

3030
<!-- net6.0-ios -->
3131
<group targetFramework="net6.0-ios">
32-
<dependency id="Uno.SourceGenerationTasks" version="4.0.0" />
32+
<dependency id="Uno.SourceGenerationTasks" version="4.0.2" />
3333
<dependency id="Uno.Foundation.Logging" version="0.0.0" />
3434
<dependency id="Uno.Diagnostics.Eventing" version="2.0.1" />
3535
</group>
3636

3737
<!-- net6.0-maccatalyst -->
3838
<group targetFramework="net6.0-maccatalyst">
39-
<dependency id="Uno.SourceGenerationTasks" version="4.0.0" />
39+
<dependency id="Uno.SourceGenerationTasks" version="4.0.2" />
4040
<dependency id="Uno.Foundation.Logging" version="0.0.0" />
4141
<dependency id="Uno.Diagnostics.Eventing" version="2.0.1" />
4242
</group>
4343

4444
<!-- net6.0-macos -->
4545
<group targetFramework="net6.0-macos">
46-
<dependency id="Uno.SourceGenerationTasks" version="4.0.0" />
46+
<dependency id="Uno.SourceGenerationTasks" version="4.0.2" />
4747
<dependency id="Uno.Foundation.Logging" version="0.0.0" />
4848
<dependency id="Uno.Diagnostics.Eventing" version="2.0.1" />
4949
</group>
@@ -55,7 +55,7 @@
5555
<dependency id="Xamarin.AndroidX.RecyclerView" version="1.1.0" />
5656
<dependency id="Xamarin.AndroidX.Fragment" version="1.1.0" />
5757
<dependency id="Xamarin.AndroidX.Activity" version="1.1.0" />
58-
<dependency id="Uno.SourceGenerationTasks" version="4.0.0" />
58+
<dependency id="Uno.SourceGenerationTasks" version="4.0.2" />
5959
<dependency id="Uno.Foundation.Logging" version="0.0.0" />
6060
<dependency id="Uno.Diagnostics.Eventing" version="2.0.1" />
6161
<dependency id="System.Collections.Immutable" version="1.3.1" />
@@ -67,31 +67,31 @@
6767
<dependency id="Xamarin.AndroidX.AppCompat" version="1.3.1.3" />
6868
<dependency id="Xamarin.AndroidX.RecyclerView" version="1.2.1.3" />
6969
<dependency id="Xamarin.AndroidX.Activity" version="1.3.1.2" />
70-
<dependency id="Uno.SourceGenerationTasks" version="4.0.0" />
70+
<dependency id="Uno.SourceGenerationTasks" version="4.0.2" />
7171
<dependency id="Uno.Foundation.Logging" version="0.0.0" />
7272
<dependency id="Uno.Diagnostics.Eventing" version="2.0.1" />
7373
<dependency id="System.Collections.Immutable" version="1.3.1" />
7474
</group>
7575

7676
<!-- iOS -->
7777
<group targetFramework="xamarinios10">
78-
<dependency id="Uno.SourceGenerationTasks" version="4.0.0" />
78+
<dependency id="Uno.SourceGenerationTasks" version="4.0.2" />
7979
<dependency id="Uno.Foundation.Logging" version="0.0.0" />
8080
<dependency id="Uno.Diagnostics.Eventing" version="2.0.1" />
8181
<dependency id="System.Collections.Immutable" version="1.3.1" />
8282
</group>
8383

8484
<!-- macOS -->
8585
<group targetFramework="xamarinmac20">
86-
<dependency id="Uno.SourceGenerationTasks" version="4.0.0" />
86+
<dependency id="Uno.SourceGenerationTasks" version="4.0.2" />
8787
<dependency id="Uno.Foundation.Logging" version="0.0.0" />
8888
<dependency id="Uno.Diagnostics.Eventing" version="2.0.1" />
8989
<dependency id="System.Collections.Immutable" version="1.3.1" />
9090
</group>
9191

9292
<!-- .NET Standard 2.0 -->
9393
<group targetFramework="netstandard2.0">
94-
<dependency id="Uno.SourceGenerationTasks" version="4.0.0" />
94+
<dependency id="Uno.SourceGenerationTasks" version="4.0.2" />
9595
<dependency id="Uno.Foundation.Logging" version="0.0.0" />
9696
<dependency id="System.Numerics.Vectors" version="4.5.0" />
9797
<dependency id="System.Runtime.InteropServices.WindowsRuntime" version="4.3.0" />

‎build/ci/.azure-devops-ios-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ jobs:
107107
nugetPackages: $(NUGET_PACKAGES)
108108
JobName: 'iOS_Automated_Tests_Runtime_Tests'
109109
JobDisplayName: 'iOS Automated Runtime Tests'
110-
JobTimeoutInMinutes: 90
110+
JobTimeoutInMinutes: 60
111111
vmImage: ${{ parameters.vmImageTest }}
112112
UITEST_SNAPSHOTS_ONLY: false
113-
UITEST_TEST_TIMEOUT: '5400000'
113+
UITEST_TEST_TIMEOUT: '3600000'
114114
UITEST_AUTOMATED_GROUP: 4
115115
UITEST_ALLOW_RERUN: 'false'
116116
xCodeRoot: ${{ parameters.xCodeRootTest }}

‎build/ci/templates/dotnet6-install-mac.yml

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
2-
DotNetVersion: '6.0.200'
2+
DotNetVersion: '6.0.300-preview.22154.4'
33
UnoCheck_Version: '1.1.0-dev.22'
4-
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/90603a57991621c9998fa66534a14e5bf470acc4/manifests/uno.ui-preview.manifest.json'
4+
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/d14571a546b55f58e51e392c04cf098168d6fe2d/manifests/uno.ui-preview.manifest.json'
55
Dotnet_Root: '/usr/local/share/dotnet/'
66
Dotnet_Tools: '~/.dotnet/tools'
77

@@ -20,23 +20,24 @@ steps:
2020
version: 3.1.x
2121
installationPath: ${{ parameters.Dotnet_Root }}
2222

23-
## Required until .NET 6 installs properly using UseDotnet
24-
## using preview builds
25-
# - bash: |
26-
# export PATH="${{ parameters.Dotnet_Root }}:${{ parameters.Dotnet_Tools }}:$PATH"
27-
# curl -L https://raw.githubusercontent.com/dotnet/install-scripts/11b4eebe23d871c074364940d301c3eb53e7c7ec/src/dotnet-install.sh > dotnet-install.sh
28-
# sh dotnet-install.sh --version ${{ parameters.DotNetVersion }} --install-dir $DOTNET_ROOT --verbose
29-
# dotnet --list-sdks
30-
# echo "##vso[task.setvariable variable=PATH]$PATH"
31-
# displayName: install .NET ${{ parameters.DotNetVersion }}
32-
# retryCountOnTaskFailure: 3
33-
34-
- task: UseDotNet@2
35-
displayName: 'Use .NET Core SDK ${{ parameters.DotNetVersion }}'
23+
# Required until .NET 6 installs properly using UseDotnet
24+
# using preview builds
25+
- bash: |
26+
export PATH="${{ parameters.Dotnet_Root }}:${{ parameters.Dotnet_Tools }}:$PATH"
27+
curl -L https://raw.githubusercontent.com/dotnet/install-scripts/11b4eebe23d871c074364940d301c3eb53e7c7ec/src/dotnet-install.sh > dotnet-install.sh
28+
sh dotnet-install.sh --version ${{ parameters.DotNetVersion }} --install-dir $DOTNET_ROOT --verbose
29+
dotnet --list-sdks
30+
echo "##vso[task.setvariable variable=PATH]$PATH"
31+
displayName: install .NET ${{ parameters.DotNetVersion }}
3632
retryCountOnTaskFailure: 3
37-
inputs:
38-
packageType: sdk
39-
version: ${{ parameters.DotNetVersion }}
33+
34+
#- task: UseDotNet@2
35+
# displayName: 'Use .NET Core SDK ${{ parameters.DotNetVersion }}'
36+
# retryCountOnTaskFailure: 3
37+
# inputs:
38+
# packageType: sdk
39+
# version: ${{ parameters.DotNetVersion }}
40+
# includePreviewVersions: true
4041

4142
- template: jdk-setup.yml
4243

0 commit comments

Comments
 (0)