mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

propagate targetArch to crossgen2

Browse source
This commit is contained in:
Manish Godse 2021-06-11 21:25:25 -07:00
parent 88b8fc6b33
commit ed9c92df3a
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/core-sdk-tasks/Crossgen.cs
View file

@ -27,7 +27,7 @@ namespace Microsoft.DotNet.Build.Tasks
public string DestinationPath { get; set; }
[Required]
public string JITPath { get; set; }
public string Architecture { get; set; }
public string CrossgenPath { get; set; }
@ -138,7 +138,12 @@ namespace Microsoft.DotNet.Build.Tasks
protected override string GenerateCommandLineCommands()
{
return $"{GetInPath()} {GetOutPath()} {GetPlatformAssemblyPaths()} {GetCreateSymbols()}";
return $"{GetInPath()} {GetOutPath()} {GetArchitecture()} {GetPlatformAssemblyPaths()} {GetCreateSymbols()}";
}
private string GetArchitecture()
{
return $"--targetarch {Architecture}";
}
private string GetCreateSymbols()
@ -192,11 +197,6 @@ namespace Microsoft.DotNet.Build.Tasks
return platformAssemblyPaths;
}
private string GetJitPath()
{
return $"-JITPath {JITPath}";
}
private string GetMissingDependenciesOk()
{
return "-MissingDependenciesOK";

6
src/redist/targets/Crossgen.targets
View file

@ -123,7 +123,7 @@
<Crossgen
SourceAssembly="%(RoslynTargets.FullPath)"
DestinationPath="%(RoslynTargets.FullPath)"
JITPath="$(LibCLRJitPath)"
Architecture="$(Architecture)"
CrossgenPath="$(CrossgenPath)"
ReadyToRun="True"
CreateSymbols="$(CreateCrossgenSymbols)"
@ -133,7 +133,7 @@
<Crossgen
SourceAssembly="%(FSharpTargets.FullPath)"
DestinationPath="%(FSharpTargets.FullPath)"
JITPath="$(LibCLRJitPath)"
Architecture="$(Architecture)"
CrossgenPath="$(CrossgenPath)"
ReadyToRun="True"
CreateSymbols="$(CreateCrossgenSymbols)"
@ -143,7 +143,7 @@
<Crossgen
SourceAssembly="%(RemainingTargets.FullPath)"
DestinationPath="%(RemainingTargets.FullPath)"
JITPath="$(LibCLRJitPath)"
Architecture="$(Architecture)"
CrossgenPath="$(CrossgenPath)"
ReadyToRun="True"
CreateSymbols="$(CreateCrossgenSymbols)"