Revert to .net6 for the slack-bot-poc as lambda doesn't easily suppor…

…t .net7 yet.
dev-cycles · Jan 12, 2024 · f3e386e · f3e386e
1 parent 0114318
commit f3e386e
Show file tree

Hide file tree

Showing 17 changed files with 25 additions and 18 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,6 +1,6 @@
 # For details on usage and latest versions, see:
 # https://mcr.microsoft.com/en-us/product/devcontainers/dotnet/about
-FROM mcr.microsoft.com/vscode/devcontainers/dotnet:7.0-bookworm
+FROM mcr.microsoft.com/vscode/devcontainers/dotnet:6.0-bookworm
 
 # For dotnet-adr - currently non-functional due to https://github.com/endjin/dotnet-adr/issues/203
 # # Install other dotnet versions (required for adr tool and dotnet suggest)

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -27,7 +27,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build: Language Server Tests",
-            "program": "${workspaceFolder}/${config:languageServerTestsPath}/bin/Debug/net7.0/Contextive.LanguageServer.Tests.dll",
+            "program": "${workspaceFolder}/${config:languageServerTestsPath}/bin/Debug/net6.0/Contextive.LanguageServer.Tests.dll",
             //"args": ["--filter-test-case","Can handle configuration value changing"],
             "cwd": "${workspaceFolder}/${config:languageServerTestsPath}",
             "stopAtEntry": false,

diff --git a/src/build.fsx b/src/build.fsx
@@ -105,9 +105,11 @@ open Fake.Core.TargetOperators
 
 "Cloud-Api-Publish" ==> "Cloud-Deploy-Local"
 
+"Cdk-Bootstrap-Local" ==> "Cloud-Deploy-Local"
+
 "Cloud-Deploy-Local" ==> "Cloud-Api-Test"
 
 // *** Start Build ***
-// Target.runOrDefault "Cloud-Api-Test"
-Target.runOrDefault "Cloud-Deploy"
+Target.runOrDefault "Cloud-Api-Test"
+// Target.runOrDefault "Cloud-Deploy"
 // Target.runOrDefault "Cdk-Bootstrap-Local"
diff --git a/src/cloud/src/Contextive.Cloud.Api.Tests/Contextive.Cloud.Api.Tests.fsproj b/src/cloud/src/Contextive.Cloud.Api.Tests/Contextive.Cloud.Api.Tests.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/cloud/src/Contextive.Cloud.Api/Contextive.Cloud.Api.fsproj b/src/cloud/src/Contextive.Cloud.Api/Contextive.Cloud.Api.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <!--<RuntimeIdentifier>linux-x64</RuntimeIdentifier>-->
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <AWSProjectType>Lambda</AWSProjectType>

diff --git a/src/cloud/src/Contextive.Cloud.Tests.E2e/Contextive.Cloud.Tests.E2e.fsproj b/src/cloud/src/Contextive.Cloud.Tests.E2e/Contextive.Cloud.Tests.E2e.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/cloud/src/Contextive.Cloud.Tests/Contextive.Cloud.Tests.fsproj b/src/cloud/src/Contextive.Cloud.Tests/Contextive.Cloud.Tests.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/cloud/src/Contextive.Cloud/Contextive.Cloud.fsproj b/src/cloud/src/Contextive.Cloud/Contextive.Cloud.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <!-- Roll forward to future major versions of the netcoreapp as needed -->
     <RollForward>Major</RollForward>
   </PropertyGroup>

