Skip to content

Commit 6270869

Browse files
ChrisPulmanChrisPulman
authored
Resolve Package issues (#714)
1 parent cbc775d commit 6270869

File tree

30 files changed

+3016
-3047
lines changed

30 files changed

+3016
-3047
lines changed

‎Directory.build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</ItemGroup>
1717
<ItemGroup>
1818
<!--<PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.333" PrivateAssets="all" />-->
19-
<PackageReference Include="Roslynator.Analyzers" Version="4.1.2" PrivateAssets="All" />
19+
<PackageReference Include="Roslynator.Analyzers" Version="4.3.0" PrivateAssets="All" />
2020
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
2121
</ItemGroup>
2222
</Project>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
<SupportedOSPlatformVersion Condition="'$(TargetFramework)'=='net6.0-macos'">10.14</SupportedOSPlatformVersion>
1919
</PropertyGroup>
2020
<ItemGroup>
21-
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="18.1.2" />
22-
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.12" Condition="'$(Configuration)'=='Debug'" />
23-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.12" />
24-
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
25-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
21+
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="18.*" />
22+
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.8.24" Condition="'$(Configuration)'=='Debug'" />
23+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.8.24" />
24+
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
25+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
2626
</ItemGroup>
2727
<Choose>
2828
<When Condition="'$(TargetFramework)'=='net6.0-android'">
2929
<ItemGroup>
30-
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.4" />
30+
<PackageReference Include="Xamarin.Google.Android.Material" Version="[1.5.0]" />
3131
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.36" />
3232
</ItemGroup>
3333
<ItemGroup>
@@ -38,7 +38,7 @@
3838
<PropertyGroup Condition="'$(TargetFramework)'=='net6.0-ios'">
3939
<MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
4040
<!-- https://github.com/xamarin/xamarin-macios/issues/14812 -->
41-
<MtouchExtraArgs>$(MtouchExtraArgs) --marshal-objectivec-exceptions:disable</MtouchExtraArgs>
41+
<MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static --marshal-objectivec-exceptions:disable</MtouchExtraArgs>
4242
</PropertyGroup>
4343
<ItemGroup>
4444
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
@@ -51,7 +51,7 @@
5151
<!-- Required for unknown crash as of .NET 6 Mobile Preview 13 -->
5252
<MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static</MtouchExtraArgs>
5353
<!-- https://github.com/xamarin/xamarin-macios/issues/14812 -->
54-
<MtouchExtraArgs>$(MtouchExtraArgs) --marshal-objectivec-exceptions:disable</MtouchExtraArgs>
54+
<MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static --marshal-objectivec-exceptions:disable</MtouchExtraArgs>
5555
<!-- Full globalization is required for Uno -->
5656
<InvariantGlobalization>false</InvariantGlobalization>
5757
</PropertyGroup>

‎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
@@ -14,12 +14,12 @@
1414
<UpToDateCheckInput Include="..\ReactiveUI.UnoRouting.Shared\**\*.xaml" />
1515
</ItemGroup>
1616
<ItemGroup>
17-
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="18.1.2" />
18-
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
19-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
20-
<PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.5.12" />
21-
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.12" Condition="'$(Configuration)'=='Debug'" />
22-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.12" />
17+
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="18.*" />
18+
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
19+
<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.8.24" Condition="'$(Configuration)'=='Debug'" />
22+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.8.24" />
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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<ApplicationManifest>app.manifest</ApplicationManifest>
88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="18.1.2" />
11-
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
12-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
13-
<PackageReference Include="Uno.WinUI.Skia.Wpf" Version="4.6.18" />
14-
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.12" Condition="'$(Configuration)'=='Debug'" />
15-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.12" />
10+
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="18.*" />
11+
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
13+
<PackageReference Include="Uno.WinUI.Skia.Wpf" Version="4.8.24" />
14+
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.8.24" Condition="'$(Configuration)'=='Debug'" />
15+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.8.24" />
1616
</ItemGroup>
1717
<ItemGroup>
1818
<UpToDateCheckInput Include="..\ReactiveUI.UnoRouting.Shared\**\*.xaml" />

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@
4040
<None Include="wwwroot\web.config" />
4141
</ItemGroup>
4242
<ItemGroup>
43-
<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.1" />
44-
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="18.1.2" />
45-
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
43+
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.1" />
44+
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="18.*" />
45+
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
4646
<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.4.0" />
47-
<PackageReference Include="Uno.WinUI.WebAssembly" Version="4.5.12" />
48-
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.12" Condition="'$(Configuration)'=='Debug'" />
49-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.12" />
50-
<PackageReference Include="Uno.Wasm.Bootstrap" Version="7.0.5" />
51-
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.5" />
47+
<PackageReference Include="Uno.WinUI.WebAssembly" Version="4.8.24" />
48+
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.8.24" Condition="'$(Configuration)'=='Debug'" />
49+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.8.24" />
50+
<PackageReference Include="Uno.Wasm.Bootstrap" Version="7.0.20" />
51+
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.20" />
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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="18.1.2" />
27-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
26+
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="18.*" />
27+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
2828
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
2929

3030
<Manifest Include="$(ApplicationManifest)" />
@@ -47,8 +47,8 @@
4747
the "Microsoft.Windows.SDK.BuildTools" package above, and the "revision" version number
4848
must be the highest found in https://www.nuget.org/packages/Microsoft.Windows.SDK.NET.Ref.
4949
-->
50-
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22000.25" />
51-
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.25" />
50+
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22000.27" />
51+
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.27" />
5252
</ItemGroup>
5353

5454
<Import Project="..\ReactiveUI.UnoRouting.Shared\ReactiveUI.UnoRouting.Shared.projitems" Label="Shared" />

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
1818
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
1919
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
20-
<TargetFrameworkVersion>v12.0</TargetFrameworkVersion>
20+
<TargetFrameworkVersion>v12.1</TargetFrameworkVersion>
2121
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
2222
<AndroidUseAapt2>true</AndroidUseAapt2>
2323
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
@@ -55,19 +55,11 @@
5555
</ItemGroup>
5656
<ItemGroup>
5757
<PackageReference Include="ReactiveUI.AndroidX" Version="18.*" />
58-
<!-- These packages are forced due to Xamarin version used in ReactiveUI.AndroidX - remove when ReactiveUI.AndroidX is fixed
5958
<PackageReference Include="Xamarin.AndroidX.Palette" Version="[1.0.0.11]" />
6059
<PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="[1.2.5.3]" />
6160
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="[2.3.1.1]" />
6261
<PackageReference Include="Xamarin.Google.Android.Material" Version="[1.5.0]" />
63-
<PackageReference Include="Xamarin.AndroidX.Core" Version="[1.7.0.2]" />
64-
<PackageReference Include="Xamarin.AndroidX.Preference" Version="[1.2.0]" /> -->
65-
66-
<PackageReference Include="Xamarin.AndroidX.Palette" Version="[1.0.0.11]" />
67-
<PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="[1.2.5.3]" />
68-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="[2.3.1.1]" />
69-
<PackageReference Include="Xamarin.Google.Android.Material" Version="[1.5.0]" />
70-
<PackageReference Include="Xamarin.AndroidX.Core" Version="[1.7.0.2]" />
62+
<PackageReference Include="Xamarin.AndroidX.Core" Version="[1.8.0]" />
7163
<PackageReference Include="Xamarin.AndroidX.Preference" Version="[1.2.0]" />
7264
</ItemGroup>
7365
<ItemGroup>

‎Xamarin/Cinephile/Cinephile.Android/Properties/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.giusepe.cinephile.cinephile" android:installLocation="auto">
3-
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="31" />
3+
<uses-sdk android:minSdkVersion="30" android:targetSdkVersion="32" />
44
<application android:label="Cinephile.Android" android:theme="@style/MyTheme"></application>
55
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
6-
</manifest>
6+
</manifest>

0 commit comments

Comments
 (0)