dependency: Update samples to Android 10.0 (#180)

reactiveui · Dec 13, 2020 · 5a2ff56 · 5a2ff56
1 parent 39e6a93
commit 5a2ff56
Show file tree

Hide file tree

Showing 12 changed files with 7,058 additions and 5,683 deletions.
diff --git a/.github/workflows/build-samples.yml b/.github/workflows/build-samples.yml
@@ -23,6 +23,7 @@ jobs:
       uses: actions/checkout@v2
       with:
         fetch-depth: 0
+        lfs: true
 
     # Install the .NET Core workload
     - name: Install .NET Core 3.1.x
@@ -43,10 +44,4 @@ jobs:
       run: msbuild LoginApp.sln /t:restore,build /maxcpucount /p:NoPackageAnalysis=true /verbosity:minimal /p:Configuration=$env:Configuration
       working-directory: samples
       env:
-        Configuration: ${{ matrix.configuration }}
-
-    # Execute all unit tests in the solution
-    - name: Execute unit tests
-      working-directory: samples
-      run: dotnet test LoginApp.sln
-
+        Configuration: ${{ matrix.configuration }}
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -27,6 +27,7 @@ jobs:
       uses: actions/checkout@v2
       with:
         fetch-depth: 0
+        lfs: true
 
     - name: Install .NET Core 3.1.x
       uses: actions/setup-dotnet@v1

diff --git a/samples/Directory.build.props b/samples/Directory.build.props
@@ -4,7 +4,7 @@
     <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>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.205" PrivateAssets="all" />
+    <PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.312" PrivateAssets="all" />
     <PackageReference Include="Roslynator.Analyzers" Version="3.0.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.1" PrivateAssets="all" />
   </ItemGroup>

diff --git a/samples/LoginApp.Android/LoginApp.Android.csproj b/samples/LoginApp.Android/LoginApp.Android.csproj
@@ -15,7 +15,7 @@
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
     <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -75,7 +75,7 @@
     <PackageReference Include="ReactiveUI.AndroidX" Version="13.*" />
     <PackageReference Include="ReactiveUI.Validation" Version="2.*" />
     <PackageReference Include="ReactiveUI.Validation.AndroidX" Version="2.*" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.1.0.5-rc3" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\LoginApp\LoginApp.csproj">
@@ -84,4 +84,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-</Project>
+</Project>
diff --git a/samples/LoginApp.Android/Properties/AndroidManifest.xml b/samples/LoginApp.Android/Properties/AndroidManifest.xml
@@ -1,9 +1,5 @@
 <?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="LoginApp.Android.LoginApp.Android">
-  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
-  <application android:allowBackup="true" android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme">
-  </application>
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="LoginApp.Android.LoginApp.Android" android:installLocation="auto">
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
+	<application android:allowBackup="true" android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme"></application>
+</manifest>