Skip to content
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

Alter RuntimeComponentManifest.targets to use the correct runtime pack #56431

Merged
merged 7 commits into from
Jul 29, 2021
Merged

Alter RuntimeComponentManifest.targets to use the correct runtime pack #56431

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d135e27
Alter RuntimeComponentManifest.targets to use the correct Runtime Pack
Jul 27, 2021
2193d6b
Feedback
Jul 28, 2021
29c27c3
Good feedback
Jul 28, 2021
3a3d659
JsonToItemsTaskFactory: error if json file not found
radical Jul 28, 2021
e8b2b73
Wasm.Build.Tests: Update ResolvedFrameworkReference, instead of addin…
radical Jul 28, 2021
686a39f
RuntimeComponentManifest.target: emit more info when we fail to find …
radical Jul 28, 2021
5cf2638
Merge remote-tracking branch 'origin/main' into fix-runtimecomponent-…
radical Jul 28, 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
12 changes: 9 additions & 3 deletions src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Sdk/RuntimeComponentManifest.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
<Project>
<Target Name="_MonoReadAvailableComponentsManifest">
<Error Condition="'%(ResolvedRuntimePack.PackageDirectory)' == '' and '$(_MonoRuntimeComponentManifestJsonFilePath)' == ''"
Text="Empty ResolvedRuntimePack.PackageDirectory while trying to read runtime components manifest" />
<Error Condition="'%(ResolvedFrameworkReference.Identity)' == 'Microsoft.NETCore.App' and '%(RuntimePackPath)' == '' and '$(_MonoRuntimeComponentManifestJsonFilePath)' == ''"
Text="Empty ResolveFrameworkReference.RuntimePackPath while trying to read runtime components manifest" />

<PropertyGroup>
<_MonoRuntimeComponentManifestJsonFilePath Condition="'$(_MonoRuntimeComponentManifestJsonFilePath)' == ''">%(ResolvedRuntimePack.PackageDirectory)\runtimes\$(RuntimeIdentifier)\build\RuntimeComponentManifest.json</_MonoRuntimeComponentManifestJsonFilePath>
<_MonoRuntimeComponentManifestJsonFilePath
Condition="'$(_MonoRuntimeComponentManifestJsonFilePath)' == '' and '%(ResolvedFrameworkReference.Identity)' == 'Microsoft.NETCore.App'">$([MSBuild]::NormalizePath('%(RuntimePackPath)', 'runtimes', '$(RuntimeIdentifier)', 'build', 'RuntimeComponentManifest.json'))</_MonoRuntimeComponentManifestJsonFilePath>
</PropertyGroup>
steveisok marked this conversation as resolved.
Show resolved Hide resolved

<Error Condition="!Exists('$(_MonoRuntimeComponentManifestJsonFilePath)')"
Text="Unable to read the runtime components manifest as the path does not exist" />
steveisok marked this conversation as resolved.
Show resolved Hide resolved

<MonoRuntimeComponentManifestReadTask JsonFilePath="$(_MonoRuntimeComponentManifestJsonFilePath)">
<Output TaskParameter="_MonoRuntimeComponentSharedLibExt" ItemName="_MonoRuntimeComponentSharedLibExt" />
<Output TaskParameter="_MonoRuntimeComponentStaticLibExt" ItemName="_MonoRuntimeComponentStaticLibExt" />
Expand Down