Browse Source

Remove ModuleInitializer duplicates

fixes/clear-batch-object-pool-sooner
Nikita Tsukanov 3 years ago
parent
commit
4ad38d2447
  1. 1
      src/Avalonia.Base/Avalonia.Base.csproj
  2. 4
      src/Avalonia.Native/Avalonia.Native.csproj
  3. 27
      src/Browser/Avalonia.Browser/webapp/package-lock.json
  4. 6
      src/Directory.Build.props
  5. 1
      src/Windows/Avalonia.Win32/Avalonia.Win32.csproj

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

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

27
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"
},

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

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

Loading…
Cancel
Save