Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 62835af

Browse files
am11am11
authored
Copy published crossgen2 in artifacts/tests (dotnet#80154)
1 parent 205adae commit 62835af

File tree

13 files changed

+98
-79
lines changed

13 files changed

+98
-79
lines changed

‎eng/pipelines/common/templates/runtimes/run-test-job.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ jobs:
244244
# Compose the Core_Root folder containing all artifacts needed for running
245245
# CoreCLR tests. This step also compiles the framework using Crossgen2
246246
# in ReadyToRun jobs.
247-
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) generatelayoutonly $(logRootNameArg)Layout $(runtimeFlavorArgs) $(crossgenArg) $(buildConfig) $(archType) $(crossArg) $(priorityArg) $(librariesOverrideArg) $(runtimeVariantArg)
247+
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) generatelayoutonly $(logRootNameArg)Layout $(runtimeFlavorArgs) $(crossgenArg) $(buildConfig) $(archType) $(crossArg) $(priorityArg) $(librariesOverrideArg) $(runtimeVariantArg) -ci
248248
displayName: Generate CORE_ROOT
249249

250250
# Build a Mono LLVM AOT cross-compiler for non-amd64 targets (in this case, just arm64)

‎src/coreclr/scripts/superpmi.py‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -693,14 +693,6 @@ def __init__(self, coreclr_args):
693693
self.pmi_location = determine_pmi_location(coreclr_args)
694694
self.corerun = os.path.join(self.core_root, self.corerun_tool_name)
695695

696-
if coreclr_args.crossgen2:
697-
self.corerun = os.path.join(self.core_root, self.corerun_tool_name)
698-
if coreclr_args.dotnet_tool_path is None:
699-
self.crossgen2_driver_tool = self.corerun
700-
else:
701-
self.crossgen2_driver_tool = coreclr_args.dotnet_tool_path
702-
logging.debug("Using crossgen2 driver tool %s", self.crossgen2_driver_tool)
703-
704696
if coreclr_args.pmi or coreclr_args.crossgen2:
705697
self.assemblies = coreclr_args.assemblies
706698
self.exclude = coreclr_args.exclude
@@ -1066,7 +1058,7 @@ async def run_crossgen2(print_prefix, assembly, self):
10661058
#
10671059
# invoke with:
10681060
#
1069-
# dotnet <Core_Root>\crossgen2\crossgen2.dll @<temp.rsp>
1061+
# <Core_Root>\crossgen2\crossgen2.exe @<temp.rsp>
10701062
#
10711063
# where "dotnet" is one of:
10721064
# 1. <runtime_root>\dotnet.cmd/sh
@@ -1089,7 +1081,7 @@ async def run_crossgen2(print_prefix, assembly, self):
10891081
# Log what is in the response file
10901082
write_file_to_log(rsp_filepath)
10911083

1092-
command = [self.crossgen2_driver_tool, self.coreclr_args.crossgen2_tool_path, "@" + rsp_filepath]
1084+
command = [self.coreclr_args.crossgen2_tool_path, "@" + rsp_filepath]
10931085
command_string = " ".join(command)
10941086
logging.debug("%s%s", print_prefix, command_string)
10951087

@@ -4916,7 +4908,8 @@ def verify_base_diff_args():
49164908

49174909
if coreclr_args.crossgen2:
49184910
# Can we find crossgen2?
4919-
crossgen2_tool_name = "crossgen2.dll"
4911+
4912+
crossgen2_tool_name = "crossgen2.exe" if platform.system() == "Windows" else "crossgen2"
49204913
crossgen2_tool_path = os.path.abspath(os.path.join(coreclr_args.core_root, "crossgen2", crossgen2_tool_name))
49214914
if not os.path.exists(crossgen2_tool_path):
49224915
print("`--crossgen2` is specified, but couldn't find " + crossgen2_tool_path + ". (Is it built?)")

‎src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<Import Project="$(RepositoryEngineeringDir)codeOptimization.targets" />
3838

