From 352ad1a9804a9671d7d88fb5e58963f714072805 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 10 Nov 2020 09:51:47 -0800 Subject: [PATCH] Rebrand and update for 5.0.1 (#27406) * 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) - 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> --- .azure/pipelines/ci.yml | 10 +- .azure/pipelines/helix-matrix.yml | 4 +- .azure/pipelines/quarantined-pr.yml | 7 +- .azure/pipelines/quarantined-tests.yml | 9 +- NuGet.config | 8 - eng/Baseline.Designer.props | 1002 ++++++++++------- eng/Baseline.xml | 188 ++-- eng/PackageOverrides.txt | 131 +++ eng/PlatformManifest.txt | 131 +++ eng/Tools.props | 29 +- eng/Versions.props | 11 +- eng/helix/content/Directory.Build.empty.in | 1 + .../content/RunTests/Directory.Build.props | 3 +- .../content/RunTests/Directory.Build.targets | 3 +- eng/scripts/RunHelix.ps1 | 7 +- eng/targets/Helix.props | 2 +- eng/targets/Helix.targets | 36 + .../GenerateFiles/Directory.Build.props.in | 7 + .../GenerateFiles/Directory.Build.targets.in | 44 + eng/tools/GenerateFiles/GenerateFiles.csproj | 33 + eng/tools/RepoTasks/RepoTasks.csproj | 1 - global.json | 4 +- .../Microsoft.AspNetCore.App.Runtime.csproj | 6 +- src/Razor/test/Directory.Build.props | 2 +- 24 files changed, 1152 insertions(+), 527 deletions(-) create mode 100644 eng/PackageOverrides.txt create mode 100644 eng/PlatformManifest.txt create mode 100644 eng/helix/content/Directory.Build.empty.in create mode 100644 eng/tools/GenerateFiles/Directory.Build.props.in create mode 100644 eng/tools/GenerateFiles/Directory.Build.targets.in create mode 100644 eng/tools/GenerateFiles/GenerateFiles.csproj diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index d3d8637c410..4401e6a4a15 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -675,13 +675,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 index 60dfce9c92c..eec20d557a7 100644 --- a/.azure/pipelines/helix-matrix.yml +++ b/.azure/pipelines/helix-matrix.yml @@ -33,12 +33,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 index e0615896a7c..35e103e180e 100644 --- a/.azure/pipelines/quarantined-pr.yml +++ b/.azure/pipelines/quarantined-pr.yml @@ -39,13 +39,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 index 86a21a3dd8b..02e3f983927 100644 --- 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/NuGet.config b/NuGet.config index 0ed7dc9124b..be79ec8ee5d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,14 +2,6 @@ - - - - - - - - diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index d3894b52f08..fa0cfea3db1 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,694 +2,900 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 3.1.7 + 5.0.0 - - - 3.0.3 + + + 5.0.0 - - - 3.0.3 + + + 5.0.0 - 3.1.7 + 5.0.0 - - - 3.2.1 - - - - - 3.1.7 + 5.0.0 - - - - - - - - - - + + + + + + + + + + + + + 5.0.0 + + + + 5.0.0 + + + + 5.0.0 + + + + 5.0.0 + + + + 5.0.0 + + + + 5.0.0 + + + + 5.0.0 + + + + 5.0.0 + + + + 5.0.0 + - 3.1.7 + 5.0.0 + + + + 5.0.0 - 3.1.7 + 5.0.0 - - - + + + - 3.1.7 + 5.0.0 - - - + + + - 3.1.7 + 5.0.0 + + + - 3.1.7 + 5.0.0 - 3.1.7 + 5.0.0 - 3.1.7 + 5.0.0 - - + + - 3.1.7 + 5.0.0 - 3.1.7 + 5.0.0 - - + + + - 3.1.7 + 5.0.0 - - + + - 3.1.7 + 5.0.0 - 3.1.7 + 5.0.0 - - - + + + - 3.1.7 + 5.0.0 - - - - + + + + + + + + + - - - + + + - 3.1.7 + 5.0.0 - - - + + + - 3.1.7 + 5.0.0 - - - - 3.1.7 + 5.0.0 - - - - - - 3.1.7 - - - - - - - - - - - + + - 3.1.7 + 5.0.0 - 3.1.7 + 5.0.0 - - - - - - - + + + - 3.1.7 + 5.0.0 - - - - - - + + - 3.1.7 + 5.0.0 - - - - - + + + + + + - - - - - - - - - 3.2.1 - - - - - - - - - - - 3.2.1 - - - - - - - 3.2.1 - - 3.2.1 + 5.0.0 - - - + + + - - - 3.2.1 + + + 5.0.0 - - - 3.2.1 + + + 5.0.0 - - + + + 5.0.0 + + + + + + + + + + + 5.0.0 + + + + - 3.1.7 + 5.0.0 - - - + + + - 3.1.7 + 5.0.0 - - - + + + + + + - - - + + - - + - 3.1.7 + 5.0.0 - 3.1.7 + 5.0.0 - - + + - - + + - - - - - 3.1.7 - - - - - - - - - - - - - - - - - - - - - + - 3.1.7 + 5.0.0 - - - 3.1.7 - - - - - - - - - 3.1.7 - - - - - - - 3.1.7 + 5.0.0 - - + + - 3.1.7 + 5.0.0 - - - + + + + + + + - - + + - 3.1.7 + 5.0.0 - - + + + + + + + + + 5.0.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - 3.1.7 + 5.0.0 - - + + - 3.1.7 + 5.0.0 - - - + + + - 3.1.7 + 5.0.0 - - + + - 3.1.7 + 5.0.0 + + + + + + + - - - + + + - - - + + + - 3.1.7 + 5.0.0 - - + + + + + + - - + + - 3.1.7 + 5.0.0 - - - + + + + + + + - - + + - 3.1.7 + 5.0.0 - - - + + + - - - - - - 3.1.7 - - - - - - - + + - 3.1.7 + 5.0.0 - - - - + + + - 3.1.7 + 5.0.0 + + + + - 3.1.7 + 5.0.0 - 3.1.7 + 5.0.0 - - + + - 3.1.7 + 5.0.0 - - + + + + + 5.0.0 + + + + + - 3.1.7 + 5.0.0 - - - - + + + + - 3.1.7 + 5.0.0 - - - - - - - - 3.1.7 - - - - + + + + - 3.1.7 + 5.0.0 + + + 5.0.0 + + + + 5.0.0 + + + + + + - 3.1.7 + 5.0.0 - - + + - - - - - - 3.1.7 - - - - + + - 3.1.7 + 5.0.0 + + + + + + + - - - - - - + + + + + - - - - - + + + + + + + + + 5.0.0 + + + + + + + + - 3.1.7 + 5.0.0 - - - + + + + + + + + + - - - + + + - 3.1.7 + 5.0.0 - - + + + + + - + - 3.1.7 + 5.0.0 + + + + - - + + - 3.1.7 + 5.0.0 + + + + - + - 3.1.7 + 5.0.0 - - - - - + + + + + - 3.1.7 + 5.0.0 - - - + + + - - - 3.1.7 - - - - - 3.1.7 + 5.0.0 - - - + + - 3.1.7 + 5.0.0 - - + + + + + + 5.0.0 + + + + + + + 5.0.0 + + + + + - 3.1.7 + 5.0.0 - 3.1.7 + 5.0.0 - 3.1.7 + 5.0.0 - - - 3.1.7 + + + 5.0.0 - - - 3.1.7 + + + 5.0.0 - 3.1.7 + 5.0.0 - 3.1.7 + 5.0.0 + + + + 5.0.0 + + + + + + + + + + + + + + + + 5.0.0 - 3.1.7 + 5.0.0 - - - + + + + + + + 5.0.0 + + + + + + + + + + + + + + + + + + + + + + 5.0.0 + + + + + + - 3.1.7 + 5.0.0 - - - - + + + + + + + + + + - - - + + + + - 3.1.7 + 5.0.0 - - - - + + + + + + + + + - - - + + + + + + 5.0.0 + + + + 5.0.0 + + + + + + + + + + + + + + + + + + + + + + 5.0.0 + + + + + + + + + + + + + + + + + + + + + 5.0.0 + + + + 5.0.0 + + + + + + + + + + + + + + + + + + 5.0.0 + + + + + + + 5.0.0 + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index ca3b6217b81..6c63e0b86c9 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -1,90 +1,108 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/PackageOverrides.txt b/eng/PackageOverrides.txt new file mode 100644 index 00000000000..6103a155d27 --- /dev/null +++ b/eng/PackageOverrides.txt @@ -0,0 +1,131 @@ +Microsoft.Win32.Registry|5.0.0 +System.Diagnostics.EventLog|5.0.0 +System.IO.Pipelines|5.0.0 +System.Security.AccessControl|5.0.0 +System.Security.Cryptography.Cng|5.0.0 +System.Security.Cryptography.Xml|5.0.0 +System.Security.Permissions|5.0.0 +System.Security.Principal.Windows|5.0.0 +System.Windows.Extensions|5.0.0 +Microsoft.Extensions.Caching.Abstractions|5.0.0 +Microsoft.Extensions.Caching.Memory|5.0.0 +Microsoft.Extensions.Configuration.Abstractions|5.0.0 +Microsoft.Extensions.Configuration.Binder|5.0.0 +Microsoft.Extensions.Configuration.CommandLine|5.0.0 +Microsoft.Extensions.Configuration|5.0.0 +Microsoft.Extensions.Configuration.EnvironmentVariables|5.0.0 +Microsoft.Extensions.Configuration.FileExtensions|5.0.0 +Microsoft.Extensions.Configuration.Ini|5.0.0 +Microsoft.Extensions.Configuration.Json|5.0.0 +Microsoft.Extensions.Configuration.UserSecrets|5.0.0 +Microsoft.Extensions.Configuration.Xml|5.0.0 +Microsoft.Extensions.DependencyInjection.Abstractions|5.0.0 +Microsoft.Extensions.DependencyInjection|5.0.0 +Microsoft.Extensions.FileProviders.Abstractions|5.0.0 +Microsoft.Extensions.FileProviders.Composite|5.0.0 +Microsoft.Extensions.FileProviders.Physical|5.0.0 +Microsoft.Extensions.FileSystemGlobbing|5.0.0 +Microsoft.Extensions.Hosting.Abstractions|5.0.0 +Microsoft.Extensions.Hosting|5.0.0 +Microsoft.Extensions.Http|5.0.0 +Microsoft.Extensions.Logging.Abstractions|5.0.0 +Microsoft.Extensions.Logging.Configuration|5.0.0 +Microsoft.Extensions.Logging.Console|5.0.0 +Microsoft.Extensions.Logging.Debug|5.0.0 +Microsoft.Extensions.Logging|5.0.0 +Microsoft.Extensions.Logging.EventLog|5.0.0 +Microsoft.Extensions.Logging.EventSource|5.0.0 +Microsoft.Extensions.Logging.TraceSource|5.0.0 +Microsoft.Extensions.Options.ConfigurationExtensions|5.0.0 +Microsoft.Extensions.Options.DataAnnotations|5.0.0 +Microsoft.Extensions.Options|5.0.0 +Microsoft.Extensions.Primitives|5.0.0 +Microsoft.AspNetCore.Antiforgery|5.0.0 +Microsoft.AspNetCore.Authentication.Abstractions|5.0.0 +Microsoft.AspNetCore.Authentication.Cookies|5.0.0 +Microsoft.AspNetCore.Authentication.Core|5.0.0 +Microsoft.AspNetCore.Authentication|5.0.0 +Microsoft.AspNetCore.Authentication.OAuth|5.0.0 +Microsoft.AspNetCore.Authorization|5.0.0 +Microsoft.AspNetCore.Authorization.Policy|5.0.0 +Microsoft.AspNetCore.Components.Authorization|5.0.0 +Microsoft.AspNetCore.Components|5.0.0 +Microsoft.AspNetCore.Components.Forms|5.0.0 +Microsoft.AspNetCore.Components.Server|5.0.0 +Microsoft.AspNetCore.Components.Web|5.0.0 +Microsoft.AspNetCore.Connections.Abstractions|5.0.0 +Microsoft.AspNetCore.CookiePolicy|5.0.0 +Microsoft.AspNetCore.Cors|5.0.0 +Microsoft.AspNetCore.Cryptography.Internal|5.0.0 +Microsoft.AspNetCore.Cryptography.KeyDerivation|5.0.0 +Microsoft.AspNetCore.DataProtection.Abstractions|5.0.0 +Microsoft.AspNetCore.DataProtection|5.0.0 +Microsoft.AspNetCore.DataProtection.Extensions|5.0.0 +Microsoft.AspNetCore.Diagnostics.Abstractions|5.0.0 +Microsoft.AspNetCore.Diagnostics|5.0.0 +Microsoft.AspNetCore.Diagnostics.HealthChecks|5.0.0 +Microsoft.AspNetCore|5.0.0 +Microsoft.AspNetCore.HostFiltering|5.0.0 +Microsoft.AspNetCore.Hosting.Abstractions|5.0.0 +Microsoft.AspNetCore.Hosting|5.0.0 +Microsoft.AspNetCore.Hosting.Server.Abstractions|5.0.0 +Microsoft.AspNetCore.Html.Abstractions|5.0.0 +Microsoft.AspNetCore.Http.Abstractions|5.0.0 +Microsoft.AspNetCore.Http.Connections.Common|5.0.0 +Microsoft.AspNetCore.Http.Connections|5.0.0 +Microsoft.AspNetCore.Http|5.0.0 +Microsoft.AspNetCore.Http.Extensions|5.0.0 +Microsoft.AspNetCore.Http.Features|5.0.0 +Microsoft.AspNetCore.HttpOverrides|5.0.0 +Microsoft.AspNetCore.HttpsPolicy|5.0.0 +Microsoft.AspNetCore.Identity|5.0.0 +Microsoft.AspNetCore.Localization|5.0.0 +Microsoft.AspNetCore.Localization.Routing|5.0.0 +Microsoft.AspNetCore.Metadata|5.0.0 +Microsoft.AspNetCore.Mvc.Abstractions|5.0.0 +Microsoft.AspNetCore.Mvc.ApiExplorer|5.0.0 +Microsoft.AspNetCore.Mvc.Core|5.0.0 +Microsoft.AspNetCore.Mvc.Cors|5.0.0 +Microsoft.AspNetCore.Mvc.DataAnnotations|5.0.0 +Microsoft.AspNetCore.Mvc|5.0.0 +Microsoft.AspNetCore.Mvc.Formatters.Json|5.0.0 +Microsoft.AspNetCore.Mvc.Formatters.Xml|5.0.0 +Microsoft.AspNetCore.Mvc.Localization|5.0.0 +Microsoft.AspNetCore.Mvc.Razor|5.0.0 +Microsoft.AspNetCore.Mvc.RazorPages|5.0.0 +Microsoft.AspNetCore.Mvc.TagHelpers|5.0.0 +Microsoft.AspNetCore.Mvc.ViewFeatures|5.0.0 +Microsoft.AspNetCore.Razor|5.0.0 +Microsoft.AspNetCore.Razor.Runtime|5.0.0 +Microsoft.AspNetCore.ResponseCaching.Abstractions|5.0.0 +Microsoft.AspNetCore.ResponseCaching|5.0.0 +Microsoft.AspNetCore.ResponseCompression|5.0.0 +Microsoft.AspNetCore.Rewrite|5.0.0 +Microsoft.AspNetCore.Routing.Abstractions|5.0.0 +Microsoft.AspNetCore.Routing|5.0.0 +Microsoft.AspNetCore.Server.HttpSys|5.0.0 +Microsoft.AspNetCore.Server.IIS|5.0.0 +Microsoft.AspNetCore.Server.IISIntegration|5.0.0 +Microsoft.AspNetCore.Server.Kestrel.Core|5.0.0 +Microsoft.AspNetCore.Server.Kestrel|5.0.0 +Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets|5.0.0 +Microsoft.AspNetCore.Session|5.0.0 +Microsoft.AspNetCore.SignalR.Common|5.0.0 +Microsoft.AspNetCore.SignalR.Core|5.0.0 +Microsoft.AspNetCore.SignalR|5.0.0 +Microsoft.AspNetCore.SignalR.Protocols.Json|5.0.0 +Microsoft.AspNetCore.StaticFiles|5.0.0 +Microsoft.AspNetCore.WebSockets|5.0.0 +Microsoft.AspNetCore.WebUtilities|5.0.0 +Microsoft.Extensions.Configuration.KeyPerFile|5.0.0 +Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions|5.0.0 +Microsoft.Extensions.Diagnostics.HealthChecks|5.0.0 +Microsoft.Extensions.FileProviders.Embedded|5.0.0 +Microsoft.Extensions.Identity.Core|5.0.0 +Microsoft.Extensions.Identity.Stores|5.0.0 +Microsoft.Extensions.Localization.Abstractions|5.0.0 +Microsoft.Extensions.Localization|5.0.0 +Microsoft.Extensions.ObjectPool|5.0.0 +Microsoft.Extensions.WebEncoders|5.0.0 +Microsoft.JSInterop|5.0.0 +Microsoft.Net.Http.Headers|5.0.0 diff --git a/eng/PlatformManifest.txt b/eng/PlatformManifest.txt new file mode 100644 index 00000000000..05d078b357a --- /dev/null +++ b/eng/PlatformManifest.txt @@ -0,0 +1,131 @@ +aspnetcorev2_inprocess.dll|Microsoft.AspNetCore.App.Ref||15.0.20300.0 +Microsoft.AspNetCore.Antiforgery.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Authentication.Abstractions.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Authentication.Cookies.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Authentication.Core.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Authentication.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Authentication.OAuth.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Authorization.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Authorization.Policy.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Components.Authorization.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Components.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Components.Forms.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Components.Server.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Components.Web.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Connections.Abstractions.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.CookiePolicy.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Cors.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Cryptography.Internal.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Cryptography.KeyDerivation.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.DataProtection.Abstractions.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.DataProtection.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.DataProtection.Extensions.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Diagnostics.Abstractions.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Diagnostics.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Diagnostics.HealthChecks.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.HostFiltering.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Hosting.Abstractions.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Hosting.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Hosting.Server.Abstractions.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Html.Abstractions.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Http.Abstractions.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Http.Connections.Common.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Http.Connections.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Http.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Http.Extensions.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Http.Features.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.HttpOverrides.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.HttpsPolicy.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Identity.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Localization.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Localization.Routing.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Metadata.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Mvc.Abstractions.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Mvc.ApiExplorer.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Mvc.Core.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Mvc.Cors.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Mvc.DataAnnotations.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Mvc.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Mvc.Formatters.Json.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Mvc.Formatters.Xml.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Mvc.Localization.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Mvc.Razor.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Mvc.RazorPages.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Mvc.TagHelpers.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Mvc.ViewFeatures.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Razor.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Razor.Runtime.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.ResponseCaching.Abstractions.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.ResponseCaching.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.ResponseCompression.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Rewrite.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Routing.Abstractions.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Routing.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Server.HttpSys.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Server.IIS.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Server.IISIntegration.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Server.Kestrel.Core.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Server.Kestrel.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.Session.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.SignalR.Common.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.SignalR.Core.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.SignalR.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.SignalR.Protocols.Json.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.StaticFiles.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.WebSockets.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.AspNetCore.WebUtilities.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.Extensions.Caching.Abstractions.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.Caching.Memory.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.Configuration.Abstractions.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.Configuration.Binder.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.Configuration.CommandLine.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.Configuration.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.Configuration.EnvironmentVariables.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.Configuration.FileExtensions.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.Configuration.Ini.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.Configuration.Json.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.Configuration.KeyPerFile.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.Extensions.Configuration.UserSecrets.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.Configuration.Xml.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.DependencyInjection.Abstractions.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.DependencyInjection.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.Extensions.Diagnostics.HealthChecks.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.Extensions.FileProviders.Abstractions.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.FileProviders.Composite.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.FileProviders.Embedded.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.Extensions.FileProviders.Physical.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.FileSystemGlobbing.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.Hosting.Abstractions.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.Hosting.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.Http.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.Identity.Core.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.Extensions.Identity.Stores.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.Extensions.Localization.Abstractions.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.Extensions.Localization.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.Extensions.Logging.Abstractions.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.Logging.Configuration.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.Logging.Console.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.Logging.Debug.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.Logging.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.Logging.EventLog.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.Logging.EventSource.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.Logging.TraceSource.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.ObjectPool.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.Extensions.Options.ConfigurationExtensions.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.Options.DataAnnotations.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.Options.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.Primitives.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +Microsoft.Extensions.WebEncoders.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.JSInterop.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.Net.Http.Headers.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.52605 +Microsoft.Win32.SystemEvents.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +System.Diagnostics.EventLog.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +System.Drawing.Common.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +System.IO.Pipelines.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +System.Security.Cryptography.Pkcs.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +System.Security.Cryptography.Xml.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +System.Security.Permissions.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 +System.Windows.Extensions.dll|Microsoft.AspNetCore.App.Ref|5.0.0.0|5.0.20.51904 \ No newline at end of file diff --git a/eng/Tools.props b/eng/Tools.props index cdfb67026c6..38f0efa3bea 100644 --- a/eng/Tools.props +++ b/eng/Tools.props @@ -1,14 +1,25 @@ - + - + + + + + + + + diff --git a/eng/Versions.props b/eng/Versions.props index b9b7aec5eac..7ed009f8207 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,21 +8,24 @@ 5 0 - 0 + 1 true release - rtm - RTM $(PreReleaseVersionIteration) + servicing + Servicing true false $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) true $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion) - + $(VersionPrefix) $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0 diff --git a/eng/helix/content/Directory.Build.empty.in b/eng/helix/content/Directory.Build.empty.in new file mode 100644 index 00000000000..058246e4086 --- /dev/null +++ b/eng/helix/content/Directory.Build.empty.in @@ -0,0 +1 @@ + diff --git a/eng/helix/content/RunTests/Directory.Build.props b/eng/helix/content/RunTests/Directory.Build.props index c1df2220ddc..058246e4086 100644 --- a/eng/helix/content/RunTests/Directory.Build.props +++ b/eng/helix/content/RunTests/Directory.Build.props @@ -1,2 +1 @@ - - \ No newline at end of file + diff --git a/eng/helix/content/RunTests/Directory.Build.targets b/eng/helix/content/RunTests/Directory.Build.targets index c1df2220ddc..058246e4086 100644 --- a/eng/helix/content/RunTests/Directory.Build.targets +++ b/eng/helix/content/RunTests/Directory.Build.targets @@ -1,2 +1 @@ - - \ No newline at end of file + diff --git a/eng/scripts/RunHelix.ps1 b/eng/scripts/RunHelix.ps1 index 0bad5574a4e..777077b4214 100644 --- a/eng/scripts/RunHelix.ps1 +++ b/eng/scripts/RunHelix.ps1 @@ -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'." + $HelixQueues = $HelixQueues -replace ";", "%3B" -dotnet msbuild $Project /t:Helix /p:TargetArchitecture="$TargetArchitecture" /p:IsRequiredCheck=true /p:IsHelixDaily=true /p:HelixTargetQueues=$HelixQueues /p:RunQuarantinedTests=$RunQuarantinedTests /p:_UseHelixOpenQueues=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log +dotnet msbuild $Project /t:Helix /p:TargetArchitecture="$TargetArchitecture" /p:IsRequiredCheck=true ` + /p:IsHelixDaily=true /p:HelixTargetQueues=$HelixQueues /p:RunQuarantinedTests=$RunQuarantinedTests ` + /p:_UseHelixOpenQueues=true /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props index 032bcd49285..941b2c0df77 100644 --- a/eng/targets/Helix.props +++ b/eng/targets/Helix.props @@ -34,7 +34,7 @@ - + diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets index ba28388707f..96433f083ec 100644 --- a/eng/targets/Helix.targets +++ b/eng/targets/Helix.targets @@ -116,6 +116,42 @@ + + + + + + + + diff --git a/eng/tools/GenerateFiles/Directory.Build.props.in b/eng/tools/GenerateFiles/Directory.Build.props.in new file mode 100644 index 00000000000..97f9206a78c --- /dev/null +++ b/eng/tools/GenerateFiles/Directory.Build.props.in @@ -0,0 +1,7 @@ + + + ${DefaultNetCoreTargetFramework} + ${DefaultNetCoreTargetFramework} + true + + diff --git a/eng/tools/GenerateFiles/Directory.Build.targets.in b/eng/tools/GenerateFiles/Directory.Build.targets.in new file mode 100644 index 00000000000..aa4cd6cd297 --- /dev/null +++ b/eng/tools/GenerateFiles/Directory.Build.targets.in @@ -0,0 +1,44 @@ + + + + 99.9 + + + + + + + + + + + + + + + + + + + + diff --git a/eng/tools/GenerateFiles/GenerateFiles.csproj b/eng/tools/GenerateFiles/GenerateFiles.csproj new file mode 100644 index 00000000000..42bcca694b9 --- /dev/null +++ b/eng/tools/GenerateFiles/GenerateFiles.csproj @@ -0,0 +1,33 @@ + + + $(DefaultNetCoreTargetFramework) + + + + + + <_TemplateProperties> + DefaultNetCoreTargetFramework=$(DefaultNetCoreTargetFramework); + KnownAppHostPackOrFrameworkReferenceTfm=$(KnownAppHostPackOrFrameworkReferenceTfm); + MicrosoftAspNetCoreAppRefPackageVersion=$(TargetingPackVersion); + MicrosoftAspNetCoreAppRuntimePackageVersion=$(SharedFxVersion); + MicrosoftNETCoreAppRefPackageVersion=$(MicrosoftNETCoreAppRefPackageVersion); + MicrosoftNETCoreAppRuntimeVersion=$(MicrosoftNETCoreAppRuntimeVersion); + MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion); + SupportedRuntimeIdentifiers=$(SupportedRuntimeIdentifiers.Trim()) + + + + + + + + + + + + diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj index e71a1d75918..656f8595f5c 100644 --- a/eng/tools/RepoTasks/RepoTasks.csproj +++ b/eng/tools/RepoTasks/RepoTasks.csproj @@ -1,5 +1,4 @@ - $(DefaultNetCoreTargetFramework) $(TargetFrameworks);net472 diff --git a/global.json b/global.json index 213d84ae533..cbc8be1926d 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "5.0.100-rc.2.20479.15" + "version": "5.0.100" }, "tools": { - "dotnet": "5.0.100-rc.2.20479.15", + "dotnet": "5.0.100", "runtimes": { "dotnet/x64": [ "2.1.18", diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj index 2e10f9ff36e..8c9ab6e7d41 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -42,11 +42,11 @@ This package is an internal implementation of the .NET Core SDK and is not meant $(AllowedOutputExtensionsInSymbolsPackageBuildOutputFolder);.map - true + true true - false + false true @@ -531,7 +531,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant DependsOnTargets="_ResolveSharedFrameworkContent" BeforeTargets="_GetPackageFiles" Condition="'$(ManifestsPackagePath)' != ''"> - + $(NativeAssetsPackagePath) diff --git a/src/Razor/test/Directory.Build.props b/src/Razor/test/Directory.Build.props index ae31334f102..504ff03f99b 100644 --- a/src/Razor/test/Directory.Build.props +++ b/src/Razor/test/Directory.Build.props @@ -6,6 +6,6 @@ Projects in this folder don't follow the usual naming conventions for test assets. Marking as such though the projects directly w/in this folder are more like test infrastructure. --> - false + true