Skip to content

Commit 0645bd6

Browse files
martijn00martijn00
committed
Update versions
1 parent c41b8c3 commit 0645bd6

File tree

15 files changed

+36
-30
lines changed

15 files changed

+36
-30
lines changed

‎Directory.Build.props‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,17 @@
1818
<RepositoryUrl>https://github.com/rotorgames/Rg.Plugins.Popup</RepositoryUrl>
1919
<RepositoryType>git</RepositoryType>
2020
<Product>$(AssemblyName) ($(TargetFramework))</Product>
21-
<Version>2.0.0.14</Version>
21+
<Version>2.1.0.0</Version>
2222

23-
<Nullable>enable</Nullable>
24-
<LangVersion>8.0</LangVersion>
23+
<!--<Nullable>enable</Nullable>-->
24+
<ImplicitUsings>enable</ImplicitUsings>
25+
<LangVersion>10.0</LangVersion>
2526
<NoWarn>$(NoWarn);1591;1701;1702;1705;VSX1000;CS0109;CS0108;CS0618;CS0114;NU1603</NoWarn>
2627
<Platform>AnyCPU</Platform>
28+
29+
<EnableNETAnalyzers>true</EnableNETAnalyzers>
30+
<AnalysisLevel>latest</AnalysisLevel>
31+
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
2732

2833
<IsTestProject>$(MSBuildProjectName.Contains('UnitTest'))</IsTestProject>
2934
<IsLibraryProject>$(MSBuildProjectName.Contains('Rg.Plugins.Popup'))</IsLibraryProject>
@@ -60,7 +65,7 @@
6065

6166
<ItemGroup Condition="'$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false' and '$(IsLibraryProject)' == 'true'">
6267
<PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" />
63-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
68+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
6469
</ItemGroup>
6570

6671
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -83,15 +88,15 @@
8388
</ItemGroup>
8489

8590
<ItemGroup>
86-
<PackageReference Include="Roslynator.Analyzers" Version="3.0.0">
91+
<PackageReference Include="Roslynator.Analyzers" Version="4.0.2">
8792
<PrivateAssets>all</PrivateAssets>
8893
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
8994
</PackageReference>
90-
<PackageReference Include="AsyncFixer" Version="1.3.0">
95+
<PackageReference Include="AsyncFixer" Version="1.5.1">
9196
<PrivateAssets>all</PrivateAssets>
9297
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
9398
</PackageReference>
94-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2">
99+
<PackageReference Include="IDisposableAnalyzers" Version="4.0.1">
95100
<PrivateAssets>all</PrivateAssets>
96101
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
97102
</PackageReference>

‎Directory.Build.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
</PropertyGroup>
1414
<PropertyGroup Condition="$(TargetFramework.StartsWith('uap'))">
1515
<DefineConstants>$(DefineConstants);NETFX_CORE;XAML;WINDOWS;WINDOWS_UWP;UWP</DefineConstants>
16-
<TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
17-
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
16+
<TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
17+
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
1818
</PropertyGroup>
1919
<PropertyGroup Condition="$(TargetFramework.StartsWith('xamarin.ios'))">
2020
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;APPLE;IOS</DefineConstants>

‎Rg.Plugins.Popup/Platforms/Android/Renderers/PopupPageRenderer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ protected override void OnLayout(bool changed, int l, int t, int r, int b)
7070

7171
var decoreView = activity?.Window?.DecorView;
7272

73-
var visibleRect = new Rect();
73+
var visibleRect = new Android.Graphics.Rect();
7474

7575
decoreView?.GetWindowVisibleDisplayFrame(visibleRect);
7676

‎Rg.Plugins.Popup/Platforms/Uap/Renderers/PopupPageRenderer.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using Xamarin.Forms;
1111
using Xamarin.Forms.Internals;
1212
using Xamarin.Forms.Platform.UWP;
13+
using Rect = Windows.Foundation.Rect;
1314
using Size = Windows.Foundation.Size;
1415
using WinPopup = global::Windows.UI.Xaml.Controls.Primitives.Popup;
1516