3939
<PropertyGroup Condition="'$(UseNativeAotForComponents)' == 'true'">
40+
<PublishAot>true</PublishAot>
4041
<IlcToolsPath>$(CoreCLRILCompilerDir)</IlcToolsPath>
4142
<IlcToolsPath Condition="'$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)' or '$(EnableNativeSanitizers)' != ''">$(CoreCLRCrossILCompilerDir)</IlcToolsPath>
4243
<SysRoot Condition="('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)') and '$(HostOS)' != 'windows'">$(ROOTFS_DIR)</SysRoot>

‎src/coreclr/tools/r2rtest/Crossgen2Runner.cs‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,19 @@ class Crossgen2RunnerOptions
2424
class Crossgen2Runner : CompilerRunner
2525
{
2626
private Crossgen2RunnerOptions Crossgen2RunnerOptions;
27-
public override CompilerIndex Index => CompilerIndex.CPAOT;
27+
private bool IsAssembly => _options.Crossgen2Path != null && _options.Crossgen2Path.FullName.EndsWith(".dll");
2828

29-
// Crossgen2 runs on top of corerun.
29+
// Crossgen2 runs as a standalone binary
3030
protected override string CompilerRelativePath => "";
31+
protected override string CompilerFileName => "";
32+
33+
protected override string CompilerPath => IsAssembly ? _options.DotNetCli : _options.Crossgen2Path?.FullName
34+
?? Path.Combine(_options.CoreRootDirectory.FullName, "crossgen2", RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "crossgen2.exe" : "crossgen2");
35+
36+
public override CompilerIndex Index => CompilerIndex.CPAOT;
3137

32-
protected override string CompilerFileName => _options.DotNetCli;
33-
protected readonly List<string> _referenceFiles = new List<string>();
38+
protected readonly List<string> _referenceFiles = new();
3439

35-
private string Crossgen2Path => _options.Crossgen2Path != null ? _options.Crossgen2Path.FullName : Path.Combine(_options.CoreRootDirectory.FullName, "crossgen2", "crossgen2.dll");
3640
private bool CompositeMode => Crossgen2RunnerOptions != null ? Crossgen2RunnerOptions.Composite : _options.Composite;
3741

3842
public Crossgen2Runner(BuildOptions options, Crossgen2RunnerOptions crossgen2RunnerOptions, IEnumerable<string> references, string overrideOutputPath = null)
@@ -64,7 +68,9 @@ public Crossgen2Runner(BuildOptions options, Crossgen2RunnerOptions crossgen2Run
6468
public override ProcessParameters CompilationProcess(string outputFileName, IEnumerable<string> inputAssemblyFileNames)
6569
{
6670
ProcessParameters processParameters = base.CompilationProcess(outputFileName, inputAssemblyFileNames);
67-
processParameters.Arguments = $"{Crossgen2Path} {processParameters.Arguments}";
71+
if (IsAssembly)
72+
processParameters.Arguments = $"{_options.Crossgen2Path.FullName} {processParameters.Arguments}";
73+
6874
// DOTNET_ variables
6975
processParameters.EnvironmentOverrides["DOTNET_GCStress"] = "";
7076
processParameters.EnvironmentOverrides["DOTNET_HeapVerify"] = "";
@@ -76,6 +82,7 @@ public override ProcessParameters CompilationProcess(string outputFileName, IEnu
7682
processParameters.EnvironmentOverrides["COMPlus_HeapVerify"] = "";
7783
processParameters.EnvironmentOverrides["COMPlus_ReadyToRun"] = "";
7884
processParameters.EnvironmentOverrides["COMPlus_GCName"] = "";
85+
7986
return processParameters;
8087
}
8188

‎src/tests/Common/CLRTest.CrossGen.targets‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,16 +85,17 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then
8585
__ResponseFile="$__OutputFile.rsp"
8686
rm $__ResponseFile 2>/dev/null
8787
88-
__Command=$_DebuggerFullPath
88+
__R2RDumpCommand=$_DebuggerFullPath
8989
# Tests run locally need __TestDotNetCmd (set by runtest.py) or a compatible 5.0 dotnet runtime in the path
9090
if [ ! -z ${__TestDotNetCmd+x} ] %3B then
91-
__Command+=" $__TestDotNetCmd"
91+
__R2RDumpCommand+=" $__TestDotNetCmd"
9292
else
93-
__Command+=" dotnet"
93+
__R2RDumpCommand+=" dotnet"
9494
fi
95-
__R2RDumpCommand=$__Command" $CORE_ROOT/R2RDump/R2RDump.dll"
95+
__R2RDumpCommand+=" $CORE_ROOT/R2RDump/R2RDump.dll"
9696
__R2RDumpCommand+=" --header --sc --in $__OutputFile --out $__OutputFile.r2rdump --val"
97-
__Command+=" $CORE_ROOT/crossgen2/crossgen2.dll"
97+
98+
__Command="$_DebuggerFullPath $CORE_ROOT/crossgen2/crossgen2"
9899
__Command+=" @$__ResponseFile"
99100
__Command+=" $ExtraCrossGen2Args"
100101
@@ -247,11 +248,10 @@ if defined RunCrossGen2 (
247248
) else (
248249
set __DotNet="dotnet"
249250
)
250-
set __Command=!_DebuggerFullPath!
251-
set __Command=!__Command! !__DotNet!
252-
set __R2RDumpCommand=!__Command! "!CORE_ROOT!\r2rdump\r2rdump.dll"
251+
set __R2RDumpCommand=!_DebuggerFullPath! !__DotNet! "!CORE_ROOT!\r2rdump\r2rdump.dll"
253252
set __R2RDumpCommand=!__R2RDumpCommand! --header --sc --in !__OutputFile! --out !__OutputFile!.r2rdump --val
254-
set __Command=!__Command! "!CORE_ROOT!\crossgen2\crossgen2.dll"
253+
254+
set __Command=!_DebuggerFullPath! "!CORE_ROOT!\crossgen2\crossgen2.exe"
255255
set __Command=!__Command! @"!__ResponseFile!"
256256
set __Command=!__Command! !ExtraCrossGen2Args!
257257
echo !__InputFile!>>!__ResponseFile!

‎src/tests/Common/Directory.Build.targets‎

Lines changed: 44 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<CopyCoreDisToolsToCoreRoot Condition="$(GCStressDependsOnCoreDisTools) And '$(DotNetBuildSourceOnly)' != 'true'">true</CopyCoreDisToolsToCoreRoot>
1919
<!-- Non-desktop OS's use a custom dotnet host, instead of corerun -->
2020
<IsDesktopOS Condition="'$(TargetsBrowser)' != 'true' and '$(TargetsAndroid)' != 'true' and '$(TargetstvOS)' != 'true' and '$(TargetsiOS)' != 'true' and '$(TargetsMacCatalyst)' != 'true'">true</IsDesktopOS>
21+
<Crossgen2Supported Condition="'$(RuntimeFlavor)' == 'coreclr' and '$(TestBuildMode)' != 'nativeaot'">true</Crossgen2Supported>
2122
</PropertyGroup>
2223

2324
<Import Project="$(RepositoryEngineeringDir)coredistools.targets" Condition="$(CopyCoreDisToolsToCoreRoot)" />
@@ -34,7 +35,47 @@
3435
</ItemDefinitionGroup>
3536

3637
<Target Name="CopyDependencyToCoreRoot"
37-
DependsOnTargets="ResolveAssemblyReferences;ResolveRuntimeFilesFromLocalBuild">
38+
DependsOnTargets="ResolveAssemblyReferences;ResolveRuntimeFilesFromLocalBuild">
39+
40+
<!-- Copy apphost to crossgen2_publish directory.
41+
The default configuration between product and tests are flipped. When we build project like:
42+
`build -c debug -rc checked`, the corresponding test command is `src/tests/build -checked -p:LibrariesConfiguration=debug`,
43+
instead of `-debug -p:RuntimeConfiguration=checked`. That forces us to either pass the
44+
`HostConfiguration=debug` explicitly or fix this disparity; both of which will break the dev workflow.
45+
46+
As a workaround, we will first check if the directory pointed by `HostConfiguration` exists, then check
47+
`LibrariesConfiguration`.
48+
-->
49+
50+
<PropertyGroup Condition="'$(Crossgen2Supported)' == 'true'">
51+
<_targetOS>$(TargetOS)</_targetOS>
52+
<_targetOS Condition="'$(_targetOS)' == 'windows'">win</_targetOS>
53+
<_apphostPath Condition="Exists('$(ArtifactsBinDir)$(_targetOS)-$(TargetArchitecture).$(HostConfiguration)\corehost\apphost$(ExeSuffix)')">$(ArtifactsBinDir)$(_targetOS)-$(TargetArchitecture).$(HostConfiguration)\corehost\apphost$(ExeSuffix)</_apphostPath>
54+
<_apphostPath Condition="'$(_apphostPath)' == '' and Exists('$(ArtifactsBinDir)$(_targetOS)-$(TargetArchitecture).$(LibrariesConfiguration)\corehost\apphost$(ExeSuffix)')">$(ArtifactsBinDir)$(_targetOS)-$(TargetArchitecture).$(LibrariesConfiguration)\corehost\apphost$(ExeSuffix)</_apphostPath>
55+
<_toolsConfiguration Condition="Exists('$(ArtifactsBinDir)ILLink.Tasks\$(ToolsConfiguration)\$(NetCoreAppToolCurrent)\ILLink.Tasks.dll')">$(ToolsConfiguration)</_toolsConfiguration>
56+
<_toolsConfiguration Condition="Exists('$(ArtifactsBinDir)ILLink.Tasks\$(LibrariesConfiguration)\$(NetCoreAppToolCurrent)\ILLink.Tasks.dll')">$(LibrariesConfiguration)</_toolsConfiguration>
57+
</PropertyGroup>
58+
59+
<MakeDir Condition="'$(Crossgen2Supported)' == 'true'" Directories="$(ArtifactsObjDir)coreclr\crossgen2_publish\$(TargetOS).$(TargetArchitecture).$(RuntimeConfiguration)" />
60+
61+
<Copy
62+
SourceFiles="$(_apphostPath)"
63+
DestinationFiles="$(ArtifactsObjDir)coreclr\crossgen2_publish\$(TargetOS).$(TargetArchitecture).$(RuntimeConfiguration)\apphost$(ExeSuffix)"
64+
Condition="'$(Crossgen2Supported)' == 'true'" />
65+
66+
<!-- Publish crossgen2 on supported platforms. -->
67+
68+
<MSBuild Condition="'$(Crossgen2Supported)' == 'true'"
69+
Targets="Restore"
70+
BuildInParallel="true"
71+
Properties="NativeAotSupported=$(NativeAotSupported);UseNativeAotForComponents=$(UseNativeAotForComponents);ToolsConfiguration=$(_toolsConfiguration);MSBuildRestoreSessionId=$([System.Guid]::NewGuid());"
72+
Projects="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Crossgen2.sfxproj" />
73+
74+
<MSBuild Condition="'$(Crossgen2Supported)' == 'true'"
75+
Targets="PublishToDisk"
76+
BuildInParallel="true"
77+
Properties="NativeAotSupported=$(NativeAotSupported);UseNativeAotForComponents=$(UseNativeAotForComponents);ToolsConfiguration=$(_toolsConfiguration);OutputPath=$(CORE_ROOT)\crossgen2;"
78+
Projects="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Crossgen2.sfxproj" />
3879

3980
<ItemGroup>
4081
<RunTimeDependencyCopyLocal Include="@(RuntimeCopyLocalItems)" />
@@ -80,11 +121,6 @@
80121
<!-- Used by the Crossgen comparison job -->
81122
<RunTimeArtifactsIncludeFolders Include="IL/" TargetDir="IL/" />
82123

83-
<!-- Used for Crossgen2 R2R tests -->
84-
<RunTimeArtifactsIncludeFolders Include="crossgen2/" TargetDir="crossgen2/">
85-
<IncludeSubFolders>True</IncludeSubFolders>
86-
</RunTimeArtifactsIncludeFolders>
87-
88124
<!-- Used for NativeAOT tests -->
89125
<RunTimeArtifactsIncludeFolders Include="ilc-published/" TargetDir="ilc-published/">
90126
<IncludeSubFolders>True</IncludeSubFolders>
@@ -135,7 +171,7 @@
135171

136172
<RunTimeDependencyCopyLocal
137173
Condition="'%(RuntimeArtifactsIncludeFolders.IncludeSubFolders)' == 'True'"
138-
Include="$(CoreCLRArtifactsPath)%(RunTimeArtifactsIncludeFolders.Identity)**/*"
174+
Include="$(CoreCLRArtifactsPath)%(RunTimeArtifactsIncludeFolders.Identity)**\*"
139175
Exclude="@(RunTimeArtifactsExcludeFiles -> '$(CoreCLRArtifactsPath)%(Identity)')"
140176
TargetDir="%(RunTimeArtifactsIncludeFolders.TargetDir)" />
141177
</ItemGroup>
@@ -223,7 +259,7 @@
223259

224260
<Copy
225261
SourceFiles="@(RunTimeDependencyCopyLocal)"
226-
DestinationFiles="@(RunTimeDependencyCopyLocal -> '$(CORE_ROOT)/%(TargetDir)%(RecursiveDir)%(Filename)%(Extension)')"
262+
DestinationFiles="@(RunTimeDependencyCopyLocal -> '$(CORE_ROOT)\%(TargetDir)%(RecursiveDir)%(Filename)%(Extension)')"
227263
SkipUnchangedFiles="$(SkipCopyUnchangedFiles)"
228264
OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
229265
Retries="$(CopyRetryCount)"

‎src/tests/baseservices/TieredCompilation/BasicTestWithMcj.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ set "DOTNET_GCStress="
3535
set "DOTNET_HeapVerify="
3636
set "DOTNET_ReadyToRun="
3737
38-
"%CORE_ROOT%\corerun" %CORE_ROOT%\crossgen2\crossgen2.dll --out r2r\$(MSBuildProjectName).dll $(MSBuildProjectName).dll -r %CORE_ROOT%\*.dll
38+
"%CORE_ROOT%\crossgen2\crossgen2.exe" --out r2r\$(MSBuildProjectName).dll $(MSBuildProjectName).dll -r %CORE_ROOT%\*.dll
3939
4040
endlocal
4141
set CLRCustomTestLauncher=RunBasicTestWithMcj.cmd --runCustomTest
@@ -47,7 +47,7 @@ mkdir r2r
4747
# Suppress some DOTNET variables for the duration of Crossgen2 execution
4848
export -n DOTNET_GCName DOTNET_GCStress DOTNET_HeapVerify DOTNET_ReadyToRun
4949
50-
"$CORE_ROOT/corerun" $CORE_ROOT/crossgen2/crossgen2.dll --out r2r/$(MSBuildProjectName).dll $(MSBuildProjectName).dll -r $CORE_ROOT/*.dll
50+
"$CORE_ROOT/crossgen2/crossgen2" --out r2r/$(MSBuildProjectName).dll $(MSBuildProjectName).dll -r $CORE_ROOT/*.dll
5151
5252
export DOTNET_GCName DOTNET_GCStress DOTNET_HeapVerify DOTNET_ReadyToRun
5353
chmod +x ./RunBasicTestWithMcj.sh

‎src/tests/build.proj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -651,8 +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-
656654
<CrossgenOutputDir>$(__TestIntermediatesDir)\crossgen.out</CrossgenOutputDir>
657655

658656
<CrossgenCmd>$(DotNetCli)</CrossgenCmd>
@@ -672,7 +670,7 @@
672670
<CrossgenCmd Condition="'$(__CompositeBuildMode)' == ''">$(CrossgenCmd) --crossgen2-parallelism 1</CrossgenCmd>
673671

674672
<CrossgenCmd>$(CrossgenCmd) --verify-type-and-field-layout</CrossgenCmd>
675-
<CrossgenCmd>$(CrossgenCmd) --crossgen2-path "$(CrossgenDir)\crossgen2\tools\crossgen2.dll"</CrossgenCmd>
673+
<CrossgenCmd>$(CrossgenCmd) --crossgen2-path "$(__BinDir)\$(BuildArchitecture)\crossgen2\tools\crossgen2.dll"</CrossgenCmd>
676674
</PropertyGroup>
677675

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

‎src/tests/readytorun/crossboundarylayout/buildcrossgen2image.cmd‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,36 +48,36 @@ goto Loop
4848

4949
if "%COMPOSITENAME%"=="" goto done
5050

51-
set BUILDCMD=%TESTBATCHROOT%\..\..\..\..\..\..\.dotnet\dotnet %CORE_ROOT%\crossgen2\crossgen2.dll -r %CORE_ROOT%\* -r %TESTINITIALBINPATH%\*.dll -o %TESTINITIALBINPATH%\%TESTTARGET_DIR%\%COMPOSITENAME%Composite.dll --composite %COMPILEARG%
51+
set BUILDCMD=%CORE_ROOT%\crossgen2\crossgen2.exe -r %CORE_ROOT%\* -r %TESTINITIALBINPATH%\*.dll -o %TESTINITIALBINPATH%\%TESTTARGET_DIR%\%COMPOSITENAME%Composite.dll --composite %COMPILEARG%
5252
echo %BUILDCMD% > %TESTINITIALBINPATH%\%TESTTARGET_DIR%\%COMPOSITENAME%Composite.dll.log
5353
call %BUILDCMD% >> %TESTINITIALBINPATH%\%TESTTARGET_DIR%\%COMPOSITENAME%Composite.dll.log 2>&1
5454
if NOT EXIST %TESTINITIALBINPATH%\%TESTTARGET_DIR%\%COMPOSITENAME%Composite.dll del %TESTINITIALBINPATH%\%TESTTARGET_DIR%\a.dll
5555
goto done
5656

5757
:CG2Single
5858
del %TESTINITIALBINPATH%\%TESTTARGET_DIR%\%COMPOSITENAME%.dll
59-
set BUILDCMD=%TESTBATCHROOT%\..\..\..\..\..\..\.dotnet\dotnet %CORE_ROOT%\crossgen2\crossgen2.dll -r %CORE_ROOT%\* -r %TESTINITIALBINPATH%\*.dll -o %TESTINITIALBINPATH%\%TESTTARGET_DIR%\%COMPOSITENAME%.dll %TESTINITIALBINPATH%\%COMPOSITENAME%.dll
59+
set BUILDCMD=%CORE_ROOT%\crossgen2\crossgen2.exe -r %CORE_ROOT%\* -r %TESTINITIALBINPATH%\*.dll -o %TESTINITIALBINPATH%\%TESTTARGET_DIR%\%COMPOSITENAME%.dll %TESTINITIALBINPATH%\%COMPOSITENAME%.dll
6060
echo %BUILDCMD% > %TESTINITIALBINPATH%\%TESTTARGET_DIR%\%COMPOSITENAME%.dll.log
6161
call %BUILDCMD% >> %TESTINITIALBINPATH%\%TESTTARGET_DIR%\%COMPOSITENAME%.dll.log 2>&1
6262
goto done
6363

6464
:CG2NoMethods
6565
del %TESTINITIALBINPATH%\%TESTTARGET_DIR%\%COMPOSITENAME%.dll
66-
set BUILDCMD=%TESTBATCHROOT%\..\..\..\..\..\..\.dotnet\dotnet %CORE_ROOT%\crossgen2\crossgen2.dll --compile-no-methods -r %CORE_ROOT%\* -r %TESTINITIALBINPATH%\*.dll -o %TESTINITIALBINPATH%\%TESTTARGET_DIR%\%COMPOSITENAME%.dll %TESTINITIALBINPATH%\%COMPOSITENAME%.dll
66+
set BUILDCMD=%CORE_ROOT%\crossgen2\crossgen2.exe --compile-no-methods -r %CORE_ROOT%\* -r %TESTINITIALBINPATH%\*.dll -o %TESTINITIALBINPATH%\%TESTTARGET_DIR%\%COMPOSITENAME%.dll %TESTINITIALBINPATH%\%COMPOSITENAME%.dll
6767
echo %BUILDCMD% > %TESTINITIALBINPATH%\%TESTTARGET_DIR%\%COMPOSITENAME%.dll.log
6868
call %BUILDCMD% >> %TESTINITIALBINPATH%\%TESTTARGET_DIR%\%COMPOSITENAME%.dll.log 2>&1
6969
goto done
7070

7171
:CG2SingleInputBubble
7272
del %TESTINITIALBINPATH%\%TESTTARGET_DIR%\%COMPOSITENAME%.dll
73-
set BUILDCMD=%TESTBATCHROOT%\..\..\..\..\..\..\.dotnet\dotnet %CORE_ROOT%\crossgen2\crossgen2.dll -r %CORE_ROOT%\* -r %TESTINITIALBINPATH%\*.dll -o %TESTINITIALBINPATH%\%TESTTARGET_DIR%\%COMPOSITENAME%.dll --inputbubble %TESTINITIALBINPATH%\%COMPOSITENAME%.dll
73+
set BUILDCMD=%CORE_ROOT%\crossgen2\crossgen2.exe -r %CORE_ROOT%\* -r %TESTINITIALBINPATH%\*.dll -o %TESTINITIALBINPATH%\%TESTTARGET_DIR%\%COMPOSITENAME%.dll --inputbubble %TESTINITIALBINPATH%\%COMPOSITENAME%.dll
7474
echo %BUILDCMD% > %TESTINITIALBINPATH%\%TESTTARGET_DIR%\%COMPOSITENAME%.dll.log
7575
call %BUILDCMD% >> %TESTINITIALBINPATH%\%TESTTARGET_DIR%\%COMPOSITENAME%.dll.log 2>&1
7676
goto done
7777

7878
:CG2SingleBubbleADOnly
7979
del %TESTINITIALBINPATH%\%TESTTARGET_DIR%\%COMPOSITENAME%.dll
80-
set BUILDCMD=%TESTBATCHROOT%\..\..\..\..\..\..\.dotnet\dotnet %CORE_ROOT%\crossgen2\crossgen2.dll -r %CORE_ROOT%\* -r %TESTINITIALBINPATH%\d.dll -o %TESTINITIALBINPATH%\%TESTTARGET_DIR%\%COMPOSITENAME%.dll --inputbubble %TESTINITIALBINPATH%\%COMPOSITENAME%.dll
80+
set BUILDCMD=%CORE_ROOT%\crossgen2\crossgen2.exe -r %CORE_ROOT%\* -r %TESTINITIALBINPATH%\d.dll -o %TESTINITIALBINPATH%\%TESTTARGET_DIR%\%COMPOSITENAME%.dll --inputbubble %TESTINITIALBINPATH%\%COMPOSITENAME%.dll
8181
echo %BUILDCMD% > %TESTINITIALBINPATH%\%TESTTARGET_DIR%\%COMPOSITENAME%.dll.log
8282
call %BUILDCMD% >> %TESTINITIALBINPATH%\%TESTTARGET_DIR%\%COMPOSITENAME%.dll.log 2>&1
8383
goto done

0 commit comments

Comments
 (0)