From 4ad38d244723a1a6ad037d641fb16c963387a43c Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Thu, 27 Apr 2023 17:41:14 +0600
Subject: [PATCH] Remove ModuleInitializer duplicates

---
 src/Avalonia.Base/Avalonia.Base.csproj        |  1 +
 src/Avalonia.Native/Avalonia.Native.csproj    |  4 ---
 .../Avalonia.Browser/webapp/package-lock.json | 27 +++++++++++++++++++
 src/Directory.Build.props                     |  6 -----
 .../Avalonia.Win32/Avalonia.Win32.csproj      |  1 -
 5 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj
index 639c27bf03..eafff3b780 100644
--- a/src/Avalonia.Base/Avalonia.Base.csproj
+++ b/src/Avalonia.Base/Avalonia.Base.csproj
@@ -22,6 +22,7 @@
   <Import Project="..\..\build\SourceGenerators.props" />
   <ItemGroup>
     <Compile Include="..\Shared\IsExternalInit.cs" Link="IsExternalInit.cs" />
+    <Compile Include="..\Shared\ModuleInitializer.cs" Link="ModuleInitializer.cs" />
     <Compile Include="..\Shared\StringCompatibilityExtensions.cs" Link="Compatibility\StringCompatibilityExtensions.cs" />
   </ItemGroup>
 
diff --git a/src/Avalonia.Native/Avalonia.Native.csproj b/src/Avalonia.Native/Avalonia.Native.csproj
index 095662a538..e69c39a41e 100644
--- a/src/Avalonia.Native/Avalonia.Native.csproj
+++ b/src/Avalonia.Native/Avalonia.Native.csproj
@@ -26,8 +26,4 @@
 
   <Import Project="..\..\build\DevAnalyzers.props" />
   <Import Project="..\..\build\TrimmingEnable.props" />
-
-  <ItemGroup>
-    <Compile Remove="..\Shared\ModuleInitializer.cs" />
-  </ItemGroup>
 </Project>
diff --git a/src/Browser/Avalonia.Browser/webapp/package-lock.json b/src/Browser/Avalonia.Browser/webapp/package-lock.json
index 12757fd7a0..d72eab6183 100644
--- a/src/Browser/Avalonia.Browser/webapp/package-lock.json
+++ b/src/Browser/Avalonia.Browser/webapp/package-lock.json
@@ -724,6 +724,30 @@
       "integrity": "sha512-OnYr1rkMVxtmMHIAKZLMcEUlJmqcbxBz9QoBU8G9v455na0fuzlT/GLu6l+SRghrk0Mm2fSSciMmzV43Q8e0Gg==",
       "dev": true,
       "hasInstallScript": true,
+      "dependencies": {
+        "@esbuild/android-arm": "0.15.9",
+        "@esbuild/linux-loong64": "0.15.9",
+        "esbuild-android-64": "0.15.9",
+        "esbuild-android-arm64": "0.15.9",
+        "esbuild-darwin-64": "0.15.9",
+        "esbuild-darwin-arm64": "0.15.9",
+        "esbuild-freebsd-64": "0.15.9",
+        "esbuild-freebsd-arm64": "0.15.9",
+        "esbuild-linux-32": "0.15.9",
+        "esbuild-linux-64": "0.15.9",
+        "esbuild-linux-arm": "0.15.9",
+        "esbuild-linux-arm64": "0.15.9",
+        "esbuild-linux-mips64le": "0.15.9",
+        "esbuild-linux-ppc64le": "0.15.9",
+        "esbuild-linux-riscv64": "0.15.9",
+        "esbuild-linux-s390x": "0.15.9",
+        "esbuild-netbsd-64": "0.15.9",
+        "esbuild-openbsd-64": "0.15.9",
+        "esbuild-sunos-64": "0.15.9",
+        "esbuild-windows-32": "0.15.9",
+        "esbuild-windows-64": "0.15.9",
+        "esbuild-windows-arm64": "0.15.9"
+      },
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -2322,6 +2346,9 @@
         }
       ],
       "license": "MIT",
+      "dependencies": {
+        "fetch-blob": "^3.2.0"
+      },
       "engines": {
         "node": ">=14.8.0"
       },
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 55a1014188..9fea11b88f 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -3,10 +3,4 @@
   <Import Project="..\build\SharedVersion.props" />
   <Import Project="..\build\SourceLink.props" Condition="'$(DisableSourceLink)' == ''" />
   <Import Project="..\build\NetAnalyzers.props"/>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)\Shared\ModuleInitializer.cs" >
-       <Link>Shared\_ModuleInitializer.cs</Link>
-       <Visible>false</Visible>
-    </Compile>
-  </ItemGroup>
 </Project>
diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
index 92ebbd57b8..089361e02f 100644
--- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
+++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
@@ -20,7 +20,6 @@
   <Import Project="..\..\..\build\DevAnalyzers.props" />
   <Import Project="..\..\..\build\SourceGenerators.props" />
   <ItemGroup>
-    <Compile Remove="..\..\Shared\ModuleInitializer.cs" />
     <Compile Remove="..\..\Shared\SourceGeneratorAttributes.cs" />
   </ItemGroup>
   <Import Project="..\..\..\build\TrimmingEnable.props" />