Move nullable to root Directory.Build.props

sweep3r · Nov 19, 2023 · dea5406 · dea5406
1 parent 9ae2214
commit dea5406
Show file tree

Hide file tree

Showing 19 changed files with 2 additions and 25 deletions.
diff --git a/Benchmarks/Mapsui.Rendering.Benchmarks/Mapsui.Rendering.Benchmarks.csproj b/Benchmarks/Mapsui.Rendering.Benchmarks/Mapsui.Rendering.Benchmarks.csproj
@@ -4,7 +4,6 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -17,6 +17,7 @@
     <IsPackable>false</IsPackable> <!--Default to not packable and override in projects that do need to be packed.-->
     <!--Disable Run Api Compat Task causes Build failure on github actions with visual studio 2022 17.5 and .net Compilers Toolset 4.6-->
     <RunApiCompat>false</RunApiCompat>
+	<Nullable>enable</Nullable>
   </PropertyGroup>
 
 	<!--Package Icon Include -->
@@ -30,7 +31,6 @@
 	  <CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
 	  <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
 	  <LangVersion>11.0</LangVersion>
-	  <Nullable>enable</Nullable>
       <NoWarn>$(NoWarn);NU1008;NU1701</NoWarn>
       <!-- Enable Windows Targeting on non Windows platforms -->
       <EnableWindowsTargeting Condition="'$(OS)' != 'Windows_NT'">true</EnableWindowsTargeting>

diff --git a/Mapsui.Nts/GeometryFeature.cs b/Mapsui.Nts/GeometryFeature.cs
@@ -35,7 +35,7 @@ public GeometryFeature(Geometry? geometry)
 
     public Geometry? Geometry { get; set; }
 
