From c5f6dff4f4c6d45b2e336644e9b7efc809f6aec7 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Thu, 25 Mar 2021 10:03:26 -0700 Subject: [PATCH 1/7] Cross-target last 2 projects to DefaultNetCoreTargetFramework --- .../JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj | 2 +- src/Logging.AzureAppServices/src/BlobLoggerProvider.cs | 2 +- .../src/Microsoft.Extensions.Logging.AzureAppServices.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj b/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj index 54ac89b43f0e..1aa139b0820a 100644 --- a/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj +++ b/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj @@ -2,7 +2,7 @@ ASP.NET Core support for JSON PATCH. - $(DefaultNetFxTargetFramework);netstandard2.0 + $(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework);netstandard2.0 $(NoWarn);CS1591 true aspnetcore;json;jsonpatch diff --git a/src/Logging.AzureAppServices/src/BlobLoggerProvider.cs b/src/Logging.AzureAppServices/src/BlobLoggerProvider.cs index 504a6b8c9222..97cfbdf90149 100644 --- a/src/Logging.AzureAppServices/src/BlobLoggerProvider.cs +++ b/src/Logging.AzureAppServices/src/BlobLoggerProvider.cs @@ -77,7 +77,7 @@ internal override async Task WriteMessagesAsync(IEnumerable messages await writer.FlushAsync(); var tryGetBuffer = stream.TryGetBuffer(out var buffer); - Debug.Assert(tryGetBuffer); + System.Diagnostics.Debug.Assert(tryGetBuffer); await blob.AppendAsync(buffer, cancellationToken); } } diff --git a/src/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj b/src/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj index 8417fffd47e6..746c9dd6296c 100644 --- a/src/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj +++ b/src/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj @@ -2,7 +2,7 @@ Logger implementation to support Azure App Services 'Diagnostics logs' and 'Log stream' features. - $(DefaultNetFxTargetFramework);netstandard2.0 + $(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework);netstandard2.0 true From 65a37110188c5200c6eb9af778ff69d577515125 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Thu, 25 Mar 2021 10:24:24 -0700 Subject: [PATCH 2/7] More projects --- .../SqlServer/src/Microsoft.Extensions.Caching.SqlServer.csproj | 2 +- .../src/Microsoft.Extensions.Caching.StackExchangeRedis.csproj | 2 +- ...icrosoft.AspNetCore.DataProtection.StackExchangeRedis.csproj | 2 +- .../Polly/src/Microsoft.Extensions.Http.Polly.csproj | 2 +- .../Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj | 2 +- src/SiteExtensions/LoggingBranch/LB.csproj | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Caching/SqlServer/src/Microsoft.Extensions.Caching.SqlServer.csproj b/src/Caching/SqlServer/src/Microsoft.Extensions.Caching.SqlServer.csproj index 116c69eee2d2..6b0174655a58 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 @@ Distributed cache implementation of Microsoft.Extensions.Caching.Distributed.IDistributedCache using Microsoft SQL Server. - netstandard2.0 + $(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework);netstandard2.0 true cache;distributedcache;sqlserver true diff --git a/src/Caching/StackExchangeRedis/src/Microsoft.Extensions.Caching.StackExchangeRedis.csproj b/src/Caching/StackExchangeRedis/src/Microsoft.Extensions.Caching.StackExchangeRedis.csproj index ef8cf3c49c2a..f07c6649f3a8 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 @@ Distributed cache implementation of Microsoft.Extensions.Caching.Distributed.IDistributedCache using Redis. - netstandard2.0 + $(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework);netstandard2.0 true cache;distributedcache;redis true diff --git a/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj b/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj index ec7a580b6e2f..f1a88a9f673a 100644 --- a/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj +++ b/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj @@ -2,7 +2,7 @@ Support for storing data protection keys in Redis. - $(DefaultNetFxTargetFramework);netstandard2.0 + $(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework);netstandard2.0 true true aspnetcore;dataprotection;redis diff --git a/src/HttpClientFactory/Polly/src/Microsoft.Extensions.Http.Polly.csproj b/src/HttpClientFactory/Polly/src/Microsoft.Extensions.Http.Polly.csproj index 4957ca15ca7a..1d140bbaa493 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 @@ The HttpClient factory is a pattern for configuring and retrieving named HttpClients in a composable way. This package integrates IHttpClientFactory with the Polly library, to add transient-fault-handling and resiliency through fluent policies such as Retry, Circuit Breaker, Timeout, Bulkhead Isolation, and Fallback. - netstandard2.0 + $(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework);netstandard2.0 $(NoWarn);CS1591 true aspnetcore;httpclient diff --git a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj index 7372403ac015..29eb59aae7d6 100644 --- a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj +++ b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj @@ -3,7 +3,7 @@ ASP.NET Core Logging Integration This site extension enables logging integration for ASP.NET Core applications on Azure App Service. - $(DefaultNetFxTargetFramework) + $(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework);netstandard2.0 false aspnet;logging;aspnetcore;AzureSiteExtension;keyvault;configuration;dataprotection false diff --git a/src/SiteExtensions/LoggingBranch/LB.csproj b/src/SiteExtensions/LoggingBranch/LB.csproj index fb4097ceab60..7f3695ce7540 100644 --- a/src/SiteExtensions/LoggingBranch/LB.csproj +++ b/src/SiteExtensions/LoggingBranch/LB.csproj @@ -3,7 +3,7 @@ ASP.NET Core Extensions This extension enables additional functionality for ASP.NET Core on Azure WebSites, such as enabling Azure logging. - $(DefaultNetFxTargetFramework) + $(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework);netstandard2.0 false aspnet;logging;aspnetcore;AzureSiteExtension;keyvault;configuration;dataprotection content From 43e2238106f87cca54487ab2f47d8fe5a2971cbd Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Thu, 25 Mar 2021 10:32:13 -0700 Subject: [PATCH 3/7] Fixup --- .../Polly/src/Microsoft.Extensions.Http.Polly.csproj | 2 +- ...osoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/HttpClientFactory/Polly/src/Microsoft.Extensions.Http.Polly.csproj b/src/HttpClientFactory/Polly/src/Microsoft.Extensions.Http.Polly.csproj index 1d140bbaa493..e8a539c76de1 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 @@ The HttpClient factory is a pattern for configuring and retrieving named HttpClients in a composable way. This package integrates IHttpClientFactory with the Polly library, to add transient-fault-handling and resiliency through fluent policies such as Retry, Circuit Breaker, Timeout, Bulkhead Isolation, and Fallback. - $(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework);netstandard2.0 + $(DefaultNetCoreTargetFramework);net472;netstandard2.0 $(NoWarn);CS1591 true aspnetcore;httpclient diff --git a/src/SiteExtensions/LoggingAggregate/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj b/src/SiteExtensions/LoggingAggregate/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj index b22f270d0c18..09d42f2ab0d5 100644 --- a/src/SiteExtensions/LoggingAggregate/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj +++ b/src/SiteExtensions/LoggingAggregate/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj @@ -1,7 +1,7 @@ - $(DefaultNetFxTargetFramework) + $(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework) From a2fd0c6376f0f08eb0d2160d59106fbb4e4197bd Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Thu, 25 Mar 2021 10:39:12 -0700 Subject: [PATCH 4/7] Fixup again --- ...osoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SiteExtensions/LoggingAggregate/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj b/src/SiteExtensions/LoggingAggregate/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj index 09d42f2ab0d5..ed8a4b61de95 100644 --- a/src/SiteExtensions/LoggingAggregate/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj +++ b/src/SiteExtensions/LoggingAggregate/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj @@ -1,7 +1,7 @@ - $(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework) + $(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework) From 59a4cf9b1d30bb253bd3faf4c5dcfdb576e52519 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Thu, 25 Mar 2021 12:38:42 -0700 Subject: [PATCH 5/7] Fixup --- .../Polly/src/Microsoft.Extensions.Http.Polly.csproj | 2 +- ...osoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/HttpClientFactory/Polly/src/Microsoft.Extensions.Http.Polly.csproj b/src/HttpClientFactory/Polly/src/Microsoft.Extensions.Http.Polly.csproj index e8a539c76de1..4957ca15ca7a 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 @@ The HttpClient factory is a pattern for configuring and retrieving named HttpClients in a composable way. This package integrates IHttpClientFactory with the Polly library, to add transient-fault-handling and resiliency through fluent policies such as Retry, Circuit Breaker, Timeout, Bulkhead Isolation, and Fallback. - $(DefaultNetCoreTargetFramework);net472;netstandard2.0 + netstandard2.0 $(NoWarn);CS1591 true aspnetcore;httpclient diff --git a/src/SiteExtensions/LoggingAggregate/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj b/src/SiteExtensions/LoggingAggregate/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj index ed8a4b61de95..b22f270d0c18 100644 --- a/src/SiteExtensions/LoggingAggregate/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj +++ b/src/SiteExtensions/LoggingAggregate/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj @@ -1,7 +1,7 @@ - $(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework) + $(DefaultNetFxTargetFramework) From 63e3282fd7e25cbaa6cff202de733cd65d90bc11 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Fri, 26 Mar 2021 10:21:45 -0700 Subject: [PATCH 6/7] Undo SiteExtension change --- .../Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj index 29eb59aae7d6..7372403ac015 100644 --- a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj +++ b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj @@ -3,7 +3,7 @@ ASP.NET Core Logging Integration This site extension enables logging integration for ASP.NET Core applications on Azure App Service. - $(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework);netstandard2.0 + $(DefaultNetFxTargetFramework) false aspnet;logging;aspnetcore;AzureSiteExtension;keyvault;configuration;dataprotection false From 0d642d4f4ffb088f932509a29cacb0aa75332966 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Fri, 26 Mar 2021 10:25:48 -0700 Subject: [PATCH 7/7] Update src/SiteExtensions/LoggingBranch/LB.csproj Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com> --- src/SiteExtensions/LoggingBranch/LB.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SiteExtensions/LoggingBranch/LB.csproj b/src/SiteExtensions/LoggingBranch/LB.csproj index 7f3695ce7540..fb4097ceab60 100644 --- a/src/SiteExtensions/LoggingBranch/LB.csproj +++ b/src/SiteExtensions/LoggingBranch/LB.csproj @@ -3,7 +3,7 @@ ASP.NET Core Extensions This extension enables additional functionality for ASP.NET Core on Azure WebSites, such as enabling Azure logging. - $(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework);netstandard2.0 + $(DefaultNetFxTargetFramework) false aspnet;logging;aspnetcore;AzureSiteExtension;keyvault;configuration;dataprotection content