Skip to content
This repository was archived by the owner on Apr 29, 2024. It is now read-only.

Commit dff32ef

Browse files
davidbritchdavidbritch
authored
Mass update to Forms 5.0. (#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.
1 parent 5cae664 commit dff32ef

File tree

1,869 files changed

+620381
-302539
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,869 files changed

+620381
-302539
lines changed

‎Advanced/DependencyResolution/DIContainerDemo/DIContainerDemo.Android/DIContainerDemo.Android.csproj

+2-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
1616
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
1717
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
18-
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
1919
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
2020
<NuGetPackageImportStamp></NuGetPackageImportStamp>
2121
</PropertyGroup>
@@ -48,7 +48,7 @@
4848
</ItemGroup>
4949
<ItemGroup>
5050
<PackageReference Include="Xamarin.Forms">
51-
<Version>4.8.0.1687</Version>
51+
<Version>5.0.0.1874</Version>
5252
</PackageReference>
5353
</ItemGroup>
5454
<ItemGroup>
@@ -65,8 +65,6 @@
6565
<None Include="Properties\AndroidManifest.xml" />
6666
</ItemGroup>
6767
<ItemGroup>
68-
<AndroidResource Include="Resources\layout\Tabbar.axml" />
69-
<AndroidResource Include="Resources\layout\Toolbar.axml" />
7068
<AndroidResource Include="Resources\values\styles.xml" />
7169
<AndroidResource Include="Resources\values\colors.xml" />
7270
<AndroidResource Include="Resources\mipmap-anydpi-v26\icon.xml" />

‎Advanced/DependencyResolution/DIContainerDemo/DIContainerDemo.Android/MainActivity.cs

-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompa
1515

1616
protected override void OnCreate(Bundle bundle)
1717
{
18-
TabLayoutResource = Resource.Layout.Tabbar;
19-
ToolbarResource = Resource.Layout.Toolbar;
20-
2118
base.OnCreate(bundle);
2219
global::Xamarin.Forms.Forms.Init(this, bundle);
2320
RegisterTypes();

‎Advanced/DependencyResolution/DIContainerDemo/DIContainerDemo.Android/Properties/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.DIContainerDemo">
3-
<uses-sdk android:minSdkVersion="19" />
3+
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
44
<application android:label="DIContainerDemo.Android"></application>
55
</manifest>

‎Advanced/DependencyResolution/DIContainerDemo/DIContainerDemo.Android/Resources/layout/Tabbar.axml

-2
This file was deleted.

‎Advanced/DependencyResolution/DIContainerDemo/DIContainerDemo.Android/Resources/layout/Toolbar.axml

-2
This file was deleted.

‎Advanced/DependencyResolution/DIContainerDemo/DIContainerDemo.UWP/DIContainerDemo.UWP.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyName>DIContainerDemo.UWP</AssemblyName>
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14-
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
14+
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
1515
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>
@@ -134,7 +134,7 @@
134134
<Version>6.1.5</Version>
135135
</PackageReference>
136136
<PackageReference Include="Xamarin.Forms">
137-
<Version>4.8.0.1687</Version>
137+
<Version>5.0.0.1874</Version>
138138
</PackageReference>
139139
</ItemGroup>
140140
<ItemGroup>
@@ -148,11 +148,11 @@
148148
<VisualStudioVersion>14.0</VisualStudioVersion>
149149
</PropertyGroup>
150150
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
151-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
151+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
152152
Other similar extension points exist, see Microsoft.Common.targets.
153153
<Target Name="BeforeBuild">
154154
</Target>
155155
<Target Name="AfterBuild">
156156
</Target>
157157
-->
158-
</Project>
158+
</Project>

‎Advanced/DependencyResolution/DIContainerDemo/DIContainerDemo.iOS/DIContainerDemo.iOS.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
</ItemGroup>
153153
<ItemGroup>
154154
<PackageReference Include="Xamarin.Forms">
155-
<Version>4.8.0.1687</Version>
155+
<Version>5.0.0.1874</Version>
156156
</PackageReference>
157157
</ItemGroup>
158158
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />

‎Advanced/DependencyResolution/DIContainerDemo/DIContainerDemo/DIContainerDemo.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1687" />
12+
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
1313
<PackageReference Include="Autofac" Version="4.8.1" />
1414
</ItemGroup>
1515

‎Advanced/DependencyResolution/FactoriesDemo/FactoriesDemo.Android/FactoriesDemo.Android.csproj

+2-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
1616
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
1717
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
18-
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
1919
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
2020
<NuGetPackageImportStamp></NuGetPackageImportStamp>
2121
</PropertyGroup>
@@ -48,7 +48,7 @@
4848
</ItemGroup>
4949
<ItemGroup>
5050
<PackageReference Include="Xamarin.Forms">
51-
<Version>4.8.0.1687</Version>
51+
<Version>5.0.0.1874</Version>
5252
</PackageReference>
5353
</ItemGroup>
5454
<ItemGroup>
@@ -65,8 +65,6 @@
6565
<None Include="Properties\AndroidManifest.xml" />
6666
</ItemGroup>
6767
<ItemGroup>
68-
<AndroidResource Include="Resources\layout\Tabbar.axml" />
69-
<AndroidResource Include="Resources\layout\Toolbar.axml" />
7068
<AndroidResource Include="Resources\values\styles.xml" />
7169
<AndroidResource Include="Resources\values\colors.xml" />
7270
<AndroidResource Include="Resources\mipmap-anydpi-v26\icon.xml" />

‎Advanced/DependencyResolution/FactoriesDemo/FactoriesDemo.Android/MainActivity.cs

-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompa
1515

1616
protected override void OnCreate(Bundle bundle)
1717
{
18-
TabLayoutResource = Resource.Layout.Tabbar;
19-
ToolbarResource = Resource.Layout.Toolbar;
20-
2118
base.OnCreate(bundle);
2219
global::Xamarin.Forms.Forms.Init(this, bundle);
2320
RegisterFactories();

‎Advanced/DependencyResolution/FactoriesDemo/FactoriesDemo.Android/Properties/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.FactoriesDemo">
3-
<uses-sdk android:minSdkVersion="19" />
3+
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
44
<application android:label="FactoriesDemo.Android">
55
</application>
66
</manifest>

‎Advanced/DependencyResolution/FactoriesDemo/FactoriesDemo.Android/Resources/layout/Tabbar.axml

-2
This file was deleted.

‎Advanced/DependencyResolution/FactoriesDemo/FactoriesDemo.Android/Resources/layout/Toolbar.axml

-2
This file was deleted.

‎Advanced/DependencyResolution/FactoriesDemo/FactoriesDemo.UWP/FactoriesDemo.UWP.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyName>FactoriesDemo.UWP</AssemblyName>
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14-
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
14+
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
1515
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>
@@ -134,7 +134,7 @@
134134
<Version>6.1.5</Version>
135135
</PackageReference>
136136
<PackageReference Include="Xamarin.Forms">
137-
<Version>4.8.0.1687</Version>
137+
<Version>5.0.0.1874</Version>
138138
</PackageReference>
139139
</ItemGroup>
140140
<ItemGroup>

‎Advanced/DependencyResolution/FactoriesDemo/FactoriesDemo.iOS/FactoriesDemo.iOS.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
</ItemGroup>
160160
<ItemGroup>
161161
<PackageReference Include="Xamarin.Forms">
162-
<Version>4.8.0.1687</Version>
162+
<Version>5.0.0.1874</Version>
163163
</PackageReference>
164164
</ItemGroup>
165165
<ItemGroup />

‎Advanced/DependencyResolution/FactoriesDemo/FactoriesDemo/FactoriesDemo.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1687" />
20+
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
2121
</ItemGroup>
2222

2323
</Project>

‎Behaviors/AttachedNumericValidationBehavior/AttachedNumericValidationBehavior/AttachedNumericValidationBehavior.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1687" />
12+
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎Behaviors/AttachedNumericValidationBehavior/WorkingWithBehaviors.Android/AttachedNumericValidationBehavior.Android.csproj

+2-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<AndroidApplication>true</AndroidApplication>
1414
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
1515
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
16-
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
1717
<JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
1818
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
1919
<NuGetPackageImportStamp />
@@ -38,7 +38,7 @@
3838
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
3939
</PropertyGroup>
4040
<ItemGroup>
41-
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1687" />
41+
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
4242
</ItemGroup>
4343
<ItemGroup>
4444
<Reference Include="Mono.Android" />
@@ -72,8 +72,6 @@
7272
<AndroidResource Include="Resources\drawable-xxhdpi\waterfront.jpg" />
7373
<AndroidResource Include="Resources\drawable\csharp.png" />
7474
<AndroidResource Include="Resources\drawable\xaml.png" />
75-
<AndroidResource Include="Resources\layout\Tabbar.axml" />
76-
<AndroidResource Include="Resources\layout\Toolbar.axml" />
7775
</ItemGroup>
7876
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
7977
<ItemGroup>

‎Behaviors/AttachedNumericValidationBehavior/WorkingWithBehaviors.Android/MainActivity.cs

-4
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ public class MainActivity : FormsAppCompatActivity
1212
{
1313
protected override void OnCreate(Bundle bundle)
1414
{
15-
//TabLayoutResource = Resource.Layout.Tabbar;
16-
//ToolbarResource = Resource.Layout.Toolbar;
17-
1815
base.OnCreate(bundle);
1916

2017
Xamarin.Forms.Forms.Init(this, bundle);
@@ -23,4 +20,3 @@ protected override void OnCreate(Bundle bundle)
2320
}
2421
}
2522
}
26-

‎Behaviors/AttachedNumericValidationBehavior/WorkingWithBehaviors.Android/Properties/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.YourCompany.WorkingWithBehaviors" android:versionCode="1" android:versionName="1">
3-
<uses-sdk android:minSdkVersion="19" />
3+
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
44
<application android:icon="@drawable/icon" android:label="Working with Behaviors"></application>
55
<uses-permission android:name="android.permission.INTERNET" />
66
</manifest>

‎Behaviors/AttachedNumericValidationBehavior/WorkingWithBehaviors.Android/Resources/layout/Tabbar.axml

-12
This file was deleted.

‎Behaviors/AttachedNumericValidationBehavior/WorkingWithBehaviors.Android/Resources/layout/Toolbar.axml

-9
This file was deleted.

‎Behaviors/AttachedNumericValidationBehavior/WorkingWithBehaviors.UWP/AttachedNumericValidationBehavior.UWP.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyName>AttachedNumericValidationBehavior.UWP</AssemblyName>
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14-
<TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
14+
<TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
1515
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>
@@ -89,7 +89,7 @@
8989
</PropertyGroup>
9090
<ItemGroup>
9191
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.12" />
92-
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1687" />
92+
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
9393
</ItemGroup>
9494
<ItemGroup />
9595
<ItemGroup>

‎Behaviors/AttachedNumericValidationBehavior/WorkingWithBehaviors.iOS/AttachedNumericValidationBehavior.iOS.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
9393
</PropertyGroup>
9494
<ItemGroup>
95-
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1687" />
95+
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
9696
</ItemGroup>
9797
<ItemGroup>
9898
<Compile Include="Main.cs" />

‎Behaviors/EffectBehavior/Droid/EffectsDemo.Droid.csproj

+2-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
1515
<AndroidApplication>True</AndroidApplication>
1616
<AssemblyName>EffectsDemo.Droid</AssemblyName>
17-
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
17+
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
1818
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
1919
<NuGetPackageImportStamp />
2020
</PropertyGroup>
@@ -39,7 +39,7 @@
3939
<ConsolePause>false</ConsolePause>
4040
</PropertyGroup>
4141
<ItemGroup>
42-
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1687" />
42+
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
4343
</ItemGroup>
4444
<ItemGroup>
4545
<Reference Include="System" />
@@ -75,8 +75,6 @@
7575
<AndroidResource Include="Resources\drawable-xxhdpi\icon.png" />
7676
</ItemGroup>
7777
<ItemGroup>
78-
<AndroidResource Include="Resources\layout\Tabbar.axml" />
79-
<AndroidResource Include="Resources\layout\Toolbar.axml" />
8078
<AndroidResource Include="Resources\values\styles.xml" />
8179
<AndroidResource Include="Resources\values\colors.xml" />
8280
</ItemGroup>

‎Behaviors/EffectBehavior/Droid/Properties/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.xamarin.effectsdemo">
3-
<uses-sdk android:minSdkVersion="19" />
3+
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
44
<application android:label="EffectsDemo">
55
</application>
66
</manifest>

0 commit comments

Comments
 (0)