DeGsoft
/
maui-linux
зеркало из https://github.com/DeGsoft/maui-linux.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[Build] Remove VS2017 and old XCODE support, move Flex to core project (#11972) 

* [Pages] Remove pages

* [Pages] Remove PagesGallery update sln

* [Build] Remove 2017

* [Build] Cleanup cake VS2017

* [Build] Remove Xamarin.Build.TypeRedirector

* [Build] Remove references to Use2017

* Update Xamarin.Forms.nuspec

* Update Xamarin.Forms.Platform.UAP.csproj

* [Android]remove Monodroid90

* Update build.cake

* Update Environment.Build.props

* [Android] Remove extra manifest

* [Android]Fix Android tests project

* [Android] Remove __ANDROID_29__ checks

* - remove a few more Android 9 references

* - updates formsviewgroup 10.0

* Update FormsAppCompatActivity.cs

* [iOS,macOS] Remove __XCODE11__

* [Core] Move Flex to core project

* Update Embedding.iOS.csproj

Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
This commit is contained in:
Rui Marinho 2020-09-01 19:21:20 +01:00 коммит произвёл GitHub
Родитель c80298c7ed
Коммит 3bc36731b4
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
185 изменённых файлов: 108 добавлений и 1377 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
.nuspec/Xamarin.Forms.AppLinks.nuspec
Просмотреть файл

@ -14,10 +14,6 @@
<description>Add support for deep linking and indexing app content using Xamarin.Forms on the Android Platform</description>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<dependencies>
<group targetFramework="MonoAndroid90">
<dependency id="Xamarin.Firebase.AppIndexing" version="71.1602.0"/>
<dependency id="Xamarin.Android.Support.v4" version="28.0.0.3"/>
</group>
<group targetFramework="MonoAndroid10.0">
<dependency id="Xamarin.AndroidX.Migration" version="1.0.0.1"/>
<dependency id="Xamarin.Firebase.AppIndexing" version="71.1602.0"/>
@ -27,9 +23,6 @@
</group>
</dependencies>
<references>
<group targetFramework="MonoAndroid90">
<reference file="Xamarin.Forms.Platform.Android.AppLinks.dll" />
</group>
<group targetFramework="MonoAndroid10.0">
<reference file="Xamarin.Forms.Platform.Android.AppLinks.dll" />
</group>
@ -38,7 +31,6 @@
<files>
<!--Icon-->
<file src="..\Assets\xamarin_128x128.png" target="Assets\" />
<file src="..\Xamarin.Forms.Platform.Android.AppLinks\bin\$Configuration$\MonoAndroid90\Xamarin.Forms.Platform.Android.AppLinks.dll" target="lib\MonoAndroid90" />
<file src="..\Xamarin.Forms.Platform.Android.AppLinks\bin\$Configuration$\MonoAndroid10.0\Xamarin.Forms.Platform.Android.AppLinks.dll" target="lib\MonoAndroid10.0" />
</files>
</package>

8
.nuspec/Xamarin.Forms.DualScreen.nuspec
Просмотреть файл

@ -17,9 +17,6 @@
<group>
<dependency id="Xamarin.Forms" version="$version$"/>
</group>
<group targetFramework="MonoAndroid90">
<dependency id="Xamarin.DuoSdk" version="0.0.3.4" />
</group>
<group targetFramework="MonoAndroid10.0">
<dependency id="Xamarin.DuoSdk" version="0.0.3.4" />
</group>
@ -38,11 +35,6 @@
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\netstandard2.0\Xamarin.Forms.DualScreen.*pdb" target="lib\netstandard2.0" />
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\netstandard2.0\Xamarin.Forms.DualScreen.*mdb" target="lib\netstandard2.0" />
<!--Android 90-->
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid90\Xamarin.Forms.DualScreen.dll" target="lib\MonoAndroid90" />
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid90\Xamarin.Forms.DualScreen.*pdb" target="lib\MonoAndroid90" />
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid90\Xamarin.Forms.DualScreen.*mdb" target="lib\MonoAndroid90" />
<!--Android 10.0-->
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid10.0\Xamarin.Forms.DualScreen.dll" target="lib\MonoAndroid10.0" />
<file src="..\Xamarin.Forms.DualScreen\bin\$Configuration$\monoandroid10.0\Xamarin.Forms.DualScreen.*pdb" target="lib\MonoAndroid10.0" />

9
.nuspec/Xamarin.Forms.Maps.nuspec
Просмотреть файл

@ -27,11 +27,6 @@
<dependency id="Xamarin.Forms" version="$version$"/>
<dependency id="Xamarin.Android.Support.v4" version="28.0.0.3"/>
</group>
<group targetFramework="MonoAndroid90">
<dependency id="Xamarin.GooglePlayServices.Maps" version="71.1610.0"/>
<dependency id="Xamarin.Android.Support.v7.AppCompat" version="28.0.0.3"/>
<dependency id="Xamarin.Forms" version="$version$"/>
</group>
<group targetFramework="tizen40">
<dependency id="Tizen.NET" version="4.0.0"/>
</group>
@ -46,10 +41,6 @@
<file src="..\Xamarin.Forms.Maps\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Maps.dll" target="lib\netstandard2.0" />
<file src="..\docs\Xamarin.Forms.Maps.xml" target="lib\netstandard2.0" />
<file src="..\Xamarin.Forms.Maps.Android\bin\$Configuration$\MonoAndroid90\Xamarin.Forms.Maps.Android.dll" target="lib\MonoAndroid90" />
<file src="..\Xamarin.Forms.Maps\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Maps.dll" target="lib\MonoAndroid90" />
<file src="..\docs\Xamarin.Forms.Maps.xml" target="lib\MonoAndroid90" />
<file src="..\Xamarin.Forms.Maps.Android\bin\$Configuration$\MonoAndroid10.0\Xamarin.Forms.Maps.Android.dll" target="lib\MonoAndroid10.0" />
<file src="..\Xamarin.Forms.Maps\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Maps.dll" target="lib\MonoAndroid10.0" />
<file src="..\docs\Xamarin.Forms.Maps.xml" target="lib\MonoAndroid10.0" />

10
.nuspec/Xamarin.Forms.Visual.Material.nuspec
Просмотреть файл

@ -20,10 +20,7 @@
<group targetFramework="MonoAndroid10">
<dependency id="Xamarin.Forms" version="$version$"/>
</group>
<group targetFramework="MonoAndroid90">
<dependency id="Xamarin.Android.Support.Design" version="28.0.0.3"/>
<dependency id="Xamarin.Android.Support.v7.AppCompat" version="28.0.0.3"/>
</group>
<group targetFramework="MonoAndroid10.0">
<dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.1.0.1" />
<dependency id="Xamarin.Google.Android.Material" version="1.0.0.1" />
@ -50,11 +47,6 @@
<!--Android 10 buildTransitive-->
<file src="Xamarin.Forms.Visual.Material.targets" target="buildTransitive\MonoAndroid10\Xamarin.Forms.Visual.Material.targets" />
<!--Android 90-->
<file src="..\Xamarin.Forms.Material.Android\bin\$Configuration$\monoandroid90\Xamarin.Forms.Material.dll" target="lib\MonoAndroid90" />
<file src="..\Xamarin.Forms.Material.Android\bin\$Configuration$\monoandroid90\Xamarin.Forms.Material.*pdb" target="lib\MonoAndroid90" />
<file src="..\Xamarin.Forms.Material.Android\bin\$Configuration$\monoandroid90\Xamarin.Forms.Material.*mdb" target="lib\MonoAndroid90" />
<!--Android 10.0-->
<file src="..\Xamarin.Forms.Material.Android\bin\$Configuration$\monoandroid10.0\Xamarin.Forms.Material.dll" target="lib\MonoAndroid10.0" />
<file src="..\Xamarin.Forms.Material.Android\bin\$Configuration$\monoandroid10.0\Xamarin.Forms.Material.*pdb" target="lib\MonoAndroid10.0" />

57
.nuspec/Xamarin.Forms.nuspec
Просмотреть файл

