Skip to content

Commit fef56fb

Browse files
martijn00martijn00
committed
Update
1 parent 00da17c commit fef56fb

File tree

12 files changed

+35
-33
lines changed

12 files changed

+35
-33
lines changed

‎Directory.Build.props‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,18 @@
1818
<RepositoryUrl>https://github.com/Baseflow/XF-Material-Library</RepositoryUrl>
1919
<RepositoryType>git</RepositoryType>
2020
<Product>$(AssemblyName) ($(TargetFramework))</Product>
21-
<Version>1.7.8</Version>
21+
<Version>1.8.0</Version>
2222
<Platform>AnyCPU</Platform>
2323

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

2834
<IsTestProject>$(MSBuildProjectName.Contains('UnitTest'))</IsTestProject>
2935
<IsLibraryProject>$(MSBuildProjectName.Contains('XF.Material'))</IsLibraryProject>
@@ -62,7 +68,7 @@
6268

6369
<ItemGroup Condition="'$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false' and '$(IsLibraryProject)' == 'true'">
6470
<PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" />
65-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
71+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
6672
</ItemGroup>
6773

6874
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -85,19 +91,15 @@
8591
</ItemGroup>
8692

8793
<ItemGroup>
88-
<PackageReference Include="Roslynator.Analyzers" Version="3.0.0">
89-
<PrivateAssets>all</PrivateAssets>
90-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
91-
</PackageReference>
92-
<PackageReference Include="AsyncFixer" Version="1.3.0">
94+
<PackageReference Include="Roslynator.Analyzers" Version="4.0.2">
9395
<PrivateAssets>all</PrivateAssets>
9496
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
9597
</PackageReference>
96-
<PackageReference Include="IDisposableAnalyzers" Version="3.4.6">
98+
<PackageReference Include="AsyncFixer" Version="1.5.1">
9799
<PrivateAssets>all</PrivateAssets>
98100
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
99101
</PackageReference>
100-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2">
102+
<PackageReference Include="IDisposableAnalyzers" Version="4.0.1">
101103
<PrivateAssets>all</PrivateAssets>
102104
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
103105
</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>

‎Samples/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<NeutralLanguage>en</NeutralLanguage>
88
<Version>1.0.0</Version>
99

10-
<LangVersion>8.0</LangVersion>
10+
<LangVersion>10.0</LangVersion>
1111
<NoWarn>$(NoWarn);1591;1701;1702;1705;VSX1000;NU1603</NoWarn>
1212

1313
<Platform>AnyCPU</Platform>

‎Samples/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>

‎Samples/MaterialMvvmSample.Android/MaterialMvvmSample.Android.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<Version>6.0.1</Version>
6161
</PackageReference>
6262
<PackageReference Include="Rg.Plugins.Popup">
63-
<Version>2.0.0.11</Version>
63+
<Version>2.1.0</Version>
6464
</PackageReference>
6565
</ItemGroup>
6666
<ItemGroup>

‎Samples/MaterialMvvmSample.Core/MaterialMvvmSample.Core.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<ItemGroup>
1313
<PackageReference Include="Autofac" Version="6.1.0" />
1414
<PackageReference Include="Autofac.Extras.CommonServiceLocator" Version="6.0.1" />
15-
<PackageReference Include="Xamarin.Forms" Version="4.5.0.657" />
15+
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2012" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎Samples/MaterialMvvmSample.Uwp/MaterialMvvmSample.Uwp.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,13 +152,13 @@
152152
</ItemGroup>
153153
<ItemGroup>
154154
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
155-
<Version>6.2.11</Version>
155+
<Version>6.2.12</Version>
156156
</PackageReference>
157157
<PackageReference Include="Rg.Plugins.Popup">
158-
<Version>2.0.0.11</Version>
158+
<Version>2.1.0</Version>
159159
</PackageReference>
160160
<PackageReference Include="Xamarin.Forms">
161-
<Version>4.5.0.657</Version>
161+
<Version>5.0.0.2012</Version>
162162
</PackageReference>
163163
</ItemGroup>
164164
<ItemGroup>

‎Samples/MaterialMvvmSample.iOS/MaterialMvvmSample.iOS.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
<Version>6.0.1</Version>
183183
</PackageReference>
184184
<PackageReference Include="Rg.Plugins.Popup">
185-
<Version>2.0.0.11</Version>
185+
<Version>2.1.0</Version>
186186
</PackageReference>
187187
</ItemGroup>
188188
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />

‎Samples/MaterialMvvmSample/MaterialMvvmSample.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<PackageReference Include="Autofac" Version="6.1.0" />
1818
<PackageReference Include="Autofac.Extras.CommonServiceLocator" Version="6.0.1" />
1919
<PackageReference Include="Vapolia.Xamarin.Svg.Forms" Version="4.0.0-pre7" />
20-
<PackageReference Include="Xamarin.Forms" Version="4.5.0.657" />
21-
<PackageReference Include="Rg.Plugins.Popup" Version="2.0.0.11" />
20+
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2012" />
21+
<PackageReference Include="Rg.Plugins.Popup" Version="2.1.0" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎XF.Material/Platforms/Uap/Renderers/DropShadowViewRenderer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ private void UpdateCornerRadius()
7373

7474
private void UpdateSurfaceColor()
7575
{
76-
_rectangle.Fill = new SolidColorBrush(Element.SurfaceColor.ToWindowsColor());
76+
_rectangle.Fill = new Windows.UI.Xaml.Media.SolidColorBrush(Element.SurfaceColor.ToWindowsColor());
7777
}
7878

7979
private void UpdateElevation()

0 commit comments

Comments
 (0)