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.

Sign up for GitHub

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

Jump to bottom

Fix build break. #46303

Merged
merged 1 commit into from
Jul 24, 2020
Merged

Fix build break. #46303

merged 1 commit into from
Jul 24, 2020

Conversation

gafter
Copy link
Member

@gafter gafter commented Jul 24, 2020 •
edited
Loading

Fixes #46302

@gafter gafter requested a review from a team as a code owner July 24, 2020 14:59
@gafter gafter self-assigned this Jul 24, 2020
@gafter gafter added this to the 16.8 milestone Jul 24, 2020
@gafter
Copy link
Member Author

gafter commented Jul 24, 2020

@dotnet/roslyn-infrastructure May I please have a review? This fixes a semantic merge conflict that github didn't notice.

@gafter gafter requested a review from a team July 24, 2020 15:02
@gafter gafter linked an issue Jul 24, 2020 that may be closed by this pull request
Build break in master #46302
Closed
@jaredpar
Copy link
Member

The CI legs have made it past the build phase. Merging as this is fixing an urgent build break. Getting past build unblocks everything else.

@jaredpar jaredpar merged commit 11e3c50 into dotnet:master Jul 24, 2020
@ghost ghost modified the milestones: 16.8, Next Jul 24, 2020
333fred added a commit to 333fred/roslyn that referenced this pull request Jul 28, 2020
@333fred
Merge remote-tracking branch 'upstream/master' into features/function…
cb3cc96 
…-pointers

* upstream/master: (207 commits)
  Update argument state when parameter has not-null type (dotnet#46072)
  Fix TypeWithAnnotations.ToTypeWithState() for (untyped) null literal (dotnet#46344)
  Update README (dotnet#46136)
  Revert "Revert "Support nullable annotations on unconstrained type parameters""
  Revert "Support nullable annotations on unconstrained type parameters (dotnet#45993)"
  Fix type in publish data
  Update VSIXExpInstaller version to one available on ADO
  Update publish data for 16.8
  Update version of RichCodeNav.EnvVarDump
  A fixed initializer must be bound to its natural type (dotnet#46293)
  Update features merged into 16.7p4 (dotnet#46229)
  Async-streams: disposal should continue without jump within a finally (dotnet#46188)
  Recommend default in type constraint, but not record (dotnet#46311)
  Add use site diagnostics to IsUnmanaged (dotnet#46114)
  Add another flaky test.
  Ensure NuGet connections use TLS 1.2
  Update to Microsoft.CodeAnalysis.Testing 1.0.1-beta1.20374.2
  Skip flaky test.
  Fix build break. (dotnet#46303)
  Skip a flaky test Relates to dotnet#46304
  ...
333fred added a commit to 333fred/roslyn that referenced this pull request Jul 28, 2020
@333fred
Merge remote-tracking branch 'upstream/features/function-pointers' in…
cdb7a8f 
…to function-pointer-type-lookup

* upstream/features/function-pointers: (212 commits)
  Correct public API number.
  Update argument state when parameter has not-null type (dotnet#46072)
  Fix TypeWithAnnotations.ToTypeWithState() for (untyped) null literal (dotnet#46344)
  Update README (dotnet#46136)
  Revert "Revert "Support nullable annotations on unconstrained type parameters""
  Revert "Support nullable annotations on unconstrained type parameters (dotnet#45993)"
  Fix type in publish data
  Update VSIXExpInstaller version to one available on ADO
  Update publish data for 16.8
  Update version of RichCodeNav.EnvVarDump
  A fixed initializer must be bound to its natural type (dotnet#46293)
  Update features merged into 16.7p4 (dotnet#46229)
  Async-streams: disposal should continue without jump within a finally (dotnet#46188)
  Recommend default in type constraint, but not record (dotnet#46311)
  Add use site diagnostics to IsUnmanaged (dotnet#46114)
  Add another flaky test.
  Ensure NuGet connections use TLS 1.2
  Update to Microsoft.CodeAnalysis.Testing 1.0.1-beta1.20374.2
  Skip flaky test.
  Fix build break. (dotnet#46303)
  ...
@RikkiGibson RikkiGibson modified the milestones: Next, 16.8.P2 Aug 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mgoertz-msft mgoertz-msft mgoertz-msft approved these changes

@jaredpar jaredpar jaredpar approved these changes

Assignees

@gafter gafter

Labels
Area-Infrastructure Urgency-Now
Projects
None yet
Milestone
16.8.P2
Development

Successfully merging this pull request may close these issues.

Build break in master
4 participants
@gafter @jaredpar @mgoertz-msft @RikkiGibson