Merge release/2.0.0 -> master - #1182
Merged
Merged
Conversation
…lates-from-sdk Template move/delete templates from sdk
…relative location to the SDK.
…t_location Looking for Microsoft.NETCoreSdk.BundledVersions.props in a location relative location to the SDK.
… don't need to run signing anymore for templates, as we have none.
Remove signing for templates, now that we don't have them anymore.
Add a list of supported TFMs that can be used by hosts to display.
…ET Core bundled in the CLI Also include GenerateDeps.proj in tasks project
…I to use to get the path to it in the SDK
Add SDK support for generating deps.json files for .NET CLI Tools
Allow ComposeStore to create crossgen profiling symbols.
Note that we cannot use `<Import Sdk="...">` because NuGet.Build.Tasks.Pack does not have an Sdk folder.
[2.0] Import nuget pack targets via relative path.
…when project is packed in most cases Fixes dotnet#992
…cies when packing a project
…nce-privateassets Don't include implicit package references as dependencies in package when project is packed in most cases
When evaluating for design time, MSBuild will evaluate items even when they have a condition that is false. So in a cross-targeting build, even though the target framework identifier won't be set, it will still evaluate the items in these item groups. So we need to have a defense against trying to do a version comparison against an empty version in these conditions themselves.
Avoid errors in conditions when MSBuild is evaluating for design time
dsplaisted
approved these changes
May 5, 2017
mmitche
pushed a commit
to mmitche/sdk
that referenced
this pull request
Jun 5, 2020
* Update dependencies from https://github.com/dotnet/arcade build 20191227.1 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19627.1 * Update dependencies from https://github.com/dotnet/arcade build 20191228.1 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19628.1
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
8 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.
Normal code flow from release/2.0.0 to master so that late preview1 fixes get on the preview2 train as well.
@dsplaisted @livarcocc @MattGertz