diff --git a/NuGet.config b/NuGet.config index 7bb82890ac..002dc1e1f0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,11 +3,11 @@ - + - - - + + + diff --git a/dir.props b/dir.props index 8b1c59227b..6cc0c62793 100644 --- a/dir.props +++ b/dir.props @@ -10,7 +10,7 @@ true false true - false + true @@ -193,12 +193,14 @@ - + - - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d36132d646..0e802b429f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -27,25 +27,25 @@ 1127689f262d52ea8ff68ef03d706fa62b3b40a1 linker - + https://github.com/dotnet/coreclr - 68ff240063fc2ddb9b03275ae5d5063a09d38ace + ecfe3bca7cfbd413415af9d2bcccb5f9a361f962 https://github.com/dotnet/standard a5b5f2e1e369972c8ff1e2183979fab6099f52ef - + https://github.com/dotnet/corefx - 54d63c3e283e0c3937a35ab4e99f391c84ff119e + c1778515a3bee34cc09c757b5563d0af0c8b1e99 - + https://github.com/dotnet/core-setup - 0bdbe6b3a7caf32a4f594196effe56a941980d7b + 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 - + https://github.com/aspnet/AspNetCore-Tooling - 16b0ca4a5838c39c8852e6cf144232597e2bee2e + 7471a3daf7ba17c22da59cf5815ff1a2b9926bcf aspnetcore-tooling @@ -56,23 +56,23 @@ https://github.com/dotnet/roslyn 66a912c9463eebe832cf742d2fe8bb2e1a4600ec - + https://github.com/microsoft/msbuild - 0f4c62feac0a5726f63b56472de7b1c1527459fc + e481bbf88fd4a406cc8a98c2f46e9bda8e76be69 - + https://github.com/NuGet/NuGet.Client - b75150f2f4127a77a166c9552845e86fb24a3282 + f2c670b0b7cdc018dc708666b2d58699d9654e42 nuget-client - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 7dbc3ebd20c79ecf311c768be865c02ff4676836 aspnet-extensions - + https://github.com/dotnet/sdk - 3819a21a612cd8bc15b6f6c4e361d18490469577 + 5c9dd04241f307f1aa6b3643d5e07ea89a1dad4a https://github.com/dotnet/cliCommandLineParser @@ -89,34 +89,34 @@ https://github.com/dotnet/xliff-tasks 173ee3bd61c9549557eefa3cfb718bdef157cb87 - + https://github.com/aspnet/AspNetCore - aee5e4080331553ea9dfb7fb388b6d72f715bf6a + 22dedcb2f0de59022e0383e1f05c9caffc708522 aspnetcore - + https://github.com/dotnet/cli - 2bb5a58198c6d96aae157ea3a119867b57cd839d + 3df3c6d5406e217c5dc7ea1cdd4abffbc9eea3ea https://github.com/dotnet/fsharp 0422ff293bb2cc722fe5021b85ef50378a9af823 - + https://github.com/aspnet/websdk - 9b65fe8b178d2ad73482080c6a0aabae911e1224 + 389b280e262b5f74e8d08cd5c784d4ba18e2fe4d https://github.com/microsoft/vstest 55e7e45431c9c05656c999b902686e7402664573 - + https://github.com/dotnet/toolset - 6a8609fc2c10ee908977238e5c6bc48b926491da + 4742a2d9c56b249808bab066a12a50554377a90b - + https://github.com/dotnet/core-sdk - f08e8bc516c2d598c8b0fba247bf8eac5e329a91 + ec736cbd54dc2b75a36acda4a7c00e4b99c7d094 diff --git a/patches/aspnet-extensions/0001-Target-framework-changes.patch b/patches/aspnet-extensions/0001-Target-framework-changes.patch index 6c10ab9461..e02f86522d 100644 --- a/patches/aspnet-extensions/0001-Target-framework-changes.patch +++ b/patches/aspnet-extensions/0001-Target-framework-changes.patch @@ -1,13 +1,36 @@ -From 26f24a8098a344cc1edc9f7136643c3678819a58 Mon Sep 17 00:00:00 2001 +From b3714fd0f8007eee0fca27951a261b810f683b32 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 12 Sep 2019 00:20:10 -0500 Subject: [PATCH] Target framework changes --- + .../ref/Microsoft.Extensions.Caching.Abstractions.csproj | 4 ++-- + .../src/Microsoft.Extensions.Caching.Abstractions.csproj | 2 +- .../Memory/ref/Microsoft.Extensions.Caching.Memory.csproj | 4 ++-- + .../Microsoft.Extensions.Configuration.Abstractions.csproj | 4 ++-- + .../Microsoft.Extensions.Configuration.Abstractions.csproj | 2 +- + .../ref/Microsoft.Extensions.Configuration.Binder.csproj | 4 ++-- + .../ref/Microsoft.Extensions.Configuration.CommandLine.csproj | 4 ++-- + ...osoft.Extensions.Configuration.EnvironmentVariables.csproj | 4 ++-- + .../Microsoft.Extensions.Configuration.FileExtensions.csproj | 4 ++-- + .../ref/Microsoft.Extensions.Configuration.Ini.csproj | 4 ++-- + .../ref/Microsoft.Extensions.Configuration.Json.csproj | 4 ++-- + .../ref/Microsoft.Extensions.Configuration.KeyPerFile.csproj | 4 ++-- + .../ref/Microsoft.Extensions.Configuration.UserSecrets.csproj | 4 ++-- + .../ref/Microsoft.Extensions.Configuration.Xml.csproj | 4 ++-- + .../Config/ref/Microsoft.Extensions.Configuration.csproj | 4 ++-- + .../Microsoft.Extensions.FileProviders.Abstractions.csproj | 4 ++-- + .../ref/Microsoft.Extensions.FileProviders.Composite.csproj | 4 ++-- + .../ref/Microsoft.Extensions.FileProviders.Embedded.csproj | 4 ++-- + .../ref/Microsoft.Extensions.FileProviders.Physical.csproj | 4 ++-- .../ref/Microsoft.Extensions.Diagnostics.HealthChecks.csproj | 4 ++-- + .../ref/Microsoft.Extensions.Hosting.Abstractions.csproj | 4 ++-- + .../src/Microsoft.Extensions.Hosting.Abstractions.csproj | 2 +- src/Hosting/Hosting/ref/Microsoft.Extensions.Hosting.csproj | 4 ++-- .../Http/ref/Microsoft.Extensions.Http.csproj | 4 ++-- + .../Microsoft.JSInterop/ref/Microsoft.JSInterop.csproj | 4 ++-- + .../Microsoft.JSInterop/src/Microsoft.JSInterop.csproj | 2 +- + .../ref/Mono.WebAssembly.Interop.csproj | 4 ++-- .../Localization/ref/Microsoft.Extensions.Localization.csproj | 4 ++-- .../ref/Microsoft.Extensions.Logging.Configuration.csproj | 4 ++-- .../ref/Microsoft.Extensions.Logging.Console.csproj | 4 ++-- @@ -16,12 +39,45 @@ Subject: [PATCH] Target framework changes .../ref/Microsoft.Extensions.Logging.EventSource.csproj | 4 ++-- .../ref/Microsoft.Extensions.Logging.TraceSource.csproj | 4 ++-- src/Logging/Logging/ref/Microsoft.Extensions.Logging.csproj | 4 ++-- + src/Logging/Logging/src/Microsoft.Extensions.Logging.csproj | 2 +- ...icrosoft.Extensions.Options.ConfigurationExtensions.csproj | 4 ++-- .../ref/Microsoft.Extensions.Options.DataAnnotations.csproj | 4 ++-- src/Options/Options/ref/Microsoft.Extensions.Options.csproj | 4 ++-- + src/Options/Options/src/Microsoft.Extensions.Options.csproj | 2 +- + src/Primitives/ref/Microsoft.Extensions.Primitives.csproj | 4 ++-- + src/Primitives/src/Microsoft.Extensions.Primitives.csproj | 2 +- src/WebEncoders/ref/Microsoft.Extensions.WebEncoders.csproj | 4 ++-- - 16 files changed, 32 insertions(+), 32 deletions(-) + 43 files changed, 79 insertions(+), 79 deletions(-) +diff --git a/src/Caching/Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj b/src/Caching/Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj +index 9ab2457b4..0c229f3f9 100644 +--- a/src/Caching/Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj ++++ b/src/Caching/Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj +@@ -1,9 +1,9 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + +- ++ + + + +diff --git a/src/Caching/Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj b/src/Caching/Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj +index 3ff41adc1..12606ab19 100644 +--- a/src/Caching/Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj ++++ b/src/Caching/Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj +@@ -6,7 +6,7 @@ Commonly used types: + Microsoft.Extensions.Caching.Distributed.IDistributedCache + Microsoft.Extensions.Caching.Memory.IMemoryCache + netstandard2.0;netcoreapp3.0 +- netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + $(NoWarn);CS1591 + true + cache;memorycache;distributedcache diff --git a/src/Caching/Memory/ref/Microsoft.Extensions.Caching.Memory.csproj b/src/Caching/Memory/ref/Microsoft.Extensions.Caching.Memory.csproj index 6908d1a59..48fe1344d 100644 --- a/src/Caching/Memory/ref/Microsoft.Extensions.Caching.Memory.csproj @@ -38,6 +94,259 @@ index 6908d1a59..48fe1344d 100644 +diff --git a/src/Configuration/Config.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj b/src/Configuration/Config.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj +index 6b574ec3b..e39a90baa 100644 +--- a/src/Configuration/Config.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj ++++ b/src/Configuration/Config.Abstractions/ref/Microsoft.Extensions.Configuration.Abstractions.csproj +@@ -1,9 +1,9 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + +- ++ + + + +diff --git a/src/Configuration/Config.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj b/src/Configuration/Config.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj +index ce441b5ff..33b07c784 100644 +--- a/src/Configuration/Config.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj ++++ b/src/Configuration/Config.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj +@@ -2,7 +2,7 @@ + + + netstandard2.0;netcoreapp3.0 +- netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + Abstractions of key-value pair based configuration. + Commonly used types: + Microsoft.Extensions.Configuration.IConfiguration +diff --git a/src/Configuration/Config.Binder/ref/Microsoft.Extensions.Configuration.Binder.csproj b/src/Configuration/Config.Binder/ref/Microsoft.Extensions.Configuration.Binder.csproj +index 76f59c4ff..a7155b1d7 100644 +--- a/src/Configuration/Config.Binder/ref/Microsoft.Extensions.Configuration.Binder.csproj ++++ b/src/Configuration/Config.Binder/ref/Microsoft.Extensions.Configuration.Binder.csproj +@@ -1,9 +1,9 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + +- ++ + + + +diff --git a/src/Configuration/Config.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.csproj b/src/Configuration/Config.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.csproj +index 22f21ba0a..467e1c208 100644 +--- a/src/Configuration/Config.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.csproj ++++ b/src/Configuration/Config.CommandLine/ref/Microsoft.Extensions.Configuration.CommandLine.csproj +@@ -1,9 +1,9 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + +- ++ + + + +diff --git a/src/Configuration/Config.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj b/src/Configuration/Config.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj +index dca01be4f..969561f3c 100644 +--- a/src/Configuration/Config.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj ++++ b/src/Configuration/Config.EnvironmentVariables/ref/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj +@@ -1,9 +1,9 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + +- ++ + + + +diff --git a/src/Configuration/Config.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj b/src/Configuration/Config.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj +index 6b0454854..3d0a1b45d 100644 +--- a/src/Configuration/Config.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj ++++ b/src/Configuration/Config.FileExtensions/ref/Microsoft.Extensions.Configuration.FileExtensions.csproj +@@ -1,9 +1,9 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + +- ++ + + + +diff --git a/src/Configuration/Config.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj b/src/Configuration/Config.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj +index e5936f87e..42ef0c3f7 100644 +--- a/src/Configuration/Config.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj ++++ b/src/Configuration/Config.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj +@@ -1,9 +1,9 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + +- ++ + + + +diff --git a/src/Configuration/Config.Json/ref/Microsoft.Extensions.Configuration.Json.csproj b/src/Configuration/Config.Json/ref/Microsoft.Extensions.Configuration.Json.csproj +index 2203dcc04..588cec7f1 100644 +--- a/src/Configuration/Config.Json/ref/Microsoft.Extensions.Configuration.Json.csproj ++++ b/src/Configuration/Config.Json/ref/Microsoft.Extensions.Configuration.Json.csproj +@@ -1,9 +1,9 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + +- ++ + + + +diff --git a/src/Configuration/Config.KeyPerFile/ref/Microsoft.Extensions.Configuration.KeyPerFile.csproj b/src/Configuration/Config.KeyPerFile/ref/Microsoft.Extensions.Configuration.KeyPerFile.csproj +index 4e074ab49..73390be01 100644 +--- a/src/Configuration/Config.KeyPerFile/ref/Microsoft.Extensions.Configuration.KeyPerFile.csproj ++++ b/src/Configuration/Config.KeyPerFile/ref/Microsoft.Extensions.Configuration.KeyPerFile.csproj +@@ -1,9 +1,9 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + +- ++ + + + +diff --git a/src/Configuration/Config.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj b/src/Configuration/Config.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj +index 4d40549a3..126b33055 100644 +--- a/src/Configuration/Config.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj ++++ b/src/Configuration/Config.UserSecrets/ref/Microsoft.Extensions.Configuration.UserSecrets.csproj +@@ -1,9 +1,9 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + +- ++ + + + +diff --git a/src/Configuration/Config.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj b/src/Configuration/Config.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj +index fb1df3e6c..4df3ae8fe 100644 +--- a/src/Configuration/Config.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj ++++ b/src/Configuration/Config.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj +@@ -1,9 +1,9 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + +- ++ + + + +diff --git a/src/Configuration/Config/ref/Microsoft.Extensions.Configuration.csproj b/src/Configuration/Config/ref/Microsoft.Extensions.Configuration.csproj +index 5cfa71396..810622a83 100644 +--- a/src/Configuration/Config/ref/Microsoft.Extensions.Configuration.csproj ++++ b/src/Configuration/Config/ref/Microsoft.Extensions.Configuration.csproj +@@ -1,9 +1,9 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + +- ++ + + + +diff --git a/src/FileProviders/Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj b/src/FileProviders/Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj +index cadffc345..fd582d4db 100644 +--- a/src/FileProviders/Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj ++++ b/src/FileProviders/Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj +@@ -1,9 +1,9 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + +- ++ + + + +diff --git a/src/FileProviders/Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj b/src/FileProviders/Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj +index 2af44470f..875f15e0e 100644 +--- a/src/FileProviders/Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj ++++ b/src/FileProviders/Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj +@@ -1,9 +1,9 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + +- ++ + + + +diff --git a/src/FileProviders/Embedded/ref/Microsoft.Extensions.FileProviders.Embedded.csproj b/src/FileProviders/Embedded/ref/Microsoft.Extensions.FileProviders.Embedded.csproj +index e9407f916..fe55ef748 100644 +--- a/src/FileProviders/Embedded/ref/Microsoft.Extensions.FileProviders.Embedded.csproj ++++ b/src/FileProviders/Embedded/ref/Microsoft.Extensions.FileProviders.Embedded.csproj +@@ -1,9 +1,9 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + +- ++ + + + +diff --git a/src/FileProviders/Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj b/src/FileProviders/Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj +index 72d70f381..07c81486d 100644 +--- a/src/FileProviders/Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj ++++ b/src/FileProviders/Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj +@@ -1,9 +1,9 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + +- ++ + + + diff --git a/src/HealthChecks/HealthChecks/ref/Microsoft.Extensions.Diagnostics.HealthChecks.csproj b/src/HealthChecks/HealthChecks/ref/Microsoft.Extensions.Diagnostics.HealthChecks.csproj index 2286087bc..64d4750ed 100644 --- a/src/HealthChecks/HealthChecks/ref/Microsoft.Extensions.Diagnostics.HealthChecks.csproj @@ -54,6 +363,35 @@ index 2286087bc..64d4750ed 100644 +diff --git a/src/Hosting/Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj b/src/Hosting/Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj +index 1a5603abf..f6f8b52f2 100644 +--- a/src/Hosting/Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj ++++ b/src/Hosting/Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj +@@ -1,9 +1,9 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + +- ++ + + + +diff --git a/src/Hosting/Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj b/src/Hosting/Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj +index 9f9236800..e2499b437 100644 +--- a/src/Hosting/Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj ++++ b/src/Hosting/Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj +@@ -3,7 +3,7 @@ + + .NET Core hosting and startup abstractions for applications. + netstandard2.0;netcoreapp3.0 +- netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + $(NoWarn);CS1591 + true + hosting diff --git a/src/Hosting/Hosting/ref/Microsoft.Extensions.Hosting.csproj b/src/Hosting/Hosting/ref/Microsoft.Extensions.Hosting.csproj index 874eb9b35..3221099d7 100644 --- a/src/Hosting/Hosting/ref/Microsoft.Extensions.Hosting.csproj @@ -86,6 +424,51 @@ index 79013981a..30f9c750e 100644 +diff --git a/src/JSInterop/Microsoft.JSInterop/ref/Microsoft.JSInterop.csproj b/src/JSInterop/Microsoft.JSInterop/ref/Microsoft.JSInterop.csproj +index 61980aa92..072ed2e08 100644 +--- a/src/JSInterop/Microsoft.JSInterop/ref/Microsoft.JSInterop.csproj ++++ b/src/JSInterop/Microsoft.JSInterop/ref/Microsoft.JSInterop.csproj +@@ -1,9 +1,9 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + +- ++ + + + +diff --git a/src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj b/src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj +index 044c843b2..9df18f74c 100644 +--- a/src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj ++++ b/src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj +@@ -2,7 +2,7 @@ + + + netstandard2.0;netcoreapp3.0 +- netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + Abstractions and features for interop between .NET and JavaScript code. + javascript;interop + true +diff --git a/src/JSInterop/Mono.WebAssembly.Interop/ref/Mono.WebAssembly.Interop.csproj b/src/JSInterop/Mono.WebAssembly.Interop/ref/Mono.WebAssembly.Interop.csproj +index a1ba60570..85b06000d 100644 +--- a/src/JSInterop/Mono.WebAssembly.Interop/ref/Mono.WebAssembly.Interop.csproj ++++ b/src/JSInterop/Mono.WebAssembly.Interop/ref/Mono.WebAssembly.Interop.csproj +@@ -1,9 +1,9 @@ + + + +- netstandard2.0 ++ netstandard2.1 + +- ++ + + + diff --git a/src/Localization/Localization/ref/Microsoft.Extensions.Localization.csproj b/src/Localization/Localization/ref/Microsoft.Extensions.Localization.csproj index 735277e75..3da0fe444 100644 --- a/src/Localization/Localization/ref/Microsoft.Extensions.Localization.csproj @@ -214,6 +597,19 @@ index bc6cea264..81f97f515 100644 +diff --git a/src/Logging/Logging/src/Microsoft.Extensions.Logging.csproj b/src/Logging/Logging/src/Microsoft.Extensions.Logging.csproj +index 9129b292f..b82d5b268 100644 +--- a/src/Logging/Logging/src/Microsoft.Extensions.Logging.csproj ++++ b/src/Logging/Logging/src/Microsoft.Extensions.Logging.csproj +@@ -3,7 +3,7 @@ + + Logging infrastructure default implementation for Microsoft.Extensions.Logging. + netstandard2.0;netcoreapp3.0 +- netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + $(NoWarn);CS1591 + true + true diff --git a/src/Options/ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj b/src/Options/ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj index 6ee158c65..89eedce02 100644 --- a/src/Options/ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj @@ -262,6 +658,48 @@ index 266f8d08b..1ae74ab96 100644 +diff --git a/src/Options/Options/src/Microsoft.Extensions.Options.csproj b/src/Options/Options/src/Microsoft.Extensions.Options.csproj +index b9baa3d0d..ceb7adb1b 100644 +--- a/src/Options/Options/src/Microsoft.Extensions.Options.csproj ++++ b/src/Options/Options/src/Microsoft.Extensions.Options.csproj +@@ -3,7 +3,7 @@ + + Provides a strongly typed way of specifying and accessing settings using dependency injection. + netstandard2.0;netcoreapp3.0 +- netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + true + aspnetcore;options + true +diff --git a/src/Primitives/ref/Microsoft.Extensions.Primitives.csproj b/src/Primitives/ref/Microsoft.Extensions.Primitives.csproj +index 33e0b9204..83e3261ec 100644 +--- a/src/Primitives/ref/Microsoft.Extensions.Primitives.csproj ++++ b/src/Primitives/ref/Microsoft.Extensions.Primitives.csproj +@@ -1,9 +1,9 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + +- ++ + + + +diff --git a/src/Primitives/src/Microsoft.Extensions.Primitives.csproj b/src/Primitives/src/Microsoft.Extensions.Primitives.csproj +index 639d32e96..4a42ce96e 100644 +--- a/src/Primitives/src/Microsoft.Extensions.Primitives.csproj ++++ b/src/Primitives/src/Microsoft.Extensions.Primitives.csproj +@@ -6,7 +6,7 @@ Microsoft.Extensions.Primitives.IChangeToken + Microsoft.Extensions.Primitives.StringValues + Microsoft.Extensions.Primitives.StringSegment + netstandard2.0;netcoreapp3.0 +- netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + $(NoWarn);CS1591 + true + true diff --git a/src/WebEncoders/ref/Microsoft.Extensions.WebEncoders.csproj b/src/WebEncoders/ref/Microsoft.Extensions.WebEncoders.csproj index 628691a22..d6ad449c0 100644 --- a/src/WebEncoders/ref/Microsoft.Extensions.WebEncoders.csproj diff --git a/patches/aspnet-extensions/0002-Do-not-build-.NET-Fx-binaries-in-source-build.patch b/patches/aspnet-extensions/0002-Do-not-build-.NET-Fx-binaries-in-source-build.patch new file mode 100644 index 0000000000..22367c889d --- /dev/null +++ b/patches/aspnet-extensions/0002-Do-not-build-.NET-Fx-binaries-in-source-build.patch @@ -0,0 +1,202 @@ +From 34635ab6a57ac9ef1e33335fa6a6e559adab04cc Mon Sep 17 00:00:00 2001 +From: Nikola Milosavljevic +Date: Tue, 10 Sep 2019 18:50:59 +0000 +Subject: [PATCH 2/2] Do not build .NET Fx binaries in source build + +--- + eng/Versions.props | 2 +- + .../src/Microsoft.Extensions.Configuration.Binder.csproj | 2 +- + .../Config/src/Microsoft.Extensions.Configuration.csproj | 2 +- + .../DI/src/Microsoft.Extensions.DependencyInjection.csproj | 3 ++- + .../Microsoft.Extensions.FileProviders.Abstractions.csproj | 2 +- + .../src/Microsoft.Extensions.FileProviders.Embedded.csproj | 6 +++--- + ...oft.Extensions.FileProviders.Embedded.multitarget.nuspec | 6 +++--- + ...t.Extensions.FileProviders.Embedded.netcoreapp3.0.nuspec | 4 ++-- + .../Microsoft.Extensions.FileProviders.Embedded.props | 2 +- + ...t.Extensions.FileProviders.Embedded.Manifest.Task.csproj | 2 +- + .../Microsoft.JSInterop/src/Microsoft.JSInterop.csproj | 2 +- + src/Primitives/src/Microsoft.Extensions.Primitives.csproj | 2 +- + 12 files changed, 18 insertions(+), 17 deletions(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index 05f4e462c..84e19a64c 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -38,7 +38,7 @@ + + false + +- true ++ true + + +- false ++ true + true + + false + +- true ++ false + true + + +@@ -50,7 +50,7 @@ + + + +- ++ + + + +-- +2.18.0 + diff --git a/patches/aspnet-extensions/0004-Make-ref-assembly-versions-match-implementation-asse.patch b/patches/aspnet-extensions/0004-Make-ref-assembly-versions-match-implementation-asse.patch new file mode 100644 index 0000000000..f3162a1b8d --- /dev/null +++ b/patches/aspnet-extensions/0004-Make-ref-assembly-versions-match-implementation-asse.patch @@ -0,0 +1,32 @@ +From d20dcc1f5e37dd823d3614617785df3e854bb894 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Fri, 8 Nov 2019 14:35:59 -0600 +Subject: [PATCH 4/4] Make ref assembly versions match implementation assembly + versions + +--- + eng/Versions.props | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index 84e19a64c..6ad9600e3 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -11,13 +11,7 @@ + 1 + $(MajorVersion).$(MinorVersion).$(PatchVersion) + servicing +- $(VersionPrefix).0 +- +- $(MajorVersion).$(MinorVersion).0.0 ++ $(VersionPrefix).0 + 0.1.$(PatchVersion) + - false - -- true -+ true - - -- -2.21.0 +2.18.0 diff --git a/patches/aspnetcore/0003-Exclude-some-projects-from-source-build.patch b/patches/aspnetcore/0003-Exclude-some-projects-from-source-build.patch index c09bd0dcfe..33efc4c71c 100644 --- a/patches/aspnetcore/0003-Exclude-some-projects-from-source-build.patch +++ b/patches/aspnetcore/0003-Exclude-some-projects-from-source-build.patch @@ -1,14 +1,14 @@ -From 13be14b9e411efee0425eb2d8d53e85a335c8a6a Mon Sep 17 00:00:00 2001 +From 9f77583a6cad4845d6549864c9ff7eaedf06dca3 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 18 Jul 2019 01:34:30 -0500 -Subject: [PATCH 3/6] Exclude some projects from source-build. +Subject: [PATCH 3/9] Exclude some projects from source-build. --- Directory.Build.props | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Directory.Build.props b/Directory.Build.props -index 141506a2b5..456bcafb06 100644 +index 966cfdca97..c72b810d59 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -18,9 +18,11 @@ @@ -24,5 +24,5 @@ index 141506a2b5..456bcafb06 100644 + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + false + + +- ++ + + + +diff --git a/src/Components/Forms/ref/Microsoft.AspNetCore.Components.Forms.csproj b/src/Components/Forms/ref/Microsoft.AspNetCore.Components.Forms.csproj +index b3fe863ead..5cbfcf0f61 100644 +--- a/src/Components/Forms/ref/Microsoft.AspNetCore.Components.Forms.csproj ++++ b/src/Components/Forms/ref/Microsoft.AspNetCore.Components.Forms.csproj +@@ -1,11 +1,11 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + false + + +- ++ + + + +diff --git a/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj b/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj +index 6415de5e4f..cd6e2f0e33 100644 +--- a/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj ++++ b/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj +@@ -1,11 +1,11 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + false + + +- ++ + + + +diff --git a/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj b/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj +index 9f8c21ba0f..f7c4059289 100644 +--- a/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj ++++ b/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj +@@ -1,11 +1,11 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + false + + +- ++ + + + +diff --git a/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj b/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj +index d2d166c02d..fe7b5e1b74 100644 +--- a/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj ++++ b/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj +@@ -1,11 +1,11 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + false + + +- ++ + + + +diff --git a/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj b/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj +index 410b369e19..dc8fca8948 100644 +--- a/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj ++++ b/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj +@@ -1,11 +1,11 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + false + + +- ++ + + + +diff --git a/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj b/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj +index 1d35660722..2a7b686794 100644 +--- a/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj ++++ b/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj +@@ -1,11 +1,11 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + false + + +- ++ + + + +diff --git a/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj b/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj +index c101e8c68d..1de4214ed1 100644 +--- a/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj ++++ b/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj +@@ -1,11 +1,11 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + false + + +- ++ + + + +diff --git a/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj b/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj +index 88480c4611..2ffc59bedf 100644 +--- a/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj ++++ b/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj +@@ -1,11 +1,11 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + false + + +- ++ + + + +diff --git a/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj b/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj +index c97c8dfe9b..4b16833ead 100644 +--- a/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj ++++ b/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj +@@ -1,7 +1,7 @@ + + + +- netstandard2.0;netstandard2.1;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + false + + +diff --git a/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj b/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj +index 12cd68e60b..21aec24ecf 100644 +--- a/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj ++++ b/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj +@@ -1,11 +1,11 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + false + + +- ++ + + + +diff --git a/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj b/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj +index 9b5134468f..83af8e9a5a 100644 +--- a/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj ++++ b/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj +@@ -1,11 +1,11 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + false + + +- ++ + + + +diff --git a/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj b/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj +index 95fdf6b70e..c695d49fdf 100644 +--- a/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj ++++ b/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj +@@ -1,11 +1,11 @@ + + + +- netstandard2.0;netcoreapp3.0 ++ netstandard2.1;netcoreapp3.0 + false + + +- ++ + + + +-- +2.18.0 + diff --git a/patches/aspnetcore/0004-Match-new-NuGet-MSBuild-version.patch b/patches/aspnetcore/0010-Revert-to-reference-versions-of-source-built-package.patch similarity index 56% rename from patches/aspnetcore/0004-Match-new-NuGet-MSBuild-version.patch rename to patches/aspnetcore/0010-Revert-to-reference-versions-of-source-built-package.patch index a98591fb90..2355eb7563 100644 --- a/patches/aspnetcore/0004-Match-new-NuGet-MSBuild-version.patch +++ b/patches/aspnetcore/0010-Revert-to-reference-versions-of-source-built-package.patch @@ -1,23 +1,29 @@ -From 720b538e1aa3a456ed5d518c4b1fa011a7e74e6c Mon Sep 17 00:00:00 2001 +From f4fab451e8ee7c8e6ae9601366da46fef5fde3bc Mon Sep 17 00:00:00 2001 From: Chris Rummel -Date: Thu, 15 Aug 2019 16:38:08 -0500 -Subject: [PATCH 4/6] Match new NuGet MSBuild version. +Date: Sun, 10 Nov 2019 09:12:17 -0600 +Subject: [PATCH 10/10] Revert to reference versions of source-built packages --- - eng/tools/RepoTasks/RepoTasks.csproj | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + eng/tools/RepoTasks/RepoTasks.csproj | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj -index 0bf6be98ae..3f8c247666 100644 +index 48c529fdd8..ff0cf5b264 100644 --- a/eng/tools/RepoTasks/RepoTasks.csproj +++ b/eng/tools/RepoTasks/RepoTasks.csproj -@@ -17,9 +17,9 @@ +@@ -12,14 +12,14 @@ + + + +- ++ + -- -- -- +- +- +- + + + @@ -25,5 +31,5 @@ index 0bf6be98ae..3f8c247666 100644 -- -2.21.0 +2.18.0 diff --git a/patches/core-sdk/0004-Patch-ASP.NET-directory.patch b/patches/core-sdk/0005-Patch-property-used-for-core-setup-version.patch similarity index 54% rename from patches/core-sdk/0004-Patch-ASP.NET-directory.patch rename to patches/core-sdk/0005-Patch-property-used-for-core-setup-version.patch index 345bd0e330..5ea48ff2ac 100644 --- a/patches/core-sdk/0004-Patch-ASP.NET-directory.patch +++ b/patches/core-sdk/0005-Patch-property-used-for-core-setup-version.patch @@ -1,25 +1,25 @@ -From 2f16ea842a6a921d9d304401aa56a131155ca8c6 Mon Sep 17 00:00:00 2001 +From 20e01d93d05085d6b64a55867fb398b0a5069066 Mon Sep 17 00:00:00 2001 From: Chris Rummel -Date: Fri, 4 Oct 2019 15:18:12 -0500 -Subject: [PATCH 5/5] Patch ASP.NET directory +Date: Sat, 9 Nov 2019 19:39:25 -0600 +Subject: [PATCH 5/5] Patch property used for core-setup version --- src/redist/targets/GenerateLayout.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets -index 962bb973a..593e37dde 100644 +index db089843c..1ab089e09 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets -@@ -10,7 +10,7 @@ - +@@ -11,7 +11,7 @@ -- $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) -+ 3.0.0 - $(MicrosoftNETCoreAppInternalPackageVersion) + $(VSRedistCommonAspNetCoreTargetingPackx6430PackageVersion) +- $(MicrosoftNETCoreAppInternalPackageVersion) ++ $(MicrosoftNETCoreAppRuntimePackageVersion) + 3.0.0 -- 2.18.0 diff --git a/patches/core-setup/0001-Use-pinned-version-of-MSBuild-reference-assemblies.patch b/patches/core-setup/0001-Use-pinned-version-of-MSBuild-reference-assemblies.patch index eba993b85b..4159b3a6f7 100644 --- a/patches/core-setup/0001-Use-pinned-version-of-MSBuild-reference-assemblies.patch +++ b/patches/core-setup/0001-Use-pinned-version-of-MSBuild-reference-assemblies.patch @@ -1,14 +1,14 @@ -From 3d9a3e368ef7afc27062fc6fdc13bbf1cab4cda1 Mon Sep 17 00:00:00 2001 +From 743e12170c0fb0de2a717c7741452f7902e6d51b Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 2 Aug 2019 16:46:59 -0500 -Subject: [PATCH] Use pinned version of MSBuild reference assemblies. +Subject: [PATCH 1/4] Use pinned version of MSBuild reference assemblies. --- tools-local/tasks/core-setup.tasks.csproj | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools-local/tasks/core-setup.tasks.csproj b/tools-local/tasks/core-setup.tasks.csproj -index e62dbb54..ad77ef86 100644 +index 3570674..49882d3 100644 --- a/tools-local/tasks/core-setup.tasks.csproj +++ b/tools-local/tasks/core-setup.tasks.csproj @@ -21,10 +21,11 @@ @@ -28,5 +28,5 @@ index e62dbb54..ad77ef86 100644 -- -2.21.0 +1.8.3.1 diff --git a/patches/core-setup/0002-Try-ExcludeFromSourceBuild-in-windowsdesktop.patch b/patches/core-setup/0002-Try-ExcludeFromSourceBuild-in-windowsdesktop.patch index 87d866bd2d..b8331634fa 100644 --- a/patches/core-setup/0002-Try-ExcludeFromSourceBuild-in-windowsdesktop.patch +++ b/patches/core-setup/0002-Try-ExcludeFromSourceBuild-in-windowsdesktop.patch @@ -1,14 +1,14 @@ -From 1cc0f98a7afd3dd49a95ea8f4a31f80f6805f75c Mon Sep 17 00:00:00 2001 +From d4761f52c50d78190349ed9feb06b1b61b312e53 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Sun, 4 Aug 2019 21:28:18 -0500 -Subject: [PATCH 2/2] Try ExcludeFromSourceBuild in windowsdesktop +Subject: [PATCH 2/4] Try ExcludeFromSourceBuild in windowsdesktop --- src/pkg/projects/windowsdesktop/src/windowsdesktop.depproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pkg/projects/windowsdesktop/src/windowsdesktop.depproj b/src/pkg/projects/windowsdesktop/src/windowsdesktop.depproj -index 06214bd4..d8308082 100644 +index 06214bd..d830808 100644 --- a/src/pkg/projects/windowsdesktop/src/windowsdesktop.depproj +++ b/src/pkg/projects/windowsdesktop/src/windowsdesktop.depproj @@ -1,4 +1,7 @@ @@ -20,5 +20,5 @@ index 06214bd4..d8308082 100644 -- -2.21.0 +1.8.3.1 diff --git a/patches/core-setup/0003-Pin-NuGetProjectModel-to-a-specific-version.patch b/patches/core-setup/0003-Pin-NuGetProjectModel-to-a-specific-version.patch index 811130f589..aa99c65533 100644 --- a/patches/core-setup/0003-Pin-NuGetProjectModel-to-a-specific-version.patch +++ b/patches/core-setup/0003-Pin-NuGetProjectModel-to-a-specific-version.patch @@ -1,14 +1,14 @@ -From fc6ccb652c8c8a4e67093fe8157e430a6253a242 Mon Sep 17 00:00:00 2001 +From 96c7a68ef24988d4d7b8ab2bd8376c35662e4d4a Mon Sep 17 00:00:00 2001 From: dseefeld Date: Thu, 5 Sep 2019 14:06:44 +0000 -Subject: [PATCH] Pin NuGetProjectModel to a specific version +Subject: [PATCH 3/4] Pin NuGetProjectModel to a specific version --- tools-local/tasks/core-setup.tasks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools-local/tasks/core-setup.tasks.csproj b/tools-local/tasks/core-setup.tasks.csproj -index e62dbb5..ccf2815 100644 +index 49882d3..2349700 100644 --- a/tools-local/tasks/core-setup.tasks.csproj +++ b/tools-local/tasks/core-setup.tasks.csproj @@ -15,7 +15,7 @@ diff --git a/patches/core-setup/0004-Don-t-call-dotnet-without-a-path.patch b/patches/core-setup/0004-Don-t-call-dotnet-without-a-path.patch index 2b1d6f0c11..37d5c4f280 100644 --- a/patches/core-setup/0004-Don-t-call-dotnet-without-a-path.patch +++ b/patches/core-setup/0004-Don-t-call-dotnet-without-a-path.patch @@ -1,6 +1,6 @@ -From 291781045d57a96ea3b3d143f9e1b2d29724987c Mon Sep 17 00:00:00 2001 +From 2ec8eb30c45ed2a5d48659f50960133471fb9ae5 Mon Sep 17 00:00:00 2001 From: Chris Rummel -Date: Thu, 3 Oct 2019 16:39:01 -0500 +Date: Sun, 10 Nov 2019 12:22:30 -0600 Subject: [PATCH 4/4] Don't call dotnet without a path --- diff --git a/patches/corefx/0001-Enable-sourcelink-in-source-build.patch b/patches/corefx/0001-Enable-sourcelink-in-source-build.patch index e6c4302050..d3bc6b4a48 100644 --- a/patches/corefx/0001-Enable-sourcelink-in-source-build.patch +++ b/patches/corefx/0001-Enable-sourcelink-in-source-build.patch @@ -1,17 +1,17 @@ -From 0b55c791f7f36d65f4e1e4fbb75e956ff54d3797 Mon Sep 17 00:00:00 2001 +From fca777a18a5d48e8add0c70cad2d690e48556bd6 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 7 Aug 2019 23:39:59 -0500 -Subject: [PATCH 1/3] Enable sourcelink in source-build +Subject: [PATCH 1/4] Enable sourcelink in source-build --- eng/Tools.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Tools.props b/eng/Tools.props -index 9d934f6..1898627 100644 +index cfe49be3c6..025f8ab9af 100644 --- a/eng/Tools.props +++ b/eng/Tools.props -@@ -16,6 +16,10 @@ +@@ -20,6 +20,10 @@ @@ -22,7 +22,7 @@ index 9d934f6..1898627 100644 -@@ -30,10 +34,6 @@ +@@ -34,10 +38,6 @@ @@ -34,5 +34,5 @@ index 9d934f6..1898627 100644 -- -1.8.3.1 +2.18.0 diff --git a/patches/corefx/0002-Enable-tests-for-CoreFX-in-s-b.patch b/patches/corefx/0002-Enable-tests-for-CoreFX-in-s-b.patch index 10806a8ee0..9838b22347 100644 --- a/patches/corefx/0002-Enable-tests-for-CoreFX-in-s-b.patch +++ b/patches/corefx/0002-Enable-tests-for-CoreFX-in-s-b.patch @@ -1,7 +1,7 @@ -From 6b6f01b6c504055355c9da5acdedd1dd84a59184 Mon Sep 17 00:00:00 2001 +From 68ef8b67ed549ea76791d4e9706e5e790ffa2644 Mon Sep 17 00:00:00 2001 From: adaggarwal Date: Mon, 5 Aug 2019 18:21:28 +0000 -Subject: [PATCH 2/3] Enable tests for CoreFX in s-b +Subject: [PATCH 2/4] Enable tests for CoreFX in s-b --- Directory.Build.props | 9 +++++++++ @@ -10,10 +10,10 @@ Subject: [PATCH 2/3] Enable tests for CoreFX in s-b 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props -index 5e9fdb6..f9938fe 100644 +index 0272828bbd..61df83ee4b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props -@@ -346,6 +346,15 @@ +@@ -350,6 +350,15 @@ @@ -30,7 +30,7 @@ index 5e9fdb6..f9938fe 100644 diff --git a/build.proj b/build.proj -index 09b69e0..46f76be 100644 +index 09b69e0f2a..46f76be42f 100644 --- a/build.proj +++ b/build.proj @@ -22,7 +22,8 @@ @@ -44,7 +44,7 @@ index 09b69e0..46f76be 100644 diff --git a/src/dirs.proj b/src/dirs.proj -index af8d308..30932b8 100644 +index af8d308269..30932b8447 100644 --- a/src/dirs.proj +++ b/src/dirs.proj @@ -13,7 +13,7 @@ @@ -57,5 +57,5 @@ index af8d308..30932b8 100644 -- -1.8.3.1 +2.18.0 diff --git a/patches/corefx/0003-Don-t-call-dotnet-without-path.patch b/patches/corefx/0004-Don-t-call-dotnet-without-a-path.patch similarity index 83% rename from patches/corefx/0003-Don-t-call-dotnet-without-path.patch rename to patches/corefx/0004-Don-t-call-dotnet-without-a-path.patch index 516392f9d9..20b4082f9b 100644 --- a/patches/corefx/0003-Don-t-call-dotnet-without-path.patch +++ b/patches/corefx/0004-Don-t-call-dotnet-without-a-path.patch @@ -1,7 +1,7 @@ -From 0f7c45e7747ec19571792038cf9c2f19e1af5076 Mon Sep 17 00:00:00 2001 +From 4225ed192088019f7d591de7048007986ef4f13a Mon Sep 17 00:00:00 2001 From: Chris Rummel -Date: Thu, 3 Oct 2019 11:24:29 -0500 -Subject: [PATCH 3/3] Don't call dotnet without path +Date: Wed, 6 Nov 2019 13:27:53 -0600 +Subject: [PATCH 4/4] Don't call dotnet without a path --- eng/common/tools.sh | 6 +++--- diff --git a/repos/aspnet-extensions.proj b/repos/aspnet-extensions.proj index 5478c0af29..d987131b69 100644 --- a/repos/aspnet-extensions.proj +++ b/repos/aspnet-extensions.proj @@ -7,10 +7,13 @@ - + --build --pack $(BuildCommandArgs) --configuration $(Configuration) $(BuildCommandArgs) --binaryLog $(BuildCommandArgs) -ci + $(BuildCommandArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg) + + $(BuildCommandArgs) /p:DisableServicingFeatures=true $(ProjectDirectory)build$(ShellExtension) $(BuildCommandArgs) $(ProjectDirectory)global.json diff --git a/repos/aspnetcore.proj b/repos/aspnetcore.proj index 86014b2a33..998a24f032 100644 --- a/repos/aspnetcore.proj +++ b/repos/aspnetcore.proj @@ -14,6 +14,7 @@ $(BuildCommandArgs) /p:BuildNodeJs=false $(BuildCommandArgs) /p:SourceBuildRuntimeIdentifier=$(TargetRid) $(BuildCommandArgs) /p:UseAppHost=false + $(BuildCommandArgs) /p:CrossgenOutput=false true $(BuildCommandArgs) -v $(LogVerbosity) diff --git a/repos/core-setup.proj b/repos/core-setup.proj index 00d5c276c0..c09c9bd193 100644 --- a/repos/core-setup.proj +++ b/repos/core-setup.proj @@ -44,6 +44,9 @@ $(EnvironmentRestoreSources)%3Bhttps://api.nuget.org/v3/index.json $(EnvironmentRestoreSources)%3Bhttps://dotnetfeed.blob.core.windows.net/dotnet-core/index.json $(EnvironmentRestoreSources)%3Bhttps://dotnetfeed.blob.core.windows.net/dotnet-tools-internal/index.json + + + true diff --git a/repos/dir.props b/repos/dir.props index 0b905bfada..deb6fb876e 100644 --- a/repos/dir.props +++ b/repos/dir.props @@ -15,6 +15,7 @@ true $(LoggingDir)$(RepositoryName).log >> $(RepoConsoleLogFile) 2>&1 + true diff --git a/smoke-test.sh b/smoke-test.sh index f0f67c7684..f46b9447ad 100755 --- a/smoke-test.sh +++ b/smoke-test.sh @@ -338,6 +338,9 @@ else fi fi +echo SDK under test is: +"$dotnetDir/dotnet" --info + # setup restore path export NUGET_PACKAGES="$restoredPackagesDir" SOURCE_BUILT_PKGS_PATH="$SCRIPT_ROOT/bin/obj/x64/$configuration/blob-feed/packages/" diff --git a/smoke-testNuGet.Config b/smoke-testNuGet.Config index 1559c1e675..86bc16dbd2 100644 --- a/smoke-testNuGet.Config +++ b/smoke-testNuGet.Config @@ -3,6 +3,14 @@ + + + + + + + + diff --git a/tools-local/prebuilt-baseline-online.xml b/tools-local/prebuilt-baseline-online.xml old mode 100755 new mode 100644 index 773b678ea5..94fe1e6e39 --- a/tools-local/prebuilt-baseline-online.xml +++ b/tools-local/prebuilt-baseline-online.xml @@ -3,35 +3,35 @@ bin/src/ApplicationInsights-dotnet.53b80940842204f78708a538628288ff5d741a1d/ bin/src/arcade.ce459ae07c3d7a1e68251268855e0bc7b3d97f75/ - bin/src/Extensions.0b951c16de0f39e13cce8372e11c28eb90576662/ + bin/src/Extensions.7dbc3ebd20c79ecf311c768be865c02ff4676836/ bin/src/xdt.c01a538851a8ab1a1fbeb2e6243f391fff7587b4/ - bin/src/AspNetCore-Tooling.16b0ca4a5838c39c8852e6cf144232597e2bee2e/ - bin/src/AspNetCore.aee5e4080331553ea9dfb7fb388b6d72f715bf6a/ - bin/src/cli.2bb5a58198c6d96aae157ea3a119867b57cd839d/ + bin/src/AspNetCore-Tooling.7471a3daf7ba17c22da59cf5815ff1a2b9926bcf/ + bin/src/AspNetCore.22dedcb2f0de59022e0383e1f05c9caffc708522/ + bin/src/cli.3df3c6d5406e217c5dc7ea1cdd4abffbc9eea3ea/ bin/src/cliCommandLineParser.0e89c2116ad28e404ba56c14d1c3f938caa25a01/ bin/src/common.6e37cdfe96ac8b06a923242120169fafacd720e6/ - bin/src/core-sdk.f08e8bc516c2d598c8b0fba247bf8eac5e329a91/ - bin/src/core-setup.0bdbe6b3a7caf32a4f594196effe56a941980d7b/ - bin/src/coreclr.68ff240063fc2ddb9b03275ae5d5063a09d38ace/ - bin/src/corefx.54d63c3e283e0c3937a35ab4e99f391c84ff119e/ + bin/src/core-sdk.ec736cbd54dc2b75a36acda4a7c00e4b99c7d094/ + bin/src/core-setup.32085cbc728e1016c9d6a7bc105845f0f9eb6b47/ + bin/src/coreclr.ecfe3bca7cfbd413415af9d2bcccb5f9a361f962/ + bin/src/corefx.c1778515a3bee34cc09c757b5563d0af0c8b1e99/ bin/src/fsharp.0422ff293bb2cc722fe5021b85ef50378a9af823/ bin/src/known-good-tests./ bin/src/known-good./ bin/src/linker.1127689f262d52ea8ff68ef03d706fa62b3b40a1/ - bin/src/msbuild.0f4c62feac0a5726f63b56472de7b1c1527459fc/ + bin/src/msbuild.e481bbf88fd4a406cc8a98c2f46e9bda8e76be69/ src/netcorecli-fsc/ bin/src/Newtonsoft.Json.cac0690ad133c5e166ce5642dc71175791404fad/ bin/src/Newtonsoft.Json.e43dae94c26f0c30e9095327a3a9eac87193923d/ - bin/src/NuGet.Client.b75150f2f4127a77a166c9552845e86fb24a3282/ + bin/src/NuGet.Client.f2c670b0b7cdc018dc708666b2d58699d9654e42/ src/package-source-build/ bin/src/roslyn.66a912c9463eebe832cf742d2fe8bb2e1a4600ec/ - bin/src/sdk.3819a21a612cd8bc15b6f6c4e361d18490469577/ + bin/src/sdk.5c9dd04241f307f1aa6b3643d5e07ea89a1dad4a/ bin/src/sourcelink.855afb5af9ea79e63dd9c051a7cfe0941bbb5ced/ bin/src/standard.a5b5f2e1e369972c8ff1e2183979fab6099f52ef/ bin/src/templating.a776e417c83c52908298b3767e462feae8b18b98/ - bin/src/toolset.6a8609fc2c10ee908977238e5c6bc48b926491da/ + bin/src/toolset.4742a2d9c56b249808bab066a12a50554377a90b/ bin/src/vstest.55e7e45431c9c05656c999b902686e7402664573/ - bin/src/websdk.9b65fe8b178d2ad73482080c6a0aabae911e1224/ + bin/src/websdk.389b280e262b5f74e8d08cd5c784d4ba18e2fe4d/ bin/src/xliff-tasks.173ee3bd61c9549557eefa3cfb718bdef157cb87/ Tools/ tools-local/tasks/ @@ -47,12 +47,18 @@ - + + + - - + + + + + + @@ -82,21 +88,20 @@ - - - - - - - - - + + + + + + + + + - - + @@ -115,11 +120,9 @@ - - @@ -129,8 +132,6 @@ - - @@ -197,8 +198,6 @@ - - @@ -212,7 +211,6 @@ - @@ -228,8 +226,6 @@ - - @@ -242,7 +238,6 @@ - @@ -261,7 +256,6 @@ - @@ -309,7 +303,6 @@ - @@ -318,7 +311,6 @@ - @@ -336,7 +328,6 @@ - @@ -344,7 +335,6 @@ - @@ -353,32 +343,24 @@ - - - - - - - - @@ -391,7 +373,7 @@ - + @@ -402,8 +384,6 @@ - - @@ -415,4 +395,4 @@ - + \ No newline at end of file