Skip to content

Commit fcc3e9f

Browse files
committed
Use coreroot in CrossgenFramework target
1 parent 6481ee4 commit fcc3e9f

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

src/tests/build.proj

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -651,10 +651,6 @@
651651
Condition="'$(__BuildTestWrappersOnly)' != '1' and '$(__CopyNativeTestBinaries)' != '1' and '$(__TestBuildMode)' == 'crossgen2' and !$(MonoAot) and !$(MonoFullAot)" >
652652

653653
<PropertyGroup>
654-
<CrossgenDir>$(__BinDir)\$(BuildArchitecture)</CrossgenDir>
655-
<Crossgen2Path>$(CrossgenDir)\crossgen2\tools\crossgen2</Crossgen2Path>
656-
<Crossgen2Path Condition="'$(TargetOS)' == 'windows'">$(Crossgen2Path).exe</Crossgen2Path>
657-
658654
<CrossgenOutputDir>$(__TestIntermediatesDir)\crossgen.out</CrossgenOutputDir>
659655

660656
<CrossgenCmd>$(DotNetCli)</CrossgenCmd>
@@ -674,7 +670,7 @@
674670
<CrossgenCmd Condition="'$(__CompositeBuildMode)' == ''">$(CrossgenCmd) --crossgen2-parallelism 1</CrossgenCmd>
675671

676672
<CrossgenCmd>$(CrossgenCmd) --verify-type-and-field-layout</CrossgenCmd>
677-
<CrossgenCmd>$(CrossgenCmd) --crossgen2-path "$(Crossgen2Path)"</CrossgenCmd>
673+
<CrossgenCmd>$(CrossgenCmd) --crossgen2-path "$(CORE_ROOT)\crossgen2\crossgen2$(ExeSuffix)"</CrossgenCmd>
678674
</PropertyGroup>
679675

680676
<Message Importance="High" Text="$(MsgPrefix)Compiling framework using Crossgen2: $(CrossgenCmd)" />

0 commit comments

Comments
 (0)