From 5e5952da4ce6a65906024bd420ae82d20f31eb3a Mon Sep 17 00:00:00 2001
From: nojaf <florian.verdonck@outlook.com>
Date: Thu, 15 Feb 2024 09:27:02 +0100
Subject: [PATCH] Remove Fable cli tool, SatelliteResourceLanguages, update
 publish folder output

---
 .config/dotnet-tools.json | 8 +-------
 Directory.Build.props     | 1 +
 build.fsx                 | 8 ++------
 infrastructure/Program.fs | 8 +++++++-
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index ef0b4a1d..4f9d04e8 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -2,14 +2,8 @@
   "version": 1,
   "isRoot": true,
   "tools": {
-    "fable": {
-      "version": "4.5.0",
-      "commands": [
-        "fable"
-      ]
-    },
     "fantomas": {
-      "version": "6.3.0-alpha-003",
+      "version": "6.3.0-alpha-007",
       "commands": [
         "fantomas"
       ]
diff --git a/Directory.Build.props b/Directory.Build.props
index 2fb15eaf..f8fdc7b6 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -17,6 +17,7 @@
         <FantomasPreviewRepository>$(MSBuildThisFileDirectory).deps\main</FantomasPreviewRepository>
         <RollForward>LatestMajor</RollForward>
         <UseArtifactsOutput>true</UseArtifactsOutput>
+        <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
     </PropertyGroup>
 
     <ItemGroup Condition="'$(IsLambda)' == 'true'">
diff --git a/build.fsx b/build.fsx
index 85287826..e547f4f2 100644
--- a/build.fsx
+++ b/build.fsx
@@ -88,7 +88,7 @@ pipeline "Fantomas-Git" {
 }
 
 let publishLambda name =
-    $"dotnet publish --tl -c Release -o {artifactDir </> name} {serverDir}/{name}/{name}.fsproj"
+    $"dotnet publish --tl -c Release {serverDir}/{name}/{name}.fsproj"
 
 let runLambda name =
     $"dotnet watch run --project {serverDir </> name </> name}.fsproj --tl"
@@ -132,11 +132,7 @@ pipeline "Build" {
         run (fun _ ->
             async {
                 Shell.rm_rf artifactDir
-                !!(serverDir + "/*/bin")
-                ++ (serverDir + "/*/obj")
-                ++ (clientDir + "/src/bin")
-                ++ (clientDir + "/build")
-                |> Seq.iter Shell.rm_rf
+                Shell.rm_rf (clientDir + "/build")
                 return 0
             })
     }
diff --git a/infrastructure/Program.fs b/infrastructure/Program.fs
index 33e79505..836c7fe0 100644
--- a/infrastructure/Program.fs
+++ b/infrastructure/Program.fs
@@ -71,7 +71,13 @@ let getAllLambdas (lastSha, lastTime) =
           Environment = environment }
 
     let mkLambdaProject (name: string) lambdas =
-        let archive = __SOURCE_DIRECTORY__ </> ".." </> "artifacts" </> name
+        let archive =
+            __SOURCE_DIRECTORY__
+            </> ".."
+            </> "artifacts"
+            </> "publish"
+            </> name
+            </> "release"
 
         { Name = name
           FileArchive = archive