@ -20,13 +20,6 @@
<dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0.1" />
<dependency id="Xamarin.AndroidX.Browser" version="1.0.0.1" />
</group>
<group targetFramework="MonoAndroid90">
<dependency id="Xamarin.Android.Support.v4" version="28.0.0.3"/>
<dependency id="Xamarin.Android.Support.Design" version="28.0.0.3"/>
<dependency id="Xamarin.Android.Support.v7.AppCompat" version="28.0.0.3"/>
<dependency id="Xamarin.Android.Support.v7.CardView" version="28.0.0.3"/>
<dependency id="Xamarin.Android.Support.CustomTabs" version="28.0.0.3"/>
</group>
<group targetFramework="uap10.0.14393">
<dependency id="NETStandard.Library" version="2.0.1"/>
<dependency id="Win2D.uwp" version="1.20.0" />
@ -64,13 +57,6 @@
<reference file="FormsViewGroup.dll" />
<reference file="Xamarin.Forms.Platform.Android.dll" />
</group>
<group targetFramework="MonoAndroid90">
<reference file="Xamarin.Forms.Core.dll" />
<reference file="Xamarin.Forms.Platform.dll" />
<reference file="Xamarin.Forms.Xaml.dll" />
<reference file="FormsViewGroup.dll" />
<reference file="Xamarin.Forms.Platform.Android.dll" />
</group>
<group targetFramework="uap10.0.14393">
<reference file="Xamarin.Forms.Core.dll" />
<reference file="Xamarin.Forms.Platform.dll" />
@ -179,8 +165,6 @@
<file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\netstandard1.0\Design" />
<file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\MonoAndroid10.0\Design" />
<file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\MonoAndroid10.0\Design" />
<file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\MonoAndroid90\Design" />
<file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\MonoAndroid90\Design" />
<file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\Xamarin.iOS10\Design" />
<file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\Xamarin.iOS10\Design" />
<file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\uap10.0.14393\Design" />
@ -197,21 +181,6 @@
<file src="proguard.cfg" target="buildTransitive\MonoAndroid10\proguard.cfg" />
<!--Android 90-->
<file src="..\Xamarin.Forms.Platform.Android\bin\$Configuration$\MonoAndroid90\Xamarin.Forms.Platform.Android.dll" target="lib\MonoAndroid90" />
<file src="..\Xamarin.Forms.Platform.Android\bin\$Configuration$\MonoAndroid90\Xamarin.Forms.Platform.Android.*pdb" target="lib\MonoAndroid90" />
<file src="..\Xamarin.Forms.Platform.Android.FormsViewGroup\bin\$Configuration$\FormsViewGroup.dll" target="lib\MonoAndroid90" />
<file src="..\Xamarin.Forms.Platform.Android.FormsViewGroup\bin\$Configuration$\FormsViewGroup.*pdb" target="lib\MonoAndroid90" />
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.dll" target="lib\MonoAndroid90" />
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.*pdb" target="lib\MonoAndroid90" />
<file src="..\docs\Xamarin.Forms.Core.xml" target="lib\MonoAndroid90" />
<file src="..\docs\Xamarin.Forms.Xaml.xml" target="lib\MonoAndroid90" />
<file src="..\docs\**\Xamarin.Forms.Core.xml" target="lib\MonoAndroid90" />
<file src="..\docs\**\Xamarin.Forms.Xaml.xml" target="lib\MonoAndroid90" />
<file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.dll" target="lib\MonoAndroid90" />
<file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.*pdb" target="lib\MonoAndroid90" />
<file src="..\Stubs\Xamarin.Forms.Platform.Android\bin\$Configuration$\MonoAndroid90\Xamarin.Forms.Platform.dll" target="lib\MonoAndroid90" />
<!--Android 100-->
<file src="..\Xamarin.Forms.Platform.Android\bin\$Configuration$\MonoAndroid10.0\Xamarin.Forms.Platform.Android.dll" target="lib\MonoAndroid10.0" />
<file src="..\Xamarin.Forms.Platform.Android\bin\$Configuration$\MonoAndroid10.0\Xamarin.Forms.Platform.Android.*pdb" target="lib\MonoAndroid10.0" />
@ -228,22 +197,9 @@
<file src="..\Stubs\Xamarin.Forms.Platform.Android\bin\$Configuration$\MonoAndroid10.0\Xamarin.Forms.Platform.dll" target="lib\MonoAndroid10.0" />
<!--iPhone Unified-->
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\Xamarin.Forms.Platform.iOS.dll" target="build\XCODE11" />
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\Xamarin.Forms.Platform.iOS.*pdb" target="build\XCODE11" />
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\Xamarin.Forms.Platform.iOS.*mdb" target="build\XCODE11" />
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\2017\Xamarin.Forms.Platform.iOS.dll" target="build\XCODE10" />
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\2017\Xamarin.Forms.Platform.iOS.*pdb" target="build\XCODE10" />
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\2017\Xamarin.Forms.Platform.iOS.*mdb" target="build\XCODE10" />
<!--iPhone Unified buildTransitive-->
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\Xamarin.Forms.Platform.iOS.dll" target="buildTransitive\XCODE11" />
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\Xamarin.Forms.Platform.iOS.*pdb" target="buildTransitive\XCODE11" />
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\Xamarin.Forms.Platform.iOS.*mdb" target="buildTransitive\XCODE11" />
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\2017\Xamarin.Forms.Platform.iOS.dll" target="buildTransitive\XCODE10" />
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\2017\Xamarin.Forms.Platform.iOS.*pdb" target="buildTransitive\XCODE10" />
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\2017\Xamarin.Forms.Platform.iOS.*mdb" target="buildTransitive\XCODE10" />
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\Xamarin.Forms.Platform.iOS.dll" target="lib\Xamarin.iOS10" />
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\Xamarin.Forms.Platform.iOS.*pdb" target="lib\Xamarin.iOS10" />
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\Xamarin.Forms.Platform.iOS.*mdb" target="lib\Xamarin.iOS10" />
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.dll" target="lib\Xamarin.iOS10" />
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.*pdb" target="lib\Xamarin.iOS10" />
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.*mdb" target="lib\Xamarin.iOS10" />
@ -297,12 +253,7 @@
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.dll" target="lib\Xamarin.Mac" />
<file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.dll" target="lib\Xamarin.Mac" />
<file src="..\Xamarin.Forms.Platform.MacOS\bin\$Configuration$\Xamarin.Forms.Platform.dll" target="lib\Xamarin.Mac" />
<file src="..\Xamarin.Forms.Platform.MacOS\bin\$Configuration$\Xamarin.Forms.Platform.macOS.dll" target="build\XCODE11" />
<file src="..\Xamarin.Forms.Platform.MacOS\bin\$Configuration$\2017\Xamarin.Forms.Platform.macOS.dll" target="build\XCODE10" />
<!--Mac buildTransitive-->
<file src="..\Xamarin.Forms.Platform.MacOS\bin\$Configuration$\Xamarin.Forms.Platform.macOS.dll" target="buildTransitive\XCODE11" />
<file src="..\Xamarin.Forms.Platform.MacOS\bin\$Configuration$\2017\Xamarin.Forms.Platform.macOS.dll" target="buildTransitive\XCODE10" />
<file src="..\Xamarin.Forms.Platform.MacOS\bin\$Configuration$\Xamarin.Forms.Platform.macOS.dll" target="lib\Xamarin.Mac" />
<!-- iOS Localized String Resource Assemblies -->
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\ar\Xamarin.Forms.Platform.iOS.resources.dll" target="lib\Xamarin.iOS10\ar" />

36
.nuspec/Xamarin.Forms.targets
Просмотреть файл

@ -182,47 +182,13 @@
<Target Name="ValidateTargetFrameworkVersionForForms" Condition="'$(XFDisableTargetFrameworkValidation)' != 'True'">
<PropertyGroup>
<MinTargetFrameworkVersionForForms>9.0</MinTargetFrameworkVersionForForms>
<MinTargetFrameworkVersionForForms>10.0</MinTargetFrameworkVersionForForms>
<TargetFrameworkVersionWithoutV>$(TargetFrameworkVersion.TrimStart('vV'))</TargetFrameworkVersionWithoutV>
</PropertyGroup>
<Error Code="XF005" Condition="$(TargetFrameworkVersionWithoutV) &lt; $(MinTargetFrameworkVersionForForms)"
Text="The %24(TargetFrameworkVersion) for $(ProjectName) ($(TargetFrameworkVersion)) is less than the minimum required %24(TargetFrameworkVersion) for Xamarin.Forms ($(MinTargetFrameworkVersionForForms)). You need to increase the %24(TargetFrameworkVersion) for $(ProjectName)." />
</Target>
<!-- Xamarin iOS targets -->
<PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' OR '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<CoreCompileDependsOn>
IncludeCorrectXIOSReference;
$(CoreCompileDependsOn);
</CoreCompileDependsOn>
<PrepareForBuildDependsOn>
IncludeCorrectXIOSReference;
$(PrepareForBuildDependsOn);
</PrepareForBuildDependsOn>
</PropertyGroup>
<Target Name="IncludeCorrectXIOSReference" Condition="'$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' OR '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PropertyGroup>
<Use2017 Condition="'$(Use2017)' == '' AND '$(MSBuildRuntimeType)' == 'Mono'">$(FrameworkSDKRoot.Contains('/Versions/5'))</Use2017>
<Use2017 Condition="'$(Use2017)' == '' AND '$(MSBuildAssemblyVersion)' &lt; '16.0'">true</Use2017>
<Use2017 Condition="'$(Use2017)' == ''">false</Use2017>
<FrameworkDll Condition="'$(TargetFrameworkIdentifier)' == 'Xamarin.iOS'">Xamarin.Forms.Platform.iOS.dll</FrameworkDll>
<FrameworkDll Condition="'$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">Xamarin.Forms.Platform.macOS.dll</FrameworkDll>
</PropertyGroup>
<ItemGroup Condition="'$(Use2017)' != 'true'">
<Reference Include="Xamarin.Forms.Platform.iOS">
<HintPath>$(MSBuildThisFileDirectory)\XCODE11\$(FrameworkDll)</HintPath>
</Reference>
</ItemGroup>
<ItemGroup Condition="'$(Use2017)' == 'true'">
<Reference Include="Xamarin.Forms.Platform.iOS">
<HintPath>$(MSBuildThisFileDirectory)\XCODE10\$(FrameworkDll)</HintPath>
</Reference>
</ItemGroup>
</Target>
<!-- UWP Targets-->
<Target Name="WinUICheckTargetPlatformVersion" BeforeTargets="PrepareForBuild"
Condition="'$(TargetPlatformVersion)' != '' and '$(TargetPlatformMinVersion)' != ''">

1
ControlGallery.Build.props
Просмотреть файл

@ -1,7 +1,6 @@
<Project>
<PropertyGroup>
<CGLangVersion Condition="'$(CGLangVersion)' == ''">7.3</CGLangVersion>
<LangVersion Condition="'$(Use2017)' == 'true'">7.3</LangVersion>
<LangVersion Condition="'$(LangVersion)' == ''">$(CGLangVersion)</LangVersion>
</PropertyGroup>
</Project>

12
EmbeddingTestBeds/Embedding.Droid/Android10.Build.targets
Просмотреть файл

@ -1,12 +0,0 @@
<Project>
<ItemGroup Condition="'$(TargetFrameworkVersion)' != 'v9.0'">
<PackageReference Include="Xamarin.AndroidX.Migration">
<Version>1.0.0.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.1" />
</ItemGroup>
</Project>

11
EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets
Просмотреть файл

@ -1,3 +1,12 @@
<Project>
<Import Project="Android10.Build.targets" Condition="'$(TargetFrameworkVersion)' != 'v9.0'" />
<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.Migration">
<Version>1.0.0.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.1" />
</ItemGroup>
</Project>

3
EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj
Просмотреть файл