-    public MRect? Extent => Geometry?.EnvelopeInternal.ToMRect(); // Todo: Make not-nullable
+    public MRect? Extent => Geometry?.EnvelopeInternal.ToMRect();
 
     public override void Dispose()
     {

diff --git a/Mapsui.UI.Android/MapControl.cs b/Mapsui.UI.Android/MapControl.cs
@@ -9,8 +9,6 @@
 using SkiaSharp.Views.Android;
 using Math = System.Math;
 
-#nullable enable
-
 namespace Mapsui.UI.Android;
 
 public enum SkiaRenderMode

diff --git a/Mapsui.UI.Blazor/Mapsui.UI.Blazor.csproj b/Mapsui.UI.Blazor/Mapsui.UI.Blazor.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
-    <Nullable>enable</Nullable>
 	  <ImplicitUsings>enable</ImplicitUsings>
     <EnableNETAnalyzers>True</EnableNETAnalyzers>
     <DefineConstants>__BLAZOR__</DefineConstants>

diff --git a/Mapsui.UI.Eto/Mapsui.UI.Eto.csproj b/Mapsui.UI.Eto/Mapsui.UI.Eto.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Nullable>enable</Nullable>
     <EnableNETAnalyzers>True</EnableNETAnalyzers>
     <DefineConstants>__ETO_FORMS__</DefineConstants>
     <PackageId>Mapsui.Eto</PackageId>

diff --git a/Mapsui.UI.Shared/MapControl.cs b/Mapsui.UI.Shared/MapControl.cs
@@ -16,7 +16,6 @@
 using Mapsui.Utilities;
 using Mapsui.Widgets;
 
-#nullable enable
 #pragma warning disable IDISP008 // Don't assign member with injected and created disposables
 #pragma warning disable IDISP001 // Dispose created.
 #pragma warning disable IDISP002 // Dispose member.

diff --git a/Mapsui.UI.WinUI/MapControl.cs b/Mapsui.UI.WinUI/MapControl.cs
@@ -7,8 +7,6 @@
 #pragma warning disable IDISP001 // Dispose created.
 #pragma warning disable IDISP002 // Dispose member.
 
-#nullable enable
-
 using System;
 using System.Threading.Tasks;
 using Windows.Devices.Sensors;

diff --git a/Mapsui.UI.iOS/MapControl.cs b/Mapsui.UI.iOS/MapControl.cs
@@ -5,8 +5,6 @@
 using Mapsui.Utilities;
 using SkiaSharp.Views.iOS;
 
-#nullable enable
-
 namespace Mapsui.UI.iOS;
 
 [Register("MapControl"), DesignTimeVisible(true)]

diff --git a/Samples/Avalonia/Directory.Build.props b/Samples/Avalonia/Directory.Build.props
@@ -1,6 +1,5 @@
 <Project>
   <PropertyGroup>
-    <Nullable>enable</Nullable>
     <AvaloniaVersion>11.0.0</AvaloniaVersion>
 	<IsPackable>false</IsPackable> <!--Default to not packable and override in projects that do need to be packed.-->
   </PropertyGroup>

diff --git a/Samples/Avalonia/Mapsui.Samples.Avalonia.Android/Mapsui.Samples.Avalonia.Android.csproj b/Samples/Avalonia/Mapsui.Samples.Avalonia.Android/Mapsui.Samples.Avalonia.Android.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0-android</TargetFramework>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
-    <Nullable>enable</Nullable>
     <ApplicationId>com.CompanyName.Mapsui.Samples.Avalonia</ApplicationId>
     <ApplicationVersion>1</ApplicationVersion>
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>

diff --git a/Samples/Avalonia/Mapsui.Samples.Avalonia.Desktop/Mapsui.Samples.Avalonia.Desktop.csproj b/Samples/Avalonia/Mapsui.Samples.Avalonia.Desktop/Mapsui.Samples.Avalonia.Desktop.csproj
@@ -4,7 +4,6 @@
     <!--If you are willing to use Windows/MacOS native APIs you will need to create 3 projects.
     One for Windows with net7.0-windows TFM, one for MacOS with net7.0-macos and one with net7.0 TFM for Linux.-->
     <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
   </PropertyGroup>
 

diff --git a/Samples/Avalonia/Mapsui.Samples.Avalonia.iOS/Mapsui.Samples.Avalonia.iOS.csproj b/Samples/Avalonia/Mapsui.Samples.Avalonia.iOS/Mapsui.Samples.Avalonia.iOS.csproj
@@ -3,7 +3,6 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0-ios</TargetFramework>
     <SupportedOSPlatformVersion>13.0</SupportedOSPlatformVersion>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Samples/Avalonia/Mapsui.Samples.Avalonia/Mapsui.Samples.Avalonia.csproj b/Samples/Avalonia/Mapsui.Samples.Avalonia/Mapsui.Samples.Avalonia.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
   </PropertyGroup>

diff --git a/Samples/Mapsui.Samples.Blazor/Mapsui.Samples.Blazor.csproj b/Samples/Mapsui.Samples.Blazor/Mapsui.Samples.Blazor.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/Samples/Mapsui.Samples.Droid/MainActivity.cs b/Samples/Mapsui.Samples.Droid/MainActivity.cs
@@ -1,7 +1,3 @@
-
-
-#nullable enable
-
 using System;
 using System.IO;
 using System.Linq;

diff --git a/Samples/Mapsui.Samples.Droid/Mapsui.Samples.Droid.csproj b/Samples/Mapsui.Samples.Droid/Mapsui.Samples.Droid.csproj
@@ -5,7 +5,6 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <ApplicationId>com.companyname.MapsuiSamples</ApplicationId>
     <OutputType>Exe</OutputType>
-    <Nullable>enable</Nullable>
     <ApplicationVersion>1</ApplicationVersion>
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
   </PropertyGroup>

diff --git a/Samples/Mapsui.Samples.Uno.WinUI/Directory.Build.props b/Samples/Mapsui.Samples.Uno.WinUI/Directory.Build.props
@@ -5,7 +5,6 @@
 	<PropertyGroup>
 		<LangVersion>11</LangVersion>
 		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
 
 		<DebugType>portable</DebugType>
 		<DebugSymbols>True</DebugSymbols>

diff --git a/Samples/Mapsui.Samples.iOS/Mapsui.Samples.iOS.csproj b/Samples/Mapsui.Samples.iOS/Mapsui.Samples.iOS.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <TargetFramework>net8.0-ios</TargetFramework>
     <OutputType>Exe</OutputType>
-    <Nullable>enable</Nullable>
     <ImplicitUsings>true</ImplicitUsings>
     <OptimizePNGs>False</OptimizePNGs>
     <MtouchUseLlvm>False</MtouchUseLlvm>