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

Commit b5c660c

Browse files
davidbritchdavidbritch
authored
Merge pull request #587 from xamarin/dabritch-forms45
Mass update to Xamarin.Forms 4.5
2 parents ab589e1 + 29ef268 commit b5c660c

File tree

1,099 files changed

+232235
-11507
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,099 files changed

+232235
-11507
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
</ItemGroup>
4949
<ItemGroup>
5050
<PackageReference Include="Xamarin.Forms">
51-
<Version>4.4.0.991265</Version>
51+
<Version>4.5.0.356</Version>
5252
</PackageReference>
5353
</ItemGroup>
5454
<ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
<Version>6.1.5</Version>
135135
</PackageReference>
136136
<PackageReference Include="Xamarin.Forms">
137-
<Version>4.4.0.991265</Version>
137+
<Version>4.5.0.356</Version>
138138
</PackageReference>
139139
</ItemGroup>
140140
<ItemGroup>

‎Advanced/DependencyResolution/DIContainerDemo/DIContainerDemo.UWP/FormsVideoPlayer/VideoPlayerRenderer.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
using Windows.Storage;
44
using Windows.Storage.Streams;
55
using Windows.UI.Xaml;
6-
using Windows.UI.Xaml.Controls;
7-
using Windows.UI.Xaml.Media;
6+
using WinControls = Windows.UI.Xaml.Controls;
7+
using WinMedia = Windows.UI.Xaml.Media;
88
using Xamarin.Forms;
99
using Xamarin.Forms.Platform.UWP;
1010
using DIContainerDemo;
@@ -13,7 +13,7 @@
1313
typeof(FormsVideoLibrary.UWP.VideoPlayerRenderer))]
1414
namespace FormsVideoLibrary.UWP
1515
{
16-
public class VideoPlayerRenderer : ViewRenderer<VideoPlayer, MediaElement>
16+
public class VideoPlayerRenderer : ViewRenderer<VideoPlayer, WinControls.MediaElement>
1717
{
1818
ILogger _logger;
1919

@@ -32,7 +32,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<VideoPlayer> ar
3232
{
3333
if (Control == null)
3434
{
35-
MediaElement mediaElement = new MediaElement();
35+
WinControls.MediaElement mediaElement = new WinControls.MediaElement();
3636
SetNativeControl(mediaElement);
3737

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

8787
switch (Control.CurrentState)
8888
{
89-
case MediaElementState.Playing:
89+
case WinMedia.MediaElementState.Playing:
9090
videoStatus = VideoStatus.Playing;
9191
break;
9292

93-
case MediaElementState.Paused:
94-
case MediaElementState.Stopped:
93+
case WinMedia.MediaElementState.Paused:
94+
case WinMedia.MediaElementState.Stopped:
9595
videoStatus = VideoStatus.Paused;
9696
break;
9797
}

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
</ItemGroup>
4949
<ItemGroup>
5050
<PackageReference Include="Xamarin.Forms">
51-
<Version>4.4.0.991265</Version>
51+
<Version>4.5.0.356</Version>
5252
</PackageReference>
5353
</ItemGroup>
5454
<ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
<Version>6.1.5</Version>
135135
</PackageReference>
136136
<PackageReference Include="Xamarin.Forms">
137-
<Version>4.4.0.991265</Version>
137+
<Version>4.5.0.356</Version>
138138
</PackageReference>
139139
</ItemGroup>
140140
<ItemGroup>

‎Advanced/DependencyResolution/FactoriesDemo/FactoriesDemo.UWP/FormsVideoPlayer/VideoPlayerRenderer.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
using Windows.Storage;
44
using Windows.Storage.Streams;
55
using Windows.UI.Xaml;
6-
using Windows.UI.Xaml.Controls;
7-
using Windows.UI.Xaml.Media;
6+
using WinControls = Windows.UI.Xaml.Controls;
7+
using WinMedia = Windows.UI.Xaml.Media;
88
using Xamarin.Forms;
99
using Xamarin.Forms.Platform.UWP;
1010
using FactoriesDemo;
@@ -13,7 +13,7 @@
1313
typeof(FormsVideoLibrary.UWP.VideoPlayerRenderer))]
1414
namespace FormsVideoLibrary.UWP
1515
{
16-
public class VideoPlayerRenderer : ViewRenderer<VideoPlayer, MediaElement>
16+
public class VideoPlayerRenderer : ViewRenderer<VideoPlayer, WinControls.MediaElement>
1717
{
1818
ILogger _logger;
1919

@@ -32,7 +32,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<VideoPlayer> ar
3232
{
3333
if (Control == null)
3434
{
35-
MediaElement mediaElement = new MediaElement();
35+
WinControls.MediaElement mediaElement = new WinControls.MediaElement();
3636
SetNativeControl(mediaElement);
3737

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

8787
switch (Control.CurrentState)
8888
{
89-
case MediaElementState.Playing:
89+
case WinMedia.MediaElementState.Playing:
9090
videoStatus = VideoStatus.Playing;
9191
break;
9292

93-
case MediaElementState.Paused:
94-
case MediaElementState.Stopped:
93+
case WinMedia.MediaElementState.Paused:
94+
case WinMedia.MediaElementState.Stopped:
9595
videoStatus = VideoStatus.Paused;
9696
break;
9797
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
</ItemGroup>
160160
<ItemGroup>
161161
<PackageReference Include="Xamarin.Forms">
162-
<Version>4.4.0.991265</Version>
162+
<Version>4.5.0.356</Version>
163163
</PackageReference>
164164
</ItemGroup>
165165
<ItemGroup />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</ItemGroup>
1818

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

2323
</Project>

‎Behaviors/AttachedNumericValidationBehavior/AttachedNumericValidationBehavior/AttachedNumericValidationBehavior.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

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

1515
<ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
3939
</PropertyGroup>
4040
<ItemGroup>
41-
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991265" />
41+
<PackageReference Include="Xamarin.Forms" Version="4.5.0.356" />
4242
</ItemGroup>
4343
<ItemGroup>
4444
<Reference Include="Mono.Android" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.4.0.991265" />
92+
<PackageReference Include="Xamarin.Forms" Version="4.5.0.356" />
9393
</ItemGroup>
9494
<ItemGroup />
9595
<ItemGroup>

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

Lines changed: 1 addition & 1 deletion
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.4.0.991265" />
95+
<PackageReference Include="Xamarin.Forms" Version="4.5.0.356" />
9696
</ItemGroup>
9797
<ItemGroup>
9898
<Compile Include="Main.cs" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<ConsolePause>false</ConsolePause>
4040
</PropertyGroup>
4141
<ItemGroup>
42-
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991265" />
42+
<PackageReference Include="Xamarin.Forms" Version="4.5.0.356" />
4343
</ItemGroup>
4444
<ItemGroup>
4545
<Reference Include="System" />

0 commit comments

Comments
 (0)