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

[main] Update dependencies from dotnet/efcore dotnet/runtime #50362

Merged
merged 111 commits into from
Sep 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
4481f33
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Aug 27, 2023
e0203e7
Update SourceBuildPrebuiltBaselines.xml
MackinnonBuck Aug 28, 2023
15ee738
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Aug 29, 2023
e1967b9
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Aug 29, 2023
8c64963
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Aug 30, 2023
bea299d
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Aug 31, 2023
630f22b
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Aug 31, 2023
dd5e59d
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 1, 2023
dd5b384
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Sep 2, 2023
de6f796
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 3, 2023
0723955
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Sep 3, 2023
6941477
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Sep 4, 2023
c580d6b
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 5, 2023
6ada3d5
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Sep 5, 2023
71deb4e
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 5, 2023
11b8dd5
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 5, 2023
6ce6a9c
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 5, 2023
0535f75
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 5, 2023
e1b03fb
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 6, 2023
bb96fa7
Merge branch 'main' into darc-main-415af172-37a5-4932-942b-aa457d56a9fa
surayya-MS Sep 6, 2023
e2aa96f
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 6, 2023
b760ac8
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Sep 6, 2023
11e2269
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 6, 2023
0a0aa2c
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 6, 2023
b98a8cc
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 6, 2023
b047067
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 6, 2023
f533f7f
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 6, 2023
abbdb45
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 6, 2023
83feed2
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 6, 2023
6045c53
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Sep 7, 2023
dfd607d
Merge branch 'main' into darc-main-415af172-37a5-4932-942b-aa457d56a9fa
BrennanConroy Sep 7, 2023
35e6878
tfm net9.0
BrennanConroy Sep 8, 2023
c213410
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 8, 2023
a2708e8
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 9, 2023
be4ac13
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 9, 2023
6012f7c
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 9, 2023
e97db64
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Sep 9, 2023
9521455
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 9, 2023
b695077
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Sep 10, 2023
ec955d5
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 10, 2023
8f9c41e
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 10, 2023
ee94e37
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Sep 11, 2023
7f61901
Merge branch 'main' into darc-main-415af172-37a5-4932-942b-aa457d56a9fa
wtgodbe Sep 11, 2023
1c34dd6
Undo arcade changes
wtgodbe Sep 11, 2023
63d43e3
Fix RepoTasks
wtgodbe Sep 11, 2023
85532bd
Oops
wtgodbe Sep 11, 2023
fe048a1
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 11, 2023
f8e7628
Try net9 for Repotasks
wtgodbe Sep 11, 2023
8b90322
Merge branch 'darc-main-415af172-37a5-4932-942b-aa457d56a9fa' of http…
wtgodbe Sep 11, 2023
208296f
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Sep 11, 2023
00fd796
Back to net8.0 for RepoTask
wtgodbe Sep 11, 2023
48affad
Merge branch 'darc-main-415af172-37a5-4932-942b-aa457d56a9fa' of http…
wtgodbe Sep 11, 2023
a995aae
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 12, 2023
c66c59a
Patch KnownWebAssemblySdkPack the same way as KnownILLinkPack
maraf Sep 12, 2023
46d0117
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Sep 12, 2023
236b8f0
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 12, 2023
6c17076
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 12, 2023
4402b9d
Update max TFM
wtgodbe Sep 12, 2023
9ceb323
Add back other workaround
wtgodbe Sep 12, 2023
5345d70
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 12, 2023
ab86341
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Sep 12, 2023
8b28f60
A couple o fixes
wtgodbe Sep 12, 2023
294a2c8
Skip benchmarks again
wtgodbe Sep 12, 2023
65b8594
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 12, 2023
243feb2
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 12, 2023
b62cc19
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Sep 12, 2023
440ed5e
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 13, 2023
ba11c6d
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 13, 2023
513d91b
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Sep 13, 2023
586a77d
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 13, 2023
5b2e46e
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Sep 13, 2023
9de076f
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 13, 2023
89992fc
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Sep 13, 2023
c479eca
Merge remote-tracking branch 'remote/main' into darc-main-415af172-37…
RussKie Sep 14, 2023
019c16c
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 14, 2023
1dda8b1
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Sep 14, 2023
4bf1513
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 14, 2023
239383e
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Sep 14, 2023
4cf1766
Try something
wtgodbe Sep 14, 2023
1aa6cf9
Keep on tryin
wtgodbe Sep 14, 2023
3bfd792
Perhaps this
wtgodbe Sep 14, 2023
2af0893
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 15, 2023
c450d00
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 15, 2023
226eefe
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Sep 15, 2023
eb7759e
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 15, 2023
c60ae83
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 15, 2023
fe7fecd
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 15, 2023
b3fba9c
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 15, 2023
163689a
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 16, 2023
4121601
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 16, 2023
5d6984b
Update dependencies from https://github.com/dotnet/efcore build 20230…
dotnet-maestro[bot] Sep 16, 2023
5b1ef05
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Sep 16, 2023
11181f0
Merge branch 'main' into darc-main-415af172-37a5-4932-942b-aa457d56a9fa
wtgodbe Sep 18, 2023
11ffeaa
Merge branch 'main' into darc-main-415af172-37a5-4932-942b-aa457d56a9fa
wtgodbe Sep 18, 2023
bb6bc1e
Fix trimming
wtgodbe Sep 18, 2023
1e0bf1c
Merge branch 'darc-main-415af172-37a5-4932-942b-aa457d56a9fa' of http…
wtgodbe Sep 18, 2023
afb9bfa
Remove unneeded stuff
wtgodbe Sep 18, 2023
841f4d4
Move
wtgodbe Sep 18, 2023
c45c1e9
Fixup
wtgodbe Sep 18, 2023
51f6183
Merge branch 'main' into darc-main-415af172-37a5-4932-942b-aa457d56a9fa
wtgodbe Sep 18, 2023
571e7ab
Fix CodeCheck
wtgodbe Sep 18, 2023
9498194
Do KnownILCompilerPack too
wtgodbe Sep 18, 2023
70fc4a7
Add KnownFrameworkRef
wtgodbe Sep 18, 2023
eefd435
More packs
wtgodbe Sep 18, 2023
a7a0d01
Keep workin around
wtgodbe Sep 18, 2023
947349d
TargetingPackVersion
wtgodbe Sep 18, 2023
0ad459f
Quarantine failing tests
wtgodbe Sep 18, 2023
619fe4c
Update for SourceBuild
wtgodbe Sep 18, 2023
45a66c5
Quarantines
SteveSandersonMS Sep 20, 2023
76a9d27
Skip instead of quarantine
SteveSandersonMS Sep 20, 2023
aec5ff4
Skip more
SteveSandersonMS Sep 20, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"remoteEnv": {
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}",
"DOTNET_MULTILEVEL_LOOKUP": "0",
"TARGET": "net8.0",
"TARGET": "net9.0",
"DOTNET_WATCH_SUPPRESS_LAUNCH_BROWSER": "true"
},
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
Expand Down
3 changes: 2 additions & 1 deletion docs/UpdatingMajorVersionAndTFM.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,12 @@ Typically, we will update the Major Version before updating the TFM. This is bec

