From 3571dfeec7674718feb93b2791d11c33dc2fca80 Mon Sep 17 00:00:00 2001
From: Eugene Tolmachev <eugene.tolmachev@microsoft.com>
Date: Thu, 30 May 2024 15:20:49 -0400
Subject: [PATCH] reintroduce net6.0 target

---
 .gitignore                           | 1 +
 AAD.Giraffe/AAD.Giraffe.fsproj       | 2 +-
 AAD.Suave/AAD.Suave.fsproj           | 2 +-
 AAD.Test/AAD.Test.fsproj             | 1 +
 AAD.fs.tasks/AAD.fs.tasks.fsproj     | 2 +-
 AAD.fs/AAD.fs.fsproj                 | 2 +-
 AAD.tasks.Test/AAD.tasks.Test.fsproj | 1 +
 RELEASE_NOTES.md                     | 3 +++
 build.fsx                            | 2 +-
 9 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6567332..23fbf01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,5 @@ packages/
 output/
 tmp/
 *.user
+.env.local
 Directory.Build.props
diff --git a/AAD.Giraffe/AAD.Giraffe.fsproj b/AAD.Giraffe/AAD.Giraffe.fsproj
index ee347ec..c273cef 100644
--- a/AAD.Giraffe/AAD.Giraffe.fsproj
+++ b/AAD.Giraffe/AAD.Giraffe.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
diff --git a/AAD.Suave/AAD.Suave.fsproj b/AAD.Suave/AAD.Suave.fsproj
index d40194f..49c08f4 100644
--- a/AAD.Suave/AAD.Suave.fsproj
+++ b/AAD.Suave/AAD.Suave.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
diff --git a/AAD.Test/AAD.Test.fsproj b/AAD.Test/AAD.Test.fsproj
index 27f26b4..93ac763 100644
--- a/AAD.Test/AAD.Test.fsproj
+++ b/AAD.Test/AAD.Test.fsproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <UserSecretsId>79a3edd0-2092-40a2-a04d-dcb46d5ca9ed</UserSecretsId>
+    <NoWarn>3511</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="OpenIdConnectMetadata.json">
diff --git a/AAD.fs.tasks/AAD.fs.tasks.fsproj b/AAD.fs.tasks/AAD.fs.tasks.fsproj
index db3c66f..a93a1fa 100644
--- a/AAD.fs.tasks/AAD.fs.tasks.fsproj
+++ b/AAD.fs.tasks/AAD.fs.tasks.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <DefineConstants>TASKS</DefineConstants>
   </PropertyGroup>
diff --git a/AAD.fs/AAD.fs.fsproj b/AAD.fs/AAD.fs.fsproj
index 8780517..d0581c5 100644
--- a/AAD.fs/AAD.fs.fsproj
+++ b/AAD.fs/AAD.fs.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
diff --git a/AAD.tasks.Test/AAD.tasks.Test.fsproj b/AAD.tasks.Test/AAD.tasks.Test.fsproj
index ebb5518..374fa3b 100644
--- a/AAD.tasks.Test/AAD.tasks.Test.fsproj
+++ b/AAD.tasks.Test/AAD.tasks.Test.fsproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <UserSecretsId>79a3edd0-2092-40a2-a04d-dcb46d5ca9ed</UserSecretsId>
+    <NoWarn>3511</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="../AAD.Test/OpenIdConnectMetadata.json">
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 561f144..c331d4a 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+### 6.1.0
+* Reintroduce net6.0 target while keeping net8.0
+
 ### 6.0.0
 
 * Breaking: Generalized certain abstractions to make token validation fully pluggable.
diff --git a/build.fsx b/build.fsx
index a42933a..c474eda 100755
--- a/build.fsx
+++ b/build.fsx
@@ -104,7 +104,7 @@ Target.create "restore" (fun _ ->
 
 Target.create "build" (fun _ ->
     let args = sprintf "/p:Version=%s --no-restore" ver.AsString
-    DotNet.publish (fun a -> a.WithCommon (fun c -> { c with CustomParams = Some args})) "."
+    DotNet.build (fun a -> a.WithCommon (fun c -> { c with CustomParams = Some args})) "."
 )
 
 Target.create "test" (fun _ ->