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

Update to .NET 6 Preview 7 #25244

Merged
merged 18 commits into from
Jul 29, 2021
Merged

Update to .NET 6 Preview 7 #25244

merged 18 commits into from
Jul 29, 2021

Conversation

bricelam
Copy link
Contributor

@bricelam bricelam commented Jul 12, 2021 •
edited
Loading

Resolves #25148

@bricelam bricelam requested a review from a team July 12, 2021 15:44
smitpatel
smitpatel previously approved these changes Jul 12, 2021
View reviewed changes
@bricelam
Copy link
Contributor Author

bricelam commented Jul 12, 2021 •
edited
Loading

Ugg. More OData failures.

@bricelam bricelam marked this pull request as ready for review July 14, 2021 16:40
@bricelam bricelam requested a review from dougbu as a code owner July 14, 2021 16:40
@bricelam
Copy link
Contributor Author

@ajcvickers Looks like there are binary breaking changes in Logging: 😕

MissingMethodException : Method not found: 'Microsoft.Extensions.Logging.LoggerMessage.Define(LogLevel, EventId, string, bool)'.

@bricelam bricelam dismissed smitpatel’s stale review July 14, 2021 17:49

Additional changes made to skip OData tests

@dougbu
Copy link
Member

dougbu commented Jul 14, 2021

Looks like there are binary breaking changes in Logging: 😕

This is a known issue though the breadth of the change is pretty annoying. Fix is

private static readonly LogDefineOptions SkipEnabledCheckLogOptions = new() { SkipEnabledCheck = true };`
...
_generatedCodeToAssemblyCompilationEnd = LoggerMessage.Define<string, double>(
    LogLevel.Annoyance,
    2,
    "...",
    SkipEnabledCheckLogOptions);

See also @TanayParikh's work in dotnet/aspnetcore#34033 and the actual break in dotnet/runtime#54581.

dotnet-maestro bot added 9 commits July 19, 2021 17:40
@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2021…
16912aa 
…0718.2 (dotnet#25288)

[release/6.0-preview7] Update dependencies from dotnet/runtime
@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2021…
92746a1 
…0719.8 (dotnet#25290)

[release/6.0-preview7] Update dependencies from dotnet/runtime
@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2021…
f51784b 
…0720.7 (dotnet#25298)

[release/6.0-preview7] Update dependencies from dotnet/runtime
@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2021…
1c97205 
…0720.12 (dotnet#25299)

[release/6.0-preview7] Update dependencies from dotnet/runtime
@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2021…
425f22e 
…0720.18 (dotnet#25301)

[release/6.0-preview7] Update dependencies from dotnet/runtime
@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2021…
ee385b2 
…0721.11 (dotnet#25312)

[release/6.0-preview7] Update dependencies from dotnet/runtime
@dotnet-maestro
[release/6.0-preview7] Update dependencies from dotnet/runtime (dotne…
96386a4 
…t#25316)

[release/6.0-preview7] Update dependencies from dotnet/runtime
@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2021…
79c2a82 
…0722.16 (dotnet#25317)

[release/6.0-preview7] Update dependencies from dotnet/runtime
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20210…
0eeef0d 
…722.16 (dotnet#25326)

[release/6.0-preview7] Update dependencies from dotnet/arcade
@dougbu dougbu mentioned this pull request Jul 23, 2021
Merged
dotnet-maestro bot and others added 3 commits July 24, 2021 03:48
@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2021…
131d5da 
…0723.17 (dotnet#25328)

[release/6.0-preview7] Update dependencies from dotnet/runtime
@mmitche @dotnet-maestro @AndriySvyryd
[preview7] Unpin Microsoft.Extensions.Caching.Memory and Microsoft.Ex…
4950317 
…tensions.Logging (dotnet#25324)

Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Andriy Svyryd <[email protected]>
@mmitche
Update dependencies from latest p7 runtime (dotnet#25337)
8f08a18
@bricelam bricelam mentioned this pull request Jul 26, 2021
Closed
@bricelam
Copy link
Contributor Author

So, the problem with that approach is that we don't own the code with skipEnabledCheck: true. It's inside the OData package. Will skip until OData releases a new package that's compatible (or the binary breaking change is reverted).

@AndriySvyryd
Copy link
Member

Upgrading to Preview 7 resolves this, but brings other breaking changes, see #25324

@bricelam
Copy link
Contributor Author

Yuck. Our branches are getting messy with one-offs in preview 6 and preview 7. ☹️ Do we have a clear path forward? Should we snub contributors and start using preview 7 (or rc 1) builds of the SDK in main?

@AndriySvyryd
Copy link
Member

AndriySvyryd commented Jul 26, 2021 •
edited
Loading

Should we snub contributors and start using preview 7 (or rc 1) builds of the SDK in main?

We should wait until dotnet/roslyn#55114 is fixed and then jump to rc1. If it's not fixed in rc1, then we'll need to have a discussion.

@bricelam bricelam mentioned this pull request Jul 26, 2021
Closed
dotnet-maestro bot and others added 4 commits July 27, 2021 08:03
@dotnet-maestro
[release/6.0-preview7] Update dependencies from dotnet/runtime (dotne…
74915d4 
…t#25338)

[release/6.0-preview7] Update dependencies from dotnet/runtime
@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2021…
2d603e9 
…0727.4 (dotnet#25341)

[release/6.0-preview7] Update dependencies from dotnet/runtime
@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2021…
bfcdda4 
…0727.12 (dotnet#25342)

Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Logging , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.DependencyModel , System.Collections.Immutable , System.Diagnostics.DiagnosticSource
 From Version 6.0.0-preview.7.21377.4 -> To Version 6.0.0-preview.7.21377.12

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2021…
02c913d 
…0727.19 (dotnet#25353)

[release/6.0-preview7] Update dependencies from dotnet/runtime
@bricelam bricelam changed the title Update to .NET 6 Preview 6 Update to .NET 6 Preview 7 Jul 28, 2021
@bricelam
Copy link
Contributor Author

bricelam commented Jul 28, 2021 •
edited
Loading

@AndriySvyryd It looks like the latest daily build of the Preview 7 SDK has it. (Or at least my local build seems to have passed.) Can you review to make sure I didn't keep anything from #25324 that we don't want in main?

@bricelam bricelam requested a review from AndriySvyryd July 28, 2021 22:19
@bricelam bricelam merged commit 9832e7b into dotnet:main Jul 29, 2021
@bricelam bricelam deleted the 6p6 branch July 29, 2021 17:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@smitpatel smitpatel smitpatel left review comments

@AndriySvyryd AndriySvyryd AndriySvyryd approved these changes

@dougbu dougbu Awaiting requested review from dougbu

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Removed pinned dependency to Microsoft.Extensions.Caching.Memory.
5 participants
@bricelam @dougbu @AndriySvyryd @smitpatel @mmitche