Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable networking in XML resolver in AOT compilers #89489

Merged
merged 1 commit into from
Jul 27, 2023
+19 −7
Merged

Disable networking in XML resolver in AOT compilers #89489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/coreclr/tools/aot/AotCompilerCommon.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<Project>
<PropertyGroup>
<ServerGarbageCollection>true</ServerGarbageCollection>
<TieredCompilation>false</TieredCompilation>
<EventSourceSupport>true</EventSourceSupport>
<OptimizationPreference>Speed</OptimizationPreference>
</PropertyGroup>

<ItemGroup>
<!-- Replace this line with the documented property once https://github.com/dotnet/runtime/issues/83495 is fixed -->
<RuntimeHostConfigurationOption Include="System.Xml.XmlResolver.IsNetworkingEnabledByDefault"
Value="false"
Trim="true" />
</ItemGroup>
</Project>
6 changes: 2 additions & 4 deletions src/coreclr/tools/aot/ILCompiler/ILCompiler.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,10 @@
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
<Configurations>Debug;Release;Checked</Configurations>
<ServerGarbageCollection>true</ServerGarbageCollection>
<TieredCompilation>false</TieredCompilation>
<EventSourceSupport>true</EventSourceSupport>
<OptimizationPreference>Speed</OptimizationPreference>
</PropertyGroup>

<Import Project="../AotCompilerCommon.props" />

<PropertyGroup>
<SelfContained>true</SelfContained>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
Expand Down
5 changes: 2 additions & 3 deletions src/coreclr/tools/aot/crossgen2/crossgen2.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
<Configurations>Debug;Release;Checked</Configurations>
<ServerGarbageCollection>true</ServerGarbageCollection>
<EventSourceSupport>true</EventSourceSupport>
<OptimizationPreference>Speed</OptimizationPreference>
<RunAnalyzers>false</RunAnalyzers>
</PropertyGroup>

<Import Project="../AotCompilerCommon.props" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it OK that crossgen2 is now using <TieredCompilation>false</TieredCompilation> when it wasn't before?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't ship this way (it ships on top of NativeAOT), but this affects inner loop. Disabling tiering is going to be a improvement for inner loop: #83112


<ItemGroup Label="Embedded Resources">
<EmbeddedResource Include="Properties\Resources.resx">
<GenerateSource>true</GenerateSource>
Expand Down