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

Merging internal commits for release/8.0 #58898

Merged
merged 19 commits into from
Nov 13, 2024
Merged

Merging internal commits for release/8.0 #58898

merged 19 commits into from
Nov 13, 2024
+380 −394

Conversation

vseanreesermsft
Copy link
Contributor

No description provided.

maestro-prod-Primary and others added 18 commits September 24, 2024 23:59
@vseanreesermsft
Merged PR 43129: [internal/release/8.0] Update dependencies from dnce…
c6a133e 
…ng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:83131e87-e80d-4d5b-f426-08dbd53b3319)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 83131e87-e80d-4d5b-f426-08dbd53b3319
- **Build**: 20240924.6
- **Date Produced**: September 24, 2024 10:32:43 PM UTC
- **Commit**: dcf4a22cf8671c1abe880ebec4cfd906c99588bf
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Extensions.Caching.Memory**: [from 8.0.1 to 8.0.1][1]
  - **Microsoft.Extensions.Configuration.Json**: [from 8.0.1 to 8.0.1][1]
  - **Microsoft.Extensions.Configuration.UserSecrets**: [from 8.0.1 to 8.0.1][1]
  - **Microsoft.Extensions.Configuration.Xml**: [from 8.0.1 to 8.0.1][1]
  - **Microsoft.Extensions.DependencyInjection**: [from 8.0.1 to 8.0.1][1]
  - **Microsoft.Extensions.DependencyInjection.Abstractions**: [from 8.0.2 to 8.0.2][1]
  - **Microsoft.Extensions.DependencyModel**: [from 8.0.2 to 8.0.2][1]
  - **Microsoft.Extensions.Diagnostics**: [from 8.0.1 to 8.0.1][1]
  - **Microsoft.Extensions.Diagnostics.Abstractions**: [from 8.0.1 to 8.0.1][1]
  - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 8.0.10-servicing.24466.10 to 8.0.10-servicing.24474.6][1]
  - **Microsoft.Extensions.Hosting**: [from 8.0.1 to 8.0.1][1]
  - **Microsoft.Extensions.Hosting.Abstractions**: [from 8.0.1 to 8.0.1][1]
  - **Microsoft.Extensions.Http**: [from 8.0.1 to 8.0.1][1]
  - **Microsoft.Extensions.Logging**: [from 8.0.1 to 8.0.1][1]
  - **Microsoft.Extensions.Logging.Abstractions**: [from 8.0.2 to 8.0.2][1]
  - **Microsoft.Extensions.Logging.Configuration**: [from 8.0.1 to 8.0.1][1]
  - **Microsoft.Extensions.Logging.Console**: [from 8.0.1 to 8.0.1][1]
  - **Microsoft.Extensions.Logging.Debug**: [from 8.0.1 to 8.0.1][1]
  - **Microsoft.Extensions.Logging.EventLog**: [from 8.0.1 to 8.0.1][1]
  - **Microsoft.Extensions.Logging.EventSource**: [from 8.0.1 to 8.0.1][1]
  - **Microsoft.Extensions.Logging.TraceSource**: [from 8.0.1 to 8.0.1][1]
  - **Microsoft.Internal.Runtime.AspNetCore.Transport**: [from 8.0.10-servicing.24466.10 to 8.0.10-servicing.24474.6][1]
  - **Microsoft.NET.Runtime.MonoAOTCompiler.Task**: [from 8.0.10 to 8.0.10][1]
  - **Microsoft.NET.Runtime.WebAssembly.Sdk**: [from 8.0.10 to 8.0.10][1]
  - **Microsoft.NETCore.App.Ref**: [from 8.0.10 to 8.0.10][1]
  - **Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm**: [from 8.0.10 to 8.0.10][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.10 to 8.0.10][1]
  - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 8.0.10-servicing.24466.10 to 8.0.10-servicing.24474.6][1]
  - **Microsoft.NETCore.Platforms**: [from 8.0.10-servicing.24466.10 to 8.0.10-servicing.24474.6][1]
  - **System.Configuration.ConfigurationManager**: [from 8.0.1 to 8.0.1][1]
  - **System.Diagnostics.EventLog**: [from 8.0.1 to 8.0.1][1]
  - **System.Diagnostics.PerformanceCounter**: [fr...
Merge commit 'cec987b5a685cd43478df7abf5a78893a8f2c765'
5696438
Merge commit 'dfe2137ce88bbcf7116a55d8ed41f5d1219be8f2'
073c9fe
Merge commit 'b68823d4a484638f2409caf0475f017afbec5584'
74acf9e
Merge commit '2651bb9970f1804cbc72f025da8c0f8e4de5e3ee'
e4ac69a
Merge commit '878a52c6a863302c483b0d73d9944ed8005a0d61'
57672f4
@vseanreesermsft
Merged PR 43131: [internal/release/8.0] Update dependencies from dnce…
20b27a0 
…ng/internal/dotnet-efcore, dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:83131e87-e80d-4d5b-f426-08dbd53b3319)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 83131e87-e80d-4d5b-f426-08dbd53b3319
- **Build**: 20241014.23
- **Date Produced**: October 15, 2024 7:35:06 AM UTC
- **Commit**: c36b66f47588241680d564feaa2d589299adcd9c
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 8.0.11-servicing.24514.8 to 8.0.11-servicing.24514.23][4]
  - **Microsoft.Internal.Runtime.AspNetCore.Transport**: [from 8.0.11-servicing.24514.8 to 8.0.11-servicing.24514.23][4]
  - **Microsoft.NET.Runtime.MonoAOTCompiler.Task**: [from 8.0.11 to 8.0.11][4]
  - **Microsoft.NET.Runtime.WebAssembly.Sdk**: [from 8.0.11 to 8.0.11][4]
  - **Microsoft.NETCore.App.Ref**: [from 8.0.11 to 8.0.11][4]
  - **Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm**: [from 8.0.11 to 8.0.11][4]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.11 to 8.0.11][4]
  - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 8.0.11-servicing.24514.8 to 8.0.11-servicing.24514.23][4]
  - **Microsoft.NETCore.Platforms**: [from 8.0.11-servicing.24514.8 to 8.0.11-servicing.24514.23][4]
  - **Microsoft.SourceBuild.Intermediate.runtime.linux-x64**: [from 8.0.11-servicing.24514.8 to 8.0.11-servicing.24514.23][4]

