Skip to content

Commit 8ed4f89

Browse files
ChrisPulmanChrisPulman
authored
Update where possible (#748)
* Update where possible * Updates Unable to get UNO WPF working - a new solution template may be required for newer versions
1 parent 51fa53f commit 8ed4f89

File tree

37 files changed

+18783
-49126
lines changed

37 files changed

+18783
-49126
lines changed

‎Directory.build.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<LangVersion>latest</LangVersion>
88
<EnableNETAnalyzers>True</EnableNETAnalyzers>
99
<AnalysisLevel>latest</AnalysisLevel>
10+
<ReactiveUIVersion>19.*</ReactiveUIVersion>
1011
</PropertyGroup>
1112
<PropertyGroup>
1213
<SolutionDir Condition="'$(SolutionDir)' == ''">$(MSBuildThisFileDirectory)</SolutionDir>
@@ -16,7 +17,7 @@
1617
</ItemGroup>
1718
<ItemGroup>
1819
<!--<PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.333" PrivateAssets="all" />-->
19-
<PackageReference Include="Roslynator.Analyzers" Version="4.3.0" PrivateAssets="All" />
20+
<PackageReference Include="Roslynator.Analyzers" Version="4.5.0" PrivateAssets="All" />
2021
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
2122
</ItemGroup>
2223
</Project>

‎ReactiveUI.Samples.sln

Lines changed: 0 additions & 234 deletions
Large diffs are not rendered by default.

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

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst;</TargetFrameworks>
3+
<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
44
<SingleProject>true</SingleProject>
55
<OutputType>Exe</OutputType>
6-
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-ios'">iossimulator-x64</RuntimeIdentifier>
7-
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">maccatalyst-x64</RuntimeIdentifier>
8-
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-macos'">osx-x64</RuntimeIdentifier>
6+
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-ios'">iossimulator-x64</RuntimeIdentifier>
7+
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">maccatalyst-x64</RuntimeIdentifier>
8+
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-macos'">osx-x64</RuntimeIdentifier>
99
<!-- Debugger workaround https://github.com/dotnet/maui-samples/blob/8aa6b8780b12e97b157514c3bdc54bb4a13001cd/HelloMacCatalyst/HelloMacCatalyst.csproj#L7 -->
1010
<!-- <MtouchExtraArgs Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs> -->
1111
<!-- Required for C# Hot Reload, except for macOS which uses CoreCLR (not Mono) -->
1212
<!-- Disabled because of https://github.com/dotnet/runtime/issues/68808 -->
1313
<!--<UseInterpreter Condition="'$(Configuration)' == 'Debug' and '$(TargetFramework)' != 'net6.0-maccatalyst' and '$(TargetFramework)' != 'net6.0-macos'">True</UseInterpreter>-->
1414
<IsUnoHead>true</IsUnoHead>
15-
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-ios'">15.4</SupportedOSPlatformVersion>
16-
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">15.4</SupportedOSPlatformVersion>
17-
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-android'">31.0</SupportedOSPlatformVersion>
18-
<SupportedOSPlatformVersion Condition="'$(TargetFramework)'=='net6.0-macos'">10.14</SupportedOSPlatformVersion>
15+
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-ios'">15.4</SupportedOSPlatformVersion>
16+
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">15.4</SupportedOSPlatformVersion>
17+
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-android'">31.0</SupportedOSPlatformVersion>
18+
<SupportedOSPlatformVersion Condition="'$(TargetFramework)'=='net7.0-macos'">10.14</SupportedOSPlatformVersion>
1919
</PropertyGroup>
2020
<ItemGroup>
21-
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="19.*" />
22-
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.9.26" Condition="'$(Configuration)'=='Debug'" />
23-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.20" />
21+
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="$(ReactiveUIVersion)" />
22+
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.6.0" />
23+
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.9.45" Condition="'$(Configuration)'=='Debug'" />
24+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.45" />
2425
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
2526
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
2627
</ItemGroup>
2728
<Choose>
28-
<When Condition="'$(TargetFramework)'=='net6.0-android'">
29+
<When Condition="'$(TargetFramework)'=='net7.0-android'">
2930
<ItemGroup>
3031
<PackageReference Include="Xamarin.Google.Android.Material" Version="[1.5.0]" />
3132
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.36" />
@@ -34,8 +35,8 @@
3435
<AndroidEnvironment Include="Android/environment.conf" />
3536
</ItemGroup>
3637
</When>
37-
<When Condition="'$(TargetFramework)'=='net6.0-ios'">
38-
<PropertyGroup Condition="'$(TargetFramework)'=='net6.0-ios'">
38+
<When Condition="'$(TargetFramework)'=='net7.0-ios'">
39+
<PropertyGroup Condition="'$(TargetFramework)'=='net7.0-ios'">
3940
<MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
4041
<!-- https://github.com/xamarin/xamarin-macios/issues/14812 -->
4142
<MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static --marshal-objectivec-exceptions:disable</MtouchExtraArgs>
@@ -44,7 +45,7 @@
4445
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
4546
</ItemGroup>
4647
</When>
47-
<When Condition="'$(TargetFramework)'=='net6.0-maccatalyst'">
48+
<When Condition="'$(TargetFramework)'=='net7.0-maccatalyst'">
4849
<PropertyGroup>
4950
<!-- Configure the GC -->
5051
<MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
@@ -59,7 +60,7 @@
5960
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
6061
</ItemGroup>
6162
</When>
62-
<When Condition="'$(TargetFramework)'=='net6.0-macos'">
63+
<When Condition="'$(TargetFramework)'=='net7.0-macos'">
6364
<PropertyGroup>
6465
</PropertyGroup>
6566
</When>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
44
<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net7.0</TargetFramework>
66
<ApplicationManifest>app.manifest</ApplicationManifest>
77
</PropertyGroup>
88
<ItemGroup Condition="exists('..\ReactiveUI.UwpRouting.Windows')">
@@ -14,12 +14,12 @@
1414
<UpToDateCheckInput Include="..\ReactiveUI.UnoRouting.Shared\**\*.xaml" />
1515
</ItemGroup>
1616
<ItemGroup>
17-
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="19.*" />
17+
<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.8.24" />
21-
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.9.26" Condition="'$(Configuration)'=='Debug'" />
22-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.20" />
20+
<PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.9.45" />
21+
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.9.45" Condition="'$(Configuration)'=='Debug'" />
22+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.45" />
2323
</ItemGroup>
2424
<Import Project="..\ReactiveUI.UnoRouting.Shared\ReactiveUI.UnoRouting.Shared.projitems" Label="Shared" />
2525
</Project>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
44
<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
5-
<TargetFramework>net6.0-windows</TargetFramework>
5+
<TargetFramework>net7.0-windows</TargetFramework>
66
<UseWPF>true</UseWPF>
77
<ApplicationManifest>app.manifest</ApplicationManifest>
88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="19.*" />
10+
<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.9.26" />
14-
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.9.26" Condition="'$(Configuration)'=='Debug'" />
15-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.20" />
13+
<PackageReference Include="Uno.WinUI.Skia.Wpf" Version="4.9.45" />
14+
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.9.45" Condition="'$(Configuration)'=='Debug'" />
15+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.45" />
1616
</ItemGroup>
1717
<ItemGroup>
1818
<UpToDateCheckInput Include="..\ReactiveUI.UnoRouting.Shared\**\*.xaml" />
@@ -21,4 +21,4 @@
2121
<Content Include="Assets\Fonts\uno-fluentui-assets.ttf" />
2222
</ItemGroup>
2323
<Import Project="..\ReactiveUI.UnoRouting.Shared\ReactiveUI.UnoRouting.Shared.projitems" Label="Shared" />
24-
</Project>
24+
</Project>

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<NoWarn>NU1701</NoWarn>
66
</PropertyGroup>
77
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
@@ -41,14 +41,14 @@
4141
</ItemGroup>
4242
<ItemGroup>
4343
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.3" />
44-
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="19.*" />
44+
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="$(ReactiveUIVersion)" />
4545
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
46-
<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.4.0" />
47-
<PackageReference Include="Uno.WinUI.WebAssembly" Version="4.9.20" />
48-
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.9.26" Condition="'$(Configuration)'=='Debug'" />
49-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.20" />
50-
<PackageReference Include="Uno.Wasm.Bootstrap" Version="7.0.24" />
51-
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.20" />
46+
<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.6.0" />
47+
<PackageReference Include="Uno.WinUI.WebAssembly" Version="4.9.45" />
48+
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.9.45" Condition="'$(Configuration)'=='Debug'" />
49+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.45" />
50+
<PackageReference Include="Uno.Wasm.Bootstrap" Version="7.0.29" />
51+
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.29" />
5252
</ItemGroup>
5353
<Import Project="..\ReactiveUI.UnoRouting.Shared\ReactiveUI.UnoRouting.Shared.projitems" Label="Shared" Condition="Exists('..\ReactiveUI.UnoRouting.Shared\ReactiveUI.UnoRouting.Shared.projitems')" />
5454
</Project>

‎Uno/ReactiveUI.UnoRouting/ReactiveUI.UnoRouting.Windows/ReactiveUI.UnoRouting.Windows.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
4+
<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
55
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
66
<RootNamespace>ReactiveUI.UnoRouting</RootNamespace>
77
<ApplicationManifest>app.manifest</ApplicationManifest>
@@ -23,7 +23,7 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="19.*" />
26+
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="$(ReactiveUIVersion)" />
2727
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
2828
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
2929

‎Xamarin/Cinephile/Cinephile.Android/Cinephile.Android.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,9 @@
5151
<Reference Include="System.Xml.Linq" />
5252
<Reference Include="System.Xml" />
5353
<Reference Include="System.Numerics" />
54-
<Reference Include="System.Numerics.Vectors" />
5554
</ItemGroup>
5655
<ItemGroup>
57-
<PackageReference Include="ReactiveUI.AndroidX" Version="18.*" />
56+
<PackageReference Include="ReactiveUI.AndroidX" Version="$(ReactiveUIVersion)" />
5857
<PackageReference Include="Xamarin.AndroidX.Palette" Version="[1.0.0.11]" />
5958
<PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="[1.2.5.3]" />
6059
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="[2.3.1.1]" />

0 commit comments

Comments
 (0)