## Updating TFM

Once dotnet/runtime has updated their TFM, we update ours in the dependency update PR ingesting that change. We won't be able to ingest new dotnet/runtime dependencies in `main` until this is done. For an example, [this](https://github.com/dotnet/aspnetcore/pull/36328) is the PR where we updated our TFM to `net8.0`. This step can be tricky - we have workarounds in [eng/tools/GenerateFiles/Directory.Build.targets.in](/eng/tools/GenerateFiles/Directory.Build.targets.in) to make the build work before we get an SDK containing runtime references with the new TFM. We copy the `KnownFrameworkReference`, `KnownRuntimePack`, and `KnownAppHostPack` from the previous TFM, give them the incoming runtime dependency versions, and give them the new TFM (these TFMs no-op most of the time - they only apply during this period when we're using an SDK that doesn't know about the new TFM). These workarounds allow us to build against the new TFM before we get an SDK with a reference to it, but there are often problems that arise in this area. The best way to debug build errors related to FrameworkReferences it to get a binlog of a failing project (`dotnet build /bl`) and look at the inputs to the task that failed. Confirm that the `Known___` items look as expected (there is an entry with the current TFM & the current dotnet/runtime dependency version), and look at the source code of the task in [dotnet/sdk](https://github.com/dotnet/sdk) for hints.
Once dotnet/runtime has updated their TFM, we update ours in the dependency update PR ingesting that change. We won't be able to ingest new dotnet/runtime dependencies in `main` until this is done. For an example, [this](https://github.com/dotnet/aspnetcore/pull/36328) is the PR where we updated our TFM to `net7.0`. This step can be tricky - we have workarounds in [eng/tools/GenerateFiles/Directory.Build.targets.in](/eng/tools/GenerateFiles/Directory.Build.targets.in) to make the build work before we get an SDK containing runtime references with the new TFM. We copy the `KnownFrameworkReference`, `KnownRuntimePack`, and `KnownAppHostPack` from the previous TFM, give them the incoming runtime dependency versions, and give them the new TFM (these TFMs no-op most of the time - they only apply during this period when we're using an SDK that doesn't know about the new TFM). These workarounds allow us to build against the new TFM before we get an SDK with a reference to it, but there are often problems that arise in this area. The best way to debug build errors related to FrameworkReferences it to get a binlog of a failing project (`dotnet build /bl`) and look at the inputs to the task that failed. Confirm that the `Known___` items look as expected (there is an entry with the current TFM & the current dotnet/runtime dependency version), and look at the source code of the task in [dotnet/sdk](https://github.com/dotnet/sdk) for hints.

