From 47a57c55e5635cd188b2e39db71ec7d3e4220290 Mon Sep 17 00:00:00 2001 From: Zhiyuan Liang Date: Mon, 5 Feb 2024 17:10:39 +0800 Subject: [PATCH 1/5] target on .NET 8.0 --- build/install-dotnet.ps1 | 6 +++-- examples/ConsoleApp/ConsoleApp-Charles.csproj | 25 +++++++++++++++++++ .../Tests.FeatureManagement.AspNetCore.csproj | 7 +++++- .../Tests.FeatureManagement.csproj | 7 +++++- 4 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 examples/ConsoleApp/ConsoleApp-Charles.csproj diff --git a/build/install-dotnet.ps1 b/build/install-dotnet.ps1 index 11552a78..b5fb7a5d 100644 --- a/build/install-dotnet.ps1 +++ b/build/install-dotnet.ps1 @@ -1,8 +1,10 @@ -# Installs .NET 6 and .NET 7 for CI/CD environment +# Installs .NET 6, .NET 7 and .NET 8 for CI/CD environment # see: https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script#examples [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([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'))) -Channel 7.0 \ No newline at end of file +&([scriptblock]::Create((Invoke-WebRequest -UseBasicParsing 'https://dot.net/v1/dotnet-install.ps1'))) -Channel 7.0 + +&([scriptblock]::Create((Invoke-WebRequest -UseBasicParsing 'https://dot.net/v1/dotnet-install.ps1'))) -Channel 8.0 \ No newline at end of file diff --git a/examples/ConsoleApp/ConsoleApp-Charles.csproj b/examples/ConsoleApp/ConsoleApp-Charles.csproj new file mode 100644 index 00000000..83e2d4f1 --- /dev/null +++ b/examples/ConsoleApp/ConsoleApp-Charles.csproj @@ -0,0 +1,25 @@ + + + + Exe + net6.0 + enable + enable + + + + + + + + + + + + + + Always + + + + diff --git a/tests/Tests.FeatureManagement.AspNetCore/Tests.FeatureManagement.AspNetCore.csproj b/tests/Tests.FeatureManagement.AspNetCore/Tests.FeatureManagement.AspNetCore.csproj index c798e1ad..2fb05ff0 100644 --- a/tests/Tests.FeatureManagement.AspNetCore/Tests.FeatureManagement.AspNetCore.csproj +++ b/tests/Tests.FeatureManagement.AspNetCore/Tests.FeatureManagement.AspNetCore.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0 + net6.0;net7.0;net8.0 false 8.0 True @@ -30,6 +30,11 @@ + + + + + diff --git a/tests/Tests.FeatureManagement/Tests.FeatureManagement.csproj b/tests/Tests.FeatureManagement/Tests.FeatureManagement.csproj index 4d8697ad..abc47c2f 100644 --- a/tests/Tests.FeatureManagement/Tests.FeatureManagement.csproj +++ b/tests/Tests.FeatureManagement/Tests.FeatureManagement.csproj @@ -1,7 +1,7 @@  - net48;net6.0;net7.0 + net48;net6.0;net7.0;net8.0 false 9.0 True @@ -29,6 +29,11 @@ + + + + + From 56586fac945eac19c141bde9dd85c9f3cb2c1b84 Mon Sep 17 00:00:00 2001 From: zhiyuanliang Date: Tue, 6 Feb 2024 14:28:37 +0800 Subject: [PATCH 2/5] remove file --- examples/ConsoleApp/ConsoleApp-Charles.csproj | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 examples/ConsoleApp/ConsoleApp-Charles.csproj diff --git a/examples/ConsoleApp/ConsoleApp-Charles.csproj b/examples/ConsoleApp/ConsoleApp-Charles.csproj deleted file mode 100644 index 83e2d4f1..00000000 --- a/examples/ConsoleApp/ConsoleApp-Charles.csproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - Exe - net6.0 - enable - enable - - - - - - - - - - - - - - Always - - - - From b6a55cb60b5ed2fa183c6c35583623e894157efc Mon Sep 17 00:00:00 2001 From: zhiyuanliang Date: Wed, 7 Feb 2024 17:07:32 +0800 Subject: [PATCH 3/5] add net8.0 for Microsoft.FeatureManagement.AspNetCore --- .../Microsoft.FeatureManagement.AspNetCore.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.FeatureManagement.AspNetCore/Microsoft.FeatureManagement.AspNetCore.csproj b/src/Microsoft.FeatureManagement.AspNetCore/Microsoft.FeatureManagement.AspNetCore.csproj index 99ebd339..69cacacf 100644 --- a/src/Microsoft.FeatureManagement.AspNetCore/Microsoft.FeatureManagement.AspNetCore.csproj +++ b/src/Microsoft.FeatureManagement.AspNetCore/Microsoft.FeatureManagement.AspNetCore.csproj @@ -11,7 +11,7 @@ - net6.0;net7.0 + net6.0;net7.0;net8.0 true false ..\..\build\Microsoft.FeatureManagement.snk From df400e2f47bf8c0489d119efe7933b4f31f0ca95 Mon Sep 17 00:00:00 2001 From: zhiyuanliang Date: Thu, 8 Feb 2024 14:07:32 +0800 Subject: [PATCH 4/5] update package version --- .../Tests.FeatureManagement.AspNetCore.csproj | 18 ++++++++------- .../Tests.FeatureManagement.csproj | 22 +++++++++---------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/tests/Tests.FeatureManagement.AspNetCore/Tests.FeatureManagement.AspNetCore.csproj b/tests/Tests.FeatureManagement.AspNetCore/Tests.FeatureManagement.AspNetCore.csproj index 2fb05ff0..fd813662 100644 --- a/tests/Tests.FeatureManagement.AspNetCore/Tests.FeatureManagement.AspNetCore.csproj +++ b/tests/Tests.FeatureManagement.AspNetCore/Tests.FeatureManagement.AspNetCore.csproj @@ -14,25 +14,27 @@ - - - - + + + + - + + - + - - + + + diff --git a/tests/Tests.FeatureManagement/Tests.FeatureManagement.csproj b/tests/Tests.FeatureManagement/Tests.FeatureManagement.csproj index abc47c2f..770bc8dc 100644 --- a/tests/Tests.FeatureManagement/Tests.FeatureManagement.csproj +++ b/tests/Tests.FeatureManagement/Tests.FeatureManagement.csproj @@ -9,30 +9,30 @@ - - - - + + + + - - + + - + - - + + - - + + From ec3d52dd8be1e842b7f9c732df921154ad8a86c9 Mon Sep 17 00:00:00 2001 From: zhiyuanliang Date: Thu, 8 Feb 2024 14:39:00 +0800 Subject: [PATCH 5/5] update --- .../Tests.FeatureManagement.AspNetCore.csproj | 14 +++++++------- .../Tests.FeatureManagement.csproj | 13 ++++++++----- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/tests/Tests.FeatureManagement.AspNetCore/Tests.FeatureManagement.AspNetCore.csproj b/tests/Tests.FeatureManagement.AspNetCore/Tests.FeatureManagement.AspNetCore.csproj index fd813662..b14bbfdb 100644 --- a/tests/Tests.FeatureManagement.AspNetCore/Tests.FeatureManagement.AspNetCore.csproj +++ b/tests/Tests.FeatureManagement.AspNetCore/Tests.FeatureManagement.AspNetCore.csproj @@ -14,27 +14,27 @@ + - - - + + - - + + - - + + diff --git a/tests/Tests.FeatureManagement/Tests.FeatureManagement.csproj b/tests/Tests.FeatureManagement/Tests.FeatureManagement.csproj index 770bc8dc..60ba9ba4 100644 --- a/tests/Tests.FeatureManagement/Tests.FeatureManagement.csproj +++ b/tests/Tests.FeatureManagement/Tests.FeatureManagement.csproj @@ -9,30 +9,33 @@ - - + + - + + - + + - + +