Skip to content

Commit 37184bf

Browse files
ChrisPulmanChrisPulman
authored
Merge branch 'main' into reorganize-samples
2 parents 5a4f28b + 5f29c42 commit 37184bf

File tree

13 files changed

+47
-47
lines changed

13 files changed

+47
-47
lines changed

‎Uno/ReactiveUI.UnoRouting/ReactiveUI.UnoRouting.Mobile/ReactiveUI.UnoRouting.Mobile.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<ItemGroup>
2121
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="$(ReactiveUIVersion)" />
2222
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.6.0" />
23-
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.10.37" Condition="'$(Configuration)'=='Debug'" />
23+
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.10.39" Condition="'$(Configuration)'=='Debug'" />
2424
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.48" />
2525
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
2626
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
@@ -29,7 +29,7 @@
2929
<When Condition="'$(TargetFramework)'=='net7.0-android'">
3030
<ItemGroup>
3131
<PackageReference Include="Xamarin.Google.Android.Material" Version="[1.5.0]" />
32-
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.36" />
32+
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.37" />
3333
</ItemGroup>
3434
<ItemGroup>
3535
<AndroidEnvironment Include="Android/environment.conf" />

‎Uno/ReactiveUI.UnoRouting/ReactiveUI.UnoRouting.Skia.Gtk/ReactiveUI.UnoRouting.Skia.Gtk.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="$(ReactiveUIVersion)" />
1818
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
1919
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
20-
<PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.10.37" />
21-
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.10.37" Condition="'$(Configuration)'=='Debug'" />
20+
<PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.10.39" />
21+
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.10.39" Condition="'$(Configuration)'=='Debug'" />
2222
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.48" />
2323
</ItemGroup>
2424
<Import Project="..\ReactiveUI.UnoRouting.Shared\ReactiveUI.UnoRouting.Shared.projitems" Label="Shared" />

‎Uno/ReactiveUI.UnoRouting/ReactiveUI.UnoRouting.Skia.Wpf/ReactiveUI.UnoRouting.Skia.Wpf.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="$(ReactiveUIVersion)" />
1111
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
1212
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
13-
<PackageReference Include="Uno.WinUI.Skia.Wpf" Version="4.10.37" />
14-
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.10.37" Condition="'$(Configuration)'=='Debug'" />
13+
<PackageReference Include="Uno.WinUI.Skia.Wpf" Version="4.10.39" />
14+
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.10.39" Condition="'$(Configuration)'=='Debug'" />
1515
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.48" />
1616
</ItemGroup>
1717
<ItemGroup>

‎Uno/ReactiveUI.UnoRouting/ReactiveUI.UnoRouting.Wasm/ReactiveUI.UnoRouting.Wasm.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="$(ReactiveUIVersion)" />
4545
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
4646
<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.6.0" />
47-
<PackageReference Include="Uno.WinUI.WebAssembly" Version="4.10.37" />
48-
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.10.37" Condition="'$(Configuration)'=='Debug'" />
47+
<PackageReference Include="Uno.WinUI.WebAssembly" Version="4.10.39" />
48+
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.10.39" Condition="'$(Configuration)'=='Debug'" />
4949
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.48" />
5050
<PackageReference Include="Uno.Wasm.Bootstrap" Version="7.0.31" />
5151
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.29" />

‎Xamarin/Cinephile/Cinephile.Core/Cinephile.Core.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<PackageReference Include="akavache" Version="9.*" />
77
<PackageReference Include="Refit" Version="7.*" />
88
<PackageReference Include="Fusillade" Version="2.*" />
9-
<PackageReference Include="System.Reactive.Compatibility" Version="6.0.0" />
9+
<PackageReference Include="System.Reactive.Compatibility" Version="6.0.1" />
1010
<PackageReference Include="DynamicData" Version="8.*" />
1111
</ItemGroup>
1212
</Project>

‎Xamarin/Cinephile/Cinephile.UnitTests/Cinephile.UnitTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
1717
<PackageReference Include="Moq" Version="4.20.70" />
1818
<PackageReference Include="Microsoft.CodeCoverage" Version="17.8.0" />
19-
<PackageReference Include="Microsoft.Reactive.Testing" Version="6.0.0" />
19+
<PackageReference Include="Microsoft.Reactive.Testing" Version="6.0.1" />
2020
</ItemGroup>
2121
<ItemGroup>
2222
<Folder Include="ViewModels\" />

‎Xamarin/Navigation.Parameters/Android/Android.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@
5252
</ItemGroup>
5353
<ItemGroup>
5454
<PackageReference Include="Xamarin.Forms" Version="3.6.*" />
55-
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.1" />
55+
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
5656
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.1" />
5757
<PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.1" />
5858
<PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="28.0.0.1" />
5959
<PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="28.0.0.1" />
60-
<PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.1" />
61-
<PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.1" />
60+
<PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" />
61+
<PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.3" />
6262
<PackageReference Include="Xamarin.Essentials" Version="1.1.0" />
6363
<PackageReference Include="ReactiveUI" Version ="9.17.11" />
6464
</ItemGroup>

