Skip to content

Commit 34183f3

Browse files
committed
Merge branch 'main' into release-21x
2 parents 0d0f134 + 2c6eb76 commit 34183f3

22 files changed

+19643
-11338
lines changed

samples/Directory.build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<WarningsAsErrors>CS8600;CS8602;CS8603;CS8604;CS8605;CS8606;CS8607;CS8608;CS8609;CS8610;CS8611;CS8612;CS8613;CS8614;CS8615;CS8616;CS8617;CS8618;CS8619;CS8620;CS8621;CS8622;CS8623;CS8624;CS8625</WarningsAsErrors>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.312" PrivateAssets="all" />
8-
<PackageReference Include="Roslynator.Analyzers" Version="3.2.0" PrivateAssets="All" />
7+
<PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.354" PrivateAssets="all" />
8+
<PackageReference Include="Roslynator.Analyzers" Version="3.2.2" PrivateAssets="All" />
99
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3" PrivateAssets="all" />
1010
</ItemGroup>
1111
<ItemGroup>

samples/LoginApp.Android/LoginApp.Android.csproj

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
1616
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
1717
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
18-
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
1919
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
2020
<NuGetPackageImportStamp>
2121
</NuGetPackageImportStamp>
@@ -71,16 +71,11 @@
7171
<AndroidResource Include="Resources\values\styles.xml" />
7272
</ItemGroup>
7373
<ItemGroup>
74-
<PackageReference Include="ReactiveUI" Version="14.*" />
75-
<PackageReference Include="ReactiveUI.AndroidX" Version="14.*" />
74+
<PackageReference Include="ReactiveUI" Version="16.*" />
75+
<PackageReference Include="ReactiveUI.AndroidX" Version="16.*" />
7676
<PackageReference Include="ReactiveUI.Validation" Version="2.*" />
7777
<PackageReference Include="ReactiveUI.Validation.AndroidX" Version="2.*" />
78-
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.3.0.1" />
79-
<!-- We are pinning transitive deps versions coming from ReactiveUI.AndroidX.
80-
See: https://github.com/reactiveui/ReactiveUI.Validation/pull/216#issuecomment-783218308 -->
81-
<PackageReference Include="Xamarin.AndroidX.Preference" Version="1.1.1.8" />
82-
<PackageReference Include="Xamarin.AndroidX.Fragment" Version="1.3.5" />
83-
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1" />
78+
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.2" />
8479
</ItemGroup>
8580
<ItemGroup>
8681
<ProjectReference Include="..\LoginApp\LoginApp.csproj">

0 commit comments

Comments
 (0)