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

Mass update to Xamarin.Forms 4.7.0.968 #630

Merged
merged 19 commits into from
Jun 18, 2020
Merged

Mass update to Xamarin.Forms 4.7.0.968 #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e725118
Added on/off visual states demo.
davidbritch May 19, 2020
33e04d0
Loading and error placeholder images.
davidbritch May 19, 2020
dd17d1e
Removed method calls.
davidbritch May 19, 2020
067b2aa
Added traffic overlay.
davidbritch May 20, 2020
99e12c5
MultiBinding support.
davidbritch May 21, 2020
b419ef2
Corrections.
davidbritch May 22, 2020
010b875
Remove IndicatorView experimental flag.
davidbritch Jun 15, 2020
86e0ef4
Simplified row/column syntax example added.
davidbritch Jun 15, 2020
b2a20eb
4.7-pre4 updates
davidbritch Jun 15, 2020
bb2f79f
Required updates for pre4.
davidbritch Jun 16, 2020
8d2a2af
Merge branch 'master' into dabritch-forms47
davidbritch Jun 17, 2020
1694c8f
DynamicResource no longer required.
davidbritch Jun 17, 2020
88d7110
Merge branch 'master' into dabritch-forms47
davidbritch Jun 17, 2020
255e08c
Shapes sample.
davidbritch Jun 17, 2020
c568ddb
URL updated.
davidbritch Jun 17, 2020
761cd4e
Mass update to 4.7.
davidbritch Jun 18, 2020
762526e
Revert image placeholders.
davidbritch Jun 18, 2020
f151cca
Change min target platform version.
davidbritch Jun 18, 2020
dbc5389
Expander fixes, and Android resource file updates.
davidbritch Jun 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion ...pendencyResolution/DIContainerDemo/DIContainerDemo.Android/DIContainerDemo.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms">
<Version>4.6.0.726</Version>
<Version>4.7.0.968</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Advanced/DependencyResolution/DIContainerDemo/DIContainerDemo.UWP/DIContainerDemo.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
<Version>6.1.5</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms">
<Version>4.6.0.726</Version>
<Version>4.7.0.968</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Advanced/DependencyResolution/DIContainerDemo/DIContainerDemo.iOS/DIContainerDemo.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms">
<Version>4.6.0.726</Version>
<Version>4.7.0.968</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
Expand Down
2 changes: 1 addition & 1 deletion Advanced/DependencyResolution/DIContainerDemo/DIContainerDemo/DIContainerDemo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.6.0.726" />
<PackageReference Include="Xamarin.Forms" Version="4.7.0.968" />
<PackageReference Include="Autofac" Version="4.8.1" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...ced/DependencyResolution/FactoriesDemo/FactoriesDemo.Android/FactoriesDemo.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms">
<Version>4.6.0.726</Version>
<Version>4.7.0.968</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Advanced/DependencyResolution/FactoriesDemo/FactoriesDemo.UWP/FactoriesDemo.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
<Version>6.1.5</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms">
<Version>4.6.0.726</Version>
<Version>4.7.0.968</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Advanced/DependencyResolution/FactoriesDemo/FactoriesDemo.iOS/FactoriesDemo.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms">
<Version>4.6.0.726</Version>
<Version>4.7.0.968</Version>
</PackageReference>
</ItemGroup>
<ItemGroup />
Expand Down
2 changes: 1 addition & 1 deletion Advanced/DependencyResolution/FactoriesDemo/FactoriesDemo/FactoriesDemo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.6.0.726" />
<PackageReference Include="Xamarin.Forms" Version="4.7.0.968" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ...dationBehavior/AttachedNumericValidationBehavior/AttachedNumericValidationBehavior.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.6.0.726" />
<PackageReference Include="Xamarin.Forms" Version="4.7.0.968" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...ionBehavior/WorkingWithBehaviors.Android/AttachedNumericValidationBehavior.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.6.0.726" />
<PackageReference Include="Xamarin.Forms" Version="4.7.0.968" />
</ItemGroup>
<ItemGroup>
<Reference Include="Mono.Android" />
Expand Down
2 changes: 1 addition & 1 deletion ...cValidationBehavior/WorkingWithBehaviors.UWP/AttachedNumericValidationBehavior.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.12" />
<PackageReference Include="Xamarin.Forms" Version="4.6.0.726" />
<PackageReference Include="Xamarin.Forms" Version="4.7.0.968" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...cValidationBehavior/WorkingWithBehaviors.iOS/AttachedNumericValidationBehavior.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.6.0.726" />
<PackageReference Include="Xamarin.Forms" Version="4.7.0.968" />
</ItemGroup>
<ItemGroup>
<Compile Include="Main.cs" />
Expand Down
2 changes: 1 addition & 1 deletion Behaviors/EffectBehavior/Droid/EffectsDemo.Droid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.6.0.726" />
<PackageReference Include="Xamarin.Forms" Version="4.7.0.968" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down
1,278 changes: 649 additions & 629 deletions Behaviors/EffectBehavior/Droid/Resources/Resource.designer.cs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Behaviors/EffectBehavior/EffectsDemo/EffectsDemo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.6.0.726" />
<PackageReference Include="Xamarin.Forms" Version="4.7.0.968" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Behaviors/EffectBehavior/UWP/EffectsDemo.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.12" />
<PackageReference Include="Xamarin.Forms" Version="4.6.0.726" />
<PackageReference Include="Xamarin.Forms" Version="4.7.0.968" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Behaviors/EffectBehavior/iOS/EffectsDemo.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.6.0.726" />
<PackageReference Include="Xamarin.Forms" Version="4.7.0.968" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down
2 changes: 1 addition & 1 deletion Behaviors/EventToCommandBehavior/Droid/EventToCommandBehavior.Droid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.6.0.726" />
<PackageReference Include="Xamarin.Forms" Version="4.7.0.968" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down
Loading