Skip to content

Commit baf8adb

Browse files
author
msftbot[bot]
authored
Upgrade to WinUI 2.5 and other Dependencies - Deprecate RadialProgressBar (#3758)
## Contributes to #3062 Adds deprecation message to the RadialProgressBar. Updates some of our dependencies. Few more to do, but will wait until we remove parsers and services packages.
2 parents 189e91a + 72bcb6b commit baf8adb

File tree

15 files changed

+23
-22
lines changed

15 files changed

+23
-22
lines changed

GazeInputTest/GazeInputTest.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
</ItemGroup>
151151
<ItemGroup>
152152
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
153-
<Version>6.2.10</Version>
153+
<Version>6.2.12</Version>
154154
</PackageReference>
155155
<PackageReference Include="StyleCop.Analyzers">
156156
<Version>1.0.2</Version>

Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
</PropertyGroup>
108108
<ItemGroup>
109109
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
110-
<Version>6.2.10</Version>
110+
<Version>6.2.12</Version>
111111
</PackageReference>
112112
<PackageReference Include="Microsoft.Services.Store.Engagement">
113113
<Version>10.1901.28001</Version>
@@ -118,7 +118,7 @@
118118
</PackageReference>
119119
-->
120120
<PackageReference Include="Microsoft.UI.Xaml">
121-
<Version>2.4.2</Version>
121+
<Version>2.5.0</Version>
122122
</PackageReference>
123123
<PackageReference Include="Monaco.Editor">
124124
<Version>0.7.0-alpha</Version>

Microsoft.Toolkit.Uwp.Samples.BackgroundTasks/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
</PropertyGroup>
110110
<ItemGroup>
111111
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
112-
<Version>6.2.10</Version>
112+
<Version>6.2.12</Version>
113113
</PackageReference>
114114
</ItemGroup>
115115
<ItemGroup>

Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialProgressBar/RadialProgressBar.cs

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
1515
/// Progression is represented by a loop filling up in a clockwise fashion.
1616
/// Like the traditional progress bar, it inherits from RangeBase, so Minimum, Maximum and Value properties work the same way.
1717
/// </summary>
18+
[Obsolete("The platform ProgressRing now supports determinate mode and is part of WinUI 2.5, please upgrade to use that control: https://docs.microsoft.com/windows/apps/winui/winui2/release-notes/winui-2.5#determinate-progressring")]
1819
[TemplatePart(Name = OutlineFigurePartName, Type = typeof(PathFigure))]
1920
[TemplatePart(Name = OutlineArcPartName, Type = typeof(ArcSegment))]
2021
[TemplatePart(Name = BarFigurePartName, Type = typeof(PathFigure))]

Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<PackageReference Include="Microsoft.UI.Xaml" Version="2.4.2" />
28+
<PackageReference Include="Microsoft.UI.Xaml" Version="2.5.0" />
2929
</ItemGroup>
3030

3131
<ItemGroup>

UITests/UITests.App/UITests.App.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
</ItemGroup>
169169
<ItemGroup>
170170
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
171-
<Version>6.2.10</Version>
171+
<Version>6.2.12</Version>
172172
</PackageReference>
173173
<PackageReference Include="MUXAppTestHelpers">
174174
<Version>0.0.4</Version>
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Microsoft.NET.CoreFramework.Debug.2.2.appx
22
Microsoft.NET.CoreRuntime.2.2.appx
3-
Microsoft.UI.Xaml.2.4.appx
3+
Microsoft.UI.Xaml.2.5.appx
44
Microsoft.VCLibs.x86.Debug.14.00.appx
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Microsoft.NET.Native.Framework.2.2.appx
22
Microsoft.NET.Native.Runtime.2.2.appx
3-
Microsoft.UI.Xaml.2.4.appx
3+
Microsoft.UI.Xaml.2.5.appx
44
Microsoft.VCLibs.x86.14.00.appx

UnitTests/UnitTests.HighPerformance.NetCore/UnitTests.HighPerformance.NetCore.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
<ItemGroup>
1616
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
17-
<PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
18-
<PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
17+
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
18+
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,13 @@
151151
</ItemGroup>
152152
<ItemGroup>
153153
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
154-
<Version>6.2.9</Version>
154+
<Version>6.2.12</Version>
155155
</PackageReference>
156156
<PackageReference Include="MSTest.TestAdapter">
157-
<Version>1.4.0</Version>
157+
<Version>2.1.2</Version>
158158
</PackageReference>
159159
<PackageReference Include="MSTest.TestFramework">
160-
<Version>1.4.0</Version>
160+
<Version>2.1.2</Version>
161161
</PackageReference>
162162
<PackageReference Include="System.Runtime.CompilerServices.Unsafe">
163163
<Version>5.0.0</Version>

UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<ItemGroup>
1010
<PackageReference Include="FluentAssertions" Version="5.10.3" />
1111
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
12-
<PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
13-
<PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
12+
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
13+
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
1414
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.5" />
1515
</ItemGroup>
1616

UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
14-
<PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
15-
<PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
14+
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
15+
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,13 @@
124124
</ItemGroup>
125125
<ItemGroup>
126126
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
127-
<Version>6.2.10</Version>
127+
<Version>6.2.12</Version>
128128
</PackageReference>
129129
<PackageReference Include="MSTest.TestAdapter">
130-
<Version>1.2.0</Version>
130+
<Version>2.1.2</Version>
131131
</PackageReference>
132132
<PackageReference Include="MSTest.TestFramework">
133-
<Version>1.2.0</Version>
133+
<Version>2.1.2</Version>
134134
</PackageReference>
135135
<PackageReference Include="System.ValueTuple">
136136
<Version>4.5.0</Version>

UnitTests/UnitTests.UWP/UnitTests.UWP.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<Version>5.10.3</Version>
112112
</PackageReference>
113113
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
114-
<Version>6.2.10</Version>
114+
<Version>6.2.12</Version>
115115
</PackageReference>
116116
<PackageReference Include="MSTest.TestAdapter">
117117
<Version>2.1.2</Version>

UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
</ItemGroup>
168168
<ItemGroup>
169169
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
170-
<Version>6.2.10</Version>
170+
<Version>6.2.12</Version>
171171
</PackageReference>
172172
<PackageReference Include="Microsoft.Toolkit.Win32.UI.XamlApplication">
173173
<Version>6.1.2</Version>

0 commit comments

Comments
 (0)