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.

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

Merging internal commits for release/7.0 #52045

Merged

Conversation

vseanreesermsft
Copy link
Contributor

No description provided.

dotnet-bot and others added 30 commits August 31, 2023 20:17
Prevent submission of EditForm after disposal
…Threading.RateLimiting

Updated Version.Details.xml - revert System.Threading.RateLimiting sha to ecb34f85ec92e1b3c814edf7da83337e199e7f66 found here: https://nuget.info/packages/System.Threading.RateLimiting/7.0.1
Merge from public release/7.0 to internal/release/7.0 and resolve conflicts if necessary
…otnet-runtime build 20231017.18

Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , System.Text.Json
 From Version 7.0.13-servicing.23516.30 -> To Version 7.0.13-servicing.23517.18
…ng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:2802be6f-a6f7-477e-8165-08da7ef6284d)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 2802be6f-a6f7-477e-8165-08da7ef6284d
- **Build**: 20231017.18
- **Date Produced**: October 18, 2023 5:47:10 AM UTC
- **Commit**: 1fd68c0252f4fc5a75d25731f4407decd4aa218e
- **Branch**: refs/heads/internal/release/7.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Internal.Runtime.AspNetCore.Transport**: [from 7.0.13-servicing.23516.30 to 7.0.13-servicing.23517.18][1]
  - **Microsoft.NET.Runtime.MonoAOTCompiler.Task**: [from 7.0.13 to 7.0.13][1]
  - **Microsoft.NET.Runtime.WebAssembly.Sdk**: [from 7.0.13 to 7.0.13][1]
  - **Microsoft.NETCore.App.Ref**: [from 7.0.13 to 7.0.13][1]
  - **Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm**: [from 7.0.13 to 7.0.13][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.13 to 7.0.13][1]
  - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 7.0.13-servicing.23516.30 to 7.0.13-servicing.23517.18][1]
  - **System.Text.Json**: [from 7.0.4 to 7.0.4][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC282d49406e&targetVersion=GC1fd68c0252&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:2802be6f-a6f7-477e-8165-08da7ef6284d)
…otnet-runtime build 20231019.10

Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , System.Text.Json
 From Version 7.0.14-servicing.23518.19 -> To Version 7.0.14-servicing.23519.10
dotnet-bot and others added 2 commits October 23, 2023 21:04
…ng/internal/dotnet-efcore

This pull request updates the following dependencies

[marker]: <> (Begin:10156ce0-bf6e-4dac-1399-08da7ef5fa55)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- **Subscription**: 10156ce0-bf6e-4dac-1399-08da7ef5fa55
- **Build**: 20231023.13
- **Date Produced**: October 23, 2023 7:55:53 PM UTC
- **Commit**: 31662b30f1a4497db482b3aed8ed4c4aa6de801b
- **Branch**: refs/heads/internal/release/7.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-ef**: [from 7.0.12 to 7.0.14][1]
  - **Microsoft.EntityFrameworkCore**: [from 7.0.12 to 7.0.14][1]
  - **Microsoft.EntityFrameworkCore.Design**: [from 7.0.12 to 7.0.14][1]
  - **Microsoft.EntityFrameworkCore.InMemory**: [from 7.0.12 to 7.0.14][1]
  - **Microsoft.EntityFrameworkCore.Relational**: [from 7.0.12 to 7.0.14][1]
  - **Microsoft.EntityFrameworkCore.Sqlite**: [from 7.0.12 to 7.0.14][1]
  - **Microsoft.EntityFrameworkCore.SqlServer**: [from 7.0.12 to 7.0.14][1]
  - **Microsoft.EntityFrameworkCore.Tools**: [from 7.0.12 to 7.0.14][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-efcore/branches?baseVersion=GCc20ecc79b7&targetVersion=GC31662b30f1&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:10156ce0-bf6e-4dac-1399-08da7ef5fa55)
@vseanreesermsft vseanreesermsft requested review from a team and wtgodbe as code owners November 14, 2023 18:19
@dotnet-issue-labeler dotnet-issue-labeler bot added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Nov 14, 2023
@ghost ghost added this to the 7.0.x milestone Nov 14, 2023
@ghost
Copy link

ghost commented Nov 14, 2023

Hi @vseanreesermsft. If this is not a tell-mode PR, please make sure to follow the instructions laid out in the servicing process document.
Otherwise, please add tell-mode label.

@ghost
Copy link

ghost commented Nov 14, 2023

Hey @dotnet/aspnet-build, looks like this PR is something you want to take a look at.

@wtgodbe
Copy link
Member

wtgodbe commented Nov 14, 2023

@MackinnonBuck could you take a look at these blazor template test failures?

BlazorWasmHostedTemplate_IndividualAuth_NoHttps_Works_WithOutLocalDB_ProgramMain

System.ComponentModel.Win32Exception : An error occurred trying to start process 'dotnet-ef' with working directory '/tmp/helix/working/A6D30982/w/B4780A0D/e/Templates/BaseFolder/AspNet.Uutzfhzkapmb/Server'. No such file or directory

Lots of failures of this type across various OSes

@MackinnonBuck
Copy link
Member

I haven't been able to narrow down the cause just yet, but it seems EF-related. My guess is that the "DotNetEfFullPath" environment variable isn't being set up correctly and that's causing this code to use the fallback "dotnet-ef" command. Trying to reproduce locally.

@MackinnonBuck
Copy link
Member

It seems that dotnet-ef 8.0.0 is getting installed:

/datadisks/disk1/work/BC800A71/t/630ced86-05ff-4c05-8274-385fc9b24e15/restore.csproj : error NU1202: Package dotnet-ef 8.0.0 is not compatible with net7.0 (.NETCoreApp,Version=v7.0) / any. Package dotnet-ef 8.0.0 supports: net8.0 (.NETCoreApp,Version=v8.0) / any

@wtgodbe
Copy link
Member

wtgodbe commented Nov 15, 2023

@dsplaisted is this the bug where the dotnet tool install silently installs the latest version of a package, rather than what was requested?

@wtgodbe
Copy link
Member

wtgodbe commented Nov 15, 2023

#52094 is this PR without the SDK update. If the tests pass, that would point to the dotnet tool install bug

@dsplaisted
Copy link
Member

@wtgodbe The bug you're referring to was with local tools, and I would be very surprised if it were to show up in 7.0, as it was related to some major tools refactoring that is only in 8.0.

In this case, it looks like this is the command line used to install the tool:

Running '/datadisks/disk1/work/BC800A71/p/dotnet-cli/dotnet tool install dotnet-ef --tool-path /datadisks/disk1/work/BC800A71/w/97FC0871/e --add-source /datadisks/disk1/work/BC800A71/p'

That command will install (as a global tool) the latest version available on the feeds. So now that .NET 8 has been released, it's trying to install the 8.0 version of dotnet-ef, which fails because it's not compatible with .NET 7.

@wtgodbe
Copy link
Member

wtgodbe commented Nov 15, 2023

If 4f873f6 works I'll port it to 8 & main

auto-merge was automatically disabled November 15, 2023 22:28

Merge commits are not allowed on this repository

@wtgodbe wtgodbe merged commit 4843428 into dotnet:release/7.0 Nov 15, 2023
26 checks passed
@ghost ghost modified the milestones: 7.0.x, 7.0.13 Nov 15, 2023
@wtgodbe
Copy link
Member

wtgodbe commented Nov 15, 2023

Ports: #52103, #52104

@wtgodbe wtgodbe modified the milestones: 7.0.13, 7.0.15 Nov 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

6 participants