From 18330caa105581623bc19457413b288103a81edb Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Sat, 17 Sep 2022 12:18:29 +0200
Subject: [PATCH] fix: warning CS0436: The type 'ModuleInitializerAttribute' in
 './src/Shared/ModuleInitializer.cs' conflicts with the imported type
 'ModuleInitializerAttribute' in 'Avalonia.Base'.

---
 src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj | 3 ---
 src/Shared/ModuleInitializer.cs                      | 2 +-
 src/Windows/Avalonia.Win32/Avalonia.Win32.csproj     | 3 +++
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
index d719135a7f..b16ee84b4d 100644
--- a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
+++ b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
@@ -9,9 +9,6 @@
       <DependentUpon>%(Filename)</DependentUpon>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Avalonia.Base\Metadata\NullableAttributes.cs" Link="NullableAttributes.cs" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Controls.ColorPicker\Avalonia.Controls.ColorPicker.csproj" />
     <ProjectReference Include="..\Avalonia.Controls.DataGrid\Avalonia.Controls.DataGrid.csproj" />
diff --git a/src/Shared/ModuleInitializer.cs b/src/Shared/ModuleInitializer.cs
index b5bb31ed81..a72929e06f 100644
--- a/src/Shared/ModuleInitializer.cs
+++ b/src/Shared/ModuleInitializer.cs
@@ -1,6 +1,6 @@
 namespace System.Runtime.CompilerServices
 {
-#if !NET5_0_OR_GREATER
+#if NETSTANDARD2_0
     internal class ModuleInitializerAttribute : Attribute
     {
 
diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
index 55d02b5d31..1d265369fd 100644
--- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
+++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
@@ -16,6 +16,9 @@
     <MicroComIdl Include="WinRT\winrt.idl" CSharpInteropPath="WinRT\WinRT.Generated.cs" />
     <MicroComIdl Include="Win32Com\win32.idl" CSharpInteropPath="Win32Com\Win32.Generated.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Remove="..\..\Shared\ModuleInitializer.cs" />
+  </ItemGroup>
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\build\System.Drawing.Common.props" />
   <Import Project="..\..\..\build\DevAnalyzers.props" />
   <PropertyGroup Label="Warnings">