Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Changes to prepare for consolidation #8593

Merged
merged 10 commits into from
Oct 18, 2019

Conversation

jkoritzinsky
Copy link
Member

  • Define a SetupRoot MSBuild property to represent the root of the core-setup repo. It will point to the root folder of the core-setup files in the consolidated repo.
  • Make some projects SDK projects so they pull in Directory.Build.props/Directory.Build.targets.
  • Make the root directory configurable for the native build.
  • Rename LICENSE.TXT to LICENSE to match the final name in the consolidated repo.
  • Add MSBuild property definitions to configure the Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk for this repo and the consolidated repo.

… Convert usages of RepoRoot and ProjectDir to either SetupRoot or RepoRoot depending on if they need files that are at the root of the repo or are setup-specific.
…t.Build.Tasks.SharedFramework.Sdk so we don't need to customize them during consolidation.
Copy link
Member

@dagood dagood left a comment

Choose a reason for hiding this comment

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

Scanned through it again, LGTM. 🎉

@jkoritzinsky
Copy link
Member Author

Looks like I might have missed a spot in the Arcade SDK. I'll put out a PR there to fix the issue.

@jkoritzinsky
Copy link
Member Author

Actually the SDK version hasn't been updated yet. That should be automatic... I'll update it manually.

@dagood
Copy link
Member

dagood commented Oct 18, 2019

Hmm... I submitted a PR to Maestro++ a while ago to enable auto-updates for this SDK. I'll see why that isn't (apparently) working. dotnet/arcade-services#662

eng/Version.Details.xml Outdated Show resolved Hide resolved
Co-Authored-By: Davis Goodin <dagood@users.noreply.github.com>
@jkoritzinsky jkoritzinsky merged commit 96ec25a into dotnet:master Oct 18, 2019
@jkoritzinsky jkoritzinsky deleted the backport-consolidation-merge branch October 18, 2019 22:21
Copy link
Member

@ViktorHofer ViktorHofer left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks a lot for the quick backporting.

@ViktorHofer
Copy link
Member

The renaming of the LICENSE.TXT to LICENSE needs to be revert asap if the Microsoft.NETCore.App assets (package, ...) are hard-linking to this file. cc @dagood @jkoritzinsky

@ViktorHofer
Copy link
Member

we can keep the LICENSE.TXT name anyway, initially I thought the renaming is necessary for GH to detect the right license but that was wrong.

@dagood
Copy link
Member

dagood commented Oct 22, 2019

Yes, the license link on https://www.nuget.org/packages/Microsoft.NETCore.App.Ref/3.0.0 (and probably more) is a 404 now: https://github.com/dotnet/core-setup/blob/master/LICENSE.TXT. I'll put up a PR.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants