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.5 #587

Merged
merged 35 commits into from
Feb 27, 2020
Merged

Mass update to Xamarin.Forms 4.5 #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
ccaccf8
DatePicker/TimePicker platform-specifics on iOS
davidbritch Jan 15, 2020
2c5f871
VisualElement first responder platform-specific on iOS.
davidbritch Jan 15, 2020
96877cd
TabbedPage Translucent TabBar platform-specific on iOS.
davidbritch Jan 15, 2020
e887e4b
Image search directory platform-specific on Windows.
davidbritch Jan 16, 2020
0f3281a
Force coerce value example.
davidbritch Jan 16, 2020
02a0c86
Now includes predefining a response.
davidbritch Jan 17, 2020
17f7358
Custom font embedded in shared project.
davidbritch Jan 20, 2020
1e23f8c
Removed stray comma.
davidbritch Jan 20, 2020
8dfad79
Added TargetName support.
davidbritch Jan 20, 2020
e0ea33f
Code cleanup.
davidbritch Jan 20, 2020
c234276
Added TargetName demo.
davidbritch Jan 21, 2020
9270cad
Formatted file.
davidbritch Jan 21, 2020
cea3cec
Updated to Forms 4.5-pre2
davidbritch Jan 28, 2020
6f31d1f
Update to 4.5-pre2
davidbritch Jan 29, 2020
612ac59
Updated NuGets.
davidbritch Feb 11, 2020
bcf79fd
Update to Forms 4.5-pre3
davidbritch Feb 11, 2020
3bd03e3
Added visual states example.
davidbritch Feb 11, 2020
0e49d06
Moved visual states inline.
davidbritch Feb 11, 2020
67883d7
Moved visual states demo.
davidbritch Feb 11, 2020
ec5d84b
Removed unnecessary setter.
davidbritch Feb 11, 2020
684c314
Removed unnecessary x:Name
davidbritch Feb 11, 2020
945080e
Merge branch 'master' into dabritch-forms45
davidbritch Feb 14, 2020
2058202
MediaElement demo.
davidbritch Feb 14, 2020
868c6bc
Code fixes.
davidbritch Feb 14, 2020
a9e71da
Added 5x new triggers to sample.
davidbritch Feb 20, 2020
2577e5e
UWP friendly demo.
davidbritch Feb 20, 2020
95f9597
Page title updated.
davidbritch Feb 20, 2020
e27bedc
Remove StateTriggerEventsDemoPage.
davidbritch Feb 21, 2020
565c853
Merge branch 'master' into dabritch-forms45
davidbritch Feb 27, 2020
8e2a8ce
Two more samples.
davidbritch Feb 27, 2020
ca8783d
Mass update to 4.5.0.356
davidbritch Feb 27, 2020
a62cdc2
Build fixes.
davidbritch Feb 27, 2020
0ea5237
Updated resource files.
davidbritch Feb 27, 2020
d322004
Build failure fixed.
davidbritch Feb 27, 2020
29ef268
UWP build fixes for 4.5.
davidbritch Feb 27, 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.4.0.991265</Version>
<Version>4.5.0.356</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.4.0.991265</Version>
<Version>4.5.0.356</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
14 changes: 7 additions & 7 deletions ...ncyResolution/DIContainerDemo/DIContainerDemo.UWP/FormsVideoPlayer/VideoPlayerRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
using Windows.Storage;
using Windows.Storage.Streams;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media;
using WinControls = Windows.UI.Xaml.Controls;
using WinMedia = Windows.UI.Xaml.Media;
using Xamarin.Forms;
using Xamarin.Forms.Platform.UWP;
using DIContainerDemo;
Expand All @@ -13,7 +13,7 @@
typeof(FormsVideoLibrary.UWP.VideoPlayerRenderer))]
namespace FormsVideoLibrary.UWP
{
public class VideoPlayerRenderer : ViewRenderer<VideoPlayer, MediaElement>
public class VideoPlayerRenderer : ViewRenderer<VideoPlayer, WinControls.MediaElement>
{
ILogger _logger;

Expand All @@ -32,7 +32,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<VideoPlayer> ar
{
if (Control == null)
{
MediaElement mediaElement = new MediaElement();
WinControls.MediaElement mediaElement = new WinControls.MediaElement();
SetNativeControl(mediaElement);

mediaElement.MediaOpened += OnMediaElementMediaOpened;
Expand Down Expand Up @@ -86,12 +86,12 @@ void OnMediaElementCurrentStateChanged(object sender, RoutedEventArgs args)

switch (Control.CurrentState)
{
case MediaElementState.Playing:
case WinMedia.MediaElementState.Playing:
videoStatus = VideoStatus.Playing;
break;

case MediaElementState.Paused:
case MediaElementState.Stopped:
case WinMedia.MediaElementState.Paused:
case WinMedia.MediaElementState.Stopped:
videoStatus = VideoStatus.Paused;
break;
}
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.4.0.991265</Version>
<Version>4.5.0.356</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.4.0.991265" />
<PackageReference Include="Xamarin.Forms" Version="4.5.0.356" />
<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.4.0.991265</Version>
<Version>4.5.0.356</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.4.0.991265</Version>
<Version>4.5.0.356</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
14 changes: 7 additions & 7 deletions ...endencyResolution/FactoriesDemo/FactoriesDemo.UWP/FormsVideoPlayer/VideoPlayerRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
using Windows.Storage;
using Windows.Storage.Streams;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media;
using WinControls = Windows.UI.Xaml.Controls;
using WinMedia = Windows.UI.Xaml.Media;
using Xamarin.Forms;
using Xamarin.Forms.Platform.UWP;
using FactoriesDemo;
Expand All @@ -13,7 +13,7 @@
typeof(FormsVideoLibrary.UWP.VideoPlayerRenderer))]
namespace FormsVideoLibrary.UWP
{
public class VideoPlayerRenderer : ViewRenderer<VideoPlayer, MediaElement>
public class VideoPlayerRenderer : ViewRenderer<VideoPlayer, WinControls.MediaElement>
{
ILogger _logger;

Expand All @@ -32,7 +32,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<VideoPlayer> ar
{
if (Control == null)
{
MediaElement mediaElement = new MediaElement();
WinControls.MediaElement mediaElement = new WinControls.MediaElement();
SetNativeControl(mediaElement);

mediaElement.MediaOpened += OnMediaElementMediaOpened;
Expand Down Expand Up @@ -86,12 +86,12 @@ void OnMediaElementCurrentStateChanged(object sender, RoutedEventArgs args)

switch (Control.CurrentState)
{
case MediaElementState.Playing:
case WinMedia.MediaElementState.Playing:
videoStatus = VideoStatus.Playing;
break;

case MediaElementState.Paused:
case MediaElementState.Stopped:
case WinMedia.MediaElementState.Paused:
case WinMedia.MediaElementState.Stopped:
videoStatus = VideoStatus.Paused;
break;
}
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.4.0.991265</Version>
<Version>4.5.0.356</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.4.0.991265" />
<PackageReference Include="Xamarin.Forms" Version="4.5.0.356" />
</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.4.0.991265" />
<PackageReference Include="Xamarin.Forms" Version="4.5.0.356" />
</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.4.0.991265" />
<PackageReference Include="Xamarin.Forms" Version="4.5.0.356" />
</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.4.0.991265" />
<PackageReference Include="Xamarin.Forms" Version="4.5.0.356" />
</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.4.0.991265" />
<PackageReference Include="Xamarin.Forms" Version="4.5.0.356" />
</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.4.0.991265" />
<PackageReference Include="Xamarin.Forms" Version="4.5.0.356" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down
Loading