Skip to content

Commit

Permalink
Resolve Package issues (#714)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ChrisPulman
ChrisPulman authored May 2, 2023
1 parent cbc775d commit 6270869
Show file tree
Hide file tree
Showing 30 changed files with 3,016 additions and 3,047 deletions.
2 changes: 1 addition & 1 deletion Directory.build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</ItemGroup>
<ItemGroup>
<!--<PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.333" PrivateAssets="all" />-->
<PackageReference Include="Roslynator.Analyzers" Version="4.1.2" PrivateAssets="All" />
<PackageReference Include="Roslynator.Analyzers" Version="4.3.0" PrivateAssets="All" />
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
</ItemGroup>
</Project>
16 changes: 8 additions & 8 deletions Uno/ReactiveUI.UnoRouting/ReactiveUI.UnoRouting.Mobile/ReactiveUI.UnoRouting.Mobile.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
<SupportedOSPlatformVersion Condition="'$(TargetFramework)'=='net6.0-macos'">10.14</SupportedOSPlatformVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="18.1.2" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.12" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.12" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="18.*" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.8.24" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.8.24" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
</ItemGroup>
<Choose>
<When Condition="'$(TargetFramework)'=='net6.0-android'">
<ItemGroup>
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.4" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="[1.5.0]" />
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.36" />
</ItemGroup>
<ItemGroup>
Expand All @@ -38,7 +38,7 @@
<PropertyGroup Condition="'$(TargetFramework)'=='net6.0-ios'">
<MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
<!-- https://github.com/xamarin/xamarin-macios/issues/14812 -->
<MtouchExtraArgs>$(MtouchExtraArgs) --marshal-objectivec-exceptions:disable</MtouchExtraArgs>
<MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static --marshal-objectivec-exceptions:disable</MtouchExtraArgs>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
Expand All @@ -51,7 +51,7 @@
<!-- Required for unknown crash as of .NET 6 Mobile Preview 13 -->
<MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static</MtouchExtraArgs>
<!-- https://github.com/xamarin/xamarin-macios/issues/14812 -->
<MtouchExtraArgs>$(MtouchExtraArgs) --marshal-objectivec-exceptions:disable</MtouchExtraArgs>
<MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static --marshal-objectivec-exceptions:disable</MtouchExtraArgs>
<!-- Full globalization is required for Uno -->
<InvariantGlobalization>false</InvariantGlobalization>
</PropertyGroup>
Expand Down
12 changes: 6 additions & 6 deletions ...eactiveUI.UnoRouting/ReactiveUI.UnoRouting.Skia.Gtk/ReactiveUI.UnoRouting.Skia.Gtk.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
<UpToDateCheckInput Include="..\ReactiveUI.UnoRouting.Shared\**\*.xaml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="18.1.2" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
<PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.5.12" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.12" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.12" />
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="18.*" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.8.24" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.8.24" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.8.24" />
</ItemGroup>
<Import Project="..\ReactiveUI.UnoRouting.Shared\ReactiveUI.UnoRouting.Shared.projitems" Label="Shared" />
</Project>
12 changes: 6 additions & 6 deletions ...eactiveUI.UnoRouting/ReactiveUI.UnoRouting.Skia.Wpf/ReactiveUI.UnoRouting.Skia.Wpf.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="18.1.2" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
<PackageReference Include="Uno.WinUI.Skia.Wpf" Version="4.6.18" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.12" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.12" />
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="18.*" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageReference Include="Uno.WinUI.Skia.Wpf" Version="4.8.24" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.8.24" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.8.24" />
</ItemGroup>
<ItemGroup>
<UpToDateCheckInput Include="..\ReactiveUI.UnoRouting.Shared\**\*.xaml" />
Expand Down
16 changes: 8 additions & 8 deletions Uno/ReactiveUI.UnoRouting/ReactiveUI.UnoRouting.Wasm/ReactiveUI.UnoRouting.Wasm.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@
<None Include="wwwroot\web.config" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.1" />
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="18.1.2" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.1" />
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="18.*" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.4.0" />
<PackageReference Include="Uno.WinUI.WebAssembly" Version="4.5.12" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.12" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.12" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="7.0.5" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.5" />
<PackageReference Include="Uno.WinUI.WebAssembly" Version="4.8.24" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.8.24" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.8.24" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="7.0.20" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.20" />
</ItemGroup>
<Import Project="..\ReactiveUI.UnoRouting.Shared\ReactiveUI.UnoRouting.Shared.projitems" Label="Shared" Condition="Exists('..\ReactiveUI.UnoRouting.Shared\ReactiveUI.UnoRouting.Shared.projitems')" />
</Project>
8 changes: 4 additions & 4 deletions Uno/ReactiveUI.UnoRouting/ReactiveUI.UnoRouting.Windows/ReactiveUI.UnoRouting.Windows.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="18.1.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
<PackageReference Include="ReactiveUI.Uno.WinUI" Version="18.*" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />

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

<Import Project="..\ReactiveUI.UnoRouting.Shared\ReactiveUI.UnoRouting.Shared.projitems" Label="Shared" />
Expand Down
12 changes: 2 additions & 10 deletions Xamarin/Cinephile/Cinephile.Android/Cinephile.Android.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v12.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v12.1</TargetFrameworkVersion>
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
<AndroidUseAapt2>true</AndroidUseAapt2>
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
Expand Down Expand Up @@ -55,19 +55,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="ReactiveUI.AndroidX" Version="18.*" />
<!-- These packages are forced due to Xamarin version used in ReactiveUI.AndroidX - remove when ReactiveUI.AndroidX is fixed
<PackageReference Include="Xamarin.AndroidX.Palette" Version="[1.0.0.11]" />
<PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="[1.2.5.3]" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="[2.3.1.1]" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="[1.5.0]" />
<PackageReference Include="Xamarin.AndroidX.Core" Version="[1.7.0.2]" />
<PackageReference Include="Xamarin.AndroidX.Preference" Version="[1.2.0]" /> -->

<PackageReference Include="Xamarin.AndroidX.Palette" Version="[1.0.0.11]" />
<PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="[1.2.5.3]" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="[2.3.1.1]" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="[1.5.0]" />
<PackageReference Include="Xamarin.AndroidX.Core" Version="[1.7.0.2]" />
<PackageReference Include="Xamarin.AndroidX.Core" Version="[1.8.0]" />
<PackageReference Include="Xamarin.AndroidX.Preference" Version="[1.2.0]" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Xamarin/Cinephile/Cinephile.Android/Properties/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<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">
<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="31" />
<uses-sdk android:minSdkVersion="30" android:targetSdkVersion="32" />
<application android:label="Cinephile.Android" android:theme="@style/MyTheme"></application>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
</manifest>
</manifest>
Loading

0 comments on commit 6270869

Please sign in to comment.