@ -16,12 +16,10 @@
<AndroidApplication>True</AndroidApplication>
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidTargetFrameworkVersion Condition="'$(AndroidTargetFrameworkVersion)' == '' AND '$(Use2017)' == 'true'">v9.0</AndroidTargetFrameworkVersion>
<AndroidTargetFrameworkVersion Condition="'$(AndroidTargetFrameworkVersion)' == ''">v10.0</AndroidTargetFrameworkVersion>
<TargetFrameworkVersion>$(AndroidTargetFrameworkVersion)</TargetFrameworkVersion>
<AndroidManifest Condition="$(AndroidTargetFrameworkVersion) == 'v10.0.99'">Properties\AndroidManifest30.xml</AndroidManifest>
<AndroidManifest Condition="$(AndroidTargetFrameworkVersion) == 'v10.0'">Properties\AndroidManifest.xml</AndroidManifest>
<AndroidManifest Condition="$(AndroidTargetFrameworkVersion) == 'v9.0'">Properties\AndroidManifest28.xml</AndroidManifest>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
@ -90,7 +88,6 @@
</ItemGroup>
<ItemGroup>
<None Include="Properties\AndroidManifest.xml" />
<None Include="Properties\AndroidManifest28.xml" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Stubs\Xamarin.Forms.Platform.Android\Xamarin.Forms.Platform.Android %28Forwarders%29.csproj">

5
EmbeddingTestBeds/Embedding.Droid/Properties/AndroidManifest28.xml
Просмотреть файл

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Embedding.Droid.Embedding.Droid" android:versionCode="1" android:versionName="1.0">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
<application android:label="Embedding.Droid"></application>
</manifest>

3
EmbeddingTestBeds/Embedding.iOS/Embedding.iOS.csproj
Просмотреть файл

@ -10,7 +10,6 @@
<RootNamespace>Embedding.iOS</RootNamespace>
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<AssemblyName>Embedding.iOS</AssemblyName>
<DefineConstants Condition="'$(Use2017)' != 'true'">__XCODE11__;$(DefineConstants);</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
<DebugSymbols>true</DebugSymbols>
@ -88,7 +87,7 @@
<Project>{57b8b73d-c3b5-4c42-869e-7b2f17d354ac}</Project>
<Name>Xamarin.Forms.Core</Name>
</ProjectReference>
<ProjectReference Condition="'$(Use2017)' != 'true'" Include="..\..\Xamarin.Forms.Material.iOS\Xamarin.Forms.Material.iOS.csproj">
<ProjectReference Include="..\..\Xamarin.Forms.Material.iOS\Xamarin.Forms.Material.iOS.csproj">
<Project>{8a75b1dc-ceed-4b1b-8675-a7dffd1e6de4}</Project>
<Name>Xamarin.Forms.Material.iOS</Name>
<IsAppExtension>false</IsAppExtension>

10
Environment.Build.props
Просмотреть файл

@ -29,20 +29,12 @@
</PropertyGroup>
<PropertyGroup>
<Use2017 Condition="'$(Use2017)' == '' AND '$(MSBuildRuntimeType)' == 'Mono'">$(FrameworkSDKRoot.Contains('/Versions/5'))</Use2017>
<Use2017 Condition="'$(Use2017)' == '' AND '$(MSBuildAssemblyVersion)' &lt; '16.0'">true</Use2017>
<Use2017 Condition="'$(Use2017)' == ''">false</Use2017>
</PropertyGroup>
<PropertyGroup>
<LangVersion Condition="'$(Use2017)' == 'true'">7.3</LangVersion>
<LangVersion Condition="'$(LangVersion)' == ''">7.3</LangVersion>
</PropertyGroup>
<!-- This is used by the libraries -->
<PropertyGroup Condition="'$(AndroidTargetFrameworks)' == ''">
<AndroidTargetFrameworks Condition="'$(Use2017)' == 'true'">MonoAndroid90;</AndroidTargetFrameworks>
<AndroidTargetFrameworks Condition="'$(Use2017)' == 'false'">MonoAndroid90;MonoAndroid10.0;</AndroidTargetFrameworks>
<AndroidTargetFrameworks>MonoAndroid10.0;</AndroidTargetFrameworks>
</PropertyGroup>
<!-- Auto install any missing Android SDKs -->

11
Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj
Просмотреть файл

@ -10,10 +10,6 @@
<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(Use2017)' == 'true'">
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>bin\$(Configuration)\$(TargetFramework)</OutputPath>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Xamarin.Forms.Platform.cs" Link="Xamarin.Forms.Platform.cs" />
</ItemGroup>
@ -31,11 +27,4 @@
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.1.0.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid90'">
<PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.v7.RecyclerView" Version="28.0.0.3" />
</ItemGroup>
<ItemGroup>
<PackageReference Condition="'$(CI)' == 'true'" Include="Xamarin.Build.TypeRedirector" Version="0.1.2-preview" PrivateAssets="all" />
</ItemGroup>
</Project>

6
Stubs/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS (Forwarders).csproj
Просмотреть файл

@ -62,10 +62,4 @@
<Reference Include="Xamarin.iOS" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<ItemGroup Condition="'$(Use2017)' == 'true'">
<Reference Include="netstandard" />
</ItemGroup>
<ItemGroup>
<PackageReference Condition="'$(CI)' == 'true'" Include="Xamarin.Build.TypeRedirector" Version="0.1.2-preview" PrivateAssets="all" />
</ItemGroup>
</Project>

14
Xamarin.Flex/Xamarin.Flex.projitems
Просмотреть файл

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<HasSharedItems>true</HasSharedItems>
<SharedGUID>{A6703C7D-D362-452A-A7A5-73771194D38C}</SharedGUID>
</PropertyGroup>
<PropertyGroup Label="Configuration">
<Import_RootNamespace>Xamarin.Flex</Import_RootNamespace>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)Flex.cs" Condition=" '$(EnableDefaultCompileItems)' == 'true' " />
</ItemGroup>
</Project>

11
Xamarin.Flex/Xamarin.Flex.shproj
Просмотреть файл

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{A6703C7D-D362-452A-A7A5-73771194D38C}</ProjectGuid>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
<Import Project="Xamarin.Flex.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
</Project>

10
Xamarin.Forms.ControlGallery.Android/Android10.Build.targets
Просмотреть файл

@ -1,10 +0,0 @@
<Project>
<ItemGroup Condition="'$(TargetFrameworkVersion)' == 'v10.0'">
<PackageReference Include="Xamarin.AndroidX.Migration" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0.1" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.0.0.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.1" />
</ItemGroup>
</Project>

8
Xamarin.Forms.ControlGallery.Android/CustomRenderers.cs
Просмотреть файл

@ -3,7 +3,6 @@ using Android.Widget;
using Android.App;
using System.Collections.Generic;
using Android.Views;
using System.Collections;
using System.ComponentModel;
using System.Linq;
using Xamarin.Forms.Controls;
@ -17,21 +16,14 @@ using Android.Runtime;
using Android.Util;
using AButton = Android.Widget.Button;
using AView = Android.Views.View;
using AViewGroup = Android.Views.ViewGroup;
using Android.OS;
using System.Reflection;
using Android.Text;
using Android.Text.Method;
using Xamarin.Forms.Controls.Issues;
#if __ANDROID_29__
using FragmentTransaction = AndroidX.Fragment.App.FragmentTransaction;
using NestedScrollView = global::AndroidX.Core.Widget.NestedScrollView;
#else
using FragmentTransaction = Android.Support.V4.App.FragmentTransaction;
using NestedScrollView = global::Android.Support.V4.Widget.NestedScrollView;
#endif
using AMenuItemCompat = global::Android.Support.V4.View.MenuItemCompat;
using Android.Support.V4.Content;
using IOPath = System.IO.Path;
[assembly: ExportRenderer(typeof(Issue5461.ScrollbarFadingEnabledFalseScrollView), typeof(ScrollbarFadingEnabledFalseScrollViewRenderer))]

12
Xamarin.Forms.ControlGallery.Android/Directory.Build.targets
Просмотреть файл

@ -1,6 +1,12 @@
<Project>
<Import Project="Android10.Build.targets" Condition="'$(TargetFrameworkVersion)' != 'v9.0'" />
<Import Condition="'$(Use2017)' == 'true'" Project="Nuget2017.Build.targets" />
<Import Condition="'$(Use2017)' != 'true'" Project="Nuget2019.Build.targets" />
<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.Migration" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0.1" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.0.0.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.1" />
</ItemGroup>
<Import Project="Nuget.Build.targets" />
<Import Project="..\Nuget.targets" Condition="'$(FromSource)' == 'false'" />
</Project>

24
Xamarin.Forms.ControlGallery.Android/DrawableExtensions.cs
Просмотреть файл

@ -2,11 +2,7 @@
using ADrawable = Android.Graphics.Drawables.Drawable;
using AColorFilter = Android.Graphics.ColorFilter;
using AColor = Android.Graphics.Color;
#if __ANDROID_29__
using ADrawableCompat = AndroidX.Core.Graphics.Drawable.DrawableCompat;
#else
using ADrawableCompat = Android.Support.V4.Graphics.Drawable.DrawableCompat;
#endif
using Android.Graphics;
namespace Xamarin.Forms.Platform.Android
@ -21,7 +17,6 @@ namespace Xamarin.Forms.Platform.Android
internal static class DrawableExtensions
{
#if __ANDROID_29__
public static BlendMode GetFilterMode(FilterMode mode)
{
switch (mode)
@ -37,14 +32,6 @@ namespace Xamarin.Forms.Platform.Android
throw new Exception("Invalid Mode");
}
#else
[Obsolete]
static PorterDuff.Mode GetFilterMode(FilterMode mode)
{
return GetFilterModePre29(mode);
}
#endif
[Obsolete]
static PorterDuff.Mode GetFilterModePre29(FilterMode mode)
{
@ -102,23 +89,12 @@ namespace Xamarin.Forms.Platform.Android
public static void SetColorFilter(this ADrawable drawable, AColor color, FilterMode mode)
{
#if __ANDROID_29__
if((int)global::Android.OS.Build.VERSION.SdkInt >= 29)
drawable.SetColorFilter(new BlendModeColorFilter(color, GetFilterMode(mode)));
else
#pragma warning disable CS0612 // Type or member is obsolete
#pragma warning disable CS0618 // Type or member is obsolete
drawable.SetColorFilter(color, GetFilterModePre29(mode));
#pragma warning restore CS0618 // Type or member is obsolete
#pragma warning restore CS0612 // Type or member is obsolete
#else
#pragma warning disable CS0612 // Type or member is obsolete
#pragma warning disable CS0618 // Type or member is obsolete
drawable.SetColorFilter(color, GetFilterMode(mode));
#pragma warning restore CS0618 // Type or member is obsolete
#pragma warning restore CS0612 // Type or member is obsolete
#endif
}
}
}