‎Xamarin/ReactiveRecyclerView/Droid/TestApp.Droid.csproj‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -66,58 +66,58 @@
6666
<Version>3.2.0</Version>
6767
</PackageReference>
6868
<PackageReference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
69-
<Version>28.0.0.1</Version>
69+
<Version>28.0.0.3</Version>
7070
</PackageReference>
7171
<PackageReference Include="Xamarin.Android.Support.Annotations">
72-
<Version>28.0.0.1</Version>
72+
<Version>28.0.0.3</Version>
7373
</PackageReference>
7474
<PackageReference Include="Xamarin.Android.Support.AsyncLayoutInflater">
75-
<Version>28.0.0.1</Version>
75+
<Version>28.0.0.3</Version>
7676
</PackageReference>
7777
<PackageReference Include="Xamarin.Android.Support.Collections">
78-
<Version>28.0.0.1</Version>
78+
<Version>28.0.0.3</Version>
7979
</PackageReference>
8080
<PackageReference Include="Xamarin.Android.Support.Compat">
81-
<Version>28.0.0.1</Version>
81+
<Version>28.0.0.3</Version>
8282
</PackageReference>
8383
<PackageReference Include="Xamarin.Android.Support.CoordinaterLayout">
84-
<Version>28.0.0.1</Version>
84+
<Version>28.0.0.3</Version>
8585
</PackageReference>
8686
<PackageReference Include="Xamarin.Android.Support.Core.UI">
87-
<Version>28.0.0.1</Version>
87+
<Version>28.0.0.3</Version>
8888
</PackageReference>
8989
<PackageReference Include="Xamarin.Android.Support.Core.Utils">
90-
<Version>28.0.0.1</Version>
90+
<Version>28.0.0.3</Version>
9191
</PackageReference>
9292
<PackageReference Include="Xamarin.Android.Support.CursorAdapter">
93-
<Version>28.0.0.1</Version>
93+
<Version>28.0.0.3</Version>
9494
</PackageReference>
9595
<PackageReference Include="Xamarin.Android.Support.CustomTabs">
96-
<Version>28.0.0.1</Version>
96+
<Version>28.0.0.3</Version>
9797
</PackageReference>
9898
<PackageReference Include="Xamarin.Android.Support.CustomView">
99-
<Version>28.0.0.1</Version>
99+
<Version>28.0.0.3</Version>
100100
</PackageReference>
101101
<PackageReference Include="Xamarin.Android.Support.Design">
102-
<Version>28.0.0.1</Version>
102+
<Version>28.0.0.3</Version>
103103
</PackageReference>
104104
<PackageReference Include="Xamarin.Android.Support.DocumentFile">
105-
<Version>28.0.0.1</Version>
105+
<Version>28.0.0.3</Version>
106106
</PackageReference>
107107
<PackageReference Include="Xamarin.Android.Support.DrawerLayout">
108-
<Version>28.0.0.1</Version>
108+
<Version>28.0.0.3</Version>
109109
</PackageReference>
110110
<PackageReference Include="Xamarin.Android.Support.Exif">
111-
<Version>28.0.0.1</Version>
111+
<Version>28.0.0.3</Version>
112112
</PackageReference>
113113
<PackageReference Include="Xamarin.Android.Support.Fragment">
114-
<Version>28.0.0.1</Version>
114+
<Version>28.0.0.3</Version>
115115
</PackageReference>
116116
<PackageReference Include="Xamarin.Android.Support.Interpolator">
117-
<Version>28.0.0.1</Version>
117+
<Version>28.0.0.3</Version>
118118
</PackageReference>
119119
<PackageReference Include="Xamarin.Android.Support.Loader">
120-
<Version>28.0.0.1</Version>
120+
<Version>28.0.0.3</Version>
121121
</PackageReference>
122122
<PackageReference Include="Xamarin.Android.Support.LocalBroadcastManager">
123123
<Version>28.0.0.1</Version>

‎Xamarin/ReactiveRecyclerView/iOS/TestApp.iOS.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
<Version>6.12.10</Version>
153153
</PackageReference>
154154
<PackageReference Include="Newtonsoft.Json">
155-
<Version>13.0.1</Version>
155+
<Version>13.0.3</Version>
156156
</PackageReference>
157157
<PackageReference Include="Plugin.Share">
158158
<Version>7.1.1</Version>

‎avalonia/hello-world/HelloWorld/HelloWorld.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
</AvaloniaResource>
1515
</ItemGroup>
1616
<ItemGroup>
17-
<PackageReference Include="Avalonia" Version="11.0.10" />
18-
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.10" />
19-
<PackageReference Include="Avalonia.Desktop" Version="11.0.10" />
17+
<PackageReference Include="Avalonia" Version="11.0.11" />
18+
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.11" />
19+
<PackageReference Include="Avalonia.Desktop" Version="11.0.11" />
2020
</ItemGroup>
2121
</Project>

0 commit comments

Comments
 (0)