Merged
Conversation
lewing
force-pushed
the
manifest
branch
2 times, most recently
from
b52957e to
3b458ba
Compare
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. |
Member
Author
|
Now also generates the package name based off the properties not the file names. |
Member
Author
|
I'd like to start producing manifests asap for the reasons mentioned in dotnet/runtime#54349 |
steveisok
approved these changes
Jun 23, 2021
joeloff
approved these changes
Jun 23, 2021
Member
joeloff
left a comment
joeloff
left a comment
There was a problem hiding this comment.
Any changes needed to flow these packages to dotnet/runtime?
radical
reviewed
Jun 23, 2021
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" |
Member
There was a problem hiding this comment.
osx-arm64 -> osx-x64 - is this deliberate? I see this for the other two packs too
Member
Author
There was a problem hiding this comment.
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
radekdoulik
reviewed
Jun 23, 2021
| <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> |
Member
There was a problem hiding this comment.
Nice! I like that the files don't need to be renamed anymore.
radekdoulik
approved these changes
Jun 23, 2021
akoeplinger
reviewed
Jun 23, 2021
Member
akoeplinger
left a comment
akoeplinger
left a comment
There was a problem hiding this comment.
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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Work to move emscripten to it's own manifest. Putting it up for discussion before it is finished.
Runtime PR dotnet/runtime#54349