### Required changes

* In [eng/Versions.props](/eng/Versions.props), increment `DefaultNetCoreTargetFramework` by 1.
* In [eng/SourceBuild.props](/eng/SourceBuild.props), update `SourceBuildTargetFrameworkFilter` to include the current TFM.
* Do a global repo search for the current version string, and update almost everything by 1 (e.g. find `net8`, replace with `net9`). See the PR linked above for examples - this shouldn't be done blindly, but on a case-by-case basis. Most things should be updated, and most choices should be obvious.
* Exceptions to this are [eng/tools/RepoTasks/RepoTasks.csproj](/eng/tools/RepoTasks/RepoTasks.csproj) and [eng/tools/RepoTasks/RepoTasks.tasks](/eng/tools/RepoTasks/RepoTasks.tasks). These build without the workarounds from [eng/tools/GenerateFiles/Directory.Build.targets.in](/eng/tools/GenerateFiles/Directory.Build.targets.in), and need to be kept at the previous TFM until we get an SDK containing a runtime with the new TFM. Generally this means we have to hard-code the previous TFM for these files, rather than using `DefaultNetCoreTargetFramework`.
* Add a reference to the new `SiteExtensions` package for the previous Major Version.
Expand Down
6 changes: 6 additions & 0 deletions eng/BeforeTargetFrameworkInference.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<Project>
<PropertyGroup>
<!-- Workaround while there is no SDK available that understands the TFM; suppress unsupported version errors. -->
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
</PropertyGroup>
</Project>
1 change: 1 addition & 0 deletions eng/SourceBuild.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<PropertyGroup>
<GitHubRepositoryName>aspnetcore</GitHubRepositoryName>
<SourceBuildManagedOnly>true</SourceBuildManagedOnly>
<SourceBuildTargetFrameworkFilter>netstandard2.0%3bnetstandard2.1%3bnetcoreapp2.1%3bnetcoreapp3.1%3bnet5.0%3bnet6.0%3bnet7.0%3bnet8.0%3bnet9.0</SourceBuildTargetFrameworkFilter>
</PropertyGroup>

<Target Name="PrepareGlobalJsonForSourceBuild"
Expand Down
2 changes: 1 addition & 1 deletion eng/SourceBuildPrebuiltBaseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

<!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
<UsagePattern IdentityGlob="Microsoft.NET.ILLink.Tasks/*8.0.*" />
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*8.0.*" />
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*9.0.*" />

<!-- Transivite dependency of Microsoft.CodeAnalysis.ExternalAccess.AspNetCore -> Microsoft.CodeAnalysis.Features.
In product build the dependency is bumped to latest, which also bumps the version of DiaSymReader -->
Expand Down
Loading
Loading