8
Xamarin.Forms.ControlGallery.Android/Issue7249SwitchRenderer.cs
Просмотреть файл

@ -55,19 +55,11 @@ namespace Xamarin.Forms.ControlGallery.Android
if (Control.Checked)
{
#if __ANDROID_29__
Control.TrackDrawable.SetColorFilter(new BlendModeColorFilter(_view.SwitchOffColor.ToAndroid(), BlendMode.SrcAtop));
#else
Control.TrackDrawable.SetColorFilter(_view.SwitchOnColor.ToAndroid(), PorterDuff.Mode.SrcAtop);
#endif
}
else
{
#if __ANDROID_29__
Control.TrackDrawable.SetColorFilter(new BlendModeColorFilter(_view.SwitchOffColor.ToAndroid(), BlendMode.SrcAtop));
#else
Control.TrackDrawable.SetColorFilter(_view.SwitchOffColor.ToAndroid(), PorterDuff.Mode.SrcAtop);
#endif
}
}
}

2
Xamarin.Forms.ControlGallery.Android/Nuget2019.Build.targets → Xamarin.Forms.ControlGallery.Android/Nuget.Build.targets
Просмотреть файл

@ -4,7 +4,7 @@
<Version>0.10.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkVersion)' != 'v9.0'">
<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.Migration">
<Version>1.0.0</Version>
</PackageReference>

7
Xamarin.Forms.ControlGallery.Android/Nuget2017.Build.targets
Просмотреть файл

@ -1,7 +0,0 @@
<Project>
<ItemGroup>
<PackageReference Include="Xamarin.Build.Download">
<Version>0.4.11</Version>
</PackageReference>
</ItemGroup>
</Project>

23
Xamarin.Forms.ControlGallery.Android/Properties/AndroidManifest28.xml
Просмотреть файл

@ -1,23 +0,0 @@
<?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="AndroidControlGallery.AndroidControlGallery" android:installLocation="auto">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
<!-- The following two permissions are not required to use
Google Maps Android API v2, but are recommended. -->
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.BATTERY_STATS" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.READ_LOGS" />
<uses-permission android:name="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE" />
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
<application android:label="AndroidControlGallery" android:supportsRtl="true">
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
<uses-library android:name="org.apache.http.legacy" android:required="false" />
</application>
</manifest>

5
Xamarin.Forms.ControlGallery.Android/StaggeredCollectionViewRenderer.cs
Просмотреть файл

@ -1,11 +1,6 @@
using System;
using Android.Content;
#if __ANDROID_29__
using AndroidX.AppCompat.Widget;
using AndroidX.RecyclerView.Widget;
#else
using Android.Support.V7.Widget;
#endif
using Xamarin.Forms;
using Xamarin.Forms.ControlGallery.Android;
using Xamarin.Forms.Controls.GalleryPages.CollectionViewGalleries.AlternateLayoutGalleries;

10
Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj
Просмотреть файл

@ -17,12 +17,10 @@
<AndroidApplication>true</AndroidApplication>
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidTargetFrameworkVersion Condition="'$(AndroidTargetFrameworkVersion)' == '' AND '$(Use2017)' == 'true'">v9.0</AndroidTargetFrameworkVersion>
<AndroidTargetFrameworkVersion Condition="'$(AndroidTargetFrameworkVersion)' == ''">v10.0</AndroidTargetFrameworkVersion>
<TargetFrameworkVersion>$(AndroidTargetFrameworkVersion)</TargetFrameworkVersion>
<AndroidManifest Condition="$(AndroidTargetFrameworkVersion) == 'v10.0.99'">Properties\AndroidManifest30.xml</AndroidManifest>
<AndroidManifest Condition="$(AndroidTargetFrameworkVersion) == 'v10.0'">Properties\AndroidManifest.xml</AndroidManifest>
<AndroidManifest Condition="$(AndroidTargetFrameworkVersion) == 'v9.0'">Properties\AndroidManifest28.xml</AndroidManifest>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<NuGetPackageImportStamp>
@ -69,10 +67,9 @@
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
<EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AndroidDexTool Condition="'$(Use2017)' != 'true'">d8</AndroidDexTool>
<AndroidLinkTool Condition="'$(Use2017)' != 'true'">r8</AndroidLinkTool>
<AndroidEnableMultiDex Condition="'$(Use2017)' != 'true'">false</AndroidEnableMultiDex>
<AndroidEnableMultiDex Condition="'$(Use2017)' == 'true'">true</AndroidEnableMultiDex>
<AndroidDexTool>d8</AndroidDexTool>
<AndroidLinkTool>r8</AndroidLinkTool>
<AndroidEnableMultiDex>false</AndroidEnableMultiDex>
</PropertyGroup>
<PropertyGroup Condition="'$(CI)' == 'true'">
<AndroidLinkMode>Full</AndroidLinkMode>
@ -248,7 +245,6 @@
</ItemGroup>
<ItemGroup>
<None Include="Properties\AndroidManifest.xml" />
<None Include="Properties\AndroidManifest28.xml" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\error.xml" />

4
Xamarin.Forms.ControlGallery.Android/_50787CustomRenderer.cs
Просмотреть файл

