Merge remote-tracking branch 'origin/master' into features/blazorless-wasm

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" />

src/Shared/ModuleInitializer.cs

@@ -1,6 +1,6 @@
 namespace System.Runtime.CompilerServices
 {
-#if !NET5_0_OR_GREATER
+#if NETSTANDARD2_0
     internal class ModuleInitializerAttribute : Attribute
     {
 

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">