‎Rg.Plugins.Popup/Rg.Plugins.Popup.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22
<PropertyGroup Condition=" '$(TargetsToBuild)' == 'All' ">
3-
<TargetFrameworks>netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10;xamarin.watchos10;monoandroid9.0;monoandroid10.0;tizen80;netcoreapp3.1;net472</TargetFrameworks>
4-
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">uap10.0.17763;$(TargetFrameworks)</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10;xamarin.watchos10;monoandroid10.0;tizen80;netcoreapp3.1;net472</TargetFrameworks>
4+
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">uap10.0.18362;$(TargetFrameworks)</TargetFrameworks>
55
</PropertyGroup>
66

77
<PropertyGroup Condition=" '$(TargetsToBuild)' != 'All' ">
8-
<TargetFrameworks Condition=" '$(TargetsToBuild)' == 'Android' ">netstandard2.0;monoandroid10.0;monoandroid9.0;</TargetFrameworks>
9-
<TargetFrameworks Condition=" '$(TargetsToBuild)' == 'Uap' ">netstandard2.0;uap10.0.17763</TargetFrameworks>
8+
<TargetFrameworks Condition=" '$(TargetsToBuild)' == 'Android' ">netstandard2.0;monoandroid10.0;</TargetFrameworks>
9+
<TargetFrameworks Condition=" '$(TargetsToBuild)' == 'Uap' ">netstandard2.0;uap10.0.18362</TargetFrameworks>
1010
<TargetFrameworks Condition=" '$(TargetsToBuild)' == 'iOS' ">netstandard2.0;xamarin.ios10</TargetFrameworks>
1111
<TargetFrameworks Condition=" '$(TargetsToBuild)' == 'Apple' ">netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10</TargetFrameworks>
1212
</PropertyGroup>
@@ -43,7 +43,7 @@
4343
<None Remove="Platforms\Wpf\**\*.cs" />
4444
<Compile Include="Platforms\Net\**\*.cs" />
4545
<Compile Include="Platforms\Wpf\**\*.cs" />
46-
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="4.5.0.657" />
46+
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.2012" />
4747
</ItemGroup>
4848

4949
<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
@@ -112,7 +112,7 @@
112112
</ItemGroup>
113113

114114
<ItemGroup>
115-
<PackageReference Include="Xamarin.Forms" Version="4.5.0.657" />
115+
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2012" />
116116
</ItemGroup>
117117

118118
<!-- There is something not working correctly w.r.t. multi-targetting so adding

‎Samples/Demo.Droid/Demo.Droid.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
</ItemGroup>
9797
<ItemGroup>
9898
<PackageReference Include="Xamarin.Forms">
99-
<Version>4.5.0.657</Version>
99+
<Version>5.0.0.2012</Version>
100100
</PackageReference>
101101
</ItemGroup>
102102
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />

‎Samples/Demo.Mac/Demo.Mac.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
</ItemGroup>
111111
<ItemGroup>
112112
<PackageReference Include="Xamarin.Forms">
113-
<Version>4.5.0.657</Version>
113+
<Version>5.0.0.2012</Version>
114114
</PackageReference>
115115
</ItemGroup>
116116
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />

‎Samples/Demo.Tizen/Demo.Tizen.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Xamarin.Forms" Version="4.5.0.657" />
9+
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2012" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎Samples/Demo.UWP/Demo.UWP.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyName>Demo.UWP</AssemblyName>
1212
<DefaultLanguage>ru-RU</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14-
<TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
14+
<TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
1515
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>
@@ -143,10 +143,10 @@
143143
</ItemGroup>
144144
<ItemGroup>
145145
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
146-
<Version>6.2.11</Version>
146+
<Version>6.2.12</Version>
147147
</PackageReference>
148148
<PackageReference Include="Xamarin.Forms">
149-
<Version>4.5.0.657</Version>
149+
<Version>5.0.0.2012</Version>
150150
</PackageReference>
151151
</ItemGroup>
152152
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">

‎Samples/Demo.WPF/Demo.WPF.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
</ItemGroup>
9797
<ItemGroup>
9898
<PackageReference Include="Xamarin.Forms.Platform.WPF">
99-
<Version>4.5.0.657</Version>
99+
<Version>5.0.0.2012</Version>
100100
</PackageReference>
101101
</ItemGroup>
102102
<ItemGroup>

0 commit comments

Comments
 (0)