@ -3,11 +3,7 @@ using Android.Content;
using Xamarin.Forms;
using Xamarin.Forms.ControlGallery.Android;
using Xamarin.Forms.Platform.Android.AppCompat;
#if __ANDROID_29__
using FragmentTransaction = AndroidX.Fragment.App.FragmentTransaction;
#else
using FragmentTransaction = Android.Support.V4.App.FragmentTransaction;
#endif
[assembly: ExportRenderer(typeof(NavigationPage), typeof(_50787CustomRenderer))]
namespace Xamarin.Forms.ControlGallery.Android
{

2
Xamarin.Forms.ControlGallery.iOS/AppDelegate.cs
Просмотреть файл

@ -154,9 +154,7 @@ namespace Xamarin.Forms.ControlGallery.iOS
Forms.SetFlags("SwipeView_Experimental", "MediaElement_Experimental");
Forms.Init();
FormsMaps.Init();
#if __XCODE11__
FormsMaterial.Init();
#endif
Forms.ViewInitialized += (object sender, ViewInitializedEventArgs e) =>
{

4
Xamarin.Forms.ControlGallery.iOS/PerformanceTrackerRenderer.cs
Просмотреть файл

@ -34,9 +34,7 @@ using Xamarin.Forms.Platform.iOS;
[assembly: ExportRenderer(typeof(TableView), typeof(PerformanceTrackingTableView))]
[assembly: ExportRenderer(typeof(TimePicker), typeof(PerformanceTrackingTimePicker))]
[assembly: ExportRenderer(typeof(WebView), typeof(PerformanceTrackingWebView))]
#if __XCODE11__
[assembly: ExportRenderer(typeof(Entry), typeof(PerformanceTrackingMaterialEntry), new[] { typeof(VisualMarker.MaterialVisual) })]
#endif
[assembly: ExportRenderer(typeof(Frame), typeof(PerformanceTrackingFrame))]
@ -580,7 +578,6 @@ namespace Xamarin.Forms.ControlGallery.iOS
}
}
#if __XCODE11__
public class PerformanceTrackingMaterialEntry : Material.iOS.MaterialEntryRenderer, IDrawnObservable
{
readonly SubviewWatcher<PerformanceTrackingMaterialEntry> _watcher;
@ -629,7 +626,6 @@ namespace Xamarin.Forms.ControlGallery.iOS
base.Dispose(disposing);
}
}
#endif
public class PerformanceTrackingImage : ImageRenderer, IDrawnObservable
{

1
Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
Просмотреть файл

@ -14,7 +14,6 @@
<AssemblyName>XamarinFormsControlGalleryiOS</AssemblyName>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<DefineConstants Condition="'$(Use2017)' != 'true'">__XCODE11__;$(DefineConstants);</DefineConstants>
<MtouchExtraArgs>--nolinkaway --optimize=experimental-xforms-product-type</MtouchExtraArgs>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">

0
Xamarin.Flex/Flex.cs → Xamarin.Forms.Core/Flex.cs
Просмотреть файл

1
Xamarin.Forms.Core/Xamarin.Forms.Core.csproj
Просмотреть файл

@ -26,7 +26,6 @@
<PropertyGroup>
<GitInfoReportImportance>high</GitInfoReportImportance>
</PropertyGroup>
<Import Project="..\Xamarin.Flex\Xamarin.Flex.projitems" Label="Shared" Condition="Exists('..\Xamarin.Flex\Xamarin.Flex.projitems')" />
<UsingTask TaskName="XFCorePostProcessor.Tasks.FixXFCoreAssembly" AssemblyFile="..\XFCorePostProcessor.Tasks\bin\Debug\net461\XFCorePostProcessor.Tasks.dll" />
<Target Condition="$(DesignTimeBuild) != true AND $(BuildingProject) == true" AfterTargets="AfterCompile" Name="XFCorePostProcessor" Inputs="$(IntermediateOutputPath)$(TargetFileName)" Outputs="$(IntermediateOutputPath)XFCorePostProcessor.stamp">
<Touch Files="$(IntermediateOutputPath)XFCorePostProcessor.stamp" AlwaysCreate="True" />

12
Xamarin.Forms.DualScreen/Xamarin.Forms.DualScreen.csproj
Просмотреть файл

@ -19,10 +19,6 @@
<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(Use2017)' == 'true'">
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>bin\$(Configuration)\$(TargetFramework)</OutputPath>
</PropertyGroup>
<ItemGroup>
<Compile Include="**\*.shared.cs" />
<Compile Include="**\*.shared.*.cs" />
@ -63,12 +59,4 @@
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid90'">
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="28.0.0.3" />
</ItemGroup>
<ItemGroup>
<PackageReference Condition="'$(CI)' == 'true'" Include="Xamarin.Build.TypeRedirector" Version="0.1.2-preview" PrivateAssets="all" />
</ItemGroup>
</Project>

4
Xamarin.Forms.Maps.Android/MapRenderer.cs
Просмотреть файл

@ -11,11 +11,7 @@ using Android.Content.PM;
using Android.Gms.Maps;
using Android.Gms.Maps.Model;
using Android.OS;
#if __ANDROID_29__
using AndroidX.Core.Content;
#else
using Android.Support.V4.Content;
#endif
using Java.Lang;
using Xamarin.Forms.Internals;
using Xamarin.Forms.Platform.Android;

7
Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj
Просмотреть файл

@ -9,10 +9,6 @@
<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(Use2017)' == 'true'">
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>bin\$(Configuration)\$(TargetFramework)</OutputPath>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
</ProjectReference>
@ -34,7 +30,4 @@
<ItemGroup>
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="71.1610.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Condition="'$(CI)' == 'true'" Include="Xamarin.Build.TypeRedirector" Version="0.1.2-preview" PrivateAssets="all" />
</ItemGroup>
</Project>

6
Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj
Просмотреть файл

@ -70,10 +70,4 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<ItemGroup Condition="'$(Use2017)' == 'true'">
<Reference Include="netstandard" />
</ItemGroup>
<ItemGroup>
<PackageReference Condition="'$(CI)' == 'true'" Include="Xamarin.Build.TypeRedirector" Version="0.1.2-preview" PrivateAssets="all" />
</ItemGroup>
</Project>

6
Xamarin.Forms.Material.Android/MaterialActivityIndicatorRenderer.cs
Просмотреть файл

@ -1,16 +1,10 @@
using System;
using System.ComponentModel;
using Android.Content;
#if __ANDROID_29__
using AndroidX.Core.View;
#else
using Android.Support.V4.View;
#endif
using Android.Views;
using Android.Widget;
using Xamarin.Forms;
using Xamarin.Forms.Platform.Android.FastRenderers;
using Xamarin.Forms.Material.Android;
using Xamarin.Forms.Platform.Android;
using AProgressBar = Android.Widget.ProgressBar;
using AView = Android.Views.View;

9
Xamarin.Forms.Material.Android/MaterialButtonRenderer.cs
Просмотреть файл

@ -1,25 +1,16 @@
using System;
using System.ComponentModel;
using System.Threading.Tasks;
using Android.Content;
using Android.Content.Res;
using Android.Graphics;
#if __ANDROID_29__
using AndroidX.Core.View;
using AndroidX.AppCompat.Widget;
using MButton = Google.Android.Material.Button.MaterialButton;
#else
using Android.Support.V4.View;
using Android.Support.V7.Widget;
using MButton = Android.Support.Design.Button.MaterialButton;
#endif
using Android.Util;
using Android.Views;
using Xamarin.Forms;
using Xamarin.Forms.Internals;
using Xamarin.Forms.Platform.Android.FastRenderers;
using Xamarin.Forms.Material.Android;
using Xamarin.Forms.Platform.Android;
using Xamarin.Forms.PlatformConfiguration.AndroidSpecific;
using AColor = Android.Graphics.Color;

11
Xamarin.Forms.Material.Android/MaterialCheckBoxRenderer.cs
Просмотреть файл

@ -1,16 +1,7 @@
using System;
using Android.Content;
using Android.Content;
using Android.Content.Res;
using Xamarin.Forms.Platform.Android;
using AColor = Android.Graphics.Color;
#if __ANDROID_29__
using AColorUtils = AndroidX.Core.Graphics.ColorUtils;
#else
using AColorUtils = Android.Support.V4.Graphics.ColorUtils;
#endif
using AAttribute = Android.Resource.Attribute;
using Android.Graphics.Drawables;
using Android.Graphics;
namespace Xamarin.Forms.Material.Android
{

6
Xamarin.Forms.Material.Android/MaterialContextThemeWrapper.cs
Просмотреть файл

@ -1,12 +1,6 @@

using Android.Content;
using Android.Views;
using Xamarin.Forms.Platform.Android;
#if __ANDROID_29__
using AndroidAppCompat = AndroidX.AppCompat.Content.Res.AppCompatResources;
#else
using AndroidAppCompat = Android.Support.V7.Content.Res.AppCompatResources;
#endif
namespace Xamarin.Forms.Material.Android
{

5
Xamarin.Forms.Material.Android/MaterialFormsEditTextBase.cs
Просмотреть файл

@ -1,12 +1,7 @@
using System;
using Android.Content;
using Android.Graphics;
using Android.Views;
#if __ANDROID_29__
using Google.Android.Material.TextField;
#else
using Android.Support.Design.Widget;
#endif
using Android.Runtime;
using Android.Util;
using Xamarin.Forms.Platform.Android;

4
Xamarin.Forms.Material.Android/MaterialFormsEditTextManager.cs
Просмотреть файл

@ -1,11 +1,7 @@

using System;
using Android.Content;
#if __ANDROID_29__
using Google.Android.Material.TextField;
#else
using Android.Support.Design.Widget;
#endif
using Xamarin.Forms.Platform.Android;
namespace Xamarin.Forms.Material.Android

6
Xamarin.Forms.Material.Android/MaterialFormsTextInputLayoutBase.cs
Просмотреть файл

@ -3,14 +3,8 @@ using System;
using Android.Content;
using Android.Runtime;
using Android.Util;
#if __ANDROID_29__
using AndroidX.Core.View;
using Google.Android.Material.TextField;
#else
using Android.Support.V4.View;
using Android.Support.Design.Widget;
using Xamarin.Forms.Platform.Android.AppCompat;
#endif
using Android.Content.Res;
using AView = Android.Views.View;
using Xamarin.Forms.Platform.Android;

7
Xamarin.Forms.Material.Android/MaterialFrameRenderer.cs
Просмотреть файл

@ -2,17 +2,10 @@
using System;
using System.ComponentModel;
using Android.Content;
#if __ANDROID_29__
using AndroidX.Core.View;
using MaterialCardView = Google.Android.Material.Card.MaterialCardView;
#else
using Android.Support.V4.View;
using MaterialCardView = Android.Support.Design.Card.MaterialCardView;
#endif
using Android.Views;
using Xamarin.Forms;
using Xamarin.Forms.Platform.Android.FastRenderers;
using Xamarin.Forms.Material.Android;
using AView = Android.Views.View;
using Xamarin.Forms.Platform.Android;
using Android.Graphics.Drawables;

6
Xamarin.Forms.Material.Android/MaterialProgressBarRenderer.cs
Просмотреть файл

@ -2,15 +2,9 @@
using System;
using System.ComponentModel;
using Android.Content;
#if __ANDROID_29__
using AndroidX.Core.View;
#else
using Android.Support.V4.View;
#endif
using Android.Views;
using Xamarin.Forms;
using Xamarin.Forms.Platform.Android.FastRenderers;
using Xamarin.Forms.Material.Android;
using AProgressBar = Android.Widget.ProgressBar;
using AView = Android.Views.View;
using Xamarin.Forms.Platform.Android;

6
Xamarin.Forms.Material.Android/MaterialSliderRenderer.cs
Просмотреть файл

@ -1,16 +1,10 @@
using System;
using System.ComponentModel;
using Android.Content;
#if __ANDROID_29__
using AndroidX.Core.View;
#else
using Android.Support.V4.View;
#endif
using Android.Views;
using Android.Widget;
using Xamarin.Forms;
using Xamarin.Forms.Platform.Android.FastRenderers;
using Xamarin.Forms.Material.Android;
using AView = Android.Views.View;
using Xamarin.Forms.Platform.Android;

7
Xamarin.Forms.Material.Android/MaterialStepperRenderer.cs
Просмотреть файл

@ -3,16 +3,9 @@ using System.ComponentModel;
using Android.Content;
using Android.Views;
using Android.Widget;
using Xamarin.Forms;
using Xamarin.Forms.Material.Android;
using Xamarin.Forms.Platform.Android;
using AButton = Android.Widget.Button;
#if __ANDROID_29__
using MButton = Google.Android.Material.Button.MaterialButton;
#else
using MButton = Android.Support.Design.Button.MaterialButton;
#endif
namespace Xamarin.Forms.Material.Android
{

11
Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj
Просмотреть файл

@ -11,10 +11,6 @@
<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(Use2017)' == 'true'">
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>bin\$(Configuration)\$(TargetFramework)</OutputPath>
</PropertyGroup>
<ItemGroup>
<AndroidResource Include="Resources\**\*" />
</ItemGroup>
@ -22,10 +18,6 @@
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid90'">
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
</ProjectReference>
@ -34,7 +26,4 @@
<ProjectReference Include="..\Xamarin.Forms.Platform.Android\Xamarin.Forms.Platform.Android.csproj">
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Condition="'$(CI)' == 'true'" Include="Xamarin.Build.TypeRedirector" Version="0.1.2-preview" PrivateAssets="all" />
</ItemGroup>
</Project>

3
Xamarin.Forms.Material.iOS/Xamarin.Forms.Material.iOS.csproj
Просмотреть файл

@ -102,7 +102,4 @@
<ItemGroup Condition="'$(Use2017)' == 'true'">
<Reference Include="netstandard" />
</ItemGroup>
<ItemGroup>
<PackageReference Condition="'$(CI)' == 'true'" Include="Xamarin.Build.TypeRedirector" Version="0.1.2-preview" PrivateAssets="all" />
</ItemGroup>
</Project>

7
Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj
Просмотреть файл

@ -12,10 +12,6 @@
<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(Use2017)' == 'true'">
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>bin\$(Configuration)\$(TargetFramework)</OutputPath>
</PropertyGroup>
<ItemGroup>
<None Remove="Resources\values\Strings.xml" />
</ItemGroup>
@ -36,7 +32,4 @@
<Version>1.0.0.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Condition="'$(CI)' == 'true'" Include="Xamarin.Build.TypeRedirector" Version="0.1.2-preview" PrivateAssets="all" />
</ItemGroup>
</Project>

2
Xamarin.Forms.Platform.Android.FormsViewGroup/Xamarin.Forms.Platform.Android.FormsViewGroup.csproj
Просмотреть файл

@ -15,7 +15,7 @@
<RootNamespace>FormsViewGroup</RootNamespace>
<AssemblyName>FormsViewGroup</AssemblyName>
<FileAlignment>512</FileAlignment>
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>

5
Xamarin.Forms.Platform.Android.UnitTests/AssertionExtensions.cs
Просмотреть файл

@ -5,11 +5,6 @@ using System;
using NUnit.Framework;
using System.IO;
#if __ANDROID_29__
#else
using Android.Support.V7.Widget;
#endif
namespace Xamarin.Forms.Platform.Android.UnitTests
{
internal static class AssertionExtensions

2
Xamarin.Forms.Platform.Android.UnitTests/EmbeddingTests.cs
Просмотреть файл

@ -1,5 +1,5 @@
using System.Threading.Tasks;
using Android.Support.V4.App;
using AndroidX.Fragment.App;
using NUnit.Framework;
namespace Xamarin.Forms.Platform.Android.UnitTests

5
Xamarin.Forms.Platform.Android.UnitTests/PlatformTestFixture.cs
Просмотреть файл

@ -11,13 +11,8 @@ using ASearchView = Android.Widget.SearchView;
using System.Collections.Generic;
using NUnit.Framework;
using System.Threading.Tasks;
#if __ANDROID_29__
using AndroidX.AppCompat.Widget;
using AndroidX.CardView.Widget;
#else
using Android.Support.V7.Widget;
#endif
namespace Xamarin.Forms.Platform.Android.UnitTests
{

11
Xamarin.Forms.Platform.Android.UnitTests/ShellTests.cs
Просмотреть файл

@ -1,22 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Android.Content;
using Android.Support.Design.Widget;
using Android.Views;
using Android.Widget;
using NUnit.Framework;
using Xamarin.Forms;
using Xamarin.Forms.CustomAttributes;
using Xamarin.Forms.Platform.Android.UnitTests;
using Google.Android.Material.BottomNavigation;
#if __ANDROID_29__
using AndroidX.AppCompat.App;
using AToolbar = AndroidX.AppCompat.Widget.Toolbar;
#else
#endif
[assembly: ExportRenderer(typeof(TestShell), typeof(TestShellRenderer))]
namespace Xamarin.Forms.Platform.Android.UnitTests

6
Xamarin.Forms.Platform.Android.UnitTests/TestActivity.cs
Просмотреть файл

@ -8,14 +8,8 @@ using Android.Views;
using Xamarin.Forms;
using Xamarin.Forms.Platform.Android.UnitTests;
using System.Threading;
#if __ANDROID_29__
using AndroidX.AppCompat.App;
using AToolbar = AndroidX.AppCompat.Widget.Toolbar;
#else
using Android.Support.V7.App;
using AToolbar = Android.Support.V7.Widget.Toolbar;
#endif
[assembly: ExportRenderer(typeof(TestShell), typeof(TestShellRenderer))]
namespace Xamarin.Forms.Platform.Android.UnitTests

2
Xamarin.Forms.Platform.Android.UnitTests/ToolbarExtensionsTests.cs
Просмотреть файл

@ -17,7 +17,7 @@ using NUnit.Framework;
using Xamarin.Forms;
using Xamarin.Forms.CustomAttributes;
using Xamarin.Forms.Platform.Android.UnitTests;
using AToolBar = Android.Support.V7.Widget.Toolbar;
using AToolBar = AndroidX.AppCompat.Widget.Toolbar;
using AView = Android.Views.View;
[assembly: ExportRenderer(typeof(TestShell), typeof(TestShellRenderer))]

6
Xamarin.Forms.Platform.Android.UnitTests/Xamarin.Forms.Platform.Android.UnitTests.csproj
Просмотреть файл

@ -16,7 +16,7 @@
<Deterministic>True</Deterministic>
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
<AndroidUseAapt2>true</AndroidUseAapt2>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@ -74,7 +74,9 @@
<PackageReference Include="NUnit">
<Version>3.12.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat">
<Version>28.0.0.3</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">

4
Xamarin.Forms.Platform.Android/AppCompat/ButtonRenderer.cs
Просмотреть файл

@ -2,11 +2,7 @@ using System;
using System.ComponentModel;
using Android.Content;
using Android.Graphics;
#if __ANDROID_29__
using AndroidX.AppCompat.Widget;
#else
using Android.Support.V7.Widget;
#endif
using Android.Util;
using Android.Views;
using Xamarin.Forms.Platform.Android.FastRenderers;

7
Xamarin.Forms.Platform.Android/AppCompat/CarouselPageRenderer.cs
Просмотреть файл

@ -3,15 +3,8 @@ using System.Collections.Specialized;
using System.ComponentModel;
using Android.Content;
using Android.Views;
#if __ANDROID_29__
using AndroidX.Fragment.App;
using AndroidX.ViewPager.Widget;
using AndroidX.Core.View;
#else
using Android.Support.V4.App;
using Android.Support.V4.View;
#endif
namespace Xamarin.Forms.Platform.Android.AppCompat
{

9
Xamarin.Forms.Platform.Android/AppCompat/CheckBoxDesignerRenderer.cs
Просмотреть файл

@ -1,22 +1,13 @@
using System;
using System.ComponentModel;
using Android.Content;
#if __ANDROID_29__
using AndroidX.AppCompat.Widget;
using AndroidX.Core.Widget;
#else
using Android.Support.V7.Widget;
using Android.Support.V4.Widget;
#endif
using AView = Android.Views.View;
using Android.Views;
using Xamarin.Forms.Internals;
using AColor = Android.Graphics.Color;
using Xamarin.Forms.PlatformConfiguration.AndroidSpecific;
using Android.Graphics.Drawables;
using Android.Graphics;
using Xamarin.Forms.Platform.Android.FastRenderers;
using Android.OS;
using Android.Widget;
using Android.Content.Res;
using AAttribute = Android.Resource.Attribute;

8
Xamarin.Forms.Platform.Android/AppCompat/CheckBoxRendererBase.cs
Просмотреть файл

@ -1,11 +1,7 @@
using System;
using System.ComponentModel;
using Android.Content;
#if __ANDROID_29__
using AndroidX.AppCompat.Widget;
#else
using Android.Support.V7.Widget;
#endif
using AView = Android.Views.View;
using Android.Views;
using Xamarin.Forms.Internals;
@ -14,11 +10,7 @@ using Android.Graphics;
using Xamarin.Forms.Platform.Android.FastRenderers;
using Android.Widget;
using Android.Content.Res;
#if __ANDROID_29__
using AndroidX.Core.Widget;
#else
using Android.Support.V4.Widget;
#endif
using AAttribute = Android.Resource.Attribute;
namespace Xamarin.Forms.Platform.Android

18
Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs
Просмотреть файл

@ -7,13 +7,8 @@ using Android.Content;
using Android.Content.Res;
using Android.OS;
using Android.Runtime;
#if __ANDROID_29__
using AndroidX.AppCompat.App;
using AToolbar = AndroidX.AppCompat.Widget.Toolbar;
#else
using Android.Support.V7.App;
using AToolbar = Android.Support.V7.Widget.Toolbar;
#endif
using Android.Views;
using Xamarin.Forms.Platform.Android.AppCompat;
using Xamarin.Forms.PlatformConfiguration.AndroidSpecific;
@ -21,7 +16,6 @@ using Xamarin.Forms.PlatformConfiguration.AndroidSpecific.AppCompat;
using AColor = Android.Graphics.Color;
using ARelativeLayout = Android.Widget.RelativeLayout;
using Xamarin.Forms.Internals;
using System.Runtime.CompilerServices;
namespace Xamarin.Forms.Platform.Android
{
@ -231,7 +225,6 @@ namespace Xamarin.Forms.Platform.Android
Profile.FramePartition("SetSupportActionBar");
AToolbar bar = null;
#if __ANDROID_29__
if (ToolbarResource == 0)
{
ToolbarResource = Resource.Layout.Toolbar;
@ -241,7 +234,6 @@ namespace Xamarin.Forms.Platform.Android
{
TabLayoutResource = Resource.Layout.Tabbar;
}
#endif
if (ToolbarResource != 0)
{
@ -249,7 +241,6 @@ namespace Xamarin.Forms.Platform.Android
{
bar = LayoutInflater.Inflate(ToolbarResource, null).JavaCast<AToolbar>();
}
#if __ANDROID_29__
catch (global::Android.Views.InflateException ie)
{
if ((ie.Cause is Java.Lang.ClassNotFoundException || ie.Cause.Cause is Java.Lang.ClassNotFoundException) &&
@ -268,19 +259,10 @@ namespace Xamarin.Forms.Platform.Android
}
else
throw;
#else
catch
{
throw;
#endif
}
if (bar == null)
#if __ANDROID_29__
throw new InvalidOperationException("ToolbarResource must be set to a Android.Support.V7.Widget.Toolbar");
#else
throw new InvalidOperationException("ToolbarResource must be set to a androidx.appcompat.widget.Toolbar");
#endif
}
else
{

8
Xamarin.Forms.Platform.Android/AppCompat/FormsFragmentPagerAdapter.cs
Просмотреть файл

@ -1,10 +1,6 @@
using System.Collections.Generic;
using Android.OS;
#if __ANDROID_29__
using AndroidX.Fragment.App;
#else
using Android.Support.V4.App;
#endif
using Java.Lang;
using Xamarin.Forms.Internals;
using FragmentTransit = Android.App.FragmentTransit;
@ -18,11 +14,7 @@ namespace Xamarin.Forms.Platform.Android.AppCompat
List<Fragment> _fragments;
bool _disposed;
#if __ANDROID_29__
public FormsFragmentPagerAdapter(MultiPage<T> page, FragmentManager fragmentManager) : base(fragmentManager, FragmentStatePagerAdapter.BehaviorResumeOnlyCurrentFragment)
#else
public FormsFragmentPagerAdapter(MultiPage<T> page, FragmentManager fragmentManager) : base(fragmentManager)
#endif
{
_page = page;
_fragmentManager = fragmentManager;

5
Xamarin.Forms.Platform.Android/AppCompat/FormsViewPager.cs
Просмотреть файл

@ -1,12 +1,7 @@
using System;
using Android.Content;
using Android.Runtime;
#if __ANDROID_29__
using AndroidX.Core.View;
using AndroidX.ViewPager.Widget;
#else
using Android.Support.V4.View;
#endif
using Android.Util;
using Android.Views;

18
Xamarin.Forms.Platform.Android/AppCompat/FragmentContainer.cs
Просмотреть файл

@ -5,12 +5,7 @@ using Android.Runtime;
using Android.Views;
using Xamarin.Forms.PlatformConfiguration.AndroidSpecific.AppCompat;
using AView = Android.Views.View;
#if __ANDROID_29__
using AndroidX.Fragment.App;
#else
using Android.Support.V4.App;
#endif
namespace Xamarin.Forms.Platform.Android.AppCompat
{
@ -21,10 +16,8 @@ namespace Xamarin.Forms.Platform.Android.AppCompat
Action<PageContainer> _onCreateCallback;
PageContainer _pageContainer;
IVisualElementRenderer _visualElementRenderer;
#if __ANDROID_29__
bool _isVisible = false;
#endif
public FragmentContainer()
{
}
@ -117,9 +110,7 @@ namespace Xamarin.Forms.Platform.Android.AppCompat
public override void OnPause()
{
#if __ANDROID_29__
_isVisible = false;
#endif
bool shouldSendEvent = Application.Current.OnThisPlatform().GetSendDisappearingEventOnPause();
if (shouldSendEvent)
@ -130,10 +121,7 @@ namespace Xamarin.Forms.Platform.Android.AppCompat
public override void OnResume()
{
#if __ANDROID_29__
_isVisible = true;
#endif
bool shouldSendEvent = Application.Current.OnThisPlatform().GetSendAppearingEventOnResume();
if (shouldSendEvent)
@ -151,11 +139,7 @@ namespace Xamarin.Forms.Platform.Android.AppCompat
if(!(currentPage == null || currentPage == PageController))
return;
#if __ANDROID_29__
if (isAppearing && _isVisible)
#else
if (isAppearing && UserVisibleHint)
#endif
PageController?.SendAppearing();
else if(!isAppearing)
PageController?.SendDisappearing();

4
Xamarin.Forms.Platform.Android/AppCompat/IManageFragments.cs
Просмотреть файл

@ -1,8 +1,4 @@
#if __ANDROID_29__
using AndroidX.Fragment.App;
#else
using Android.Support.V4.App;
#endif
namespace Xamarin.Forms.Platform.Android.AppCompat
{

5
Xamarin.Forms.Platform.Android/AppCompat/ImageButtonRenderer.cs
Просмотреть файл

@ -1,11 +1,7 @@
using System;
using System.ComponentModel;
using Android.Content;
#if __ANDROID_29__
using AndroidX.AppCompat.Widget;
#else
using Android.Support.V7.Widget;
#endif
using AView = Android.Views.View;
using Android.Views;
using Xamarin.Forms.Internals;
@ -14,7 +10,6 @@ using Xamarin.Forms.PlatformConfiguration.AndroidSpecific;
using Android.Graphics.Drawables;
using Android.Graphics;
using Xamarin.Forms.Platform.Android.FastRenderers;
using Android.OS;
namespace Xamarin.Forms.Platform.Android
{

6
Xamarin.Forms.Platform.Android/AppCompat/MasterDetailContainer.cs
Просмотреть файл

@ -1,14 +1,8 @@
using Android.App;
using Android.Content;
#if __ANDROID_29__
using Fragment = AndroidX.Fragment.App.Fragment;
using FragmentManager = AndroidX.Fragment.App.FragmentManager;
using FragmentTransaction = AndroidX.Fragment.App.FragmentTransaction;
#else
using Fragment = Android.Support.V4.App.Fragment;
using FragmentManager = Android.Support.V4.App.FragmentManager;
using FragmentTransaction = Android.Support.V4.App.FragmentTransaction;
#endif
namespace Xamarin.Forms.Platform.Android.AppCompat
{

5
Xamarin.Forms.Platform.Android/AppCompat/MasterDetailPageRenderer.cs
Просмотреть файл

@ -2,14 +2,9 @@ using System;
using System.ComponentModel;
using System.Threading.Tasks;
using Android.Content;
#if __ANDROID_29__
using AndroidX.Core.Widget;
using AndroidX.Fragment.App;
using AndroidX.DrawerLayout.Widget;
#else
using Android.Support.V4.Widget;
using Android.Support.V4.App;
#endif
using Android.Views;
using AView = Android.Views.View;
using Android.OS;

12
Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs
Просмотреть файл

@ -10,8 +10,6 @@ using Android.Content.Res;
using Android.Graphics;
using Android.Graphics.Drawables;
using Android.Runtime;
#if __ANDROID_29__
using AndroidX.Core.Widget;
using Fragment = AndroidX.Fragment.App.Fragment;
using FragmentManager = AndroidX.Fragment.App.FragmentManager;
using FragmentTransaction = AndroidX.Fragment.App.FragmentTransaction;
@ -20,16 +18,6 @@ using ActionBarDrawerToggle = AndroidX.AppCompat.App.ActionBarDrawerToggle;
using AndroidX.AppCompat.Graphics.Drawable;
using AndroidX.DrawerLayout.Widget;
using AndroidX.AppCompat.App;
#else
using Android.Support.V4.Widget;
using Fragment = Android.Support.V4.App.Fragment;
using FragmentManager = Android.Support.V4.App.FragmentManager;
using FragmentTransaction = Android.Support.V4.App.FragmentTransaction;
using AToolbar = Android.Support.V7.Widget.Toolbar;
using ActionBarDrawerToggle = Android.Support.V7.App.ActionBarDrawerToggle;
using Android.Support.V7.Graphics.Drawable;
using Android.Support.V7.App;
#endif
using Android.Util;
using Android.Views;
using Xamarin.Forms.Internals;

4
Xamarin.Forms.Platform.Android/AppCompat/PageExtensions.cs
Просмотреть файл

@ -4,11 +4,7 @@ using Android.App;
using Android.Content;
using Android.OS;
using Android.Views;
#if __ANDROID_29__
using Fragment = AndroidX.Fragment.App.Fragment;
#else
using Fragment = global::Android.Support.V4.App.Fragment;
#endif
namespace Xamarin.Forms.Platform.Android
{

6
Xamarin.Forms.Platform.Android/AppCompat/RadioButtonRenderer.cs
Просмотреть файл

@ -2,13 +2,8 @@ using System;
using System.ComponentModel;
using Android.Content;
using Android.Graphics;
#if __ANDROID_29__
using AndroidX.Core.View;
using AndroidX.AppCompat.Widget;
#else
using Android.Support.V7.Widget;
using Android.Support.V4.View;
#endif
using Android.Util;
using Android.Views;
using Xamarin.Forms.Internals;
@ -16,7 +11,6 @@ using Xamarin.Forms.Platform.Android.FastRenderers;
using Xamarin.Forms.PlatformConfiguration.AndroidSpecific;
using AColor = Android.Graphics.Color;
using AView = Android.Views.View;
using Android.Graphics.Drawables;
using Android.Widget;
namespace Xamarin.Forms.Platform.Android

5
Xamarin.Forms.Platform.Android/AppCompat/SwitchRenderer.cs
Просмотреть файл

@ -1,13 +1,8 @@
using System;
using System.ComponentModel;
using Android.Content;
using Android.Graphics;
using Android.Graphics.Drawables;
#if __ANDROID_29__
using AndroidX.AppCompat.Widget;
#else
using Android.Support.V7.Widget;
#endif
using Android.Widget;
using Xamarin.Forms.Platform.Android.FastRenderers;

11
Xamarin.Forms.Platform.Android/AppCompat/TabbedPageRenderer.cs
Просмотреть файл

@ -5,30 +5,19 @@ using Android.Content;
using Android.Content.Res;
using Android.Graphics;
using Android.Graphics.Drawables;
using Android.OS;
using Android.Runtime;
#if __ANDROID_29__
using AndroidX.Fragment.App;
using AndroidX.Core.View;
using AndroidX.ViewPager.Widget;
using Google.Android.Material.BottomNavigation;
using Google.Android.Material.BottomSheet;
using Google.Android.Material.Tabs;
using ADrawableCompat = AndroidX.Core.Graphics.Drawable.DrawableCompat;
#else
using Android.Support.V4.App;
using Android.Support.Design.Widget;
using Android.Support.V4.View;
using ADrawableCompat = Android.Support.V4.Graphics.Drawable.DrawableCompat;
#endif
using AWidget = Android.Widget;
using Android.Views;
using Xamarin.Forms.Internals;
using Xamarin.Forms.PlatformConfiguration.AndroidSpecific;
using AView = Android.Views.View;
using AMenu = Android.Views.Menu;
using AColor = Android.Graphics.Color;
using System.Threading.Tasks;
using System.Collections.Generic;
namespace Xamarin.Forms.Platform.Android.AppCompat

8
Xamarin.Forms.Platform.Android/ButtonLayoutManager.cs
Просмотреть файл

@ -1,17 +1,9 @@
using System;
using System.ComponentModel;
using Android.Content;
using Android.Graphics;
using Android.Graphics.Drawables;
#if __ANDROID_29__
using AndroidX.Core.View;
using AndroidX.Core.Widget;
using AndroidX.AppCompat.Widget;
#else
using Android.Support.V4.View;
using Android.Support.V4.Widget;
using Android.Support.V7.Widget;
#endif
using Xamarin.Forms.Internals;
using ARect = Android.Graphics.Rect;
using AView = Android.Views.View;

8
Xamarin.Forms.Platform.Android/CellAdapter.cs
Просмотреть файл

@ -1,21 +1,15 @@
using System;
using System.Collections.Specialized;
using System.ComponentModel;
using Android.App;
using Android.Content;
using Android.Util;
using Android.Views;
using Android.Widget;
using AView = Android.Views.View;
using AListView = Android.Widget.ListView;
using Android.Graphics.Drawables;
#if __ANDROID_29__
using AActionMode = global::AndroidX.AppCompat.View.ActionMode;
using AndroidX.AppCompat.App;
#else
using AActionMode = global::Android.Support.V7.View.ActionMode;
using Android.Support.V7.App;
#endif
namespace Xamarin.Forms.Platform.Android
{
public abstract class CellAdapter : BaseAdapter<object>, AdapterView.IOnItemLongClickListener, ActionMode.ICallback, AdapterView.IOnItemClickListener, AActionMode.ICallback

12
Xamarin.Forms.Platform.Android/Cells/BaseCellView.cs
Просмотреть файл

@ -1,22 +1,10 @@
using System.IO;
using System.Threading.Tasks;
using Android.Content;
using Android.Graphics;
using Android.Text;
using Android.Views;
using Android.Widget;
using AView = Android.Views.View;
using AColor = Android.Graphics.Color;
using AColorDraw = Android.Graphics.Drawables.ColorDrawable;
using Xamarin.Forms.Internals;
#if __ANDROID_29__
using AndroidX.Core.Widget;
using AndroidX.Core.Content;
#else
using Android.Support.V4.Widget;
using Android.Support.V4.Content;
#endif
using Android.OS;
using System;
namespace Xamarin.Forms.Platform.Android

4
Xamarin.Forms.Platform.Android/Cells/EntryCellView.cs
Просмотреть файл

@ -1,10 +1,6 @@
using System;
using Android.Content;
#if __ANDROID_29__
using AndroidX.Core.Widget;
#else
using Android.Support.V4.Widget;
#endif
using Android.Text;
using Android.Views;
using Android.Views.InputMethods;

7
Xamarin.Forms.Platform.Android/CollectionView/AdapterNotifier.cs
Просмотреть файл

@ -1,9 +1,4 @@
#if __ANDROID_29__
using AndroidX.AppCompat.Widget;
using AndroidX.RecyclerView.Widget;
#else
using Android.Support.V7.Widget;
#endif
using AndroidX.RecyclerView.Widget;
namespace Xamarin.Forms.Platform.Android
{

6
Xamarin.Forms.Platform.Android/CollectionView/CarouselSpacingItemDecoration.cs
Просмотреть файл

@ -1,11 +1,5 @@
using System;
using Android.Graphics;
#if __ANDROID_29__
using AndroidX.RecyclerView.Widget;
using AndroidX.AppCompat.Widget;
#else
using Android.Support.V7.Widget;
#endif
using ARect = Android.Graphics.Rect;
using AView = Android.Views.View;
using FormsCarouselView = Xamarin.Forms.CarouselView;

5
Xamarin.Forms.Platform.Android/CollectionView/CarouselViewRenderer.cs
Просмотреть файл

@ -3,13 +3,8 @@ using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
using Android.Content;
#if __ANDROID_29__
using AndroidX.RecyclerView.Widget;
#else
using Android.Support.V7.Widget;
#endif
using Android.Views;
using Java.Interop;
using FormsCarouselView = Xamarin.Forms.CarouselView;
using Xamarin.Forms.Platform.Android.CollectionView;

7
Xamarin.Forms.Platform.Android/CollectionView/CenterSnapHelper.cs
Просмотреть файл

@ -1,9 +1,4 @@
#if __ANDROID_29__
using AndroidX.AppCompat.Widget;
using AndroidX.RecyclerView.Widget;
#else
using Android.Support.V7.Widget;
#endif
using AndroidX.RecyclerView.Widget;
using AView = Android.Views.View;
namespace Xamarin.Forms.Platform.Android

6
Xamarin.Forms.Platform.Android/CollectionView/DataChangeObserver.cs
Просмотреть файл

@ -1,12 +1,6 @@
using System;
#if __ANDROID_29__
using AndroidX.AppCompat.Widget;
using static AndroidX.RecyclerView.Widget.RecyclerView;
using AndroidX.RecyclerView.Widget;
#else
using Android.Support.V7.Widget;
using static Android.Support.V7.Widget.RecyclerView;
#endif
using Object = Java.Lang.Object;
namespace Xamarin.Forms.Platform.Android

5
Xamarin.Forms.Platform.Android/CollectionView/EdgeSnapHelper.cs
Просмотреть файл

@ -1,9 +1,4 @@
#if __ANDROID_29__
using AndroidX.AppCompat.Widget;
using AndroidX.RecyclerView.Widget;
#else
using Android.Support.V7.Widget;
#endif
using AView = Android.Views.View;
using ALayoutDirection = Android.Views.LayoutDirection;

6
Xamarin.Forms.Platform.Android/CollectionView/EmptyViewAdapter.cs
Просмотреть файл

@ -1,12 +1,6 @@
using System;
using Android.Content;
using Android.Content.Res;
#if __ANDROID_29__
using AndroidX.AppCompat.Widget;
using AndroidX.RecyclerView.Widget;
#else
using Android.Support.V7.Widget;
#endif
using Android.Views;
using Object = Java.Lang.Object;

5
Xamarin.Forms.Platform.Android/CollectionView/EndSingleSnapHelper.cs
Просмотреть файл

@ -1,9 +1,4 @@
#if __ANDROID_29__
using AndroidX.AppCompat.Widget;
using AndroidX.RecyclerView.Widget;
#else
using Android.Support.V7.Widget;
#endif
using AView = Android.Views.View;
namespace Xamarin.Forms.Platform.Android

5
Xamarin.Forms.Platform.Android/CollectionView/EndSnapHelper.cs
Просмотреть файл

@ -1,9 +1,4 @@
#if __ANDROID_29__
using AndroidX.AppCompat.Widget;
using AndroidX.RecyclerView.Widget;
#else
using Android.Support.V7.Widget;
#endif
using AView = Android.Views.View;
namespace Xamarin.Forms.Platform.Android

7
Xamarin.Forms.Platform.Android/CollectionView/GridLayoutSpanSizeLookup.cs
Просмотреть файл

@ -1,9 +1,4 @@
#if __ANDROID_29__
using AndroidX.AppCompat.Widget;
using AndroidX.RecyclerView.Widget;
#else
using Android.Support.V7.Widget;
#endif
using AndroidX.RecyclerView.Widget;
namespace Xamarin.Forms.Platform.Android
{

5
Xamarin.Forms.Platform.Android/CollectionView/GroupableItemsViewAdapter.cs
Просмотреть файл

@ -1,11 +1,6 @@
using System;
using Android.Content;
#if __ANDROID_29__
using AndroidX.AppCompat.Widget;
using AndroidX.RecyclerView.Widget;
#else
using Android.Support.V7.Widget;
#endif
using Android.Views;
namespace Xamarin.Forms.Platform.Android

7
Xamarin.Forms.Platform.Android/CollectionView/ItemsSourceFactory.cs
Просмотреть файл

@ -1,14 +1,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Collections.Specialized;
using System.IO;
#if __ANDROID_29__
using AndroidX.AppCompat.Widget;
using AndroidX.RecyclerView.Widget;
#else
using Android.Support.V7.Widget;
#endif
namespace Xamarin.Forms.Platform.Android
{

5
Xamarin.Forms.Platform.Android/CollectionView/ItemsViewAdapter.cs
Просмотреть файл

@ -1,11 +1,6 @@
using System;
using Android.Content;
#if __ANDROID_29__
using AndroidX.AppCompat.Widget;
using AndroidX.RecyclerView.Widget;
#else
using Android.Support.V7.Widget;
#endif
using Android.Widget;
using Object = Java.Lang.Object;
using ViewGroup = Android.Views.ViewGroup;

7
Xamarin.Forms.Platform.Android/CollectionView/ItemsViewRenderer.cs
Просмотреть файл

@ -1,15 +1,8 @@
using System;
using System.ComponentModel;
using Android.Content;
using Android.Graphics;
#if __ANDROID_29__
using AndroidX.AppCompat.Widget;
using AndroidX.RecyclerView.Widget;
using AViewCompat = AndroidX.Core.View.ViewCompat;
#else
using Android.Support.V7.Widget;
using AViewCompat = Android.Support.V4.View.ViewCompat;
#endif
using Android.Views;
using Xamarin.Forms.Internals;
using Xamarin.Forms.Platform.Android.CollectionView;

8
Xamarin.Forms.Platform.Android/CollectionView/NongreedySnapHelper.cs
Просмотреть файл

@ -1,10 +1,4 @@
#if __ANDROID_29__
using AndroidX.AppCompat.Widget;
using AndroidX.RecyclerView.Widget;
#else
using System;
using Android.Support.V7.Widget;
#endif
using AndroidX.RecyclerView.Widget;
namespace Xamarin.Forms.Platform.Android
{

5
Xamarin.Forms.Platform.Android/CollectionView/PositionalSmoothScroller.cs
Просмотреть файл

@ -1,10 +1,5 @@
using Android.Content;
#if __ANDROID_29__
using AndroidX.AppCompat.Widget;
using AndroidX.RecyclerView.Widget;
#else
using Android.Support.V7.Widget;
#endif
namespace Xamarin.Forms.Platform.Android
{

8
Xamarin.Forms.Platform.Android/CollectionView/RecyclerViewScrollListener.cs
Просмотреть файл

@ -1,10 +1,4 @@
#if __ANDROID_29__
using AndroidX.AppCompat.Widget;
using AndroidX.RecyclerView.Widget;
#else
using Android.Support.V7.Widget;
#endif
using AView = Android.Views.View;
using AndroidX.RecyclerView.Widget;
namespace Xamarin.Forms.Platform.Android.CollectionView
{

6
Xamarin.Forms.Platform.Android/CollectionView/ScrollHelper.cs
Просмотреть файл

@ -1,12 +1,6 @@
using System;
using Android.Graphics;
using ARect = Android.Graphics.Rect;
#if __ANDROID_29__
using AndroidX.AppCompat.Widget;
using AndroidX.RecyclerView.Widget;
#else
using Android.Support.V7.Widget;
#endif
namespace Xamarin.Forms.Platform.Android
{

5
Xamarin.Forms.Platform.Android/CollectionView/SelectableItemsViewAdapter.cs
Просмотреть файл

@ -1,12 +1,7 @@
using System;
using System.Collections.Generic;
using Android.Content;
#if __ANDROID_29__
using AndroidX.AppCompat.Widget;
using AndroidX.RecyclerView.Widget;
#else
using Android.Support.V7.Widget;
#endif
using Object = Java.Lang.Object;
namespace Xamarin.Forms.Platform.Android

6
Xamarin.Forms.Platform.Android/CollectionView/SelectableViewHolder.cs
Просмотреть файл

@ -1,14 +1,8 @@
using System;
using System.Linq;
using Android.Graphics.Drawables;
#if __ANDROID_29__
using AndroidX.Core.Content;
using AndroidX.AppCompat.Widget;
using AndroidX.RecyclerView.Widget;
#else
using Android.Support.V4.Content;
using Android.Support.V7.Widget;
#endif
using Android.Util;
namespace Xamarin.Forms.Platform.Android

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше