-
Notifications
You must be signed in to change notification settings - Fork 29
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.
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
Initial workload split #29
Conversation
b52957e
to
3b458ba
Compare
We don't need to do it now but we should move the emscripten setup/checks here as part of the base targets. |
Now also generates the package name based off the properties not the file names. |
I'd like to start producing manifests asap for the reasons mentioned in dotnet/runtime#54349 |
There was a problem hiding this comment.
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?
eng/nuget/Microsoft.NET.Runtime.Emscripten.Sdk/Microsoft.NET.Runtime.Emscripten.Sdk.pkgproj
Outdated
Show resolved
Hide resolved
...icrosoft.NET.Workload.Emscripten.Manifest/Microsoft.NET.Workload.Emscripten.Manifest.pkgproj
Show resolved
Hide resolved
...icrosoft.NET.Workload.Emscripten.Manifest/Microsoft.NET.Workload.Emscripten.Manifest.pkgproj
Show resolved
Hide resolved
"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" |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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)
eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest/WorkloadManifest.targets
Show resolved
Hide resolved
<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> |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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 :)
...uget/Microsoft.NET.Runtime.Emscripten.Python/Microsoft.NET.Runtime.Emscripten.Python.pkgproj
Outdated
Show resolved
Hide resolved
eng/nuget/Microsoft.NET.Runtime.Emscripten.Node/Microsoft.NET.Runtime.Emscripten.Node.pkgproj
Outdated
Show resolved
Hide resolved
eng/nuget/Microsoft.NET.Runtime.Emscripten.Sdk/Microsoft.NET.Runtime.Emscripten.Sdk.pkgproj
Outdated
Show resolved
Hide resolved
…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>
Work to move emscripten to it's own manifest. Putting it up for discussion before it is finished.
Runtime PR dotnet/runtime#54349