Skip to content

[release/6.0] x64 on arm64 fixes #7906

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.

Sign up for GitHub

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

Merged
markwilkie merged 6 commits into from
Sep 18, 2021
Merged

[release/6.0] x64 on arm64 fixes #7906

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4fbe444
Account for target installer arch in mac pkg id generation (#7831)
sfoslund Sep 9, 2021
225f864
Adding detection and retargeting of DOTNETHOME (#7785)
ericstj Sep 3, 2021
a0aa5f3
Remove Bundle override of DOTNETHOME (#7855)
ericstj Sep 8, 2021
aa0a3d3
Ensure workloads can find embedded dotnethome_x64.wxs (#7845)
ericstj Sep 7, 2021
fe23bc1
Adding x64 emulation support for pkg installers (#7893)
sfoslund Sep 16, 2021
3abbdb8
Update mac x64 installer script arch detection (#7913)
sfoslund Sep 17, 2021
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
Prev Previous commit
Next Next commit
Adding x64 emulation support for pkg installers (#7893) 
* Adding x64 emulation support for pkg installers

* PR feedback

* PR feedback
  • Loading branch information
@sfoslund @ericstj
sfoslund authored and ericstj committed Sep 17, 2021
commit fe23bc12e191c8390d445f1f441ddd3560f341ed
40 changes: 39 additions & 1 deletion src/Microsoft.DotNet.Build.Tasks.Installers/src/GenerateMacOSDistributionFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ public class GenerateMacOSDistributionFile : BuildTask
[Required]
public string DestinationFile { get; set; }

public string Alternativex64InstallPath { get; set; }

public override bool Execute()
{
try
Expand All @@ -38,7 +40,16 @@ public override bool Execute()

var titleElement = new XElement("title", $"{ProductBrandName} ({TargetArchitecture})");

var choiceLineElements = BundledPackages.Select(component => new XElement("line", new XAttribute("choice", component.GetMetadata("FileNameWithExtension"))));
var archScriptContent = @"<![CDATA[
function IsX64Machine() {
var machine = system.sysctl(""hw.machine"");
system.log(""Machine type: "" + machine);
var result = machine == ""x64"" || machine.endsWith(""_x64"");
system.log(""IsX64Machine: "" + result);
return result;
}
]]>";
var scriptElement = new XElement("script", new XText(archScriptContent));

var choiceElements = BundledPackages
.Select(component => new XElement("choice",
Expand All @@ -48,6 +59,23 @@ public override bool Execute()
new XAttribute("description", component.GetMetadata("Description")),
new XElement("pkg-ref", new XAttribute("id", component.GetMetadata("FileNameWithExtension")))));

if (TargetArchitecture == "x64")
{
Alternativex64InstallPath ??= "/usr/local/share/dotnet/x64";

choiceElements =
choiceElements.Select(c => new XElement(c)
.WithAttribute("selected", "IsX64Machine()"))
.Concat(
choiceElements.Select(c => new XElement(c)
.WithAttribute("id", c.Attribute("id").Value + ".alternate")
.WithAttribute("selected", "!IsX64Machine()")
.WithAttribute("customLocation", Alternativex64InstallPath)));
}

var choiceLineElements = choiceElements
.Select(c => new XElement("line", new XAttribute("choice", c.Attribute("id").Value)));

var pkgRefElements = BundledPackages
.Select(component => new XElement("pkg-ref",
new XAttribute("id", component.GetMetadata("FileNameWithExtension")),
Expand Down Expand Up @@ -78,6 +106,7 @@ public override bool Execute()
document.Root.Add(new XElement("choices-outline", choiceLineElements));
document.Root.Add(choiceElements);
document.Root.Add(pkgRefElements);
document.Root.Add(scriptElement);
using XmlWriter writer = XmlWriter.Create(File.OpenWrite(DestinationFile));
document.WriteTo(writer);
}
Expand All @@ -89,4 +118,13 @@ public override bool Execute()
return true;
}
}

static class XElementExtensions
{
public static XElement WithAttribute(this XElement element, XName attribute, object value)
{
element.SetAttributeValue(attribute, value);
return element;
}
}
}