未验证 提交 93957c6d 编写于 作者: T Tomáš Rylek 提交者: GitHub

Deduplicate project files with the same name in different folders (#64841)

This is a somewhat annoying aspect hitting less than 10% of the
JIT/Methodical subtree: as the new merged wrapper logic is based
on simple assembly names, we cannot merge multiple test projects
that produce a test assembly with the same name otherwise such
assemblies stomp over each other when getting copied to the merged
wrapper folder. I have added a new option to ILTransform to include
the directory name in the project names in these cases. We can
remove some of this in the future when selectively merging actual
test source code (compiling multiple tests into a single asssembly).

Thanks

Tomas
上级 5978738b
......@@ -8,7 +8,7 @@
}
.assembly extern mscorlib { }
.assembly 'localloc' { }
.assembly 'localloc_boxunbox' { }
.assembly extern xunit.core {}
.namespace JitTest
{
......
......@@ -5,7 +5,7 @@
.assembly extern System.Console { auto }
.assembly extern mscorlib { auto }
.assembly 'tailcall' { }
.assembly 'tailcall_boxunbox' { }
.assembly extern xunit.core {}
.namespace JitTest
{
......
......@@ -8,7 +8,7 @@
}
.assembly extern mscorlib { }
.assembly 'try' { }
.assembly 'try_boxunbox' { }
.assembly extern xunit.core {}
.namespace JitTest
{
......
......@@ -8,7 +8,7 @@
}
.assembly extern mscorlib { }
.assembly 'filter' { }
.assembly 'filter_seh_Boxing' { }
.assembly extern xunit.core {}
.namespace SinCalc
{
......
......@@ -8,7 +8,7 @@
}
.assembly extern mscorlib { }
.assembly 'try' { }
.assembly 'try_seh' { }
.assembly extern xunit.core {}
.namespace SinCalc
{
......
......@@ -7,7 +7,7 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly 'filter' { }
.assembly 'filter_SEH_casts' { }
.method public static int32 main() cil managed
{
.maxstack 8
......
......@@ -10,6 +10,6 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="assemname.cs" />
<ProjectReference Include="testlib.csproj" />
<ProjectReference Include="testlib_misc.csproj" />
</ItemGroup>
</Project>
......@@ -10,6 +10,6 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="assemname.cs" />
<ProjectReference Include="testlib.csproj" />
<ProjectReference Include="testlib_misc.csproj" />
</ItemGroup>
</Project>
......@@ -10,6 +10,6 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="assemname.cs" />
<ProjectReference Include="testlib.csproj" />
<ProjectReference Include="testlib_misc.csproj" />
</ItemGroup>
</Project>
......@@ -10,6 +10,6 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="assemname.cs" />
<ProjectReference Include="testlib.csproj" />
<ProjectReference Include="testlib_misc.csproj" />
</ItemGroup>
</Project>
......@@ -11,6 +11,6 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="threads1.cs" />
<ProjectReference Include="testlib.csproj" />
<ProjectReference Include="testlib_misc.csproj" />
</ItemGroup>
</Project>
......@@ -10,6 +10,6 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="threads1.cs" />
<ProjectReference Include="testlib.csproj" />
<ProjectReference Include="testlib_misc.csproj" />
</ItemGroup>
</Project>
......@@ -11,6 +11,6 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="threads1.cs" />
<ProjectReference Include="testlib.csproj" />
<ProjectReference Include="testlib_misc.csproj" />
</ItemGroup>
</Project>
......@@ -11,6 +11,6 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="threads1.cs" />
<ProjectReference Include="testlib.csproj" />
<ProjectReference Include="testlib_misc.csproj" />
</ItemGroup>
</Project>
......@@ -11,6 +11,6 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="threads2.cs" />
<ProjectReference Include="testlib.csproj" />
<ProjectReference Include="testlib_misc.csproj" />
</ItemGroup>
</Project>
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册