diff --git a/src/cloud/src/Contextive.Cloud/LambdaFunctions.fs b/src/cloud/src/Contextive.Cloud/LambdaFunctions.fs
@@ -16,7 +16,7 @@ let props construct name entryPointModule (definitions: IBucket) (eventBus: IEve
 
     FunctionProps(
         Runtime = Runtime.DOTNET_6,
-        Code = Code.FromAsset(assemblyPath "../../../../Contextive.Cloud.Api/bin/Debug/net7.0/linux-x64/publish"),
+        Code = Code.FromAsset(assemblyPath "../../../../Contextive.Cloud.Api/bin/Debug/net6.0/linux-x64/publish"),
         Handler = $"Contextive.Cloud.Api::{entryPointModule}::FunctionHandlerAsync",
         Description = $"Contextive {name}",
         MemorySize = Nullable<float>(256.0),

diff --git a/src/core/Contextive.Core.Tests/Contextive.Core.Tests.fsproj b/src/core/Contextive.Core.Tests/Contextive.Core.Tests.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>

diff --git a/src/core/Contextive.Core/Contextive.Core.fsproj b/src/core/Contextive.Core/Contextive.Core.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'">

diff --git a/src/language-server/Contextive.LanguageServer.Tests/Contextive.LanguageServer.Tests.fsproj b/src/language-server/Contextive.LanguageServer.Tests/Contextive.LanguageServer.Tests.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>

diff --git a/src/language-server/Contextive.LanguageServer/Contextive.LanguageServer.fsproj b/src/language-server/Contextive.LanguageServer/Contextive.LanguageServer.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <WarnOn>3390;$(WarnOn)</WarnOn>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/src/paket.dependencies b/src/paket.dependencies
@@ -1,7 +1,7 @@
 source https://api.nuget.org/v3/index.json
 
 storage: none
-framework: net7.0
+framework: net6.0
 nuget Amazon.CDK.AWS.Apigatewayv2.Alpha
 nuget Amazon.CDK.AWS.Apigatewayv2.Integrations.Alpha
 nuget Amazon.CDK.Lib

diff --git a/src/paket.lock b/src/paket.lock
@@ -1,5 +1,5 @@
 STORAGE: NONE
-RESTRICTION: == net7.0
+RESTRICTION: == net6.0
 NUGET
   remote: https://api.nuget.org/v3/index.json
     Amazon.CDK.Asset.AwsCliV1 (2.2.201)
@@ -330,6 +330,7 @@ NUGET
       Microsoft.Extensions.Logging.Abstractions (>= 8.0)
       Microsoft.Extensions.Logging.Configuration (>= 8.0)
       Microsoft.Extensions.Options (>= 8.0)
+      System.Runtime.CompilerServices.Unsafe (>= 6.0)
       System.Text.Json (>= 8.0)
     Microsoft.Extensions.Options (8.0)
       Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0)
@@ -341,6 +342,7 @@ NUGET
       Microsoft.Extensions.Options (>= 8.0)
       Microsoft.Extensions.Primitives (>= 8.0)
     Microsoft.Extensions.Primitives (8.0)
+      System.Runtime.CompilerServices.Unsafe (>= 6.0)
     Microsoft.IO.RecyclableMemoryStream (2.3.2)
     Microsoft.VisualStudio.Threading (17.8.14)
       Microsoft.Bcl.AsyncInterfaces (>= 7.0)
@@ -408,6 +410,7 @@ NUGET
     SimpleInfoName (2.2)
     System.CodeDom (8.0)
     System.Collections.Immutable (8.0)
+      System.Runtime.CompilerServices.Unsafe (>= 6.0)
     System.IO.Hashing (8.0)
     System.IO.Pipelines (8.0)
     System.Management (8.0)
@@ -417,7 +420,9 @@ NUGET
     System.Security.AccessControl (6.0)
     System.Security.Principal.Windows (5.0)
     System.Text.Encodings.Web (8.0)
+      System.Runtime.CompilerServices.Unsafe (>= 6.0)
     System.Text.Json (8.0)
+      System.Runtime.CompilerServices.Unsafe (>= 6.0)
       System.Text.Encodings.Web (>= 8.0)
     System.Threading.Channels (8.0)
     System.Threading.Tasks.Extensions (4.5.4)

diff --git a/src/vscode/contextive/src/Contextive.VsCodeExtension.fsproj b/src/vscode/contextive/src/Contextive.VsCodeExtension.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <OtherFlags>--nowarn:46</OtherFlags>
   </PropertyGroup>

diff --git a/src/vscode/contextive/test/Contextive.VsCodeExtension.Tests.E2e.fsproj b/src/vscode/contextive/test/Contextive.VsCodeExtension.Tests.E2e.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>