Skip to content

Commit 5a2ff56

Browse files
glennawatsonglennawatson
authored
dependency: Update samples to Android 10.0 (#180)
1 parent 39e6a93 commit 5a2ff56

File tree

12 files changed

+7058
-5683
lines changed

12 files changed

+7058
-5683
lines changed

‎.github/workflows/build-samples.yml

+2-7
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
uses: actions/checkout@v2
2424
with:
2525
fetch-depth: 0
26+
lfs: true
2627

2728
# Install the .NET Core workload
2829
- name: Install .NET Core 3.1.x
@@ -43,10 +44,4 @@ jobs:
4344
run: msbuild LoginApp.sln /t:restore,build /maxcpucount /p:NoPackageAnalysis=true /verbosity:minimal /p:Configuration=$env:Configuration
4445
working-directory: samples
4546
env:
46-
Configuration: ${{ matrix.configuration }}
47-
48-
# Execute all unit tests in the solution
49-
- name: Execute unit tests
50-
working-directory: samples
51-
run: dotnet test LoginApp.sln
52-
47+
Configuration: ${{ matrix.configuration }}

‎.github/workflows/ci-build.yml

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
uses: actions/checkout@v2
2828
with:
2929
fetch-depth: 0
30+
lfs: true
3031

3132
- name: Install .NET Core 3.1.x
3233
uses: actions/setup-dotnet@v1

‎samples/Directory.build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
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.205" PrivateAssets="all" />
7+
<PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.312" PrivateAssets="all" />
88
<PackageReference Include="Roslynator.Analyzers" Version="3.0.0" PrivateAssets="All" />
99
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.1" PrivateAssets="all" />
1010
</ItemGroup>

‎samples/LoginApp.Android/LoginApp.Android.csproj

+3-3
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>v9.0</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
1919
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
2020
<NuGetPackageImportStamp>
2121
</NuGetPackageImportStamp>
@@ -75,7 +75,7 @@
7575
<PackageReference Include="ReactiveUI.AndroidX" Version="13.*" />
7676
<PackageReference Include="ReactiveUI.Validation" Version="2.*" />
7777
<PackageReference Include="ReactiveUI.Validation.AndroidX" Version="2.*" />
78-
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.1.0.5-rc3" />
78+
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.2.1" />
7979
</ItemGroup>
8080
<ItemGroup>
8181
<ProjectReference Include="..\LoginApp\LoginApp.csproj">
@@ -84,4 +84,4 @@
8484
</ProjectReference>
8585
</ItemGroup>
8686
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
87-
</Project>
87+
</Project>

‎samples/LoginApp.Android/Properties/AndroidManifest.xml

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:versionCode="1"
4-
android:versionName="1.0"
5-
package="LoginApp.Android.LoginApp.Android">
6-
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
7-
<application android:allowBackup="true" android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme">
8-
</application>
9-
</manifest>
2+
<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">
3+
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
4+
<application android:allowBackup="true" android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme"></application>
5+
</manifest>

0 commit comments

Comments
 (0)