From f1bf94d02d46497544dfb1ef717caecfea707608 Mon Sep 17 00:00:00 2001 From: AMER JUSUPOVIC Date: Wed, 25 Oct 2023 14:44:29 -0700 Subject: [PATCH 01/10] remove netcoreapp3.1 from target frameworks --- .../Microsoft.Azure.AppConfiguration.AspNetCore.csproj | 2 +- .../Tests.AzureAppConfiguration.AspNetCore.csproj | 4 ++-- .../Tests.AzureAppConfiguration.csproj | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.Azure.AppConfiguration.AspNetCore/Microsoft.Azure.AppConfiguration.AspNetCore.csproj b/src/Microsoft.Azure.AppConfiguration.AspNetCore/Microsoft.Azure.AppConfiguration.AspNetCore.csproj index 4a625fc49..9cc9b0795 100644 --- a/src/Microsoft.Azure.AppConfiguration.AspNetCore/Microsoft.Azure.AppConfiguration.AspNetCore.csproj +++ b/src/Microsoft.Azure.AppConfiguration.AspNetCore/Microsoft.Azure.AppConfiguration.AspNetCore.csproj @@ -2,7 +2,7 @@ - netstandard2.0;netcoreapp3.1;net6.0;net7.0 + netstandard2.0;net6.0;net7.0 Microsoft.Azure.AppConfiguration.AspNetCore allows developers to use Microsoft Azure App Configuration service as a configuration source in their applications. This package adds additional features for ASP.NET Core applications to the existing package Microsoft.Extensions.Configuration.AzureAppConfiguration. true false diff --git a/tests/Tests.AzureAppConfiguration.AspNetCore/Tests.AzureAppConfiguration.AspNetCore.csproj b/tests/Tests.AzureAppConfiguration.AspNetCore/Tests.AzureAppConfiguration.AspNetCore.csproj index fd919761a..8cdf38832 100644 --- a/tests/Tests.AzureAppConfiguration.AspNetCore/Tests.AzureAppConfiguration.AspNetCore.csproj +++ b/tests/Tests.AzureAppConfiguration.AspNetCore/Tests.AzureAppConfiguration.AspNetCore.csproj @@ -1,8 +1,8 @@  - netcoreapp2.1;netcoreapp3.1;net6.0;net7.0 - 8.0 + net48;net6.0;net7.0 + 8.0 false true ..\..\build\AzureAppConfiguration.snk diff --git a/tests/Tests.AzureAppConfiguration/Tests.AzureAppConfiguration.csproj b/tests/Tests.AzureAppConfiguration/Tests.AzureAppConfiguration.csproj index 0cf7ee175..5f69aed82 100644 --- a/tests/Tests.AzureAppConfiguration/Tests.AzureAppConfiguration.csproj +++ b/tests/Tests.AzureAppConfiguration/Tests.AzureAppConfiguration.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;netcoreapp3.1;net6.0;net7.0 + net48;net6.0;net7.0 8.0 false true From e94fef451a04f349f72b90b89d7680d40b1e8f3e Mon Sep 17 00:00:00 2001 From: AMER JUSUPOVIC Date: Wed, 25 Oct 2023 15:06:21 -0700 Subject: [PATCH 02/10] fix indentation --- .../Tests.AzureAppConfiguration.AspNetCore.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Tests.AzureAppConfiguration.AspNetCore/Tests.AzureAppConfiguration.AspNetCore.csproj b/tests/Tests.AzureAppConfiguration.AspNetCore/Tests.AzureAppConfiguration.AspNetCore.csproj index 8cdf38832..e6c8b0521 100644 --- a/tests/Tests.AzureAppConfiguration.AspNetCore/Tests.AzureAppConfiguration.AspNetCore.csproj +++ b/tests/Tests.AzureAppConfiguration.AspNetCore/Tests.AzureAppConfiguration.AspNetCore.csproj @@ -1,8 +1,8 @@  - net48;net6.0;net7.0 - 8.0 + net48;net6.0;net7.0 + 8.0 false true ..\..\build\AzureAppConfiguration.snk From 68d43d79d66a10efacdc44ad297d2fca85f6d21e Mon Sep 17 00:00:00 2001 From: AMER JUSUPOVIC Date: Wed, 25 Oct 2023 15:07:36 -0700 Subject: [PATCH 03/10] fix target framework indentation --- .../Tests.AzureAppConfiguration.AspNetCore.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Tests.AzureAppConfiguration.AspNetCore/Tests.AzureAppConfiguration.AspNetCore.csproj b/tests/Tests.AzureAppConfiguration.AspNetCore/Tests.AzureAppConfiguration.AspNetCore.csproj index e6c8b0521..70efbec4e 100644 --- a/tests/Tests.AzureAppConfiguration.AspNetCore/Tests.AzureAppConfiguration.AspNetCore.csproj +++ b/tests/Tests.AzureAppConfiguration.AspNetCore/Tests.AzureAppConfiguration.AspNetCore.csproj @@ -1,8 +1,8 @@  - net48;net6.0;net7.0 - 8.0 + net48;net6.0;net7.0 + 8.0 false true ..\..\build\AzureAppConfiguration.snk From c2f66eb5419d3da348494b092909254a3d96c26c Mon Sep 17 00:00:00 2001 From: AMER JUSUPOVIC Date: Wed, 25 Oct 2023 16:55:23 -0700 Subject: [PATCH 04/10] remove netstandard2.0 --- ...Microsoft.Azure.AppConfiguration.AspNetCore.csproj | 11 ++--------- .../Tests.AzureAppConfiguration.AspNetCore.csproj | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/Microsoft.Azure.AppConfiguration.AspNetCore/Microsoft.Azure.AppConfiguration.AspNetCore.csproj b/src/Microsoft.Azure.AppConfiguration.AspNetCore/Microsoft.Azure.AppConfiguration.AspNetCore.csproj index 9cc9b0795..8f3e81710 100644 --- a/src/Microsoft.Azure.AppConfiguration.AspNetCore/Microsoft.Azure.AppConfiguration.AspNetCore.csproj +++ b/src/Microsoft.Azure.AppConfiguration.AspNetCore/Microsoft.Azure.AppConfiguration.AspNetCore.csproj @@ -2,7 +2,7 @@ - netstandard2.0;net6.0;net7.0 + net6.0;net7.0 Microsoft.Azure.AppConfiguration.AspNetCore allows developers to use Microsoft Azure App Configuration service as a configuration source in their applications. This package adds additional features for ASP.NET Core applications to the existing package Microsoft.Extensions.Configuration.AzureAppConfiguration. true false @@ -15,14 +15,7 @@ - - - - - - - - + diff --git a/tests/Tests.AzureAppConfiguration.AspNetCore/Tests.AzureAppConfiguration.AspNetCore.csproj b/tests/Tests.AzureAppConfiguration.AspNetCore/Tests.AzureAppConfiguration.AspNetCore.csproj index 70efbec4e..02ee43d60 100644 --- a/tests/Tests.AzureAppConfiguration.AspNetCore/Tests.AzureAppConfiguration.AspNetCore.csproj +++ b/tests/Tests.AzureAppConfiguration.AspNetCore/Tests.AzureAppConfiguration.AspNetCore.csproj @@ -1,7 +1,7 @@  - net48;net6.0;net7.0 + net6.0;net7.0 8.0 false true From c24326467942288d957fe837786cf7cb32c9236b Mon Sep 17 00:00:00 2001 From: AMER JUSUPOVIC Date: Wed, 25 Oct 2023 17:04:22 -0700 Subject: [PATCH 05/10] use channel instead of version for install-dotnet.ps1 --- build/install-dotnet.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/install-dotnet.ps1 b/build/install-dotnet.ps1 index 898b64099..11552a783 100644 --- a/build/install-dotnet.ps1 +++ b/build/install-dotnet.ps1 @@ -3,6 +3,6 @@ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; -&([scriptblock]::Create((Invoke-WebRequest -UseBasicParsing 'https://dot.net/v1/dotnet-install.ps1'))) -Version 7.0.100 +&([scriptblock]::Create((Invoke-WebRequest -UseBasicParsing 'https://dot.net/v1/dotnet-install.ps1'))) -Channel 6.0 -&([scriptblock]::Create((Invoke-WebRequest -UseBasicParsing 'https://dot.net/v1/dotnet-install.ps1'))) -Version 6.0.301 \ No newline at end of file +&([scriptblock]::Create((Invoke-WebRequest -UseBasicParsing 'https://dot.net/v1/dotnet-install.ps1'))) -Channel 7.0 \ No newline at end of file From 1868d05bfd3516aea6c9bdaf637697bfbe0c836e Mon Sep 17 00:00:00 2001 From: AMER JUSUPOVIC Date: Mon, 30 Oct 2023 11:57:44 -0700 Subject: [PATCH 06/10] update packages to 6.x.x versions from 3.1.x, fix asyncinterfaces issue --- ...ions.Configuration.AzureAppConfiguration.csproj | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/Microsoft.Extensions.Configuration.AzureAppConfiguration.csproj b/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/Microsoft.Extensions.Configuration.AzureAppConfiguration.csproj index 665408831..c50ac8e3f 100644 --- a/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/Microsoft.Extensions.Configuration.AzureAppConfiguration.csproj +++ b/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/Microsoft.Extensions.Configuration.AzureAppConfiguration.csproj @@ -17,17 +17,11 @@ - - + + - - - - - - - - + + From 585cbb7e49ae66aa017d888ded268f8625cd7633 Mon Sep 17 00:00:00 2001 From: AMER JUSUPOVIC Date: Mon, 30 Oct 2023 12:05:55 -0700 Subject: [PATCH 07/10] fix tests file package version downgrades --- .../Tests.AzureAppConfiguration.AspNetCore.csproj | 2 +- .../Tests.AzureAppConfiguration.Functions.Worker.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Tests.AzureAppConfiguration.AspNetCore/Tests.AzureAppConfiguration.AspNetCore.csproj b/tests/Tests.AzureAppConfiguration.AspNetCore/Tests.AzureAppConfiguration.AspNetCore.csproj index 02ee43d60..ef89659c6 100644 --- a/tests/Tests.AzureAppConfiguration.AspNetCore/Tests.AzureAppConfiguration.AspNetCore.csproj +++ b/tests/Tests.AzureAppConfiguration.AspNetCore/Tests.AzureAppConfiguration.AspNetCore.csproj @@ -10,7 +10,7 @@ - + diff --git a/tests/Tests.AzureAppConfiguration.Functions.Worker/Tests.AzureAppConfiguration.Functions.Worker.csproj b/tests/Tests.AzureAppConfiguration.Functions.Worker/Tests.AzureAppConfiguration.Functions.Worker.csproj index 88a8f6331..0340afd52 100644 --- a/tests/Tests.AzureAppConfiguration.Functions.Worker/Tests.AzureAppConfiguration.Functions.Worker.csproj +++ b/tests/Tests.AzureAppConfiguration.Functions.Worker/Tests.AzureAppConfiguration.Functions.Worker.csproj @@ -10,7 +10,7 @@ - + From 37ade3ab176950dbdd7a3f50652067b531365d6b Mon Sep 17 00:00:00 2001 From: AMER JUSUPOVIC Date: Tue, 31 Oct 2023 15:23:38 -0700 Subject: [PATCH 08/10] fix bcl.asyncinterfaces issue, remove unused test package --- ...osoft.Extensions.Configuration.AzureAppConfiguration.csproj | 3 +-- .../Tests.AzureAppConfiguration.csproj | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/Microsoft.Extensions.Configuration.AzureAppConfiguration.csproj b/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/Microsoft.Extensions.Configuration.AzureAppConfiguration.csproj index c50ac8e3f..075822c89 100644 --- a/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/Microsoft.Extensions.Configuration.AzureAppConfiguration.csproj +++ b/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/Microsoft.Extensions.Configuration.AzureAppConfiguration.csproj @@ -2,7 +2,7 @@ - netstandard2.0 + netstandard2.0;netstandard2.1 8.0 Microsoft.Extensions.Configuration.AzureAppConfiguration is a configuration provider for the .NET Core framework that allows developers to use Microsoft Azure App Configuration service as a configuration source in their applications. true @@ -21,7 +21,6 @@ - diff --git a/tests/Tests.AzureAppConfiguration/Tests.AzureAppConfiguration.csproj b/tests/Tests.AzureAppConfiguration/Tests.AzureAppConfiguration.csproj index 5f69aed82..19955a28f 100644 --- a/tests/Tests.AzureAppConfiguration/Tests.AzureAppConfiguration.csproj +++ b/tests/Tests.AzureAppConfiguration/Tests.AzureAppConfiguration.csproj @@ -11,7 +11,6 @@ - From 3534f99fdc1e5c133f8137be1fd85a4165c9352d Mon Sep 17 00:00:00 2001 From: AMER JUSUPOVIC Date: Wed, 1 Nov 2023 11:41:05 -0700 Subject: [PATCH 09/10] move system.text.json to only netstandard2.0 --- ...oft.Extensions.Configuration.AzureAppConfiguration.csproj | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/Microsoft.Extensions.Configuration.AzureAppConfiguration.csproj b/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/Microsoft.Extensions.Configuration.AzureAppConfiguration.csproj index 075822c89..c6c4084cc 100644 --- a/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/Microsoft.Extensions.Configuration.AzureAppConfiguration.csproj +++ b/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/Microsoft.Extensions.Configuration.AzureAppConfiguration.csproj @@ -19,9 +19,12 @@ - + + + + bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\XMLComments\$(MSBuildProjectName).xml From ee90f6df2ddc54faf2ed10c1229003d91b5bfad9 Mon Sep 17 00:00:00 2001 From: AMER JUSUPOVIC Date: Wed, 1 Nov 2023 11:58:32 -0700 Subject: [PATCH 10/10] remove system.text.json --- ...soft.Extensions.Configuration.AzureAppConfiguration.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/Microsoft.Extensions.Configuration.AzureAppConfiguration.csproj b/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/Microsoft.Extensions.Configuration.AzureAppConfiguration.csproj index c6c4084cc..5a4bdec2e 100644 --- a/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/Microsoft.Extensions.Configuration.AzureAppConfiguration.csproj +++ b/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/Microsoft.Extensions.Configuration.AzureAppConfiguration.csproj @@ -21,10 +21,6 @@ - - - - bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\XMLComments\$(MSBuildProjectName).xml