Skip to content

Restore CombineTargetFrameworkInfoProperties opt-in#7642

Merged
rokonec merged 1 commit into
dotnet:mainfrom
rainersigwald:revert-CombineTargetFrameworkInfoProperties
May 25, 2022
Merged

Restore CombineTargetFrameworkInfoProperties opt-in#7642
rokonec merged 1 commit into
dotnet:mainfrom
rainersigwald:revert-CombineTargetFrameworkInfoProperties

Conversation

@rainersigwald

@rainersigwald rainersigwald commented May 20, 2022

Copy link
Copy Markdown
Member

This caused a regression in scenarios using Visual Studio 17.3 previews
with global.json files pointing to old .NET SDKs.

This reverts commit fe4fde9.

Conflicts:
src/Framework/ChangeWaves.cs
src/Tasks/CombineTargetFrameworkInfoProperties.cs

Fixes AB#1534809.

@Forgind Forgind left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Also revert the change in the ChangeWaves doc?

…operties (dotnet#6928)"

This caused a regression in scenarios using Visual Studio 17.3 previews
with `global.json` files pointing to old .NET SDKs.

This reverts commit fe4fde9.

Conflicts:
	src/Framework/ChangeWaves.cs
	src/Tasks/CombineTargetFrameworkInfoProperties.cs
@rainersigwald rainersigwald force-pushed the revert-CombineTargetFrameworkInfoProperties branch from 8eda4ff to 21755de Compare May 20, 2022 21:18
@rainersigwald rainersigwald added the merge-when-branch-open PRs that are approved, except that there is a problem that means we are not merging stuff right now. label May 23, 2022
@rokonec rokonec merged commit 4646eab into dotnet:main May 25, 2022
JoeRobich added a commit to JoeRobich/omnisharp-roslyn that referenced this pull request Aug 31, 2022
Link to suspected failing change dotnet/msbuild#7642
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merge-when-branch-open PRs that are approved, except that there is a problem that means we are not merging stuff right now.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants