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.

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

Synthesize assembly names by default for ilproj-based tests #108997

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -286,13 +286,13 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0372b5080a4aec8d73d6861ad4b993d9d0fe3a11</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-alpha.1.24504.10">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-alpha.1.24517.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0372b5080a4aec8d73d6861ad4b993d9d0fe3a11</Sha>
<Sha>2830cf5d4b6c7853c6f187b8646ee7cfda7a9ae7</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-alpha.1.24504.10">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-alpha.1.24517.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0372b5080a4aec8d73d6861ad4b993d9d0fe3a11</Sha>
<Sha>2830cf5d4b6c7853c6f187b8646ee7cfda7a9ae7</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.0-alpha.1.24504.10">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-alpha.1.24504.10</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftExtensionsDependencyModelVersion>6.0.0</MicrosoftExtensionsDependencyModelVersion>
<!-- ILAsm dependencies -->
<MicrosoftNETCoreILAsmVersion>10.0.0-alpha.1.24504.10</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILAsmVersion>10.0.0-alpha.1.24517.1</MicrosoftNETCoreILAsmVersion>
<!-- Libraries dependencies -->
<MicrosoftBclAsyncInterfacesVersion>6.0.0</MicrosoftBclAsyncInterfacesVersion>
<MicrosoftBclHashCodeVersion>1.1.1</MicrosoftBclHashCodeVersion>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24511.1",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.24504.10"
"Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.24517.1"
}
}
9 changes: 9 additions & 0 deletions src/tests/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@
<RestorePackages>false</RestorePackages>
</PropertyGroup>

<!-- Most IL tests do not depend on having a specific assembly name, but some of them contain
hard-coded assembly name directives which are incorrect. This MSBuild property default configures ilasm
to override the assembly name directive when assembling so that it matches the output dll name,
which fixes a variety of failures in crossgen r2r tests (from not being able to find dlls for references).
-->
<PropertyGroup>
<SynthesizeIlasmAssemblyName>true</SynthesizeIlasmAssemblyName>
</PropertyGroup>

<!-- Which tests shall we build? Default: Priority 0 tests.
At the command-line, the user can specify /p:CLRTestPriorityToBuild=666 (for example), and
all tests with CLRTestPriority 666,..., 1 AND 0 will build.
Expand Down
9 changes: 9 additions & 0 deletions src/tests/JIT/jit64/mcc/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />

<PropertyGroup>
<!-- FIXME: some of the mcc tests fail on windows checked unless we do this -->
<SynthesizeIlasmAssemblyName>false</SynthesizeIlasmAssemblyName>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<PropertyGroup>
<!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
<RequiresProcessIsolation>true</RequiresProcessIsolation>
<SynthesizeIlasmAssemblyName>false</SynthesizeIlasmAssemblyName>
</PropertyGroup>
<PropertyGroup>
<DebugType>Full</DebugType>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<PropertyGroup>
<!-- Needed for mechanical merging of all remaining tests, this particular project may not actually need process isolation -->
<RequiresProcessIsolation>true</RequiresProcessIsolation>
<SynthesizeIlasmAssemblyName>false</SynthesizeIlasmAssemblyName>
</PropertyGroup>
<ItemGroup>
<Compile Include="svm_diamondshape.il" />
Expand Down
1 change: 0 additions & 1 deletion src/tests/baseservices/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@
<RunAnalyzers>true</RunAnalyzers>
<NoWarn>$(NoWarn);xUnit1013</NoWarn>
<EnableNETAnalyzers>false</EnableNETAnalyzers>
<SynthesizeIlasmAssemblyName>true</SynthesizeIlasmAssemblyName>
</PropertyGroup>
</Project>
Loading