[master] Update dependencies from dotnet/runtime dotnet/efcore #26788
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![dotnet-maestro[bot]](https://avatars.githubusercontent.com/in/16706?s=60&v=4){kind=small}
ghost
added
area-infrastructure
dotnet-maestro
bot
changed the title
|
@dotnet/aspnet-build It looks like we're going to update the default TFM to merge this dependency update.
|
|
See #22737 |
dotnet-maestro
bot
changed the title
TanayParikh
added
the
blocked
|
Marking blocked on: #22737 |
@TanayParikh please work to get this PR going rather than handling #22737 separately. |
Sounds good. Working on tackling #26767 right now. Any tips on resolving this? Just do a rollback on requisite packages? |
dotnet-maestro
bot
changed the title
dotnet-maestro
bot
requested review from
BrennanConroy,
halter73,
jkotalik,
SteveSandersonMS,
Tratcher and
a team
as code owners
TanayParikh
reviewed
Oct 14, 2020
dotnet-maestro
bot
changed the title
|
@dsplaisted @wli3 I don't see anything about @TanayParikh if not, there may be a bug in our workaround at https://github.com/dotnet/aspnetcore/blob/master/eng/Workarounds.targets#L46-L56 Might also be as simple as changing |
Thanks, hadn't done that, updated. Build progressing further now. |
dougbu
reviewed
Oct 15, 2020
| @@ -3,7 +3,7 @@ | |||
| <metadata> | |||
| $CommonMetadataElements$ | |||
| <dependencies> | |||
| <group targetFramework=".net5.0"> | |||
| <group targetFramework=".net6.0"> | |||
There was a problem hiding this comment.
It's pretty easy to extend the properties passed into *.nuspec files. Should do that to avoid having to change this again (relatively soon).
| @@ -281,7 +281,7 @@ public async Task Build_Hosted_Works() | |||
| Assert.FileDoesNotExist(result, buildOutputDirectory, "wwwroot", "_framework", "_bin", "blazorwasm.dll"); | |||
|
|
|||
| var staticWebAssets = Assert.FileExists(result, buildOutputDirectory, "blazorhosted.StaticWebAssets.xml"); | |||
| Assert.FileContains(result, staticWebAssets, Path.Combine("net5.0", "wwwroot")); | |||
| Assert.FileContains(result, staticWebAssets, Path.Combine("net6.0", "wwwroot")); | |||
There was a problem hiding this comment.
My suggestion for test code is to compile https://github.com/dotnet/aspnetcore/blob/master/src/Framework/test/TestDataAttribute.cs into every test project and unconditionally include the bit at https://github.com/dotnet/aspnetcore/blob/master/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj#L19-L22. The code to read that attribute value is pretty simple but could also be centralized. Again, this will make it much easier to change next time around.
src/Components/WebAssembly/Sdk/src/targets/Microsoft.NET.Sdk.BlazorWebAssembly.Current.targets
Show resolved
Hide resolved
src/ProjectTemplates/BlazorTemplates.Tests/Infrastructure/Directory.Build.props.in
Outdated
Show resolved
Hide resolved
src/ProjectTemplates/test/Infrastructure/Directory.Build.props.in
Outdated
Show resolved
Hide resolved
6 tasks
dotnet-maestro
bot
changed the title
dotnet-maestro
bot
changed the title
|
Down to a couple of problems that may be specific to this update, only the first truly blocking:
|
|
Still unable to get clear information from the dumps. Don't know if this is normal but I find the extra |
dotnet-maestro
bot
changed the title
dotnet-maestro
bot
changed the title
…026.1 Microsoft.EntityFrameworkCore.Tools , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer From Version 6.0.0-alpha.1.20509.5 -> To Version 6.0.0-alpha.1.20526.1
…1025.3 System.ComponentModel.Annotations , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Internal.Transport , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , Microsoft.Win32.Registry , Microsoft.Win32.SystemEvents , Microsoft.NETCore.App.Internal , Microsoft.NETCore.App.Ref , System.Drawing.Common , System.Windows.Extensions , System.Threading.Channels , System.Text.Encodings.Web , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.WebSockets.WebSocketProtocol , System.Reflection.Metadata , System.Text.Json , System.Resources.Extensions , System.Runtime.CompilerServices.Unsafe , System.Security.AccessControl , System.Security.Cryptography.Cng , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.Security.Principal.Windows , System.ServiceProcess.ServiceController From Version 6.0.0-alpha.1.20507.4 -> To Version 6.0.0-alpha.1.20525.3
- make `$(CrossgenOutput)` property override-able - use override in CI jobs that submit to other platforms - for now, leave the ARM64 Helix jobs alone (build on Ubuntu, run in Debian) nits: - correct condition for `$(GenerateCrossgenProfilingSymbols)` - set `$(ASPNETCORE_TEST_LOG_DIR)` in every step of the Helix build jobs
dougbu
force-pushed
the
darc-master-76e24f4d-c90c-42ac-a1e5-411ae61ca37b
branch
from
f0ca22e to
84abf5e
Compare
dougbu
reviewed
Oct 27, 2020
| @@ -37,5 +37,10 @@ $env:BUILD_SOURCEBRANCH="local" | |||
| $env:BUILD_REPOSITORY_NAME="aspnetcore" | |||
| $env:SYSTEM_TEAMPROJECT="aspnetcore" | |||
|
|
|||
| Write-Host -ForegroundColor Yellow "If running tests that need the shared Fx, run './build -pack -all' before this." | |||
| Write-Host -ForegroundColor Yellow "And if packing for a different platform, add '/p:CrossgenOutput=false'." | |||
| <MSBuild Projects="$(RepoRoot)eng\tools\GenerateFiles\GenerateFiles.csproj" | ||
| RemoveProperties="BaseIntermediateOutputPath;ExcludeRestorePackageImports" | ||
| Targets="GenerateDirectoryBuildFiles" /> | ||
| </Target> |
There was a problem hiding this comment.
@dotnet/aspnet-build if you have a chance, please dummy-check my many manual changes in this PR. Big example here and in the new eng/tools/GenerateFiles/ project.
|
|
||
| <!-- Produce crossgen profiling symbols (.ni.pdb or .map files). --> | ||
| <GenerateCrossgenProfilingSymbols>true</GenerateCrossgenProfilingSymbols> | ||
| <GenerateCrossgenProfilingSymbols Condition=" '$(CrossgenOutput)' == 'false' OR '$(TargetOsName)' == 'osx'">false</GenerateCrossgenProfilingSymbols> | ||
| <GenerateCrossgenProfilingSymbols Condition=" '$(CrossgenOutput)' != 'true' OR '$(TargetOsName)' == 'osx' ">false</GenerateCrossgenProfilingSymbols> |
There was a problem hiding this comment.
Mentioned this nit in a commit description. Nothing exists that I'm aware of to set $(CrossgenOutput) to false outside the Helix jobs. Checking for not-true makes more sense given how that property is set just above.
|
(BTW I was looking for a crossed toes emoji too but couldn't find one 😺) |
…026.2 Microsoft.EntityFrameworkCore.Tools , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer From Version 6.0.0-alpha.1.20509.5 -> To Version 6.0.0-alpha.1.20526.2
dotnet-maestro
bot
changed the title
* Fix debug using embedded PDBs. * Check for either debugBuild or referenced PDBs Co-authored-by: Thays <[email protected]>
dotnet-maestro
bot
deleted the
darc-master-76e24f4d-c90c-42ac-a1e5-411ae61ca37b
branch
|
Hurray! |
dougbu
pushed a commit
that referenced
this pull request
Oct 31, 2020
… master - [master] Update dependencies from dotnet/runtime dotnet/efcore (#26788) - 219ecd6 - when project template tests run test assets, need latest shared Fx bits - hit `BadImageFormatException`s otherwise - test projects build against uploaded packages - those packages reference the 5.0.1 shared framework - the ASP.NET parts of the 5.0.1 shared Fx are `crossgen`ed to target Windows - Use runtime and ref/ assemblies matching repo in Helix testing - add Directory.Build.*.in files based on project template test infrastructure - use files as import boundary where the project doesn't create its own Directory.Build.* files - ensure `dotnet-watch` tests also use the latest runtime and ref/ assemblies - Extend Helix Directory.Build.* workarounds - generate Directory.Build.* files when restoring any projects - include generated files in Helix runs needing the latest runtime - copy generated files when testing `dotnet-watch` locally - include generated content in Microsoft.NET.Sdk.BlazorWebAssembly.IntegrationTests test assets - remove duplicate settings from existing Directory.Build.* files - ensure shared framework and targeting packs are laid out under .dotnet/ before test assets restore - Disable `crossgen` when building for Helix runs - make `$(CrossgenOutput)` property override-able - use override in CI jobs that submit to other platforms - for now, leave the ARM64 Helix jobs alone (build on Ubuntu, run in Debian)
This was referenced Oct 31, 2020
dougbu
pushed a commit
that referenced
this pull request
Nov 10, 2020
… master - [master] Update dependencies from dotnet/runtime dotnet/efcore (#26788) - 219ecd6 - when project template tests run test assets, need latest shared Fx bits - hit `BadImageFormatException`s otherwise - test projects build against uploaded packages - those packages reference the 5.0.1 shared framework - the ASP.NET parts of the 5.0.1 shared Fx are `crossgen`ed to target Windows - Use runtime and ref/ assemblies matching repo in Helix testing - add Directory.Build.*.in files based on project template test infrastructure - use files as import boundary where the project doesn't create its own Directory.Build.* files - ensure `dotnet-watch` tests also use the latest runtime and ref/ assemblies - Extend Helix Directory.Build.* workarounds - generate Directory.Build.* files when restoring any projects - include generated files in Helix runs needing the latest runtime - copy generated files when testing `dotnet-watch` locally - include generated content in Microsoft.NET.Sdk.BlazorWebAssembly.IntegrationTests test assets - remove duplicate settings from existing Directory.Build.* files - ensure shared framework and targeting packs are laid out under .dotnet/ before test assets restore - Disable `crossgen` when building for Helix runs - make `$(CrossgenOutput)` property override-able - use override in CI jobs that submit to other platforms - for now, leave the ARM64 Helix jobs alone (build on Ubuntu, run in Debian)
dougbu
added a commit
that referenced
this pull request
Nov 10, 2020
* Move to 5.0.1 versions * Move to GA .NET SDK - required for some tests to pass * Remove feeds that won't be needed after 5.0.0 is GA * Cherry-pick `$(CrossgenOutput)` and Directory.Build.*.in changes from master - [master] Update dependencies from dotnet/runtime dotnet/efcore (#26788) - 219ecd6 - when project template tests run test assets, need latest shared Fx bits - hit `BadImageFormatException`s otherwise - test projects build against uploaded packages - those packages reference the 5.0.1 shared framework - the ASP.NET parts of the 5.0.1 shared Fx are `crossgen`ed to target Windows - Use runtime and ref/ assemblies matching repo in Helix testing - add Directory.Build.*.in files based on project template test infrastructure - use files as import boundary where the project doesn't create its own Directory.Build.* files - ensure `dotnet-watch` tests also use the latest runtime and ref/ assemblies - Extend Helix Directory.Build.* workarounds - generate Directory.Build.* files when restoring any projects - include generated files in Helix runs needing the latest runtime - copy generated files when testing `dotnet-watch` locally - include generated content in Microsoft.NET.Sdk.BlazorWebAssembly.IntegrationTests test assets - remove duplicate settings from existing Directory.Build.* files - ensure shared framework and targeting packs are laid out under .dotnet/ before test assets restore - Disable `crossgen` when building for Helix runs - make `$(CrossgenOutput)` property override-able - use override in CI jobs that submit to other platforms - for now, leave the ARM64 Helix jobs alone (build on Ubuntu, run in Debian) * Correct an `$(IsTestAssetProject)` setting - affected projects are all test assets or provide test support - without this, a number of the projects are incorrectly marked as shipping * Baseline released 5.0.0 packages - this is a complete rewrite of eng/Baseline.xml - based on the 5.0.0 MergedManifest.xml file * Add 5.0.0 PackageOverrides.txt and PlatformManifest.txt files - need consistent versions when servicing targeting packs Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
dougbu
pushed a commit
to dougbu/razor-compiler
that referenced
this pull request
Nov 17, 2021
…t/aspnetcore#26788) [master] Update dependencies from dotnet/runtime dotnet/efcore - Update TFM net5.0 -> net6.0 - Introduce $(TargetTFM) - TargetTfm -> DefaultNetCoreTargetFramework - Updated: NETCoreAppMaximumVersion - Apply suggestions from code review Co-authored-by: Doug Bunting <[email protected]> - Fix version numbers used in Blazor WASM SDK - Address feedback from peer review - Fix check for platform version - Fix build config for dotnet-watch project - Update TFM net5.0 -> net6.0 - Introduce $(TargetTFM) - TargetTfm -> DefaultNetCoreTargetFramework - Apply suggestions from code review Co-authored-by: Doug Bunting <[email protected]> - Fix version numbers used in Blazor WASM SDK - Address feedback from peer review - Remove workaround in dotnet-watch tests - Testrunner to 5.0 and adding workarounds - Try props.in - net50 - Fixup KnownFrameworkReference for integration tests - Resolve a few comments - don't use repo-specific properties in shipping file - pass `$(DefaultNetCoreTargetFramework)` into template files used in tests - Update src/Components/WebAssembly/Sdk/src/targets/Microsoft.NET.Sdk.BlazorWebAssembly.Current.targets - Update KnownFrameworkReference for template tests - Use DefaultNetcoreTFM - Undo change to props.in - Update src/ProjectTemplates/test/ProjectTemplates.Tests.csproj - Update GenerateTestProps.targets - this is where `$(KnownAppHostPackOrFrameworkReferenceTfm)` is needed - Update src/ProjectTemplates/test/ProjectTemplates.Tests.csproj - additional template input not needed here - Other file changes - Rename the one net5.0 directory in the repo - Fixup rebase remnants - Use runtime and ref/ assemblies matching repo in Helix testing - add Directory.Build.*.in files based on project template test infrastructure - use files as import boundary where the project doesn't create its own Directory.Build.* files - ensure `dotnet-watch` tests also use the latest runtime and ref/ assemblies - Switch Directory.Build.*.in files in Helix content - ensure item manipulation is done after base items exist nit: Fix *.in exclusion - Update TFM workaround to reference 5.0 instead of 3.1 (dotnet/aspnetcore#26991) - Make some Directory.Build.*.in settings override-able - that is, move some properties to Directory.Build.props.in also - fix `Condition`s that resulted in empty Directory.Build.targets - separate Directory.Build.empty.in - ensure RunTests project is _not_ affected by root Directory.Build.* files - Update SDK - Set `$(DefaultNetCoreTargetFramework)` in Helix root Directory.Build.props = `dotnet-watch` tests otherwise fail with "The TargetFramework value '' was not recognized" - Extend Helix Directory.Build.* workarounds - generate Directory.Build.* files when restoring any projects - include generated files in Helix runs needing the latest runtime - copy generated files when testing `dotnet-watch` locally - include generated content in Microsoft.NET.Sdk.BlazorWebAssembly.IntegrationTests test assets - remove duplicate settings from existing Directory.Build.* files - ensure shared framework and targeting packs are laid out under .dotnet/ before test assets restore - !fixup! Remove extra end tags - !fixup! Don't build GenerateFiles.csproj in desktop `msbuild` - !fixup! Arcade uses different test targets - Disable `crossgen` when building for Helix runs - make `$(CrossgenOutput)` property override-able - use override in CI jobs that submit to other platforms - for now, leave the ARM64 Helix jobs alone (build on Ubuntu, run in Debian) nits: - correct condition for `$(GenerateCrossgenProfilingSymbols)` - set `$(ASPNETCORE_TEST_LOG_DIR)` in every step of the Helix build jobs - Ensure ReadRequest type can be loaded on server. Fixes dotnet/aspnetcore#26882 (dotnet/aspnetcore#26931) - Enable debugging when using embedded PDBs (dotnet/aspnetcore#27107) * Fix debug using embedded PDBs. * Check for either debugBuild or referenced PDBs Co-authored-by: Thays <[email protected]> - Ensure Blazor JS files are up-to-date - Merge branch 'master' into darc-master-76e24f4d-c90c-42ac-a1e5-411ae61ca37b Commit migrated from dotnet/aspnetcore@219ecd688012
dougbu
added a commit
to dougbu/razor-compiler
that referenced
this pull request
Nov 17, 2021
* Move to 5.0.1 versions * Move to GA .NET SDK - required for some tests to pass * Remove feeds that won't be needed after 5.0.0 is GA * Cherry-pick `$(CrossgenOutput)` and Directory.Build.*.in changes from master - [master] Update dependencies from dotnet/runtime dotnet/efcore (dotnet/aspnetcore#26788) - 219ecd688012 - when project template tests run test assets, need latest shared Fx bits - hit `BadImageFormatException`s otherwise - test projects build against uploaded packages - those packages reference the 5.0.1 shared framework - the ASP.NET parts of the 5.0.1 shared Fx are `crossgen`ed to target Windows - Use runtime and ref/ assemblies matching repo in Helix testing - add Directory.Build.*.in files based on project template test infrastructure - use files as import boundary where the project doesn't create its own Directory.Build.* files - ensure `dotnet-watch` tests also use the latest runtime and ref/ assemblies - Extend Helix Directory.Build.* workarounds - generate Directory.Build.* files when restoring any projects - include generated files in Helix runs needing the latest runtime - copy generated files when testing `dotnet-watch` locally - include generated content in Microsoft.NET.Sdk.BlazorWebAssembly.IntegrationTests test assets - remove duplicate settings from existing Directory.Build.* files - ensure shared framework and targeting packs are laid out under .dotnet/ before test assets restore - Disable `crossgen` when building for Helix runs - make `$(CrossgenOutput)` property override-able - use override in CI jobs that submit to other platforms - for now, leave the ARM64 Helix jobs alone (build on Ubuntu, run in Debian) * Correct an `$(IsTestAssetProject)` setting - affected projects are all test assets or provide test support - without this, a number of the projects are incorrectly marked as shipping * Baseline released 5.0.0 packages - this is a complete rewrite of eng/Baseline.xml - based on the 5.0.0 MergedManifest.xml file * Add 5.0.0 PackageOverrides.txt and PlatformManifest.txt files - need consistent versions when servicing targeting packs Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Commit migrated from dotnet/aspnetcore@352ad1a9804a
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request updates the following dependencies
From https://github.com/dotnet/efcore
From https://github.com/dotnet/runtime