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

[master] Update dependencies from dotnet/runtime dotnet/efcore #26788

Merged
merged 56 commits into from
Oct 27, 2020
Merged

[master] Update dependencies from dotnet/runtime dotnet/efcore #26788

Show file tree
Hide file tree
Changes from 51 commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
4327a5b
Update TFM net5.0 -> net6.0
TanayParikh Oct 14, 2020
1e1f840
Introduce $(TargetTFM)
TanayParikh Oct 15, 2020
7620c77
TargetTfm -> DefaultNetCoreTargetFramework
TanayParikh Oct 15, 2020
a7d9f50
Updated: NETCoreAppMaximumVersion
TanayParikh Oct 15, 2020
e623004
Apply suggestions from code review
captainsafia Oct 15, 2020
055e4a5
Fix version numbers used in Blazor WASM SDK
captainsafia Oct 15, 2020
438fff3
Address feedback from peer review
captainsafia Oct 16, 2020
0c65b39
Fix check for platform version
captainsafia Oct 16, 2020
b4188e7
Fix build config for dotnet-watch project
captainsafia Oct 16, 2020
f478802
Update TFM net5.0 -> net6.0
TanayParikh Oct 14, 2020
ffd19e9
Introduce $(TargetTFM)
TanayParikh Oct 15, 2020
bcf9285
TargetTfm -> DefaultNetCoreTargetFramework
TanayParikh Oct 15, 2020
bd2223f
Apply suggestions from code review
captainsafia Oct 15, 2020
267fada
Fix version numbers used in Blazor WASM SDK
captainsafia Oct 15, 2020
0ece813
Address feedback from peer review
captainsafia Oct 16, 2020
722230f
Remove workaround in dotnet-watch tests
captainsafia Oct 17, 2020
9609a84
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Oct 19, 2020
33000d5
Testrunner to 5.0 and adding workarounds
jkotalik Oct 19, 2020
bc64068
Try props.in
jkotalik Oct 19, 2020
1b95457
net50
jkotalik Oct 19, 2020
d8c8940
Fixup KnownFrameworkReference for integration tests
wtgodbe Oct 20, 2020
29b1e86
Update dependencies from https://github.com/dotnet/efcore build 20201…
dotnet-maestro[bot] Oct 20, 2020
a2025b8
Resolve a few comments
dougbu Oct 20, 2020
6f88be4
Update src/Components/WebAssembly/Sdk/src/targets/Microsoft.NET.Sdk.B…
dougbu Oct 20, 2020
dbba99d
Update KnownFrameworkReference for template tests
wtgodbe Oct 20, 2020
c5a8dea
Use DefaultNetcoreTFM
wtgodbe Oct 20, 2020
bd54554
Undo change to props.in
wtgodbe Oct 20, 2020
7ccb531
Update src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
dougbu Oct 20, 2020
868b318
Update GenerateTestProps.targets
dougbu Oct 20, 2020
fc89d36
Update src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
dougbu Oct 20, 2020
852dc96
Other file changes
jkotalik Oct 20, 2020
ecdefcd
Rename the one net5.0 directory in the repo
dougbu Oct 20, 2020
be806ca
Fixup rebase remnants
dougbu Oct 20, 2020
9bbd47d
Update dependencies from https://github.com/dotnet/efcore build 20201…
dotnet-maestro[bot] Oct 21, 2020
f4ec996
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Oct 21, 2020
59581fc
Use runtime and ref/ assemblies matching repo in Helix testing
dougbu Oct 21, 2020
0ce4f5f
Switch Directory.Build.*.in files in Helix content
dougbu Oct 21, 2020
2ebab12
Update TFM workaround to reference 5.0 instead of 3.1 (#26991)
wtgodbe Oct 22, 2020
c3e76ad
Make some Directory.Build.*.in settings override-able
dougbu Oct 22, 2020
6cf1031
Update dependencies from https://github.com/dotnet/efcore build 20201…
dotnet-maestro[bot] Oct 22, 2020
0c5ffbb
Update dependencies from https://github.com/dotnet/efcore build 20201…
dotnet-maestro[bot] Oct 23, 2020
ba1a1ff
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Oct 23, 2020
94d5dbd
Update SDK
wtgodbe Oct 23, 2020
8869364
Set `$(DefaultNetCoreTargetFramework)` in Helix root Directory.Build.…
dougbu Oct 23, 2020
af8b5c2
Extend Helix Directory.Build.* workarounds
dougbu Oct 24, 2020
998cad1
!fixup! Remove extra end tags
dougbu Oct 25, 2020
e2ec3db
!fixup! Don't build GenerateFiles.csproj in desktop `msbuild`
dougbu Oct 25, 2020
3e46086
!fixup! Arcade uses different test targets
dougbu Oct 25, 2020
35db324
Update dependencies from https://github.com/dotnet/efcore build 20201…
dotnet-maestro[bot] Oct 26, 2020
f7c221e
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Oct 26, 2020
84abf5e
Disable `crossgen` when building for Helix runs
dougbu Oct 26, 2020
be0c335
Update dependencies from https://github.com/dotnet/efcore build 20201…
dotnet-maestro[bot] Oct 27, 2020
a5895af
Ensure ReadRequest type can be loaded on server. Fixes #26882 (#26931)
SteveSandersonMS Oct 15, 2020
246d2b6
Enable debugging when using embedded PDBs (#27107)
captainsafia Oct 26, 2020
bb91131
Ensure Blazor JS files are up-to-date
dougbu Oct 27, 2020
f9e7755
Merge branch 'master' into darc-master-76e24f4d-c90c-42ac-a1e5-411ae6…
dougbu Oct 27, 2020
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
10 changes: 6 additions & 4 deletions .azure/pipelines/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,13 +693,15 @@ stages:
timeoutInMinutes: 240
steps:
# Build the shared framework
- script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
- script: ./build.cmd -ci -nobl -all -pack -arch x64
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
displayName: Build shared fx
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj $(_InternalRuntimeDownloadArgs)
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
displayName: Restore interop projects
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -noRestore -test -all -noBuildNative -projects eng\helix\helix.proj
/p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true $(_InternalRuntimeDownloadArgs)
/p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
/p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
displayName: Run build.cmd helix target
env:
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
Expand Down
4 changes: 3 additions & 1 deletion .azure/pipelines/helix-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,14 @@ jobs:
steps:
# Build the shared framework
- script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
displayName: Build shared fx
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
displayName: Restore interop projects
- script: .\build.cmd -ci -nobl -noBuildRepoTasks -NoRestore -test -all -noBuildNative -projects eng\helix\helix.proj
/p:IsHelixDaily=true /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true
/p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
/p:RunTemplateTests=true /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
displayName: Run build.cmd helix target
env:
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
Expand Down
7 changes: 5 additions & 2 deletions .azure/pipelines/quarantined-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,16 @@ jobs:
timeoutInMinutes: 120
steps:
# Build the shared framework
- script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
- script: ./build.cmd -ci -nobl -all -pack -arch x64
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
displayName: Build shared fx
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
displayName: Restore interop projects
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -noRestore -test -all -noBuildJava -noBuildNative
-projects eng\helix\helix.proj /p:RunQuarantinedTests=true /p:IsRequiredCheck=true /p:IsHelixJob=true
/p:BuildInteropProjects=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
/p:BuildInteropProjects=true /p:RunTemplateTests=true
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
displayName: Run build.cmd helix target
continueOnError: true
env:
Expand Down
9 changes: 6 additions & 3 deletions .azure/pipelines/quarantined-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,16 @@ jobs:
timeoutInMinutes: 480
steps:
# Build the shared framework
- script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
- script: ./build.cmd -ci -nobl -all -pack -arch x64
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
displayName: Build shared fx
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
displayName: Restore interop projects
- script: ./build.cmd -ci -nobl -noBuildRepoTasks -noRestore -test -all -noBuildJava -noBuildNative
-projects eng\helix\helix.proj /p:IsHelixDaily=true /p:RunQuarantinedTests=true /p:IsRequiredCheck=true /p:IsHelixJob=true
/p:BuildInteropProjects=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
-projects eng\helix\helix.proj /p:IsHelixDaily=true /p:RunQuarantinedTests=true /p:IsRequiredCheck=true
/p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
displayName: Run build.cmd helix target
continueOnError: true
env:
Expand Down
29 changes: 20 additions & 9 deletions eng/Tools.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
<Project>
<ItemGroup>
<ItemGroup Condition=" '$(DotNetBuildFromSource)' != 'true' ">
<!--
This is here to workaround flakiness in the NuGet SDK resolver in MSBuild.
Arcade will run a pre-restore for these packages. This works more consistently than the SDK resolution which uses global.json.
Without this here, we see regular failures with 'error MSB4236: The SDK 'Yarn.MSBuild' specified could not be found.'
Since this project is evaluated before .npmproj files are loaded, this should cause the package to end
up in the NuGet cache ahead of time.
This is not needed in source build.
This is here to workaround flakiness in the NuGet SDK resolver in MSBuild. Arcade will run a pre-restore for
these packages. This works more consistently than the SDK resolution which uses global.json. Without this
here, we see regular failures with 'error MSB4236: The SDK 'Yarn.MSBuild' specified could not be found.'
Since this project is evaluated before .npmproj files are loaded, this should cause the package to end up in
the NuGet cache ahead of time. This is not needed in source build.
-->
<PackageReference Condition="'$(DotNetBuildFromSource)' != 'true'" Include="Yarn.MSBuild" Version="1.15.2" />
<PackageReference Include="Yarn.MSBuild" Version="1.15.2" />
</ItemGroup>

<!-- Update the generated files when we restore projects. Skip in desktop msbuild due to VS 16.8 requirements. -->
<Target Name="GenerateDirectoryBuildFiles"
AfterTargets="Restore"
Condition=" '$(DotNetBuildFromSource)' != 'true' AND '$(MSBuildRuntimeType)' == 'core' ">
<!-- Separate invocations and use different properties to ensure second can load the restored package info. -->
<MSBuild Projects="$(RepoRoot)eng\tools\GenerateFiles\GenerateFiles.csproj"
RemoveProperties="BaseIntermediateOutputPath"
Targets="Restore" />
<MSBuild Projects="$(RepoRoot)eng\tools\GenerateFiles\GenerateFiles.csproj"
RemoveProperties="BaseIntermediateOutputPath;ExcludeRestorePackageImports"
Targets="GenerateDirectoryBuildFiles" />
</Target>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@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.

</Project>
Loading