Skip to content

Produce non-stable version of targeting pack #22372

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

Merged
merged 9 commits into from
Jun 9, 2020
Merged

Conversation

wtgodbe
Copy link
Member

@wtgodbe wtgodbe commented May 29, 2020

Resolves #21850

Now that the targeting pack .msi has non-stable branding, we need to produce a package that identifies the version of that .msi so that dotnet/installer can know what to download. Note that we can't use some arbitrary nonshipping package from AspNetCore, since the targeting pack doesn't always build. Should be ported forwards to master also (and will require reaction in dotnet/installer's master branch)

@wtgodbe wtgodbe requested a review from a team May 29, 2020 20:56
@Pilchie Pilchie added the feature-platform Deprecated: Cross-cutting issues related to ASP.NET Core as a platform label Jun 1, 2020
Copy link
Contributor

@dougbu dougbu left a comment

Choose a reason for hiding this comment

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

If everything builds properly locally with two projects in the same directory, don't worry about moving the new one.

<GenerateDocumentationFile>false</GenerateDocumentationFile>
<IncludeBuildOutput>false</IncludeBuildOutput>
<IncludeSymbols>false</IncludeSymbols>
<NoPackageAnalysis>true</NoPackageAnalysis>
Copy link
Contributor

Choose a reason for hiding this comment

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

Side question: Should this and the main Microsoft.AspNetCore.App.Ref project also set <IsReferenceAssemblyProject>false</IsReferenceAssemblyProject>❔ No urgency here and I'm not asking for a change in this PR but most of the special cases for $(IsReferenceAssemblyProject) projects are not necessary here (all but referencing reference assemblies). Probably better to put these in the $(IsImplementationProject) category (unless of course some of those special cases break things 😈).

Copy link
Member Author

Choose a reason for hiding this comment

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

As far as I can tell, it shouldn't change how these projects build either way. Mostly it affects AssemblyVersions and compilation items, which don't apply here. There's a condition in versions.props that ensures that we use the .0 versions of CoreFx dependencies in ref projects, but it also checks for if the project is named Microsoft.AspNetCore.App.Ref, so either setting should be fine.

@wtgodbe
Copy link
Member Author

wtgodbe commented Jun 1, 2020

@dougbu I'm still going to separate the new proj into another folder, I just pushed my local changes to save them before I started doing branding. Returning to this now

@wtgodbe wtgodbe requested a review from ryanbrandenburg as a code owner June 1, 2020 19:36
@wtgodbe
Copy link
Member Author

wtgodbe commented Jun 1, 2020

@dougbu this is now more "interesting" to review

@wtgodbe
Copy link
Member Author

wtgodbe commented Jun 1, 2020

Copy link
Contributor

@dougbu dougbu left a comment

Choose a reason for hiding this comment

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

Still approved but please run the updated layout by a few other people. I'm not sure which layout others would prefer and let's avoid shuffling things around a couple of weeks down the line. (My preference is to avoid special-cased ref/ projects that don't actually produce reference assemblies.)

@wtgodbe
Copy link
Member Author

wtgodbe commented Jun 1, 2020

@dougbu I reorganized the projects as you suggested. New internal build: https://dev.azure.com/dnceng/internal/_build/results?buildId=667319&view=results

Copy link
Contributor

@dougbu dougbu left a comment

Choose a reason for hiding this comment

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

This time I'm not going to look again 😺

Will also need to change

  • src\ProjectTemplates\BlazorTemplates.Tests\BlazorTemplates.Tests.csproj
  • src\ProjectTemplates\BlazorTemplates.Tests\Infrastructure\GenerateTestProps.targets

@wtgodbe
Copy link
Member Author

wtgodbe commented Jun 2, 2020

Something broke, the ref pack is missing lots of AspNetCore .dll's now (though it has the .xml files still). looking

@wtgodbe
Copy link
Member Author

wtgodbe commented Jun 2, 2020

The build of the ref pack project now gives all AspNetCore ref assemblies the metadata IsReferenceAssembly=false at the time that _ResolveTargetingPackContent is called. Still trying to figure out why

@wtgodbe
Copy link
Member Author

wtgodbe commented Jun 2, 2020

Oh, got it - it's due to ReferenceReferenceAssemblies, which is based off of whether or not the project is in a folder named ref. Fixing

@wtgodbe
Copy link
Member Author

wtgodbe commented Jun 2, 2020

Will also need to change

src\ProjectTemplates\BlazorTemplates.Tests\BlazorTemplates.Tests.csproj
src\ProjectTemplates\BlazorTemplates.Tests\Infrastructure\GenerateTestProps.targets

Those don't exist in this branch yet - @pranavkm after you merge the wasm -> 3.1 PR next week, I'll fix this guy up

@wtgodbe
Copy link
Member Author

wtgodbe commented Jun 2, 2020

@wtgodbe wtgodbe added the tell-mode Indicates a PR which is being merged during tell-mode label Jun 2, 2020
@wtgodbe
Copy link
Member Author

wtgodbe commented Jun 3, 2020

Alright, everything looks copacetic now

@wtgodbe wtgodbe merged commit 99e90f5 into release/3.1 Jun 9, 2020
@wtgodbe wtgodbe deleted the wtgodbe/NonStableRef branch June 9, 2020 23:40
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 tell-mode Indicates a PR which is being merged during tell-mode
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants