Mass update to Forms 5.0. (xamarin#682)

* Remove sample. * Removed samples. * Mass update to 5.0-pre1 * Removed MediaElement and Expander. * Removed experimental flags. * Use xct:Expander * Rename MasterDetailPage to FlyoutPage. * Replace MasterDetailPage with FlyoutPage * Formatting applied. * TargetFrameworkVersion updated to 10.0. * RoundRectangleGeometry example added. * Blur applied on the specified VisualElement. * Use the 5.0 RadioButton API. * Minor updates. * Threshold example added. * Navigating overrides commented out. * RadioButton demos updated. * minSDKVersion bumped to 21 * targetSdkVersion set to 29. * Removed tabbar and toolbar references. * Removed TabLayoutResource line. * Remove ToolbarResource line. * Removed Tabbar.axml AndroidResource from csproj. * Remve Toolbar.axml AndroidResource from csproj * Removed Tabbar.xml * Removed Tabbar.axml * Remove Toolbar.xml * Remove Toolbar.axml * Remove references to Tabbar.xml * Remove references to Toolbar.xml * Updated designer files. * AndroidX support. * Forms 5.0 updates. * AndroidX updates. * AndroidX updates. * AndroidX support. * AndroidX updates. * AndroidX updates. * Update plugin. * Update to 5.0-pre2 * Sample fixed. * Set target platform version and min version to 10.0.17763.0 * Tidy up using statements. * MinVersion reset to 10.0.16299.0 * Remove StrokeThickness=1 * RadioButton experimental flag removed. * Expander sample using XCT. * Mass update to 5.0.0.1558-pre3 * Added FlyoutFooter. * Samples now use XCT. * Update to Forms 5.0-pre4 * Update to 5.0-pre4 * Updates. * WebViewExecutionMode platform-specific on UWP. * Mass update to 5.0.0.1874. * UWP fixes. * Android fixes. * Sample removed.
ulricden · Jan 6, 2021 · dff32ef · dff32ef
1 parent 5cae664
commit dff32ef
Show file tree

Hide file tree

Showing 1,869 changed files with 620,381 additions and 302,539 deletions.
diff --git a/...pendencyResolution/DIContainerDemo/DIContainerDemo.Android/DIContainerDemo.Android.csproj b/...pendencyResolution/DIContainerDemo/DIContainerDemo.Android/DIContainerDemo.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>
   </PropertyGroup>
@@ -48,7 +48,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.Forms">
-      <Version>4.8.0.1687</Version>
+      <Version>5.0.0.1874</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
@@ -65,8 +65,6 @@
     <None Include="Properties\AndroidManifest.xml" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="Resources\layout\Tabbar.axml" />
-    <AndroidResource Include="Resources\layout\Toolbar.axml" />
     <AndroidResource Include="Resources\values\styles.xml" />
     <AndroidResource Include="Resources\values\colors.xml" />
     <AndroidResource Include="Resources\mipmap-anydpi-v26\icon.xml" />

diff --git a/Advanced/DependencyResolution/DIContainerDemo/DIContainerDemo.Android/MainActivity.cs b/Advanced/DependencyResolution/DIContainerDemo/DIContainerDemo.Android/MainActivity.cs
@@ -15,9 +15,6 @@ public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompa
 
         protected override void OnCreate(Bundle bundle)
         {
-            TabLayoutResource = Resource.Layout.Tabbar;
-            ToolbarResource = Resource.Layout.Toolbar;
-
             base.OnCreate(bundle);
             global::Xamarin.Forms.Forms.Init(this, bundle);
             RegisterTypes();

diff --git a/...pendencyResolution/DIContainerDemo/DIContainerDemo.Android/Properties/AndroidManifest.xml b/...pendencyResolution/DIContainerDemo/DIContainerDemo.Android/Properties/AndroidManifest.xml
@@ -1,5 +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="com.companyname.DIContainerDemo">
-	<uses-sdk android:minSdkVersion="19" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
 	<application android:label="DIContainerDemo.Android"></application>
 </manifest>
diff --git a/...DependencyResolution/DIContainerDemo/DIContainerDemo.Android/Resources/layout/Tabbar.axml b/...DependencyResolution/DIContainerDemo/DIContainerDemo.Android/Resources/layout/Tabbar.axml
diff --git a/...ependencyResolution/DIContainerDemo/DIContainerDemo.Android/Resources/layout/Toolbar.axml b/...ependencyResolution/DIContainerDemo/DIContainerDemo.Android/Resources/layout/Toolbar.axml
diff --git a/Advanced/DependencyResolution/DIContainerDemo/DIContainerDemo.UWP/DIContainerDemo.UWP.csproj b/Advanced/DependencyResolution/DIContainerDemo/DIContainerDemo.UWP/DIContainerDemo.UWP.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>DIContainerDemo.UWP</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
@@ -134,7 +134,7 @@
       <Version>6.1.5</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Forms">
-      <Version>4.8.0.1687</Version>
+      <Version>5.0.0.1874</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
@@ -148,11 +148,11 @@
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/Advanced/DependencyResolution/DIContainerDemo/DIContainerDemo.iOS/DIContainerDemo.iOS.csproj b/Advanced/DependencyResolution/DIContainerDemo/DIContainerDemo.iOS/DIContainerDemo.iOS.csproj
@@ -152,7 +152,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.Forms">
-      <Version>4.8.0.1687</Version>
+      <Version>5.0.0.1874</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />

diff --git a/Advanced/DependencyResolution/DIContainerDemo/DIContainerDemo/DIContainerDemo.csproj b/Advanced/DependencyResolution/DIContainerDemo/DIContainerDemo/DIContainerDemo.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.8.0.1687" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
     <PackageReference Include="Autofac" Version="4.8.1" />
   </ItemGroup>
 

diff --git a/...ced/DependencyResolution/FactoriesDemo/FactoriesDemo.Android/FactoriesDemo.Android.csproj b/...ced/DependencyResolution/FactoriesDemo/FactoriesDemo.Android/FactoriesDemo.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>
   </PropertyGroup>
@@ -48,7 +48,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.Forms">
-      <Version>4.8.0.1687</Version>
+      <Version>5.0.0.1874</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
@@ -65,8 +65,6 @@
     <None Include="Properties\AndroidManifest.xml" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="Resources\layout\Tabbar.axml" />
-    <AndroidResource Include="Resources\layout\Toolbar.axml" />
     <AndroidResource Include="Resources\values\styles.xml" />
     <AndroidResource Include="Resources\values\colors.xml" />
     <AndroidResource Include="Resources\mipmap-anydpi-v26\icon.xml" />

diff --git a/Advanced/DependencyResolution/FactoriesDemo/FactoriesDemo.Android/MainActivity.cs b/Advanced/DependencyResolution/FactoriesDemo/FactoriesDemo.Android/MainActivity.cs
@@ -15,9 +15,6 @@ public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompa
 
         protected override void OnCreate(Bundle bundle)
         {
-            TabLayoutResource = Resource.Layout.Tabbar;
-            ToolbarResource = Resource.Layout.Toolbar;
-
             base.OnCreate(bundle);
             global::Xamarin.Forms.Forms.Init(this, bundle);
             RegisterFactories();

diff --git a/...d/DependencyResolution/FactoriesDemo/FactoriesDemo.Android/Properties/AndroidManifest.xml b/...d/DependencyResolution/FactoriesDemo/FactoriesDemo.Android/Properties/AndroidManifest.xml
@@ -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.companyname.FactoriesDemo">
-    <uses-sdk android:minSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
     <application android:label="FactoriesDemo.Android">
     </application>
 </manifest>
diff --git a/...ced/DependencyResolution/FactoriesDemo/FactoriesDemo.Android/Resources/layout/Tabbar.axml b/...ced/DependencyResolution/FactoriesDemo/FactoriesDemo.Android/Resources/layout/Tabbar.axml
diff --git a/...ed/DependencyResolution/FactoriesDemo/FactoriesDemo.Android/Resources/layout/Toolbar.axml b/...ed/DependencyResolution/FactoriesDemo/FactoriesDemo.Android/Resources/layout/Toolbar.axml
diff --git a/Advanced/DependencyResolution/FactoriesDemo/FactoriesDemo.UWP/FactoriesDemo.UWP.csproj b/Advanced/DependencyResolution/FactoriesDemo/FactoriesDemo.UWP/FactoriesDemo.UWP.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>FactoriesDemo.UWP</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
@@ -134,7 +134,7 @@
       <Version>6.1.5</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Forms">
-      <Version>4.8.0.1687</Version>
+      <Version>5.0.0.1874</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Advanced/DependencyResolution/FactoriesDemo/FactoriesDemo.iOS/FactoriesDemo.iOS.csproj b/Advanced/DependencyResolution/FactoriesDemo/FactoriesDemo.iOS/FactoriesDemo.iOS.csproj
@@ -159,7 +159,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.Forms">
-      <Version>4.8.0.1687</Version>
+      <Version>5.0.0.1874</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup />

diff --git a/Advanced/DependencyResolution/FactoriesDemo/FactoriesDemo/FactoriesDemo.csproj b/Advanced/DependencyResolution/FactoriesDemo/FactoriesDemo/FactoriesDemo.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.8.0.1687" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
   </ItemGroup>
 
 </Project>
diff --git a/...dationBehavior/AttachedNumericValidationBehavior/AttachedNumericValidationBehavior.csproj b/...dationBehavior/AttachedNumericValidationBehavior/AttachedNumericValidationBehavior.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.8.0.1687" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...ionBehavior/WorkingWithBehaviors.Android/AttachedNumericValidationBehavior.Android.csproj b/...ionBehavior/WorkingWithBehaviors.Android/AttachedNumericValidationBehavior.Android.csproj
@@ -13,7 +13,7 @@
     <AndroidApplication>true</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
     <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
     <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
     <NuGetPackageImportStamp />
@@ -38,7 +38,7 @@
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.8.0.1687" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Mono.Android" />
@@ -72,8 +72,6 @@
     <AndroidResource Include="Resources\drawable-xxhdpi\waterfront.jpg" />
     <AndroidResource Include="Resources\drawable\csharp.png" />
     <AndroidResource Include="Resources\drawable\xaml.png" />
-    <AndroidResource Include="Resources\layout\Tabbar.axml" />
-    <AndroidResource Include="Resources\layout\Toolbar.axml" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <ItemGroup>

diff --git a/Behaviors/AttachedNumericValidationBehavior/WorkingWithBehaviors.Android/MainActivity.cs b/Behaviors/AttachedNumericValidationBehavior/WorkingWithBehaviors.Android/MainActivity.cs
@@ -12,9 +12,6 @@ public class MainActivity : FormsAppCompatActivity
     {
         protected override void OnCreate(Bundle bundle)
         {
-            //TabLayoutResource = Resource.Layout.Tabbar;
-            //ToolbarResource = Resource.Layout.Toolbar;
-
             base.OnCreate(bundle);
 
             Xamarin.Forms.Forms.Init(this, bundle);
@@ -23,4 +20,3 @@ protected override void OnCreate(Bundle bundle)
         }
     }
 }
-
diff --git a/...chedNumericValidationBehavior/WorkingWithBehaviors.Android/Properties/AndroidManifest.xml b/...chedNumericValidationBehavior/WorkingWithBehaviors.Android/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.YourCompany.WorkingWithBehaviors" android:versionCode="1" android:versionName="1">
-	<uses-sdk android:minSdkVersion="19" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
 	<application android:icon="@drawable/icon" android:label="Working with Behaviors"></application>
 	<uses-permission android:name="android.permission.INTERNET" />
 </manifest>
diff --git a/...tachedNumericValidationBehavior/WorkingWithBehaviors.Android/Resources/layout/Tabbar.axml b/...tachedNumericValidationBehavior/WorkingWithBehaviors.Android/Resources/layout/Tabbar.axml
diff --git a/...achedNumericValidationBehavior/WorkingWithBehaviors.Android/Resources/layout/Toolbar.axml b/...achedNumericValidationBehavior/WorkingWithBehaviors.Android/Resources/layout/Toolbar.axml
diff --git a/...cValidationBehavior/WorkingWithBehaviors.UWP/AttachedNumericValidationBehavior.UWP.csproj b/...cValidationBehavior/WorkingWithBehaviors.UWP/AttachedNumericValidationBehavior.UWP.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>AttachedNumericValidationBehavior.UWP</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
@@ -89,7 +89,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.12" />
-    <PackageReference Include="Xamarin.Forms" Version="4.8.0.1687" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>

diff --git a/...cValidationBehavior/WorkingWithBehaviors.iOS/AttachedNumericValidationBehavior.iOS.csproj b/...cValidationBehavior/WorkingWithBehaviors.iOS/AttachedNumericValidationBehavior.iOS.csproj
@@ -92,7 +92,7 @@
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.8.0.1687" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Main.cs" />

diff --git a/Behaviors/EffectBehavior/Droid/EffectsDemo.Droid.csproj b/Behaviors/EffectBehavior/Droid/EffectsDemo.Droid.csproj
@@ -14,7 +14,7 @@
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidApplication>True</AndroidApplication>
     <AssemblyName>EffectsDemo.Droid</AssemblyName>
-    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
     <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
     <NuGetPackageImportStamp />
   </PropertyGroup>
@@ -39,7 +39,7 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.8.0.1687" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -75,8 +75,6 @@
     <AndroidResource Include="Resources\drawable-xxhdpi\icon.png" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="Resources\layout\Tabbar.axml" />
-    <AndroidResource Include="Resources\layout\Toolbar.axml" />
     <AndroidResource Include="Resources\values\styles.xml" />
     <AndroidResource Include="Resources\values\colors.xml" />
   </ItemGroup>

diff --git a/Behaviors/EffectBehavior/Droid/Properties/AndroidManifest.xml b/Behaviors/EffectBehavior/Droid/Properties/AndroidManifest.xml
@@ -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.xamarin.effectsdemo">
-	<uses-sdk android:minSdkVersion="19" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
 	<application android:label="EffectsDemo">
 	</application>
 </manifest>