[4]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC5292f3ab6decc3a8f863b02e6043fdaa1190c72d&targetVersion=GCc36b66f47588241680d564feaa2d589299adcd9c&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:83131e87-e80d-4d5b-f426-08dbd53b3319)

[marker]: <> (Begin:e179a2a7-bc5d-4498-2467-08dbd53ba9ce)
## From https://dev.azure.com/dnceng/internal/_git/dot
@vseanreesermsft @mmitche
Merged PR 43827: revert OOB package shas
127af9e 
revert OOB package shas from '5292f3ab6decc3a8f863b02e6043fdaa1190c72d' to 'dcf4a22cf8671c1abe880ebec4cfd906c99588bf'

----
#### AI description  (iteration 1)
#### PR Classification
Reversion of previous changes to package SHAs.

#### PR Summary
This pull request reverts the SHAs of several dependencies to their previous values.
- `eng/Version.Details.xml`: Reverted SHAs for multiple dependencies including `Microsoft.Extensions.Hosting.Abstractions`, `Microsoft.Extensions.Logging`, `System.Security.Cryptography.Pkcs`, and others.
@dotnet-bot
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
4c938ae 
…otnet-runtime build 20241017.7

Microsoft.Extensions.HostFactoryResolver.Sources , 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 , Microsoft.NETCore.Platforms , Microsoft.SourceBuild.Intermediate.runtime.linux-x64
 From Version 8.0.11-servicing.24514.23 -> To Version 8.0.11-servicing.24517.7
@vseanreesermsft
Merged PR 43936: [internal/release/8.0] Update dependencies from dnce…
fc878b7 
…ng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:83131e87-e80d-4d5b-f426-08dbd53b3319)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 83131e87-e80d-4d5b-f426-08dbd53b3319
- **Build**: 20241017.7
- **Date Produced**: October 17, 2024 11:26:32 PM UTC
- **Commit**: 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 8.0.11-servicing.24514.23 to 8.0.11-servicing.24517.7][1]
  - **Microsoft.Internal.Runtime.AspNetCore.Transport**: [from 8.0.11-servicing.24514.23 to 8.0.11-servicing.24517.7][1]
  - **Microsoft.NET.Runtime.MonoAOTCompiler.Task**: [from 8.0.11 to 8.0.11][1]
  - **Microsoft.NET.Runtime.WebAssembly.Sdk**: [from 8.0.11 to 8.0.11][1]
  - **Microsoft.NETCore.App.Ref**: [from 8.0.11 to 8.0.11][1]
  - **Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm**: [from 8.0.11 to 8.0.11][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.11 to 8.0.11][1]
  - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 8.0.11-servicing.24514.23 to 8.0.11-servicing.24517.7][1]
  - **Microsoft.NETCore.Platforms**: [from 8.0.11-servicing.24514.23 to 8.0.11-servicing.24517.7][1]
  - **Microsoft.SourceBuild.Intermediate.runtime.linux-x64**: [from 8.0.11-servicing.24514.23 to 8.0.11-servicing.24517.7][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:83131e87-e80d-4d5b-f426-08dbd53b3319)
@vseanreesermsft
Merged PR 44008: [internal/release/8.0] Merge from public
cb771e5 
Merge from public release/8.0 to internal/release/8.0 and resolve conflicts if necessary

----
#### AI description  (iteration 1)
#### PR Classification
Merge from public branch to internal release branch.

#### PR Summary
This pull request updates dependencies, fixes a bug related to SAS token generation, and improves error handling for certificate export.
- `/eng/Version.Details.xml`, `/global.json`, `/eng/Versions.props`: Updated various dependencies to newer versions.
- `/eng/common/templates-official/steps/get-delegation-sas.yml`, `/eng/common/templates/steps/get-delegation-sas.yml`: Added workaround for SAS token generation issue.
- `/src/Tools/dotnet-dev-certs/src/Program.cs`, `/src/Shared/CertificateGeneration/CertificateManager.cs`, `/src/Shared/CertificateGeneration/EnsureCertificateResult.cs`: Improved error handling for exporting certificates to non-existent directories.
- `/NuGet.config`: Added multiple new package sources.
- `/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs`: Updated test to reflect new error handling for certificate export.
@dotnet-bot
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
155b8bf 
…otnet-efcore build 20241018.7

dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools
 From Version 8.0.11 -> To Version 8.0.11
@vseanreesermsft
Merged PR 44022: [internal/release/8.0] Update dependencies from dnce…
bb08e05 
…ng/internal/dotnet-efcore

This pull request updates the following dependencies

[marker]: <> (Begin:e179a2a7-bc5d-4498-2467-08dbd53ba9ce)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- **Subscription**: e179a2a7-bc5d-4498-2467-08dbd53ba9ce
- **Build**: 20241018.7
- **Date Produced**: October 18, 2024 11:34:50 PM UTC
- **Commit**: 3b21bdbca2e61c185d51f7317415415d28d2bc3c
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

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

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:e179a2a7-bc5d-4498-2467-08dbd53ba9ce)
@vseanreesermsft
[internal/release/8.0] Updated NuGet.config - add feed for efcore 3b2…
53c99d3 
…1bdbc
@vseanreesermsft
Merged PR 44051: [internal/release/8.0] Updated NuGet.config - add fe…
8e8eded 
…ed for efcore 3b21bdbc

[internal/release/8.0] Updated NuGet.config - add feed for efcore 3b21bdbc

----
#### AI description  (iteration 1)
#### PR Classification
Configuration update to add a new package feed.

#### PR Summary
This pull request updates the `NuGet.config` file to include a new package feed for efcore.
- `NuGet.config`: Added a new package source for `darc-int-dotnet-efcore-3b21bdbc`.
@dotnet-bot
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
809a619 
…otnet-efcore build 20241021.4

dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools
 From Version 8.0.11 -> To Version 8.0.11
@vseanreesermsft
Merged PR 44074: [internal/release/8.0] Update dependencies from dnce…
4757647 
…ng/internal/dotnet-efcore

This pull request updates the following dependencies

[marker]: <> (Begin:e179a2a7-bc5d-4498-2467-08dbd53ba9ce)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- **Subscription**: e179a2a7-bc5d-4498-2467-08dbd53ba9ce
- **Build**: 20241021.4
- **Date Produced**: October 21, 2024 10:31:38 PM UTC
- **Commit**: 5d020e763f00511c102f94fdf5bf525512d7daaf
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

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

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:e179a2a7-bc5d-4498-2467-08dbd53ba9ce)
@vseanreesermsft
Merge commit '47576478939fdd59b4400ad135f47938af486ab3' into internal…
8eb7a80 
…-merge-8.0-2024-11-12-1234
@vseanreesermsft vseanreesermsft requested review from wtgodbe and a team as code owners November 12, 2024 20:34
@dotnet-issue-labeler dotnet-issue-labeler bot added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Nov 12, 2024
@dotnet-policy-service dotnet-policy-service bot added this to the 8.0.x milestone Nov 12, 2024
@wtgodbe
Copy link
Member

wtgodbe commented Nov 13, 2024

/_/src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/MsQuicApi.cs(90): warning IL3000: System.Net.Quic.MsQuicApi..cctor(): 'System.Reflection.Assembly.Location.get' always returns an empty string for assemblies embedded in a single-file app. If the path to the app directory is needed, consider calling 'System.AppContext.BaseDirectory'. [C:hwB71C09AAwC1000A28eTemplatesBaseFolderAspNet.ldyn3i3otbgjAspNet.ldyn3i3otbgj.csproj]

@elinor-fung is this related to the quic change in Runtime that affected the 9.0 build a few weeks ago?

@elinor-fung
Copy link
Member

Yeah, seems so. Looks like we need the same suppression of IL3000 fix we put in 9.0.

@rzikm - was the original change only in internal 8.0 and 9.0? Or is there somewhere else we will hit this too?

@wtgodbe
Copy link
Member

wtgodbe commented Nov 13, 2024

Cool, in that case I'll merge around the test failure

@wtgodbe wtgodbe merged commit e387348 into dotnet:release/8.0 Nov 13, 2024
20 of 25 checks passed
@dotnet-policy-service dotnet-policy-service bot modified the milestones: 8.0.x, 8.0.12 Nov 13, 2024
@rzikm
Copy link
Member

rzikm commented Nov 13, 2024

Yeah, seems so. Looks like we need the same suppression of IL3000 fix we put in 9.0.

@rzikm - was the original change only in internal 8.0 and 9.0? Or is there somewhere else we will hit this too?

It should only be 8.0 And 9.0. I will also soon port it to main as well (with the suppression as to not cause more warnings)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wtgodbe wtgodbe Awaiting requested review from wtgodbe wtgodbe is a code owner

Assignees
No one assigned
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework
Projects
None yet
Milestone
8.0.12
Development

Successfully merging this pull request may close these issues.
5 participants
@vseanreesermsft @wtgodbe @elinor-fung @rzikm @dotnet-bot