[master] Update dependencies from dotnet/runtime dotnet/efcore (#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 (#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 #26882 (#26931) - Enable debugging when using embedded PDBs (#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
dotnet · Oct 27, 2020 · 219ecd6 · 219ecd6
1 parent 062237e
commit 219ecd6
Show file tree

Hide file tree

Showing 120 changed files with 676 additions and 452 deletions.
diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
@@ -709,13 +709,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

diff --git a/.azure/pipelines/helix-matrix.yml b/.azure/pipelines/helix-matrix.yml
@@ -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

diff --git a/.azure/pipelines/quarantined-pr.yml b/.azure/pipelines/quarantined-pr.yml
@@ -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:

diff --git a/.azure/pipelines/quarantined-tests.yml b/.azure/pipelines/quarantined-tests.yml
@@ -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:

diff --git a/eng/Tools.props b/eng/Tools.props
@@ -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>
 </Project>