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.

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

Add file manifest for runtime and targeting pack #11235

Merged
merged 11 commits into from
Jun 20, 2019
Merged

Conversation

jkotalik
Copy link
Contributor

Fixes #10215 and #10216

This seems to be working locally for win-x64. I want to confirm things look good on CI before I do some finalization.

Few open questions that I'm working on solving:

  • For the runtime pack manifest, make sure manifests are in the right location and have the right names (may need clarification here as it wasn't clear in the issues)
  • Determine which dlls should be in which manifest (should native dlls be in the targeting pack?)

I'd also like to add a few automated tests once I confirm things are correct.

@jkotalik jkotalik added the feature-platform Deprecated: Cross-cutting issues related to ASP.NET Core as a platform label Jun 14, 2019
@jkotalik jkotalik added this to the 3.0.0-preview7 milestone Jun 14, 2019
@jkotalik
Copy link
Contributor Author

@dsplaisted I think I need to run this PR by you to make sure I'm producing the right manifests in the correct locations.

@jkotalik jkotalik marked this pull request as ready for review June 17, 2019 16:57
@jkotalik jkotalik requested a review from a team as a code owner June 17, 2019 16:57
build/tasks/CreateFrameworkListFile.cs Outdated Show resolved Hide resolved
@jkotalik jkotalik force-pushed the jkotalik/frameworkList branch from 9aacd76 to 92a3a5c Compare June 19, 2019 17:17
@jkotalik
Copy link
Contributor Author

Verified the targeting pack and the runtime pack work locally. For the runtime pack, I change the KnownFrameworkReference to a local dev build of the M.A.App.Runtime.win-x64 and made sure restore/build worked. dotnet run failed from System.IO.FileNotFoundException: Could not load file or assembly 'Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'. The system cannot find the file specified., however, I think this is due to me not targeting an equivalent version of Microsoft.NetCore.App.Runtime.win-x64.

I'll be on top of verifying this once it gets merged into core-sdk and can react quickly.

eng/tools/RepoTasks/FileUtilities.cs Show resolved Hide resolved
@@ -100,6 +100,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant
<RuntimePackageRoot>$([MSBuild]::EnsureTrailingSlash('$(RuntimePackageRoot)'))</RuntimePackageRoot>
<CrossgenToolPath>$([System.IO.Path]::Combine('$(RuntimePackageRoot)', 'tools', '$(CrossgenToolPackagePath)'))</CrossgenToolPath>
<AssetTargetFallback>$(AssetTargetFallback);native,Version=0.0</AssetTargetFallback>

<FrameworkListFileName>RuntimeList.xml</FrameworkListFileName>
<FrameworkListOutputPath>$(ArtifactsObjDir)$(FrameworkListFileName)</FrameworkListOutputPath>
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: FrameworkList => RuntimeList. these are different files so the property names should probably follow suite.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

How much do you care about this? PR is green and I'd rather not wait another 2 hours for a rebuild on a rename like this if you have no other feedback.

@jkotalik jkotalik merged commit 5079006 into master Jun 20, 2019
@ghost ghost deleted the jkotalik/frameworkList branch June 20, 2019 02:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature-platform Deprecated: Cross-cutting issues related to ASP.NET Core as a platform
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add manifest to ASP.NET targeting pack
3 participants