Skip to content

Initial workload split#29

Merged
lewing merged 11 commits into
dotnet:mainfrom
lewing:manifest
Jun 24, 2021
Merged

Initial workload split#29
lewing merged 11 commits into
dotnet:mainfrom
lewing:manifest

Conversation

@lewing

@lewing lewing commented Jun 17, 2021

Copy link
Copy Markdown
Member

Work to move emscripten to it's own manifest. Putting it up for discussion before it is finished.

Runtime PR dotnet/runtime#54349

@lewing

lewing commented Jun 17, 2021

Copy link
Copy Markdown
Member Author

We don't need to do it now but we should move the emscripten setup/checks here as part of the base targets.

@lewing lewing requested a review from radekdoulik June 21, 2021 15:40
@lewing lewing marked this pull request as ready for review June 21, 2021 15:45
@lewing

lewing commented Jun 22, 2021

Copy link
Copy Markdown
Member Author

Now also generates the package name based off the properties not the file names.

cc @akoeplinger @radekdoulik

@lewing

lewing commented Jun 23, 2021

Copy link
Copy Markdown
Member Author

I'd like to start producing manifests asap for the reasons mentioned in dotnet/runtime#54349

@joeloff joeloff left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any changes needed to flow these packages to dotnet/runtime?

"win-x64": "Microsoft.NET.Runtime.${EmscriptenVersion}.Node.win-x64",
"linux-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.linux-x64",
"osx-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.osx-x64",
"osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.osx-x64"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

osx-arm64 -> osx-x64 - is this deliberate? I see this for the other two packs too

@lewing lewing Jun 23, 2021

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is to tell the sdk that it should use the osx-x64 packs when targeting osx-arm64 (they work using rosetta)

<Target Name="_PrepareForPack" BeforeTargets="GetPackageFiles" Returns="@(PackageFile)">
<!-- Override the id to include the sdk band as per the workload installer spec -->
<PropertyGroup>
<Id>Microsoft.NET.Runtime.Emscripten.$(EmscriptenVersion).Node.$(PackageRID)</Id>

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! I like that the files don't need to be renamed anymore.

@akoeplinger akoeplinger left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left a few comments, looks good otherwise :)

Comment thread eng/Versions.props Outdated
lewing and others added 4 commits June 23, 2021 14:45
…untime.Emscripten.Sdk.pkgproj

Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
…Runtime.Emscripten.Node.pkgproj

Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
…T.Runtime.Emscripten.Python.pkgproj

Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
@lewing lewing merged commit fe42910 into dotnet:main Jun 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants