diff --git a/patches/aspnet-extensions/0001-Target-framework-changes.patch b/patches/aspnet-extensions/0001-Target-framework-changes.patch index 767385bd94..89358764d4 100644 --- a/patches/aspnet-extensions/0001-Target-framework-changes.patch +++ b/patches/aspnet-extensions/0001-Target-framework-changes.patch @@ -1,124 +1,124 @@ -From 2a66159c0e2053d964505316278d83ef5955f1fe Mon Sep 17 00:00:00 2001 +From f4ca05a04139be956614a6faa921c9cadf8bd5c3 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Sat, 19 Oct 2019 16:29:22 -0500 -Subject: [PATCH] Target framework changes +Subject: [PATCH 1/4] Target framework changes --- - Directory.Build.props | 1 + - .../ref/Microsoft.Extensions.Caching.Abstractions.csproj | 4 ++-- - .../src/Microsoft.Extensions.Caching.Abstractions.csproj | 2 +- - .../Memory/ref/Microsoft.Extensions.Caching.Memory.csproj | 4 ++-- - .../Memory/src/Microsoft.Extensions.Caching.Memory.csproj | 2 +- - .../ref/Microsoft.Extensions.Caching.SqlServer.csproj | 4 ++-- - .../src/Microsoft.Extensions.Caching.SqlServer.csproj | 2 +- - .../Microsoft.Extensions.Caching.StackExchangeRedis.csproj | 4 ++-- - .../Microsoft.Extensions.Caching.StackExchangeRedis.csproj | 2 +- - .../Microsoft.Extensions.Configuration.Abstractions.csproj | 4 ++-- - .../Microsoft.Extensions.Configuration.Abstractions.csproj | 2 +- - .../Microsoft.Extensions.Configuration.AzureKeyVault.csproj | 4 ++-- - .../Microsoft.Extensions.Configuration.AzureKeyVault.csproj | 2 +- - .../ref/Microsoft.Extensions.Configuration.Binder.csproj | 4 ++-- - .../src/Microsoft.Extensions.Configuration.Binder.csproj | 2 +- - .../Microsoft.Extensions.Configuration.CommandLine.csproj | 4 ++-- - .../Microsoft.Extensions.Configuration.CommandLine.csproj | 2 +- - ...oft.Extensions.Configuration.EnvironmentVariables.csproj | 4 ++-- - ...oft.Extensions.Configuration.EnvironmentVariables.csproj | 2 +- - ...Microsoft.Extensions.Configuration.FileExtensions.csproj | 4 ++-- - ...Microsoft.Extensions.Configuration.FileExtensions.csproj | 2 +- - .../ref/Microsoft.Extensions.Configuration.Ini.csproj | 4 ++-- - .../src/Microsoft.Extensions.Configuration.Ini.csproj | 2 +- - .../ref/Microsoft.Extensions.Configuration.Json.csproj | 4 ++-- - .../src/Microsoft.Extensions.Configuration.Json.csproj | 4 ++-- - .../Microsoft.Extensions.Configuration.KeyPerFile.csproj | 4 ++-- - .../Microsoft.Extensions.Configuration.KeyPerFile.csproj | 2 +- - ...Microsoft.Extensions.Configuration.NewtonsoftJson.csproj | 4 ++-- - ...Microsoft.Extensions.Configuration.NewtonsoftJson.csproj | 2 +- - .../Microsoft.Extensions.Configuration.UserSecrets.csproj | 4 ++-- - .../Microsoft.Extensions.Configuration.UserSecrets.csproj | 2 +- - .../ref/Microsoft.Extensions.Configuration.Xml.csproj | 4 ++-- - .../src/Microsoft.Extensions.Configuration.Xml.csproj | 2 +- - .../Config/ref/Microsoft.Extensions.Configuration.csproj | 4 ++-- - .../Config/src/Microsoft.Extensions.Configuration.csproj | 2 +- - ...osoft.Extensions.DependencyInjection.Abstractions.csproj | 4 ++-- - ...osoft.Extensions.DependencyInjection.Abstractions.csproj | 2 +- - .../DI/ref/Microsoft.Extensions.DependencyInjection.csproj | 2 +- - .../DI/src/Microsoft.Extensions.DependencyInjection.csproj | 2 +- - .../ref/Microsoft.Extensions.DiagnosticAdapter.csproj | 4 ++-- - .../src/Microsoft.Extensions.DiagnosticAdapter.csproj | 2 +- - .../Microsoft.Extensions.FileProviders.Abstractions.csproj | 4 ++-- - .../Microsoft.Extensions.FileProviders.Abstractions.csproj | 2 +- - .../ref/Microsoft.Extensions.FileProviders.Composite.csproj | 4 ++-- - .../src/Microsoft.Extensions.FileProviders.Composite.csproj | 2 +- - .../ref/Microsoft.Extensions.FileProviders.Embedded.csproj | 4 ++-- - .../src/Microsoft.Extensions.FileProviders.Embedded.csproj | 6 +++--- - ...oft.Extensions.FileProviders.Embedded.multitarget.nuspec | 4 ++-- - ...soft.Extensions.FileProviders.Embedded.netcoreapp.nuspec | 4 ++-- - .../Microsoft.Extensions.FileProviders.Embedded.props | 2 +- - ...t.Extensions.FileProviders.Embedded.Manifest.Task.csproj | 2 +- - .../ref/Microsoft.Extensions.FileProviders.Physical.csproj | 4 ++-- - .../src/Microsoft.Extensions.FileProviders.Physical.csproj | 2 +- - .../ref/Microsoft.Extensions.FileSystemGlobbing.csproj | 4 ++-- - .../src/Microsoft.Extensions.FileSystemGlobbing.csproj | 2 +- - ....Extensions.Diagnostics.HealthChecks.Abstractions.csproj | 4 ++-- - ....Extensions.Diagnostics.HealthChecks.Abstractions.csproj | 2 +- - .../Microsoft.Extensions.Diagnostics.HealthChecks.csproj | 4 ++-- - .../Microsoft.Extensions.Diagnostics.HealthChecks.csproj | 2 +- - .../ref/Microsoft.Extensions.Hosting.Abstractions.csproj | 4 ++-- - .../src/Microsoft.Extensions.Hosting.Abstractions.csproj | 4 ++-- - src/Hosting/Hosting/ref/Microsoft.Extensions.Hosting.csproj | 2 +- - src/Hosting/Hosting/src/Microsoft.Extensions.Hosting.csproj | 2 +- - .../ref/Microsoft.Extensions.Hosting.WindowsServices.csproj | 2 +- - .../src/Microsoft.Extensions.Hosting.WindowsServices.csproj | 2 +- - .../Http/ref/Microsoft.Extensions.Http.csproj | 4 ++-- - .../Http/src/Microsoft.Extensions.Http.csproj | 2 +- - .../Polly/ref/Microsoft.Extensions.Http.Polly.csproj | 4 ++-- - .../Polly/src/Microsoft.Extensions.Http.Polly.csproj | 2 +- - .../Microsoft.JSInterop/ref/Microsoft.JSInterop.csproj | 4 ++-- - .../Microsoft.JSInterop/src/Microsoft.JSInterop.csproj | 4 ++-- - .../ref/Mono.WebAssembly.Interop.csproj | 4 ++-- - .../src/Mono.WebAssembly.Interop.csproj | 2 +- - .../Microsoft.Extensions.Localization.Abstractions.csproj | 4 ++-- - .../Microsoft.Extensions.Localization.Abstractions.csproj | 2 +- - .../ref/Microsoft.Extensions.Localization.csproj | 4 ++-- - .../src/Microsoft.Extensions.Localization.csproj | 2 +- - .../ref/Microsoft.Extensions.Logging.Abstractions.csproj | 4 ++-- - .../src/Microsoft.Extensions.Logging.Abstractions.csproj | 2 +- - .../Microsoft.Extensions.Logging.AzureAppServices.csproj | 4 ++-- - .../Microsoft.Extensions.Logging.AzureAppServices.csproj | 2 +- - .../ref/Microsoft.Extensions.Logging.Configuration.csproj | 4 ++-- - .../src/Microsoft.Extensions.Logging.Configuration.csproj | 2 +- - .../ref/Microsoft.Extensions.Logging.Console.csproj | 4 ++-- - .../src/Microsoft.Extensions.Logging.Console.csproj | 2 +- - .../ref/Microsoft.Extensions.Logging.Debug.csproj | 4 ++-- - .../src/Microsoft.Extensions.Logging.Debug.csproj | 2 +- - .../ref/Microsoft.Extensions.Logging.EventLog.csproj | 4 ++-- - .../src/Microsoft.Extensions.Logging.EventLog.csproj | 2 +- - .../ref/Microsoft.Extensions.Logging.EventSource.csproj | 4 ++-- - .../src/Microsoft.Extensions.Logging.EventSource.csproj | 4 ++-- - .../ref/Microsoft.Extensions.Logging.TraceSource.csproj | 4 ++-- - .../src/Microsoft.Extensions.Logging.TraceSource.csproj | 2 +- - src/Logging/Logging/ref/Microsoft.Extensions.Logging.csproj | 4 ++-- - src/Logging/Logging/src/Microsoft.Extensions.Logging.csproj | 2 +- - src/ObjectPool/ref/Microsoft.Extensions.ObjectPool.csproj | 4 ++-- - src/ObjectPool/src/Microsoft.Extensions.ObjectPool.csproj | 2 +- - ...rosoft.Extensions.Options.ConfigurationExtensions.csproj | 4 ++-- - ...rosoft.Extensions.Options.ConfigurationExtensions.csproj | 2 +- - .../ref/Microsoft.Extensions.Options.DataAnnotations.csproj | 4 ++-- - .../src/Microsoft.Extensions.Options.DataAnnotations.csproj | 4 ++-- - src/Options/Options/ref/Microsoft.Extensions.Options.csproj | 4 ++-- - src/Options/Options/src/Microsoft.Extensions.Options.csproj | 4 ++-- - src/Primitives/ref/Microsoft.Extensions.Primitives.csproj | 4 ++-- - src/Primitives/src/Microsoft.Extensions.Primitives.csproj | 4 ++-- - .../src/Microsoft.AspNetCore.Testing.csproj | 2 +- - src/WebEncoders/ref/Microsoft.Extensions.WebEncoders.csproj | 4 ++-- - src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj | 4 ++-- + Directory.Build.props | 1 + + .../ref/Microsoft.Extensions.Caching.Abstractions.csproj | 4 ++-- + .../src/Microsoft.Extensions.Caching.Abstractions.csproj | 2 +- + src/Caching/Memory/ref/Microsoft.Extensions.Caching.Memory.csproj | 4 ++-- + src/Caching/Memory/src/Microsoft.Extensions.Caching.Memory.csproj | 2 +- + .../SqlServer/ref/Microsoft.Extensions.Caching.SqlServer.csproj | 4 ++-- + .../SqlServer/src/Microsoft.Extensions.Caching.SqlServer.csproj | 2 +- + .../ref/Microsoft.Extensions.Caching.StackExchangeRedis.csproj | 4 ++-- + .../src/Microsoft.Extensions.Caching.StackExchangeRedis.csproj | 2 +- + .../ref/Microsoft.Extensions.Configuration.Abstractions.csproj | 4 ++-- + .../src/Microsoft.Extensions.Configuration.Abstractions.csproj | 2 +- + .../ref/Microsoft.Extensions.Configuration.AzureKeyVault.csproj | 4 ++-- + .../src/Microsoft.Extensions.Configuration.AzureKeyVault.csproj | 2 +- + .../ref/Microsoft.Extensions.Configuration.Binder.csproj | 4 ++-- + .../src/Microsoft.Extensions.Configuration.Binder.csproj | 2 +- + .../ref/Microsoft.Extensions.Configuration.CommandLine.csproj | 4 ++-- + .../src/Microsoft.Extensions.Configuration.CommandLine.csproj | 2 +- + .../Microsoft.Extensions.Configuration.EnvironmentVariables.csproj | 4 ++-- + .../Microsoft.Extensions.Configuration.EnvironmentVariables.csproj | 2 +- + .../ref/Microsoft.Extensions.Configuration.FileExtensions.csproj | 4 ++-- + .../src/Microsoft.Extensions.Configuration.FileExtensions.csproj | 2 +- + .../Config.Ini/ref/Microsoft.Extensions.Configuration.Ini.csproj | 4 ++-- + .../Config.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj | 2 +- + .../Config.Json/ref/Microsoft.Extensions.Configuration.Json.csproj | 4 ++-- + .../Config.Json/src/Microsoft.Extensions.Configuration.Json.csproj | 4 ++-- + .../ref/Microsoft.Extensions.Configuration.KeyPerFile.csproj | 4 ++-- + .../src/Microsoft.Extensions.Configuration.KeyPerFile.csproj | 2 +- + .../ref/Microsoft.Extensions.Configuration.NewtonsoftJson.csproj | 4 ++-- + .../src/Microsoft.Extensions.Configuration.NewtonsoftJson.csproj | 2 +- + .../ref/Microsoft.Extensions.Configuration.UserSecrets.csproj | 4 ++-- + .../src/Microsoft.Extensions.Configuration.UserSecrets.csproj | 2 +- + .../Config.Xml/ref/Microsoft.Extensions.Configuration.Xml.csproj | 4 ++-- + .../Config.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj | 2 +- + .../Config/ref/Microsoft.Extensions.Configuration.csproj | 4 ++-- + .../Config/src/Microsoft.Extensions.Configuration.csproj | 2 +- + .../Microsoft.Extensions.DependencyInjection.Abstractions.csproj | 4 ++-- + .../Microsoft.Extensions.DependencyInjection.Abstractions.csproj | 2 +- + .../DI/ref/Microsoft.Extensions.DependencyInjection.csproj | 2 +- + .../DI/src/Microsoft.Extensions.DependencyInjection.csproj | 2 +- + .../ref/Microsoft.Extensions.DiagnosticAdapter.csproj | 4 ++-- + .../src/Microsoft.Extensions.DiagnosticAdapter.csproj | 2 +- + .../ref/Microsoft.Extensions.FileProviders.Abstractions.csproj | 4 ++-- + .../src/Microsoft.Extensions.FileProviders.Abstractions.csproj | 2 +- + .../ref/Microsoft.Extensions.FileProviders.Composite.csproj | 4 ++-- + .../src/Microsoft.Extensions.FileProviders.Composite.csproj | 2 +- + .../Embedded/ref/Microsoft.Extensions.FileProviders.Embedded.csproj | 4 ++-- + .../Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj | 6 +++--- + .../Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec | 4 ++-- + .../Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec | 4 ++-- + .../Microsoft.Extensions.FileProviders.Embedded.props | 2 +- + ...Microsoft.Extensions.FileProviders.Embedded.Manifest.Task.csproj | 2 +- + .../Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj | 4 ++-- + .../Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj | 2 +- + .../ref/Microsoft.Extensions.FileSystemGlobbing.csproj | 4 ++-- + .../src/Microsoft.Extensions.FileSystemGlobbing.csproj | 2 +- + ...icrosoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj | 4 ++-- + ...icrosoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj | 2 +- + .../ref/Microsoft.Extensions.Diagnostics.HealthChecks.csproj | 4 ++-- + .../src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj | 2 +- + .../ref/Microsoft.Extensions.Hosting.Abstractions.csproj | 4 ++-- + .../src/Microsoft.Extensions.Hosting.Abstractions.csproj | 4 ++-- + src/Hosting/Hosting/ref/Microsoft.Extensions.Hosting.csproj | 2 +- + src/Hosting/Hosting/src/Microsoft.Extensions.Hosting.csproj | 2 +- + .../ref/Microsoft.Extensions.Hosting.WindowsServices.csproj | 2 +- + .../src/Microsoft.Extensions.Hosting.WindowsServices.csproj | 2 +- + src/HttpClientFactory/Http/ref/Microsoft.Extensions.Http.csproj | 4 ++-- + src/HttpClientFactory/Http/src/Microsoft.Extensions.Http.csproj | 2 +- + .../Polly/ref/Microsoft.Extensions.Http.Polly.csproj | 4 ++-- + .../Polly/src/Microsoft.Extensions.Http.Polly.csproj | 2 +- + src/JSInterop/Microsoft.JSInterop/ref/Microsoft.JSInterop.csproj | 4 ++-- + src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj | 4 ++-- + .../Mono.WebAssembly.Interop/ref/Mono.WebAssembly.Interop.csproj | 4 ++-- + .../Mono.WebAssembly.Interop/src/Mono.WebAssembly.Interop.csproj | 2 +- + .../ref/Microsoft.Extensions.Localization.Abstractions.csproj | 4 ++-- + .../src/Microsoft.Extensions.Localization.Abstractions.csproj | 2 +- + .../Localization/ref/Microsoft.Extensions.Localization.csproj | 4 ++-- + .../Localization/src/Microsoft.Extensions.Localization.csproj | 2 +- + .../ref/Microsoft.Extensions.Logging.Abstractions.csproj | 4 ++-- + .../src/Microsoft.Extensions.Logging.Abstractions.csproj | 2 +- + .../ref/Microsoft.Extensions.Logging.AzureAppServices.csproj | 4 ++-- + .../src/Microsoft.Extensions.Logging.AzureAppServices.csproj | 2 +- + .../ref/Microsoft.Extensions.Logging.Configuration.csproj | 4 ++-- + .../src/Microsoft.Extensions.Logging.Configuration.csproj | 2 +- + .../Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj | 4 ++-- + .../Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj | 2 +- + .../Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj | 4 ++-- + .../Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj | 2 +- + .../ref/Microsoft.Extensions.Logging.EventLog.csproj | 4 ++-- + .../src/Microsoft.Extensions.Logging.EventLog.csproj | 2 +- + .../ref/Microsoft.Extensions.Logging.EventSource.csproj | 4 ++-- + .../src/Microsoft.Extensions.Logging.EventSource.csproj | 4 ++-- + .../ref/Microsoft.Extensions.Logging.TraceSource.csproj | 4 ++-- + .../src/Microsoft.Extensions.Logging.TraceSource.csproj | 2 +- + src/Logging/Logging/ref/Microsoft.Extensions.Logging.csproj | 4 ++-- + src/Logging/Logging/src/Microsoft.Extensions.Logging.csproj | 2 +- + src/ObjectPool/ref/Microsoft.Extensions.ObjectPool.csproj | 4 ++-- + src/ObjectPool/src/Microsoft.Extensions.ObjectPool.csproj | 2 +- + .../ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj | 4 ++-- + .../src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj | 2 +- + .../ref/Microsoft.Extensions.Options.DataAnnotations.csproj | 4 ++-- + .../src/Microsoft.Extensions.Options.DataAnnotations.csproj | 4 ++-- + src/Options/Options/ref/Microsoft.Extensions.Options.csproj | 4 ++-- + src/Options/Options/src/Microsoft.Extensions.Options.csproj | 4 ++-- + src/Primitives/ref/Microsoft.Extensions.Primitives.csproj | 4 ++-- + src/Primitives/src/Microsoft.Extensions.Primitives.csproj | 4 ++-- + .../src/Microsoft.AspNetCore.Testing.csproj | 2 +- + src/WebEncoders/ref/Microsoft.Extensions.WebEncoders.csproj | 4 ++-- + src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj | 4 ++-- 108 files changed, 168 insertions(+), 167 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props -index 0dbdaf0bd..ae8a1733c 100644 +index 5c87238..b9ac69e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props -@@ -38,6 +38,7 @@ +@@ -36,6 +36,7 @@ 8.0 netcoreapp$(MajorVersion).$(MinorVersion) @@ -127,7 +127,7 @@ index 0dbdaf0bd..ae8a1733c 100644 Microsoft .NET Extensions true diff --git a/src/Caching/Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj b/src/Caching/Abstractions/ref/Microsoft.Extensions.Caching.Abstractions.csproj -index 5a386d571..171a1bbd5 100644 +index 5a386d5..171a1bb 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 @@ @@ -143,7 +143,7 @@ index 5a386d571..171a1bbd5 100644 diff --git a/src/Caching/Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj b/src/Caching/Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj -index 40b3f185b..34ac6725d 100644 +index 40b3f18..34ac672 100644 --- a/src/Caching/Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj +++ b/src/Caching/Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj @@ -5,7 +5,7 @@ @@ -156,7 +156,7 @@ index 40b3f185b..34ac6725d 100644 $(NoWarn);CS1591 true diff --git a/src/Caching/Memory/ref/Microsoft.Extensions.Caching.Memory.csproj b/src/Caching/Memory/ref/Microsoft.Extensions.Caching.Memory.csproj -index ea36e245c..665081c3a 100644 +index ea36e24..665081c 100644 --- a/src/Caching/Memory/ref/Microsoft.Extensions.Caching.Memory.csproj +++ b/src/Caching/Memory/ref/Microsoft.Extensions.Caching.Memory.csproj @@ -1,9 +1,9 @@ @@ -172,7 +172,7 @@ index ea36e245c..665081c3a 100644 diff --git a/src/Caching/Memory/src/Microsoft.Extensions.Caching.Memory.csproj b/src/Caching/Memory/src/Microsoft.Extensions.Caching.Memory.csproj -index 3d42c1707..ccf9e22b0 100644 +index 3d42c17..ccf9e22 100644 --- a/src/Caching/Memory/src/Microsoft.Extensions.Caching.Memory.csproj +++ b/src/Caching/Memory/src/Microsoft.Extensions.Caching.Memory.csproj @@ -2,7 +2,7 @@ @@ -185,7 +185,7 @@ index 3d42c1707..ccf9e22b0 100644 $(NoWarn);CS1591 true diff --git a/src/Caching/SqlServer/ref/Microsoft.Extensions.Caching.SqlServer.csproj b/src/Caching/SqlServer/ref/Microsoft.Extensions.Caching.SqlServer.csproj -index 0259e794e..381d979ac 100644 +index 0259e79..381d979 100644 --- a/src/Caching/SqlServer/ref/Microsoft.Extensions.Caching.SqlServer.csproj +++ b/src/Caching/SqlServer/ref/Microsoft.Extensions.Caching.SqlServer.csproj @@ -1,9 +1,9 @@ @@ -201,7 +201,7 @@ index 0259e794e..381d979ac 100644 diff --git a/src/Caching/SqlServer/src/Microsoft.Extensions.Caching.SqlServer.csproj b/src/Caching/SqlServer/src/Microsoft.Extensions.Caching.SqlServer.csproj -index 3e42fb09c..6ef6ad719 100644 +index 3e42fb0..6ef6ad7 100644 --- a/src/Caching/SqlServer/src/Microsoft.Extensions.Caching.SqlServer.csproj +++ b/src/Caching/SqlServer/src/Microsoft.Extensions.Caching.SqlServer.csproj @@ -2,7 +2,7 @@ @@ -214,7 +214,7 @@ index 3e42fb09c..6ef6ad719 100644 true cache;distributedcache;sqlserver diff --git a/src/Caching/StackExchangeRedis/ref/Microsoft.Extensions.Caching.StackExchangeRedis.csproj b/src/Caching/StackExchangeRedis/ref/Microsoft.Extensions.Caching.StackExchangeRedis.csproj -index 31f974d8e..967b44fa1 100644 +index 31f974d..967b44f 100644 --- a/src/Caching/StackExchangeRedis/ref/Microsoft.Extensions.Caching.StackExchangeRedis.csproj +++ b/src/Caching/StackExchangeRedis/ref/Microsoft.Extensions.Caching.StackExchangeRedis.csproj @@ -1,9 +1,9 @@ @@ -230,7 +230,7 @@ index 31f974d8e..967b44fa1 100644 diff --git a/src/Caching/StackExchangeRedis/src/Microsoft.Extensions.Caching.StackExchangeRedis.csproj b/src/Caching/StackExchangeRedis/src/Microsoft.Extensions.Caching.StackExchangeRedis.csproj -index 9fba467ca..870f0eed5 100644 +index 9fba467..870f0ee 100644 --- a/src/Caching/StackExchangeRedis/src/Microsoft.Extensions.Caching.StackExchangeRedis.csproj +++ b/src/Caching/StackExchangeRedis/src/Microsoft.Extensions.Caching.StackExchangeRedis.csproj @@ -2,7 +2,7 @@ @@ -243,7 +243,7 @@ index 9fba467ca..870f0eed5 100644 true cache;distributedcache;redis 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 0e2f639e0..944a2b758 100644 +index 0e2f639..944a2b7 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 @@ @@ -259,7 +259,7 @@ index 0e2f639e0..944a2b758 100644 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 367e597d2..12242c1d8 100644 +index 367e597..12242c1 100644 --- a/src/Configuration/Config.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj +++ b/src/Configuration/Config.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj @@ -1,7 +1,7 @@ @@ -272,7 +272,7 @@ index 367e597d2..12242c1d8 100644 Abstractions of key-value pair based configuration. Commonly used types: diff --git a/src/Configuration/Config.AzureKeyVault/ref/Microsoft.Extensions.Configuration.AzureKeyVault.csproj b/src/Configuration/Config.AzureKeyVault/ref/Microsoft.Extensions.Configuration.AzureKeyVault.csproj -index 7c469ae43..5d0eddd3e 100644 +index 7c469ae..5d0eddd 100644 --- a/src/Configuration/Config.AzureKeyVault/ref/Microsoft.Extensions.Configuration.AzureKeyVault.csproj +++ b/src/Configuration/Config.AzureKeyVault/ref/Microsoft.Extensions.Configuration.AzureKeyVault.csproj @@ -1,9 +1,9 @@ @@ -288,7 +288,7 @@ index 7c469ae43..5d0eddd3e 100644 diff --git a/src/Configuration/Config.AzureKeyVault/src/Microsoft.Extensions.Configuration.AzureKeyVault.csproj b/src/Configuration/Config.AzureKeyVault/src/Microsoft.Extensions.Configuration.AzureKeyVault.csproj -index 321ae7fa9..6c1c87ebb 100644 +index 321ae7f..6c1c87e 100644 --- a/src/Configuration/Config.AzureKeyVault/src/Microsoft.Extensions.Configuration.AzureKeyVault.csproj +++ b/src/Configuration/Config.AzureKeyVault/src/Microsoft.Extensions.Configuration.AzureKeyVault.csproj @@ -2,7 +2,7 @@ @@ -301,7 +301,7 @@ index 321ae7fa9..6c1c87ebb 100644 true true 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 e01485dcd..c5ebb1be5 100644 +index e01485d..c5ebb1b 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 @@ @@ -317,7 +317,7 @@ index e01485dcd..c5ebb1be5 100644 diff --git a/src/Configuration/Config.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj b/src/Configuration/Config.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj -index 7b336a56e..a3d4c9ba6 100644 +index 7b336a5..a3d4c9b 100644 --- a/src/Configuration/Config.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj +++ b/src/Configuration/Config.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj @@ -2,7 +2,7 @@ @@ -330,7 +330,7 @@ index 7b336a56e..a3d4c9ba6 100644 true true 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 074f010a3..4beb663aa 100644 +index 074f010..4beb663 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 @@ @@ -346,7 +346,7 @@ index 074f010a3..4beb663aa 100644 diff --git a/src/Configuration/Config.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj b/src/Configuration/Config.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj -index 8966564ba..946304aac 100644 +index 8966564..946304a 100644 --- a/src/Configuration/Config.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj +++ b/src/Configuration/Config.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj @@ -2,7 +2,7 @@ @@ -359,7 +359,7 @@ index 8966564ba..946304aac 100644 $(PackageTags);commandline true 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 1612df673..ccd016a72 100644 +index 1612df6..ccd016a 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 @@ @@ -375,7 +375,7 @@ index 1612df673..ccd016a72 100644 diff --git a/src/Configuration/Config.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj b/src/Configuration/Config.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj -index 6e95fafa1..a3aa387cc 100644 +index 6e95faf..a3aa387 100644 --- a/src/Configuration/Config.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj +++ b/src/Configuration/Config.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj @@ -2,7 +2,7 @@ @@ -388,7 +388,7 @@ index 6e95fafa1..a3aa387cc 100644 $(PackageTags);envvar;environmentvariable true 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 094350e4a..6edbe587f 100644 +index 094350e..6edbe58 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 @@ @@ -404,7 +404,7 @@ index 094350e4a..6edbe587f 100644 diff --git a/src/Configuration/Config.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj b/src/Configuration/Config.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj -index 3ddd53c18..a4bc5c798 100644 +index 3ddd53c..a4bc5c7 100644 --- a/src/Configuration/Config.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj +++ b/src/Configuration/Config.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj @@ -2,7 +2,7 @@ @@ -417,7 +417,7 @@ index 3ddd53c18..a4bc5c798 100644 true true 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 6e40290af..4b792fd58 100644 +index 6e40290..4b792fd 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 @@ @@ -433,7 +433,7 @@ index 6e40290af..4b792fd58 100644 diff --git a/src/Configuration/Config.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj b/src/Configuration/Config.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj -index 373912982..c6c018fa4 100644 +index 3739129..c6c018f 100644 --- a/src/Configuration/Config.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj +++ b/src/Configuration/Config.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj @@ -2,7 +2,7 @@ @@ -446,7 +446,7 @@ index 373912982..c6c018fa4 100644 $(PackageTags);ini true 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 addd1ffd2..ca8ed821b 100644 +index addd1ff..ca8ed82 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 @@ @@ -462,7 +462,7 @@ index addd1ffd2..ca8ed821b 100644 diff --git a/src/Configuration/Config.Json/src/Microsoft.Extensions.Configuration.Json.csproj b/src/Configuration/Config.Json/src/Microsoft.Extensions.Configuration.Json.csproj -index 8b14a9a15..e592cf6f2 100644 +index 8b14a9a..e592cf6 100644 --- a/src/Configuration/Config.Json/src/Microsoft.Extensions.Configuration.Json.csproj +++ b/src/Configuration/Config.Json/src/Microsoft.Extensions.Configuration.Json.csproj @@ -2,7 +2,7 @@ @@ -484,7 +484,7 @@ index 8b14a9a15..e592cf6f2 100644 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 8dbe6d3ba..b9f179800 100644 +index 8dbe6d3..b9f1798 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 @@ @@ -500,7 +500,7 @@ index 8dbe6d3ba..b9f179800 100644 diff --git a/src/Configuration/Config.KeyPerFile/src/Microsoft.Extensions.Configuration.KeyPerFile.csproj b/src/Configuration/Config.KeyPerFile/src/Microsoft.Extensions.Configuration.KeyPerFile.csproj -index 7f9c5e7eb..2d6255cd4 100644 +index 7f9c5e7..2d6255c 100644 --- a/src/Configuration/Config.KeyPerFile/src/Microsoft.Extensions.Configuration.KeyPerFile.csproj +++ b/src/Configuration/Config.KeyPerFile/src/Microsoft.Extensions.Configuration.KeyPerFile.csproj @@ -2,7 +2,7 @@ @@ -513,7 +513,7 @@ index 7f9c5e7eb..2d6255cd4 100644 true true diff --git a/src/Configuration/Config.NewtonsoftJson/ref/Microsoft.Extensions.Configuration.NewtonsoftJson.csproj b/src/Configuration/Config.NewtonsoftJson/ref/Microsoft.Extensions.Configuration.NewtonsoftJson.csproj -index 044991b25..0d44b158b 100644 +index 044991b..0d44b15 100644 --- a/src/Configuration/Config.NewtonsoftJson/ref/Microsoft.Extensions.Configuration.NewtonsoftJson.csproj +++ b/src/Configuration/Config.NewtonsoftJson/ref/Microsoft.Extensions.Configuration.NewtonsoftJson.csproj @@ -1,9 +1,9 @@ @@ -529,7 +529,7 @@ index 044991b25..0d44b158b 100644 diff --git a/src/Configuration/Config.NewtonsoftJson/src/Microsoft.Extensions.Configuration.NewtonsoftJson.csproj b/src/Configuration/Config.NewtonsoftJson/src/Microsoft.Extensions.Configuration.NewtonsoftJson.csproj -index 2d453a13a..4f4ba5f1e 100644 +index 2d453a1..4f4ba5f 100644 --- a/src/Configuration/Config.NewtonsoftJson/src/Microsoft.Extensions.Configuration.NewtonsoftJson.csproj +++ b/src/Configuration/Config.NewtonsoftJson/src/Microsoft.Extensions.Configuration.NewtonsoftJson.csproj @@ -2,7 +2,7 @@ @@ -542,7 +542,7 @@ index 2d453a13a..4f4ba5f1e 100644 true true 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 8c31f90dc..2aebd0aea 100644 +index 8c31f90..2aebd0a 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 @@ @@ -558,7 +558,7 @@ index 8c31f90dc..2aebd0aea 100644 diff --git a/src/Configuration/Config.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj b/src/Configuration/Config.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj -index bf88139bc..b977a5a29 100644 +index bf88139..b977a5a 100644 --- a/src/Configuration/Config.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj +++ b/src/Configuration/Config.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj @@ -2,7 +2,7 @@ @@ -571,7 +571,7 @@ index bf88139bc..b977a5a29 100644 $(PackageTags);secrets;usersecrets true 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 9f706c942..bc38b9634 100644 +index 9f706c9..bc38b96 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 @@ @@ -587,7 +587,7 @@ index 9f706c942..bc38b9634 100644 diff --git a/src/Configuration/Config.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj b/src/Configuration/Config.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj -index 9468359d7..367736e25 100644 +index 9468359..367736e 100644 --- a/src/Configuration/Config.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj +++ b/src/Configuration/Config.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj @@ -2,7 +2,7 @@ @@ -600,7 +600,7 @@ index 9468359d7..367736e25 100644 $(PackageTags);xml true diff --git a/src/Configuration/Config/ref/Microsoft.Extensions.Configuration.csproj b/src/Configuration/Config/ref/Microsoft.Extensions.Configuration.csproj -index 6defcaaf6..69637654b 100644 +index 6defcaa..6963765 100644 --- a/src/Configuration/Config/ref/Microsoft.Extensions.Configuration.csproj +++ b/src/Configuration/Config/ref/Microsoft.Extensions.Configuration.csproj @@ -1,9 +1,9 @@ @@ -616,7 +616,7 @@ index 6defcaaf6..69637654b 100644 diff --git a/src/Configuration/Config/src/Microsoft.Extensions.Configuration.csproj b/src/Configuration/Config/src/Microsoft.Extensions.Configuration.csproj -index dfa2c258f..fda29fe85 100644 +index dfa2c25..fda29fe 100644 --- a/src/Configuration/Config/src/Microsoft.Extensions.Configuration.csproj +++ b/src/Configuration/Config/src/Microsoft.Extensions.Configuration.csproj @@ -2,7 +2,7 @@ @@ -629,7 +629,7 @@ index dfa2c258f..fda29fe85 100644 true true diff --git a/src/DependencyInjection/DI.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.csproj b/src/DependencyInjection/DI.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.csproj -index 43e405be8..808fefc1d 100644 +index 43e405b..808fefc 100644 --- a/src/DependencyInjection/DI.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.csproj +++ b/src/DependencyInjection/DI.Abstractions/ref/Microsoft.Extensions.DependencyInjection.Abstractions.csproj @@ -1,9 +1,9 @@ @@ -645,7 +645,7 @@ index 43e405be8..808fefc1d 100644 diff --git a/src/DependencyInjection/DI.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj b/src/DependencyInjection/DI.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj -index 2d0421994..0850c8e56 100644 +index 2d04219..0850c8e 100644 --- a/src/DependencyInjection/DI.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj +++ b/src/DependencyInjection/DI.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj @@ -4,7 +4,7 @@ @@ -658,7 +658,7 @@ index 2d0421994..0850c8e56 100644 dependencyinjection;di $(DefineConstants);ActivatorUtilities_In_DependencyInjection diff --git a/src/DependencyInjection/DI/ref/Microsoft.Extensions.DependencyInjection.csproj b/src/DependencyInjection/DI/ref/Microsoft.Extensions.DependencyInjection.csproj -index dc39334b9..3a2f54141 100644 +index dc39334..3a2f541 100644 --- a/src/DependencyInjection/DI/ref/Microsoft.Extensions.DependencyInjection.csproj +++ b/src/DependencyInjection/DI/ref/Microsoft.Extensions.DependencyInjection.csproj @@ -1,7 +1,7 @@ @@ -671,7 +671,7 @@ index dc39334b9..3a2f54141 100644 diff --git a/src/DependencyInjection/DI/src/Microsoft.Extensions.DependencyInjection.csproj b/src/DependencyInjection/DI/src/Microsoft.Extensions.DependencyInjection.csproj -index eb488c625..79f00d116 100644 +index eb488c6..79f00d1 100644 --- a/src/DependencyInjection/DI/src/Microsoft.Extensions.DependencyInjection.csproj +++ b/src/DependencyInjection/DI/src/Microsoft.Extensions.DependencyInjection.csproj @@ -2,7 +2,7 @@ @@ -684,7 +684,7 @@ index eb488c625..79f00d116 100644 dependencyinjection;di true diff --git a/src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj b/src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj -index 57dd0b0c7..286bf287d 100644 +index 57dd0b0..286bf28 100644 --- a/src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj +++ b/src/DiagnosticAdapter/ref/Microsoft.Extensions.DiagnosticAdapter.csproj @@ -1,9 +1,9 @@ @@ -700,7 +700,7 @@ index 57dd0b0c7..286bf287d 100644 diff --git a/src/DiagnosticAdapter/src/Microsoft.Extensions.DiagnosticAdapter.csproj b/src/DiagnosticAdapter/src/Microsoft.Extensions.DiagnosticAdapter.csproj -index a9e883540..a29e51d3d 100644 +index a9e8835..a29e51d 100644 --- a/src/DiagnosticAdapter/src/Microsoft.Extensions.DiagnosticAdapter.csproj +++ b/src/DiagnosticAdapter/src/Microsoft.Extensions.DiagnosticAdapter.csproj @@ -2,7 +2,7 @@ @@ -713,7 +713,7 @@ index a9e883540..a29e51d3d 100644 true diagnosticadapter;diagnosticlistener;diagnostics diff --git a/src/FileProviders/Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj b/src/FileProviders/Abstractions/ref/Microsoft.Extensions.FileProviders.Abstractions.csproj -index cd3104535..16600b590 100644 +index cd31045..16600b5 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 @@ @@ -729,7 +729,7 @@ index cd3104535..16600b590 100644 diff --git a/src/FileProviders/Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj b/src/FileProviders/Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj -index 49e129e49..5c14e91d9 100644 +index 49e129e..5c14e91 100644 --- a/src/FileProviders/Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj +++ b/src/FileProviders/Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj @@ -7,7 +7,7 @@ Commonly used types: @@ -742,7 +742,7 @@ index 49e129e49..5c14e91d9 100644 true true diff --git a/src/FileProviders/Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj b/src/FileProviders/Composite/ref/Microsoft.Extensions.FileProviders.Composite.csproj -index 46f117717..eca2fe1d9 100644 +index 46f1177..eca2fe1 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 @@ @@ -758,7 +758,7 @@ index 46f117717..eca2fe1d9 100644 diff --git a/src/FileProviders/Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj b/src/FileProviders/Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj -index ccec2c097..cf45c1c4e 100644 +index ccec2c0..cf45c1c 100644 --- a/src/FileProviders/Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj +++ b/src/FileProviders/Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj @@ -3,7 +3,7 @@ @@ -771,7 +771,7 @@ index ccec2c097..cf45c1c4e 100644 true true diff --git a/src/FileProviders/Embedded/ref/Microsoft.Extensions.FileProviders.Embedded.csproj b/src/FileProviders/Embedded/ref/Microsoft.Extensions.FileProviders.Embedded.csproj -index 89cba5ba5..13216fc59 100644 +index 89cba5b..13216fc 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 @@ @@ -787,7 +787,7 @@ index 89cba5ba5..13216fc59 100644 diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj -index 44e8e2afb..c5a274edd 100644 +index 3d5fe3c..b3eb3d2 100644 --- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj +++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj @@ -3,7 +3,7 @@ @@ -799,7 +799,7 @@ index 44e8e2afb..c5a274edd 100644 $(MSBuildProjectName).multitarget.nuspec $(DefaultNetCoreTargetFramework) $(MSBuildProjectName).netcoreapp.nuspec -@@ -28,8 +28,8 @@ +@@ -28,7 +28,7 @@ @@ -807,17 +807,16 @@ index 44e8e2afb..c5a274edd 100644 - + + - diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec -index ca6b2bcf1..458f981ee 100644 +index 6acde4e..74f74e3 100644 --- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec +++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec -@@ -20,7 +20,7 @@ +@@ -19,7 +19,7 @@ + - - - + @@ -825,13 +824,13 @@ index ca6b2bcf1..458f981ee 100644 diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec -index ea8d3386f..ff549539f 100644 +index 217efb6..3350ea7 100644 --- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec +++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec -@@ -17,7 +17,7 @@ +@@ -16,7 +16,7 @@ + - - - + @@ -839,7 +838,7 @@ index ea8d3386f..ff549539f 100644 diff --git a/src/FileProviders/Embedded/src/build/netstandard2.0/Microsoft.Extensions.FileProviders.Embedded.props b/src/FileProviders/Embedded/src/build/netstandard2.0/Microsoft.Extensions.FileProviders.Embedded.props -index aabbabc92..2d8c55e95 100644 +index aabbabc..2d8c55e 100644 --- a/src/FileProviders/Embedded/src/build/netstandard2.0/Microsoft.Extensions.FileProviders.Embedded.props +++ b/src/FileProviders/Embedded/src/build/netstandard2.0/Microsoft.Extensions.FileProviders.Embedded.props @@ -5,7 +5,7 @@ @@ -852,7 +851,7 @@ index aabbabc92..2d8c55e95 100644 true false diff --git a/src/FileProviders/Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj b/src/FileProviders/Physical/ref/Microsoft.Extensions.FileProviders.Physical.csproj -index c662e5734..9054f1b60 100644 +index c662e57..9054f1b 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 @@ @@ -881,7 +880,7 @@ index c662e5734..9054f1b60 100644 diff --git a/src/FileProviders/Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj b/src/FileProviders/Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj -index dee9f559a..6040609a9 100644 +index dee9f55..6040609 100644 --- a/src/FileProviders/Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj +++ b/src/FileProviders/Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj @@ -3,7 +3,7 @@ @@ -894,7 +893,7 @@ index dee9f559a..6040609a9 100644 true true diff --git a/src/FileSystemGlobbing/ref/Microsoft.Extensions.FileSystemGlobbing.csproj b/src/FileSystemGlobbing/ref/Microsoft.Extensions.FileSystemGlobbing.csproj -index c93da686d..ce3680459 100644 +index c93da68..ce36804 100644 --- a/src/FileSystemGlobbing/ref/Microsoft.Extensions.FileSystemGlobbing.csproj +++ b/src/FileSystemGlobbing/ref/Microsoft.Extensions.FileSystemGlobbing.csproj @@ -1,9 +1,9 @@ @@ -910,7 +909,7 @@ index c93da686d..ce3680459 100644 diff --git a/src/FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj b/src/FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj -index 65910694d..3d8c78458 100644 +index 6591069..3d8c784 100644 --- a/src/FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj +++ b/src/FileSystemGlobbing/src/Microsoft.Extensions.FileSystemGlobbing.csproj @@ -4,7 +4,7 @@ @@ -923,7 +922,7 @@ index 65910694d..3d8c78458 100644 files;filesystem;glob;globbing true diff --git a/src/HealthChecks/Abstractions/ref/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj b/src/HealthChecks/Abstractions/ref/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj -index 6b67a0868..adf9112f5 100644 +index 6b67a08..adf9112 100644 --- a/src/HealthChecks/Abstractions/ref/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj +++ b/src/HealthChecks/Abstractions/ref/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj @@ -1,9 +1,9 @@ @@ -939,7 +938,7 @@ index 6b67a0868..adf9112f5 100644 diff --git a/src/HealthChecks/Abstractions/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj b/src/HealthChecks/Abstractions/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj -index aeb85d3e7..562ec5b9b 100644 +index aeb85d3..562ec5b 100644 --- a/src/HealthChecks/Abstractions/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj +++ b/src/HealthChecks/Abstractions/src/Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.csproj @@ -7,7 +7,7 @@ Commonly Used Types @@ -952,7 +951,7 @@ index aeb85d3e7..562ec5b9b 100644 $(NoWarn);CS1591 true diff --git a/src/HealthChecks/HealthChecks/ref/Microsoft.Extensions.Diagnostics.HealthChecks.csproj b/src/HealthChecks/HealthChecks/ref/Microsoft.Extensions.Diagnostics.HealthChecks.csproj -index 83dae521f..9edbd09ff 100644 +index 83dae52..9edbd09 100644 --- a/src/HealthChecks/HealthChecks/ref/Microsoft.Extensions.Diagnostics.HealthChecks.csproj +++ b/src/HealthChecks/HealthChecks/ref/Microsoft.Extensions.Diagnostics.HealthChecks.csproj @@ -1,9 +1,9 @@ @@ -968,7 +967,7 @@ index 83dae521f..9edbd09ff 100644 diff --git a/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj b/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj -index 35c789a69..fc648d253 100644 +index 35c789a..fc648d2 100644 --- a/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj +++ b/src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj @@ -6,7 +6,7 @@ Commonly Used Types: @@ -981,7 +980,7 @@ index 35c789a69..fc648d253 100644 $(NoWarn);CS1591 true diff --git a/src/Hosting/Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj b/src/Hosting/Abstractions/ref/Microsoft.Extensions.Hosting.Abstractions.csproj -index a0f842ac4..ac01bda7d 100644 +index a0f842a..ac01bda 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 @@ @@ -997,7 +996,7 @@ index a0f842ac4..ac01bda7d 100644 diff --git a/src/Hosting/Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj b/src/Hosting/Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj -index fc4e84b44..da6aa728d 100644 +index fc4e84b..da6aa72 100644 --- a/src/Hosting/Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj +++ b/src/Hosting/Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj @@ -2,7 +2,7 @@ @@ -1019,7 +1018,7 @@ index fc4e84b44..da6aa728d 100644 diff --git a/src/Hosting/Hosting/ref/Microsoft.Extensions.Hosting.csproj b/src/Hosting/Hosting/ref/Microsoft.Extensions.Hosting.csproj -index e75cb1125..f59551bb3 100644 +index e75cb11..f59551b 100644 --- a/src/Hosting/Hosting/ref/Microsoft.Extensions.Hosting.csproj +++ b/src/Hosting/Hosting/ref/Microsoft.Extensions.Hosting.csproj @@ -1,7 +1,7 @@ @@ -1032,7 +1031,7 @@ index e75cb1125..f59551bb3 100644 diff --git a/src/Hosting/Hosting/src/Microsoft.Extensions.Hosting.csproj b/src/Hosting/Hosting/src/Microsoft.Extensions.Hosting.csproj -index 7f57888ba..bf994de97 100644 +index 7f57888..bf994de 100644 --- a/src/Hosting/Hosting/src/Microsoft.Extensions.Hosting.csproj +++ b/src/Hosting/Hosting/src/Microsoft.Extensions.Hosting.csproj @@ -2,7 +2,7 @@ @@ -1045,7 +1044,7 @@ index 7f57888ba..bf994de97 100644 $(NoWarn);CS1591 true diff --git a/src/Hosting/WindowsServices/ref/Microsoft.Extensions.Hosting.WindowsServices.csproj b/src/Hosting/WindowsServices/ref/Microsoft.Extensions.Hosting.WindowsServices.csproj -index 2d582b402..ed7909836 100644 +index 2d582b4..ed79098 100644 --- a/src/Hosting/WindowsServices/ref/Microsoft.Extensions.Hosting.WindowsServices.csproj +++ b/src/Hosting/WindowsServices/ref/Microsoft.Extensions.Hosting.WindowsServices.csproj @@ -1,7 +1,7 @@ @@ -1058,7 +1057,7 @@ index 2d582b402..ed7909836 100644 diff --git a/src/Hosting/WindowsServices/src/Microsoft.Extensions.Hosting.WindowsServices.csproj b/src/Hosting/WindowsServices/src/Microsoft.Extensions.Hosting.WindowsServices.csproj -index 9f8d1df17..4b973b810 100644 +index 9f8d1df..4b973b8 100644 --- a/src/Hosting/WindowsServices/src/Microsoft.Extensions.Hosting.WindowsServices.csproj +++ b/src/Hosting/WindowsServices/src/Microsoft.Extensions.Hosting.WindowsServices.csproj @@ -2,7 +2,7 @@ @@ -1071,7 +1070,7 @@ index 9f8d1df17..4b973b810 100644 hosting true diff --git a/src/HttpClientFactory/Http/ref/Microsoft.Extensions.Http.csproj b/src/HttpClientFactory/Http/ref/Microsoft.Extensions.Http.csproj -index 097173637..c02c49ff5 100644 +index 0971736..c02c49f 100644 --- a/src/HttpClientFactory/Http/ref/Microsoft.Extensions.Http.csproj +++ b/src/HttpClientFactory/Http/ref/Microsoft.Extensions.Http.csproj @@ -1,9 +1,9 @@ @@ -1087,7 +1086,7 @@ index 097173637..c02c49ff5 100644 diff --git a/src/HttpClientFactory/Http/src/Microsoft.Extensions.Http.csproj b/src/HttpClientFactory/Http/src/Microsoft.Extensions.Http.csproj -index b7c800e03..803ca4a13 100644 +index b7c800e..803ca4a 100644 --- a/src/HttpClientFactory/Http/src/Microsoft.Extensions.Http.csproj +++ b/src/HttpClientFactory/Http/src/Microsoft.Extensions.Http.csproj @@ -6,7 +6,7 @@ @@ -1100,7 +1099,7 @@ index b7c800e03..803ca4a13 100644 $(NoWarn);CS1591 true diff --git a/src/HttpClientFactory/Polly/ref/Microsoft.Extensions.Http.Polly.csproj b/src/HttpClientFactory/Polly/ref/Microsoft.Extensions.Http.Polly.csproj -index c9ae0be22..fbc4f709e 100644 +index c9ae0be..fbc4f70 100644 --- a/src/HttpClientFactory/Polly/ref/Microsoft.Extensions.Http.Polly.csproj +++ b/src/HttpClientFactory/Polly/ref/Microsoft.Extensions.Http.Polly.csproj @@ -1,9 +1,9 @@ @@ -1116,7 +1115,7 @@ index c9ae0be22..fbc4f709e 100644 diff --git a/src/HttpClientFactory/Polly/src/Microsoft.Extensions.Http.Polly.csproj b/src/HttpClientFactory/Polly/src/Microsoft.Extensions.Http.Polly.csproj -index 682df832e..826c1f395 100644 +index 682df83..826c1f3 100644 --- a/src/HttpClientFactory/Polly/src/Microsoft.Extensions.Http.Polly.csproj +++ b/src/HttpClientFactory/Polly/src/Microsoft.Extensions.Http.Polly.csproj @@ -4,7 +4,7 @@ @@ -1129,7 +1128,7 @@ index 682df832e..826c1f395 100644 true aspnetcore;httpclient diff --git a/src/JSInterop/Microsoft.JSInterop/ref/Microsoft.JSInterop.csproj b/src/JSInterop/Microsoft.JSInterop/ref/Microsoft.JSInterop.csproj -index ceb24636a..9ec916f74 100644 +index ceb2463..9ec916f 100644 --- a/src/JSInterop/Microsoft.JSInterop/ref/Microsoft.JSInterop.csproj +++ b/src/JSInterop/Microsoft.JSInterop/ref/Microsoft.JSInterop.csproj @@ -1,9 +1,9 @@ @@ -1145,7 +1144,7 @@ index ceb24636a..9ec916f74 100644 diff --git a/src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj b/src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj -index a45484e0d..808027236 100644 +index a45484e..8080272 100644 --- a/src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj +++ b/src/JSInterop/Microsoft.JSInterop/src/Microsoft.JSInterop.csproj @@ -1,7 +1,7 @@ @@ -1167,7 +1166,7 @@ index a45484e0d..808027236 100644 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..2fcc4f04b 100644 +index a1ba605..2fcc4f0 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 @@ @@ -1183,7 +1182,7 @@ index a1ba60570..2fcc4f04b 100644 diff --git a/src/JSInterop/Mono.WebAssembly.Interop/src/Mono.WebAssembly.Interop.csproj b/src/JSInterop/Mono.WebAssembly.Interop/src/Mono.WebAssembly.Interop.csproj -index f85c89a6d..f6485b71b 100644 +index f85c89a..f6485b7 100644 --- a/src/JSInterop/Mono.WebAssembly.Interop/src/Mono.WebAssembly.Interop.csproj +++ b/src/JSInterop/Mono.WebAssembly.Interop/src/Mono.WebAssembly.Interop.csproj @@ -1,7 +1,7 @@ @@ -1196,7 +1195,7 @@ index f85c89a6d..f6485b71b 100644 wasm;javascript;interop true diff --git a/src/Localization/Abstractions/ref/Microsoft.Extensions.Localization.Abstractions.csproj b/src/Localization/Abstractions/ref/Microsoft.Extensions.Localization.Abstractions.csproj -index af97cae59..c15aacf2f 100644 +index af97cae..c15aacf 100644 --- a/src/Localization/Abstractions/ref/Microsoft.Extensions.Localization.Abstractions.csproj +++ b/src/Localization/Abstractions/ref/Microsoft.Extensions.Localization.Abstractions.csproj @@ -1,9 +1,9 @@ @@ -1212,7 +1211,7 @@ index af97cae59..c15aacf2f 100644 diff --git a/src/Localization/Abstractions/src/Microsoft.Extensions.Localization.Abstractions.csproj b/src/Localization/Abstractions/src/Microsoft.Extensions.Localization.Abstractions.csproj -index 4b8816040..ee475b808 100644 +index 4b88160..ee475b8 100644 --- a/src/Localization/Abstractions/src/Microsoft.Extensions.Localization.Abstractions.csproj +++ b/src/Localization/Abstractions/src/Microsoft.Extensions.Localization.Abstractions.csproj @@ -6,7 +6,7 @@ @@ -1225,7 +1224,7 @@ index 4b8816040..ee475b808 100644 $(NoWarn);CS1591 true diff --git a/src/Localization/Localization/ref/Microsoft.Extensions.Localization.csproj b/src/Localization/Localization/ref/Microsoft.Extensions.Localization.csproj -index 67e8f38f8..30e6cb43f 100644 +index 67e8f38..30e6cb4 100644 --- a/src/Localization/Localization/ref/Microsoft.Extensions.Localization.csproj +++ b/src/Localization/Localization/ref/Microsoft.Extensions.Localization.csproj @@ -1,9 +1,9 @@ @@ -1241,7 +1240,7 @@ index 67e8f38f8..30e6cb43f 100644 diff --git a/src/Localization/Localization/src/Microsoft.Extensions.Localization.csproj b/src/Localization/Localization/src/Microsoft.Extensions.Localization.csproj -index b6b059ce8..9675020fd 100644 +index b6b059c..9675020 100644 --- a/src/Localization/Localization/src/Microsoft.Extensions.Localization.csproj +++ b/src/Localization/Localization/src/Microsoft.Extensions.Localization.csproj @@ -3,7 +3,7 @@ @@ -1254,7 +1253,7 @@ index b6b059ce8..9675020fd 100644 $(NoWarn);CS1591 true diff --git a/src/Logging/Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj b/src/Logging/Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj -index 07dea7303..15f0de2ee 100644 +index 07dea73..15f0de2 100644 --- a/src/Logging/Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj +++ b/src/Logging/Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.csproj @@ -1,9 +1,9 @@ @@ -1270,7 +1269,7 @@ index 07dea7303..15f0de2ee 100644 diff --git a/src/Logging/Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj b/src/Logging/Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj -index 683235925..cc19a4174 100644 +index 6832359..cc19a41 100644 --- a/src/Logging/Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj +++ b/src/Logging/Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj @@ -10,7 +10,7 @@ Microsoft.Extensions.Logging.LogLevel @@ -1283,7 +1282,7 @@ index 683235925..cc19a4174 100644 true true diff --git a/src/Logging/Logging.AzureAppServices/ref/Microsoft.Extensions.Logging.AzureAppServices.csproj b/src/Logging/Logging.AzureAppServices/ref/Microsoft.Extensions.Logging.AzureAppServices.csproj -index 0132b2187..08cd67ab2 100644 +index 0132b21..08cd67a 100644 --- a/src/Logging/Logging.AzureAppServices/ref/Microsoft.Extensions.Logging.AzureAppServices.csproj +++ b/src/Logging/Logging.AzureAppServices/ref/Microsoft.Extensions.Logging.AzureAppServices.csproj @@ -1,9 +1,9 @@ @@ -1299,7 +1298,7 @@ index 0132b2187..08cd67ab2 100644 diff --git a/src/Logging/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj b/src/Logging/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj -index 5bedde8c6..b7a76f03a 100644 +index 5bedde8..b7a76f0 100644 --- a/src/Logging/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj +++ b/src/Logging/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj @@ -2,7 +2,7 @@ @@ -1312,7 +1311,7 @@ index 5bedde8c6..b7a76f03a 100644 true true diff --git a/src/Logging/Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj b/src/Logging/Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj -index 7071343de..be043323e 100644 +index 7071343..be04332 100644 --- a/src/Logging/Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj +++ b/src/Logging/Logging.Configuration/ref/Microsoft.Extensions.Logging.Configuration.csproj @@ -1,9 +1,9 @@ @@ -1328,7 +1327,7 @@ index 7071343de..be043323e 100644 diff --git a/src/Logging/Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj b/src/Logging/Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj -index 4ef5201cb..19d63ffea 100644 +index bc77602..68c6449 100644 --- a/src/Logging/Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj +++ b/src/Logging/Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj @@ -2,7 +2,7 @@ @@ -1341,7 +1340,7 @@ index 4ef5201cb..19d63ffea 100644 true true diff --git a/src/Logging/Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj b/src/Logging/Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj -index b82bf7ebd..a000867c9 100644 +index b82bf7e..a000867 100644 --- a/src/Logging/Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj +++ b/src/Logging/Logging.Console/ref/Microsoft.Extensions.Logging.Console.csproj @@ -1,9 +1,9 @@ @@ -1357,7 +1356,7 @@ index b82bf7ebd..a000867c9 100644 diff --git a/src/Logging/Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj b/src/Logging/Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj -index f907dbcf7..b92434465 100644 +index f907dbc..b924344 100644 --- a/src/Logging/Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj +++ b/src/Logging/Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj @@ -2,7 +2,7 @@ @@ -1370,7 +1369,7 @@ index f907dbcf7..b92434465 100644 $(NoWarn);CS1591 true diff --git a/src/Logging/Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj b/src/Logging/Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj -index b35fb8a34..b533d6d60 100644 +index b35fb8a..b533d6d 100644 --- a/src/Logging/Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj +++ b/src/Logging/Logging.Debug/ref/Microsoft.Extensions.Logging.Debug.csproj @@ -1,9 +1,9 @@ @@ -1386,7 +1385,7 @@ index b35fb8a34..b533d6d60 100644 diff --git a/src/Logging/Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj b/src/Logging/Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj -index 9e4e8768e..d487f4e88 100644 +index 9e4e876..d487f4e 100644 --- a/src/Logging/Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj +++ b/src/Logging/Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj @@ -2,7 +2,7 @@ @@ -1399,7 +1398,7 @@ index 9e4e8768e..d487f4e88 100644 $(NoWarn);CS1591 true diff --git a/src/Logging/Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj b/src/Logging/Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj -index 19e726785..6d7c53560 100644 +index 19e7267..6d7c535 100644 --- a/src/Logging/Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj +++ b/src/Logging/Logging.EventLog/ref/Microsoft.Extensions.Logging.EventLog.csproj @@ -1,9 +1,9 @@ @@ -1415,7 +1414,7 @@ index 19e726785..6d7c53560 100644 diff --git a/src/Logging/Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj b/src/Logging/Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj -index 1b0e84381..78dc54898 100644 +index 1b0e843..78dc548 100644 --- a/src/Logging/Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj +++ b/src/Logging/Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj @@ -2,7 +2,7 @@ @@ -1428,7 +1427,7 @@ index 1b0e84381..78dc54898 100644 $(NoWarn);CS1591 $(PackageTags);eventlog;windowseventlog diff --git a/src/Logging/Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj b/src/Logging/Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj -index eb007ac3b..d92f31e98 100644 +index eb007ac..d92f31e 100644 --- a/src/Logging/Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj +++ b/src/Logging/Logging.EventSource/ref/Microsoft.Extensions.Logging.EventSource.csproj @@ -1,9 +1,9 @@ @@ -1444,7 +1443,7 @@ index eb007ac3b..d92f31e98 100644 diff --git a/src/Logging/Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj b/src/Logging/Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj -index 182fd068e..319db280d 100644 +index 182fd06..319db28 100644 --- a/src/Logging/Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj +++ b/src/Logging/Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj @@ -2,7 +2,7 @@ @@ -1466,7 +1465,7 @@ index 182fd068e..319db280d 100644 diff --git a/src/Logging/Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj b/src/Logging/Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj -index 780246fa7..e3f89fb1f 100644 +index 780246f..e3f89fb 100644 --- a/src/Logging/Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj +++ b/src/Logging/Logging.TraceSource/ref/Microsoft.Extensions.Logging.TraceSource.csproj @@ -1,9 +1,9 @@ @@ -1482,7 +1481,7 @@ index 780246fa7..e3f89fb1f 100644 diff --git a/src/Logging/Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj b/src/Logging/Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj -index 16dda708a..4450fca2f 100644 +index 16dda70..4450fca 100644 --- a/src/Logging/Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj +++ b/src/Logging/Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj @@ -2,7 +2,7 @@ @@ -1495,7 +1494,7 @@ index 16dda708a..4450fca2f 100644 $(NoWarn);CS1591 true diff --git a/src/Logging/Logging/ref/Microsoft.Extensions.Logging.csproj b/src/Logging/Logging/ref/Microsoft.Extensions.Logging.csproj -index 0a6d562eb..0fa8355af 100644 +index 0a6d562..0fa8355 100644 --- a/src/Logging/Logging/ref/Microsoft.Extensions.Logging.csproj +++ b/src/Logging/Logging/ref/Microsoft.Extensions.Logging.csproj @@ -1,9 +1,9 @@ @@ -1511,7 +1510,7 @@ index 0a6d562eb..0fa8355af 100644 diff --git a/src/Logging/Logging/src/Microsoft.Extensions.Logging.csproj b/src/Logging/Logging/src/Microsoft.Extensions.Logging.csproj -index 9956a47fb..dbbc335e6 100644 +index 16cd1d4..5ae2126 100644 --- a/src/Logging/Logging/src/Microsoft.Extensions.Logging.csproj +++ b/src/Logging/Logging/src/Microsoft.Extensions.Logging.csproj @@ -2,7 +2,7 @@ @@ -1524,7 +1523,7 @@ index 9956a47fb..dbbc335e6 100644 $(NoWarn);CS1591 true diff --git a/src/ObjectPool/ref/Microsoft.Extensions.ObjectPool.csproj b/src/ObjectPool/ref/Microsoft.Extensions.ObjectPool.csproj -index 1fbb81a9c..bc6fb4f62 100644 +index 1fbb81a..bc6fb4f 100644 --- a/src/ObjectPool/ref/Microsoft.Extensions.ObjectPool.csproj +++ b/src/ObjectPool/ref/Microsoft.Extensions.ObjectPool.csproj @@ -1,9 +1,9 @@ @@ -1540,7 +1539,7 @@ index 1fbb81a9c..bc6fb4f62 100644 diff --git a/src/ObjectPool/src/Microsoft.Extensions.ObjectPool.csproj b/src/ObjectPool/src/Microsoft.Extensions.ObjectPool.csproj -index c193ad6e1..6fecff24f 100644 +index c193ad6..6fecff2 100644 --- a/src/ObjectPool/src/Microsoft.Extensions.ObjectPool.csproj +++ b/src/ObjectPool/src/Microsoft.Extensions.ObjectPool.csproj @@ -2,7 +2,7 @@ @@ -1553,7 +1552,7 @@ index c193ad6e1..6fecff24f 100644 true pooling diff --git a/src/Options/ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj b/src/Options/ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj -index 3b29d61c4..515a890cc 100644 +index 3b29d61..515a890 100644 --- a/src/Options/ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj +++ b/src/Options/ConfigurationExtensions/ref/Microsoft.Extensions.Options.ConfigurationExtensions.csproj @@ -1,9 +1,9 @@ @@ -1569,7 +1568,7 @@ index 3b29d61c4..515a890cc 100644 diff --git a/src/Options/ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj b/src/Options/ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj -index b417e4c8c..f91085522 100644 +index b417e4c..f910855 100644 --- a/src/Options/ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj +++ b/src/Options/ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj @@ -2,7 +2,7 @@ @@ -1582,7 +1581,7 @@ index b417e4c8c..f91085522 100644 true aspnetcore;configuration;options diff --git a/src/Options/DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.csproj b/src/Options/DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.csproj -index a7d7979ae..c11b77fcb 100644 +index a7d7979..c11b77f 100644 --- a/src/Options/DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.csproj +++ b/src/Options/DataAnnotations/ref/Microsoft.Extensions.Options.DataAnnotations.csproj @@ -1,9 +1,9 @@ @@ -1598,7 +1597,7 @@ index a7d7979ae..c11b77fcb 100644 diff --git a/src/Options/DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj b/src/Options/DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj -index c44c8b7b6..13f0ee38e 100644 +index c44c8b7..13f0ee3 100644 --- a/src/Options/DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj +++ b/src/Options/DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj @@ -2,7 +2,7 @@ @@ -1620,7 +1619,7 @@ index c44c8b7b6..13f0ee38e 100644 diff --git a/src/Options/Options/ref/Microsoft.Extensions.Options.csproj b/src/Options/Options/ref/Microsoft.Extensions.Options.csproj -index 8358f43d5..18a1d7c30 100644 +index 8358f43..18a1d7c 100644 --- a/src/Options/Options/ref/Microsoft.Extensions.Options.csproj +++ b/src/Options/Options/ref/Microsoft.Extensions.Options.csproj @@ -1,9 +1,9 @@ @@ -1636,7 +1635,7 @@ index 8358f43d5..18a1d7c30 100644 diff --git a/src/Options/Options/src/Microsoft.Extensions.Options.csproj b/src/Options/Options/src/Microsoft.Extensions.Options.csproj -index f86a9f1ad..bd0601e61 100644 +index f86a9f1..bd0601e 100644 --- a/src/Options/Options/src/Microsoft.Extensions.Options.csproj +++ b/src/Options/Options/src/Microsoft.Extensions.Options.csproj @@ -2,7 +2,7 @@ @@ -1658,7 +1657,7 @@ index f86a9f1ad..bd0601e61 100644 diff --git a/src/Primitives/ref/Microsoft.Extensions.Primitives.csproj b/src/Primitives/ref/Microsoft.Extensions.Primitives.csproj -index 9623f02f7..5bee81191 100644 +index 9623f02..5bee811 100644 --- a/src/Primitives/ref/Microsoft.Extensions.Primitives.csproj +++ b/src/Primitives/ref/Microsoft.Extensions.Primitives.csproj @@ -1,9 +1,9 @@ @@ -1674,7 +1673,7 @@ index 9623f02f7..5bee81191 100644 diff --git a/src/Primitives/src/Microsoft.Extensions.Primitives.csproj b/src/Primitives/src/Microsoft.Extensions.Primitives.csproj -index 81dc5fe59..139fc10bb 100644 +index 81dc5fe..139fc10 100644 --- a/src/Primitives/src/Microsoft.Extensions.Primitives.csproj +++ b/src/Primitives/src/Microsoft.Extensions.Primitives.csproj @@ -5,7 +5,7 @@ @@ -1696,7 +1695,7 @@ index 81dc5fe59..139fc10bb 100644 diff --git a/src/TestingUtils/Microsoft.AspNetCore.Testing/src/Microsoft.AspNetCore.Testing.csproj b/src/TestingUtils/Microsoft.AspNetCore.Testing/src/Microsoft.AspNetCore.Testing.csproj -index 9da267c41..437e9ee36 100644 +index 448351f..c1c44c6 100644 --- a/src/TestingUtils/Microsoft.AspNetCore.Testing/src/Microsoft.AspNetCore.Testing.csproj +++ b/src/TestingUtils/Microsoft.AspNetCore.Testing/src/Microsoft.AspNetCore.Testing.csproj @@ -2,7 +2,7 @@ @@ -1709,7 +1708,7 @@ index 9da267c41..437e9ee36 100644 true aspnetcore diff --git a/src/WebEncoders/ref/Microsoft.Extensions.WebEncoders.csproj b/src/WebEncoders/ref/Microsoft.Extensions.WebEncoders.csproj -index 5beee97dd..1f43f48ba 100644 +index 5beee97..1f43f48 100644 --- a/src/WebEncoders/ref/Microsoft.Extensions.WebEncoders.csproj +++ b/src/WebEncoders/ref/Microsoft.Extensions.WebEncoders.csproj @@ -1,9 +1,9 @@ @@ -1725,7 +1724,7 @@ index 5beee97dd..1f43f48ba 100644 diff --git a/src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj b/src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj -index 364f4d3d8..c30a88b3d 100644 +index 364f4d3..c30a88b 100644 --- a/src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj +++ b/src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj @@ -2,7 +2,7 @@ @@ -1747,5 +1746,5 @@ index 364f4d3d8..c30a88b3d 100644 -- -2.18.0 +2.7.4 diff --git a/patches/aspnet-extensions/0003-Build-MS.Internal.Ext.Refs-for-AspNetCore.patch b/patches/aspnet-extensions/0002-Build-MS.Internal.Ext.Refs-for-AspNetCore.patch similarity index 92% rename from patches/aspnet-extensions/0003-Build-MS.Internal.Ext.Refs-for-AspNetCore.patch rename to patches/aspnet-extensions/0002-Build-MS.Internal.Ext.Refs-for-AspNetCore.patch index dbaa947dec..284475bac9 100644 --- a/patches/aspnet-extensions/0003-Build-MS.Internal.Ext.Refs-for-AspNetCore.patch +++ b/patches/aspnet-extensions/0002-Build-MS.Internal.Ext.Refs-for-AspNetCore.patch @@ -1,7 +1,7 @@ -From 9d97837d014e982f99d4d4a60c96f2f443f88914 Mon Sep 17 00:00:00 2001 +From ecf43b244977a72144d1cc9ef00fdff6552417f9 Mon Sep 17 00:00:00 2001 From: adaggarwal Date: Wed, 13 Nov 2019 22:59:38 +0000 -Subject: [PATCH 2/2] Build MS.Internal.Ext.Refs for AspNetCore +Subject: [PATCH 2/4] Build MS.Internal.Ext.Refs for AspNetCore --- .../ref/Microsoft.Internal.Extensions.Refs.csproj | 6 +++--- @@ -35,5 +35,5 @@ index c89ec06..952d69e 100644 -- -1.8.3.1 +2.7.4 diff --git a/patches/aspnet-extensions/0003-Don-t-warn-for-package-upgrades.patch b/patches/aspnet-extensions/0003-Don-t-warn-for-package-upgrades.patch index 9a451a7ffb..f33ce654b3 100644 --- a/patches/aspnet-extensions/0003-Don-t-warn-for-package-upgrades.patch +++ b/patches/aspnet-extensions/0003-Don-t-warn-for-package-upgrades.patch @@ -1,14 +1,14 @@ -From dbfe192c7005cba605a99753a15dc65bc86c1512 Mon Sep 17 00:00:00 2001 +From d7d674d61c76bce7824d0353c5642266236a83aa Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 14 Nov 2019 20:50:56 -0600 -Subject: [PATCH 3/3] Don't warn for package upgrades +Subject: [PATCH 3/4] Don't warn for package upgrades --- Directory.Build.props | 1 + 1 file changed, 1 insertion(+) diff --git a/Directory.Build.props b/Directory.Build.props -index ae8a1733c..db1fa96de 100644 +index b9ac69e..365f4ea 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -19,6 +19,7 @@ @@ -20,5 +20,5 @@ index ae8a1733c..db1fa96de 100644 -- -2.18.0 +2.7.4 diff --git a/patches/aspnet-extensions/0004-Don-t-call-dotnet-without-a-path.patch b/patches/aspnet-extensions/0004-Don-t-call-dotnet-without-a-path.patch index 3d9431f284..a8b7d30618 100644 --- a/patches/aspnet-extensions/0004-Don-t-call-dotnet-without-a-path.patch +++ b/patches/aspnet-extensions/0004-Don-t-call-dotnet-without-a-path.patch @@ -1,17 +1,17 @@ -From b5498725a373eb203f75673687884393af8257fc Mon Sep 17 00:00:00 2001 +From 44308d18ac36deeb40b109a520a997a998b20929 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 23 Oct 2019 18:56:04 -0500 -Subject: [PATCH 2/2] Don't call dotnet without a path +Subject: [PATCH 4/4] Don't call dotnet without a path --- eng/common/tools.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/common/tools.sh b/eng/common/tools.sh -index 757d5b9ea..5a4cfeb1f 100755 +index 94965a8..8e14f8b 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh -@@ -340,9 +340,9 @@ function MSBuild { +@@ -362,9 +362,9 @@ function MSBuild { # Work around issues with Azure Artifacts credential provider # https://github.com/dotnet/arcade/issues/3932 @@ -25,5 +25,5 @@ index 757d5b9ea..5a4cfeb1f 100755 local toolset_dir="${_InitializeToolset%/*}" local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" -- -2.18.0 +2.7.4 diff --git a/patches/aspnetcore-tooling/0001-Don-t-build-fullfx.patch b/patches/aspnetcore-tooling/0001-Don-t-build-fullfx.patch index 1141faf52a..7e82d4df02 100644 --- a/patches/aspnetcore-tooling/0001-Don-t-build-fullfx.patch +++ b/patches/aspnetcore-tooling/0001-Don-t-build-fullfx.patch @@ -1,15 +1,15 @@ -From 722a6b2ceced53bb6e536856a813672c421fd273 Mon Sep 17 00:00:00 2001 +From 1a5a1cd558339f753323b59c86681a6d83d1ebf6 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Sun, 20 Oct 2019 15:51:49 -0500 -Subject: [PATCH 1/5] Don't build fullfx +Subject: [PATCH 1/4] Don't build fullfx --- .../src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj | 10 +++++----- - .../build/netstandard2.0/Sdk.Razor.CurrentVersion.targets | 2 +- - 2 files changed, 6 insertions(+), 6 deletions(-) + .../build/netstandard2.0/Sdk.Razor.CurrentVersion.targets | 4 ++-- + 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj -index dd3272a..ac0b233 100644 +index ba32df8..4f8ecce 100644 --- a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj +++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj @@ -1,7 +1,7 @@ @@ -46,18 +46,20 @@ index dd3272a..ac0b233 100644 diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets -index 84d7bb7..b0a7c5e 100644 +index e5e8d92..b0a7c5e 100644 --- a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets +++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets -@@ -31,7 +31,7 @@ Copyright (c) .NET Foundation. All rights reserved. +@@ -30,8 +30,8 @@ Copyright (c) .NET Foundation. All rights reserved. + $(MSBuildThisFileDirectory)..\..\ $(RazorSdkDirectoryRoot)tasks\ - <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">$(DefaultNetCoreTargetFramework) +- <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">netcoreapp3.1 - <_RazorSdkTasksTFM Condition=" '$(_RazorSdkTasksTFM)' == ''">net46 ++ <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">$(DefaultNetCoreTargetFramework) + <_RazorSdkTasksTFM Condition=" '$(_RazorSdkTasksTFM)' == ''">net472 $(RazorSdkBuildTasksDirectoryRoot)$(_RazorSdkTasksTFM)\Microsoft.NET.Sdk.Razor.Tasks.dll -- -1.8.3.1 +2.7.4 diff --git a/patches/aspnetcore-tooling/0002-dont-call-dotnet-without-path.patch b/patches/aspnetcore-tooling/0002-dont-call-dotnet-without-path.patch index 3f9dda4126..1c4dd8273c 100644 --- a/patches/aspnetcore-tooling/0002-dont-call-dotnet-without-path.patch +++ b/patches/aspnetcore-tooling/0002-dont-call-dotnet-without-path.patch @@ -1,17 +1,17 @@ -From 33b9cd78c75736fc56695d10d80a7337aa999390 Mon Sep 17 00:00:00 2001 +From 0c8defec29ee1144a70f20870b3e46c31509cc13 Mon Sep 17 00:00:00 2001 From: adaggarwal Date: Wed, 30 Oct 2019 19:41:56 +0000 -Subject: [PATCH 2/5] dont call dotnet without path +Subject: [PATCH 2/4] dont call dotnet without path --- eng/common/tools.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/common/tools.sh b/eng/common/tools.sh -index 757d5b9..5a4cfeb 100755 +index 94965a8..8e14f8b 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh -@@ -340,9 +340,9 @@ function MSBuild { +@@ -362,9 +362,9 @@ function MSBuild { # Work around issues with Azure Artifacts credential provider # https://github.com/dotnet/arcade/issues/3932 @@ -25,5 +25,5 @@ index 757d5b9..5a4cfeb 100755 local toolset_dir="${_InitializeToolset%/*}" local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" -- -1.8.3.1 +2.7.4 diff --git a/patches/aspnetcore-tooling/0003-Import-PackageVersions.props.patch b/patches/aspnetcore-tooling/0003-Import-PackageVersions.props.patch index 4b885501fd..9eff0c904b 100644 --- a/patches/aspnetcore-tooling/0003-Import-PackageVersions.props.patch +++ b/patches/aspnetcore-tooling/0003-Import-PackageVersions.props.patch @@ -1,17 +1,17 @@ -From 4056ed9ce4115fb5db22c5fc088bda17e8d2d3ee Mon Sep 17 00:00:00 2001 +From 0ba59aca7eb538cacfc603ccf3f0e0c283603e32 Mon Sep 17 00:00:00 2001 From: adaggarwal Date: Wed, 13 Nov 2019 16:31:47 +0000 -Subject: [PATCH 3/5] Import PackageVersions.props +Subject: [PATCH 3/4] Import PackageVersions.props --- eng/Versions.props | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eng/Versions.props b/eng/Versions.props -index a3a95fb..eee5f55 100644 +index dd53e83..7355673 100644 --- a/eng/Versions.props +++ b/eng/Versions.props -@@ -139,4 +139,7 @@ +@@ -141,4 +141,7 @@ 0.10.0 2.4.1 @@ -20,5 +20,5 @@ index a3a95fb..eee5f55 100644 + -- -1.8.3.1 +2.7.4 diff --git a/patches/aspnetcore-tooling/0004-Pin-MSBuild-version-to-reference-versions.patch b/patches/aspnetcore-tooling/0004-Pin-MSBuild-version-to-reference-versions.patch index 73146e4d5d..a3780d8ea3 100644 --- a/patches/aspnetcore-tooling/0004-Pin-MSBuild-version-to-reference-versions.patch +++ b/patches/aspnetcore-tooling/0004-Pin-MSBuild-version-to-reference-versions.patch @@ -1,7 +1,7 @@ -From 17ae709240a62b098d864acbe6d4c828fabd60cb Mon Sep 17 00:00:00 2001 +From 7aaf76c72b2b5bb9781eca190ae59920e8def8b8 Mon Sep 17 00:00:00 2001 From: adaggarwal Date: Wed, 13 Nov 2019 16:35:48 +0000 -Subject: [PATCH 4/5] Pin MSBuild version to reference versions +Subject: [PATCH 4/4] Pin MSBuild version to reference versions --- src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj | 4 ++-- @@ -9,7 +9,7 @@ Subject: [PATCH 4/5] Pin MSBuild version to reference versions 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj -index ac0b233..3ccc243 100644 +index 4f8ecce..5a433ed 100644 --- a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj +++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj @@ -16,8 +16,8 @@ @@ -39,5 +39,5 @@ index 128866b..5abcc32 100644 -- -1.8.3.1 +2.7.4 diff --git a/patches/aspnetcore/0001-Don-t-call-dotnet-without-path.patch b/patches/aspnetcore/0001-Don-t-call-dotnet-without-path.patch index a4f82cbadf..eff04cbd64 100644 --- a/patches/aspnetcore/0001-Don-t-call-dotnet-without-path.patch +++ b/patches/aspnetcore/0001-Don-t-call-dotnet-without-path.patch @@ -1,17 +1,17 @@ -From c9ceade354813f98ca291757e7d1657d0959ee4e Mon Sep 17 00:00:00 2001 +From a1fe4eb3f66c953fe8509b462a4d1adc86aa4f78 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 23 Oct 2019 20:04:55 -0500 -Subject: [PATCH 01/13] Don't call dotnet without path +Subject: [PATCH 01/12] Don't call dotnet without path --- eng/common/tools.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/common/tools.sh b/eng/common/tools.sh -index 757d5b9ea4..5a4cfeb1f0 100755 +index 6221830..d3635b8 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh -@@ -340,9 +340,9 @@ function MSBuild { +@@ -370,9 +370,9 @@ function MSBuild { # Work around issues with Azure Artifacts credential provider # https://github.com/dotnet/arcade/issues/3932 @@ -25,5 +25,5 @@ index 757d5b9ea4..5a4cfeb1f0 100755 local toolset_dir="${_InitializeToolset%/*}" local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" -- -2.18.0 +2.7.4 diff --git a/patches/aspnetcore/0002-Use-non-portable-NETCoreAppRuntime-for-crossgen.patch b/patches/aspnetcore/0002-Use-non-portable-NETCoreAppRuntime-for-crossgen.patch index d4e14358a4..1020ada665 100644 --- a/patches/aspnetcore/0002-Use-non-portable-NETCoreAppRuntime-for-crossgen.patch +++ b/patches/aspnetcore/0002-Use-non-portable-NETCoreAppRuntime-for-crossgen.patch @@ -1,7 +1,7 @@ -From 528f9457371651668d1923b27cdd5b761f8f2441 Mon Sep 17 00:00:00 2001 +From b8e0bcb052f711dd57e559ab9f78a4e56e322918 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Tue, 29 Oct 2019 18:19:03 +0000 -Subject: [PATCH 02/13] Use non-portable NETCoreAppRuntime for crossgen +Subject: [PATCH 02/12] Use non-portable NETCoreAppRuntime for crossgen --- eng/Dependencies.props | 1 + @@ -9,10 +9,10 @@ Subject: [PATCH 02/13] Use non-portable NETCoreAppRuntime for crossgen 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/eng/Dependencies.props b/eng/Dependencies.props -index 2e11857b1b..b49aee2a5c 100644 +index 8e7bb0e..fca75d9 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props -@@ -110,6 +110,7 @@ and are generated based on the last package release. +@@ -113,6 +113,7 @@ and are generated based on the last package release. @@ -21,10 +21,10 @@ index 2e11857b1b..b49aee2a5c 100644 diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj -index 4c4298a92d..edad46be14 100644 +index 4a7b1c9..b63c15c 100644 --- a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj -@@ -100,7 +100,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant +@@ -107,7 +107,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant x64_arm64\$(CrossgenToolPackagePath) x86_arm\$(CrossgenToolPackagePath) @@ -35,7 +35,7 @@ index 4c4298a92d..edad46be14 100644 $([MSBuild]::EnsureTrailingSlash('$(RuntimePackageRoot)')) $([System.IO.Path]::Combine('$(RuntimePackageRoot)', 'tools', '$(CrossgenToolPackagePath)')) $(AssetTargetFallback);native,Version=0.0 -@@ -115,7 +117,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant +@@ -122,7 +124,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant Runtime;Native @@ -45,5 +45,5 @@ index 4c4298a92d..edad46be14 100644 Platform=$(TargetArchitecture) -- -2.18.0 +2.7.4 diff --git a/patches/aspnetcore/0003-Conditionally-set-PackAsToolShimRID.patch b/patches/aspnetcore/0003-Conditionally-set-PackAsToolShimRID.patch index 47328b47c2..e1e3b70b36 100644 --- a/patches/aspnetcore/0003-Conditionally-set-PackAsToolShimRID.patch +++ b/patches/aspnetcore/0003-Conditionally-set-PackAsToolShimRID.patch @@ -1,17 +1,17 @@ -From 87371172f24562810552567b15890eefc9d57249 Mon Sep 17 00:00:00 2001 +From 36db65e3e4a7e141fc11875d06705ca1c4f79031 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Thu, 31 Oct 2019 20:38:26 +0000 -Subject: [PATCH 03/13] Conditionally set PackAsToolShimRID +Subject: [PATCH 03/12] Conditionally set PackAsToolShimRID --- Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.targets b/Directory.Build.targets -index db3cea59f1..518b5e6246 100644 +index 0e0db95..854c5ea 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets -@@ -46,7 +46,7 @@ +@@ -45,7 +45,7 @@ true @@ -21,5 +21,5 @@ index db3cea59f1..518b5e6246 100644 win-x64;win-x86 -- -2.18.0 +2.7.4 diff --git a/patches/aspnetcore/0004-Exclude-analyzer-for-source-build.patch b/patches/aspnetcore/0004-Exclude-analyzer-for-source-build.patch index cb2f3c413e..912b17a835 100644 --- a/patches/aspnetcore/0004-Exclude-analyzer-for-source-build.patch +++ b/patches/aspnetcore/0004-Exclude-analyzer-for-source-build.patch @@ -1,17 +1,17 @@ -From bbd6cbebda9e08a49725b66d9130f76469479413 Mon Sep 17 00:00:00 2001 +From 3922c27dd9a37558926020815fce616da358aa4c Mon Sep 17 00:00:00 2001 From: adaggarwal Date: Thu, 14 Nov 2019 16:52:25 +0000 -Subject: [PATCH 04/13] Exclude analyzer for source-build +Subject: [PATCH 04/12] Exclude analyzer for source-build --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props -index 2fe19bde83..0bc8b25ecc 100644 +index 27c4622..563894e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props -@@ -95,7 +95,7 @@ +@@ -101,7 +101,7 @@ $(RuntimeInstallerBaseName)-internal @@ -21,5 +21,5 @@ index 2fe19bde83..0bc8b25ecc 100644 -- -2.18.0 +2.7.4 diff --git a/patches/aspnetcore/0005-Import-PackageVersions.props.patch b/patches/aspnetcore/0005-Import-PackageVersions.props.patch index bf2980c56e..c68f9e3668 100644 --- a/patches/aspnetcore/0005-Import-PackageVersions.props.patch +++ b/patches/aspnetcore/0005-Import-PackageVersions.props.patch @@ -1,17 +1,17 @@ -From 2812263dd785904cf8edd68f258d78d82c3cea59 Mon Sep 17 00:00:00 2001 +From 9c7735674a8dadd29dae456297e543f1216f37fd Mon Sep 17 00:00:00 2001 From: adaggarwal Date: Thu, 14 Nov 2019 16:55:29 +0000 -Subject: [PATCH 05/13] Import PackageVersions.props +Subject: [PATCH 05/12] Import PackageVersions.props --- eng/Versions.props | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eng/Versions.props b/eng/Versions.props -index a3e611aa4b..37797a5219 100644 +index f0b625f..b5af9f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props -@@ -267,6 +267,9 @@ +@@ -265,6 +265,9 @@ $(XunitVersion) 1.0.19249.1 @@ -22,5 +22,5 @@ index a3e611aa4b..37797a5219 100644 -- -2.18.0 +2.7.4 diff --git a/patches/aspnetcore/0006-Exclude-some-projects-from-source-build.patch b/patches/aspnetcore/0006-Exclude-some-projects-from-source-build.patch index 218ced32d4..844327a18b 100644 --- a/patches/aspnetcore/0006-Exclude-some-projects-from-source-build.patch +++ b/patches/aspnetcore/0006-Exclude-some-projects-from-source-build.patch @@ -1,14 +1,14 @@ -From 494311a11525c9ca8ce44cff9d6de39802d1dbc6 Mon Sep 17 00:00:00 2001 +From 3e3d7b29d859bfcbc66478e9cfbfc8ee81e02406 Mon Sep 17 00:00:00 2001 From: adaggarwal Date: Thu, 14 Nov 2019 16:57:39 +0000 -Subject: [PATCH 06/13] Exclude some projects from source-build +Subject: [PATCH 06/12] 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 0bc8b25ecc..88411a30b2 100644 +index 563894e..38e2f77 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -18,9 +18,11 @@ @@ -24,5 +24,5 @@ index 0bc8b25ecc..88411a30b2 100644 +@@ -303,7 +305,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant $(IntermediateOutputPath)crossgen\ + $(IntermediateOutputPath)platformAssemblies\ - $(CrossgenToolDir)$(LibPrefix)clrjit$(LibExtension) + + $(RuntimePackageRoot)runtimes\$(RuntimeIdentifier)\native\$(LibPrefix)clrjit$(LibExtension) @@ -84,5 +84,5 @@ index edad46be14..b4e9189960 100644 -- -2.18.0 +2.7.4 diff --git a/patches/core-sdk/0001-Don-t-call-dotnet-without-a-path.patch b/patches/core-sdk/0001-Don-t-call-dotnet-without-a-path.patch index 97c956c329..c6a0e74ce5 100644 --- a/patches/core-sdk/0001-Don-t-call-dotnet-without-a-path.patch +++ b/patches/core-sdk/0001-Don-t-call-dotnet-without-a-path.patch @@ -1,17 +1,17 @@ -From 3a91cf574ed014e419733348f4ee586369be6ff3 Mon Sep 17 00:00:00 2001 +From 1b00163ca3f4c73892cd21f3921f44de5231d014 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 23 Oct 2019 21:14:21 -0500 -Subject: [PATCH] Don't call dotnet without a path +Subject: [PATCH 1/8] Don't call dotnet without a path --- eng/common/tools.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/common/tools.sh b/eng/common/tools.sh -index 757d5b9..5a4cfeb 100755 +index 94965a8..8e14f8b 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh -@@ -340,9 +340,9 @@ function MSBuild { +@@ -362,9 +362,9 @@ function MSBuild { # Work around issues with Azure Artifacts credential provider # https://github.com/dotnet/arcade/issues/3932 @@ -25,5 +25,5 @@ index 757d5b9..5a4cfeb 100755 local toolset_dir="${_InitializeToolset%/*}" local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" -- -1.8.3.1 +2.7.4 diff --git a/patches/core-sdk/0002-Patch-property-used-for-core-setup-version.patch b/patches/core-sdk/0002-Patch-property-used-for-core-setup-version.patch index c2b91c5977..7a6ff97eb9 100644 --- a/patches/core-sdk/0002-Patch-property-used-for-core-setup-version.patch +++ b/patches/core-sdk/0002-Patch-property-used-for-core-setup-version.patch @@ -1,25 +1,25 @@ -From db3a5d4787e17bb2967bdd46ae3b1fbc3f0a1b97 Mon Sep 17 00:00:00 2001 +From 413c4eb665adab164e9d41b22dc4e7d1f563fb37 Mon Sep 17 00:00:00 2001 From: adaggarwal Date: Tue, 12 Nov 2019 20:27:43 +0000 -Subject: [PATCH] Patch property used for core-setup version +Subject: [PATCH 2/8] 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 7cf525f..0e41cd9 100644 +index 751f97c..ed591f2 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -12,7 +12,7 @@ - $(VSRedistCommonAspNetCoreTargetingPackx6431PackageVersion) + $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) - $(MicrosoftNETCoreAppInternalPackageVersion) + $(MicrosoftNETCoreAppRuntimePackageVersion) - $(CoreSetupBlobVersion) + 3.1.0-rtm.19565.2 -- -1.8.3.1 +2.7.4 diff --git a/patches/core-sdk/0003-Enable-building-on-arm64-machines.patch b/patches/core-sdk/0003-Enable-building-on-arm64-machines.patch index 1e277f9064..d73585dd2f 100644 --- a/patches/core-sdk/0003-Enable-building-on-arm64-machines.patch +++ b/patches/core-sdk/0003-Enable-building-on-arm64-machines.patch @@ -1,7 +1,7 @@ -From 0047cdf04b38ec1cc7599cd50b33cee0382d3c40 Mon Sep 17 00:00:00 2001 +From d4daccc3d0dd1f29676d5a124e27ba55906f093b Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Tue, 8 Oct 2019 17:02:29 -0400 -Subject: [PATCH] Enable building on arm64 machines +Subject: [PATCH 3/8] Enable building on arm64 machines With this commit, I can build core-sdk on RHEL 8 on arm64 directly, without cross compilation. @@ -68,10 +68,10 @@ index 47adeab..3fccba0 100644 $(RedistLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCoreAppRuntimePackageVersion) * diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets -index 0e41cd9..711e1bc 100644 +index ed591f2..632357b 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets -@@ -47,11 +47,11 @@ +@@ -42,11 +42,11 @@ $(CoreSetupRid) @@ -98,5 +98,5 @@ index bdc42db..6e010c5 100644 -- -1.8.3.1 +2.7.4 diff --git a/patches/core-sdk/0004-Exclude-test-folder-from-SourceBuild.patch b/patches/core-sdk/0004-Exclude-test-folder-from-SourceBuild.patch index 8fe0442a0b..70e0c34acb 100644 --- a/patches/core-sdk/0004-Exclude-test-folder-from-SourceBuild.patch +++ b/patches/core-sdk/0004-Exclude-test-folder-from-SourceBuild.patch @@ -1,7 +1,7 @@ -From d8ab1b4b3a8b94fa9179714d582d598885b67eee Mon Sep 17 00:00:00 2001 +From 5c8c043f6945d86123d485e9264105aebf838e12 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Tue, 19 Nov 2019 21:58:21 +0000 -Subject: [PATCH] Exclude test folder from SourceBuild +Subject: [PATCH 4/8] Exclude test folder from SourceBuild --- test/Directory.Build.props | 3 +++ @@ -20,5 +20,5 @@ index a953b97..26d4863 100644 + -- -1.8.3.1 +2.7.4 diff --git a/patches/core-sdk/0005-Use-variable-source-build-sets-for-ASP.NET.patch b/patches/core-sdk/0005-Use-variable-source-build-sets-for-ASP.NET.patch index c7e65836e5..644d209ff0 100644 --- a/patches/core-sdk/0005-Use-variable-source-build-sets-for-ASP.NET.patch +++ b/patches/core-sdk/0005-Use-variable-source-build-sets-for-ASP.NET.patch @@ -1,25 +1,25 @@ -From 8f40f56ca2f7a85c3624305090b842385d595dda Mon Sep 17 00:00:00 2001 +From 39454b764f63713b462ff398a1b95205e0c0dafb Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Tue, 19 Nov 2019 00:34:09 -0600 -Subject: [PATCH] Use variable source-build sets for ASP.NET +Subject: [PATCH 5/8] Use variable source-build sets for ASP.NET --- 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 711e1bc..78058a8 100644 +index 632357b..9c56b25 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -11,7 +11,7 @@ -- $(VSRedistCommonAspNetCoreTargetingPackx6431PackageVersion) +- $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) + $(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion) $(MicrosoftNETCoreAppRuntimePackageVersion) -- -1.8.3.1 +2.7.4 diff --git a/patches/core-sdk/0006-Remove-debian-package-generation.patch b/patches/core-sdk/0006-Remove-debian-package-generation.patch index 3a8f3d77f3..5620b7f67a 100644 --- a/patches/core-sdk/0006-Remove-debian-package-generation.patch +++ b/patches/core-sdk/0006-Remove-debian-package-generation.patch @@ -1,7 +1,7 @@ -From ede2e80a858b8f80c8de0d0f5ca354227d18d10c Mon Sep 17 00:00:00 2001 +From bd4eab28bd9099d2638fdbb522898e8cc1a7c948 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Tue, 19 Nov 2019 23:04:43 +0000 -Subject: [PATCH] Remove debian package generation +Subject: [PATCH 6/8] Remove debian package generation --- src/redist/redist.csproj | 1 - @@ -34,5 +34,5 @@ index a4e008b..77d2718 100644 /> -- -1.8.3.1 +2.7.4 diff --git a/patches/core-sdk/0007-Don-t-set-SourceLinkVersion-in-core-sdk.patch b/patches/core-sdk/0007-Don-t-set-SourceLinkVersion-in-core-sdk.patch index d8492ff380..c1d89f34f2 100644 --- a/patches/core-sdk/0007-Don-t-set-SourceLinkVersion-in-core-sdk.patch +++ b/patches/core-sdk/0007-Don-t-set-SourceLinkVersion-in-core-sdk.patch @@ -1,14 +1,14 @@ -From 2cd6c070c058b1de400d47eb99813c9a8d45a619 Mon Sep 17 00:00:00 2001 +From 3e4e7520670f5108dd8582dd4ff9fb0fe5806bd7 Mon Sep 17 00:00:00 2001 From: dseefeld Date: Wed, 4 Dec 2019 21:53:35 +0000 -Subject: [PATCH] Don't set SourceLinkVersion in core-sdk +Subject: [PATCH 7/8] Don't set SourceLinkVersion in core-sdk --- eng/Versions.props | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props -index 422a9b2..0ac6245 100644 +index 290101a..d8763a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,7 +117,6 @@ @@ -20,5 +20,5 @@ index 422a9b2..0ac6245 100644 -- -1.8.3.1 +2.7.4 diff --git a/patches/core-sdk/0008-Add-target-rid-to-AppHostRuntimeIdentifiers.patch b/patches/core-sdk/0008-Add-target-rid-to-AppHostRuntimeIdentifiers.patch index 2a9f64492d..e069655b85 100644 --- a/patches/core-sdk/0008-Add-target-rid-to-AppHostRuntimeIdentifiers.patch +++ b/patches/core-sdk/0008-Add-target-rid-to-AppHostRuntimeIdentifiers.patch @@ -1,14 +1,14 @@ -From 62020f2c4fdf2c0389b4106cac9286f1c3a9eb7c Mon Sep 17 00:00:00 2001 +From 528e193b5481292d0fe78380766d90879a2e6a05 Mon Sep 17 00:00:00 2001 From: Tom Deseyn Date: Thu, 16 Jan 2020 08:37:34 +0100 -Subject: [PATCH] Add target rid to AppHostRuntimeIdentifiers +Subject: [PATCH 8/8] Add target rid to AppHostRuntimeIdentifiers --- src/redist/targets/GenerateBundledVersions.targets | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets -index a214842a0..2c350f15f 100644 +index a214842..2c350f1 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -48,6 +48,11 @@ @@ -33,5 +33,5 @@ index a214842a0..2c350f15f 100644 Date: Wed, 24 Apr 2019 18:12:23 -0500 -Subject: [PATCH 1/8] Allow separate tool and SDK directories. +Subject: [PATCH 1/3] Allow separate tool and SDK directories. --- init-dotnet.cmd | 8 +++++++- @@ -10,7 +10,7 @@ Subject: [PATCH 1/8] Allow separate tool and SDK directories. 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/init-dotnet.cmd b/init-dotnet.cmd -index ad70b4c42a..345d7fd8fb 100644 +index ad70b4c..345d7fd 100644 --- a/init-dotnet.cmd +++ b/init-dotnet.cmd @@ -5,9 +5,15 @@ echo Installing dotnet using Arcade... @@ -32,7 +32,7 @@ index ad70b4c42a..345d7fd8fb 100644 \ No newline at end of file +exit /b 0 diff --git a/init-tools.cmd b/init-tools.cmd -index 0905e913b9..0dc79839d8 100644 +index b483d72..8791176 100644 --- a/init-tools.cmd +++ b/init-tools.cmd @@ -34,6 +34,11 @@ if exist "%TOOLRUNTIME_DIR%" rmdir /S /Q "%TOOLRUNTIME_DIR%" @@ -48,7 +48,7 @@ index 0905e913b9..0dc79839d8 100644 if not exist "%DOTNET_CMD%" ( echo ERROR: Ensure that '%DotNetBuildToolsDir%' contains the .NET Core SDK at '%DOTNET_PATH%' diff --git a/init-tools.sh b/init-tools.sh -index 42bbc0972f..b8ad791fd6 100755 +index 5ac2b44..feb5447 100755 --- a/init-tools.sh +++ b/init-tools.sh @@ -25,6 +25,11 @@ if [ -e "$__TOOLRUNTIME_DIR" ]; then rm -rf -- "$__TOOLRUNTIME_DIR"; fi @@ -64,5 +64,5 @@ index 42bbc0972f..b8ad791fd6 100755 if [ ! -e "$__DOTNET_CMD" ]; then echo "ERROR: Ensure that $DotNetBuildToolsDir contains the .NET Core SDK at $__DOTNET_PATH" -- -2.18.0 +2.7.4 diff --git a/patches/coreclr/0002-Conditionally-override-PackageVersion-properties.patch b/patches/coreclr/0002-Conditionally-override-PackageVersion-properties.patch index 0d2773f7d4..740ef39c27 100644 --- a/patches/coreclr/0002-Conditionally-override-PackageVersion-properties.patch +++ b/patches/coreclr/0002-Conditionally-override-PackageVersion-properties.patch @@ -1,27 +1,27 @@ -From f2b6e2f828479800e27638d7a5cde7e0e4bb3f8e Mon Sep 17 00:00:00 2001 +From bdf90dcfaba2ae004f1d43dba7554a1058a8a7cc Mon Sep 17 00:00:00 2001 From: dseefeld Date: Thu, 31 Oct 2019 14:48:46 +0000 -Subject: [PATCH] Conditionally override PackageVersion properties +Subject: [PATCH 2/3] Conditionally override PackageVersion properties --- dependencies.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dependencies.props b/dependencies.props -index 774b169..dc7afc0 100644 +index 4874fbe..fdd67ee 100644 --- a/dependencies.props +++ b/dependencies.props @@ -22,12 +22,12 @@ -- 3.0.0-preview6.19280.1 +- 3.0.0-rc2.19462.5 - 2.4.1-pre.build.4059 - 1.0.0-beta-build0015 - 2.0.43 - 1.0.4-preview6.19326.1 - 2.2.0 -+ 3.0.0-preview6.19280.1 ++ 3.0.0-rc2.19462.5 + 2.4.1-pre.build.4059 + 1.0.0-beta-build0015 + 2.0.43 @@ -40,5 +40,5 @@ index 774b169..dc7afc0 100644 -- -1.8.3.1 +2.7.4 diff --git a/patches/coreclr/0007-Exclude-optdata-from-source-build.patch b/patches/coreclr/0003-Exclude-optdata-from-source-build.patch similarity index 80% rename from patches/coreclr/0007-Exclude-optdata-from-source-build.patch rename to patches/coreclr/0003-Exclude-optdata-from-source-build.patch index 715a7a6b6c..57f924323e 100644 --- a/patches/coreclr/0007-Exclude-optdata-from-source-build.patch +++ b/patches/coreclr/0003-Exclude-optdata-from-source-build.patch @@ -1,14 +1,14 @@ -From e0f7aeb4e917b2c321d8ab5ce88e4a3e269b75cc Mon Sep 17 00:00:00 2001 +From 05cc1c97a0ca289f6bcd747c8a63de01480bde09 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 24 Jul 2019 23:33:09 -0500 -Subject: [PATCH 7/7] Exclude optdata from source-build +Subject: [PATCH 3/3] Exclude optdata from source-build --- src/.nuget/optdata/optdata.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/.nuget/optdata/optdata.csproj b/src/.nuget/optdata/optdata.csproj -index 31fdb4a1fc..7abbb3193e 100644 +index 31fdb4a..7abbb31 100644 --- a/src/.nuget/optdata/optdata.csproj +++ b/src/.nuget/optdata/optdata.csproj @@ -4,6 +4,7 @@ @@ -20,5 +20,5 @@ index 31fdb4a1fc..7abbb3193e 100644 -- -2.21.0 +2.7.4