From 613e1b1e781b9e2ba810162edad6138ec9ced29c Mon Sep 17 00:00:00 2001
From: Jakub Majocha <1760221+majocha@users.noreply.github.com>
Date: Wed, 4 Sep 2024 15:59:38 +0200
Subject: [PATCH 1/3] ensure cslib.dll exists

---
 tests/fsharp/core/quotes/cslib.dll | Bin 3584 -> 0 bytes
 tests/fsharp/tests.fs              |  38 +++++++++++++++++++----------
 2 files changed, 25 insertions(+), 13 deletions(-)
 delete mode 100644 tests/fsharp/core/quotes/cslib.dll

diff --git a/tests/fsharp/core/quotes/cslib.dll b/tests/fsharp/core/quotes/cslib.dll
deleted file mode 100644
index 79b530ded94af7b960632ed7be1b144807ee15d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3584
zcmeHJOK%%h6#m9`QYTGAT13@~N2hs|k|N6`K>`#NCvjQ=O;chg<s~&^`^Fg<&zPBU
z8$&6PP=T)Kf<+e~v0%ZHMG+MeKcP#+hDDcj#R7>15|r=U89&mN*QP?ECz*54IrqEg
ze&^mhcf9b*B_si)_}sh+TxBbg)B3N~Cc6jseKUwFeb@G1HI84~UtG5Xv+jFU->R8q
z%XPibEGg4(xTfuz`Ne`+^C~K{V@LmJociP(aNJ1Z?UC=-TC-ipu({pH0=<mLBh46<
z$tTAL7}9nk;w=H;uVs^(agii)7X&K*oi=tQM7csDi(=$}%kemI+p-D_w4Hxpm_WJ<
zo~Hj?m!ApMMo534hl+i=&RgbZcs1h(ewp2xTaJbl+MSp#!?}#F9FIWFb(KNMbqjIg
zW*FTfKgJs&+!E-)ITLt_a~NAt|J)f)9ORDmWBf>LB$DqiS89AFad4Y-fC1)Djgw5_
z`57agNvNKg%w#hY*@?qX%X~d>s6XT2k@GBt^?WFHA@psx8VKTJ9$Z<Dk>vs|)0S->
zIkr5XXZr>HOXANsUWu&;Qy8Zn0Q$uF)tJEUs7{jNY*8)_(~QVf<76G=0e+6#UVMcy
zqZi+4eG$8i`!GjHFIIHq27aUch9UY*Z9k*+IYvaH&C_)oL&&3O>}6&qp!X>=h?hVg
zy`4ml(M~clBnUi4JBb5G8T*+1g4R!9n2}-roiqu-`+Ek+&cMrUPqN!>Z%k)0@Sf3!
z0mI-dg5OKs&-`LfQxD;=wqMlxQS8D8$Y49hsqe=G^@CW#EJpAubw71k+vV6kgjJ+A
zaf>`eUv{h|yO}GNS;q>3!<bs|Dh)>+K>@X(?D>veLOBp!Yc46P;<--qsI8m|{it2B
zoQ5hk>k4zVlB!fxWjf>;DK$ccS+7>N9pxWWuJWz0yQ>Xa4y>wbd&sL&qgu5}PFHM6
ztre^_6*iYhE$CpQ^j2tl?viq>4Q+MxFE!lIt|@`Bt7JQN*zAnfWo0UkgF-V1RShf3
z510y>a_ISSFq5~fs_O-zT@G5IIBlj?T|xP0?6L}C?tDGCh;$e1vhM}nT1aF?O}m!U
z4D0}H21U!SsxZJ}>2*~OaRwXFUM%l>;ob9xZY+E>G@IUY^w8%>nTC;0nlO53?A)pK
z!|AWzdTnLz<n@b*-gKgOP%wjOBR<}b$eAl9cAxUC`U%gS+bFBLEK_ma_s#|eaohA;
zl@fhG4!pdc#l((j$MMcCG@Q_`JBoq6d3Rm;Hn$EOv|SVYVKm|?`WLZHv2K^v-4^wn
zp7s2^<1ARV8yzjB^x{kJ%`xWCUy0kZ{GTFn&j5RX&8=1I`w7`Q#04kcj+b)4l<Z<G
zQ;A7hD}0SlQ_u0PC}5sn+7tBWsgFiqU3{DR>G#$R+ZrqFv#}$$MORuK%~Ko9YQbk7
zo8Jk=oG#Yj>HblD#}wIXF&ePnLP(rPFOn})pYY%r<P;KRGhV$zrVWkBvhL__5+zv!
zJWfVN8=vRw0dGIaQ{OU=No<xcL<hS<tWR`@OO`ij=K&^pe;T@)P-9(kceq{_YV^T*
zq#m10GN{m!Z{$JE=Q#VT8a>NO>u735RjiW}^eZx@b1%kmsakTkR#3b@pJP(jagt*_
z&f6f5kUOxonob>36MskOG1Fum5LqK<hpf!M9mk>f<Zi8i8U0L5KY6z%yf@E(X$AfO
D{JCli

diff --git a/tests/fsharp/tests.fs b/tests/fsharp/tests.fs
index 338bad2e373..e15f62416c6 100644
--- a/tests/fsharp/tests.fs
+++ b/tests/fsharp/tests.fs
@@ -72,16 +72,6 @@ module CoreTests =
         exec cfg ("." ++ "test-langversion-46.exe") ""
 
         testOkFile.CheckExists()
-
-    // This test stays in FsharpSuite for a later migration phases, it uses hardcoded #r to a C# compiled cslib.dll inside
-    [<Fact>]
-    let ``quotes-FSC-FSC_DEBUG`` () = singleTestBuildAndRun "core/quotes" FSC_DEBUG
-
-    [<Fact>]
-    let ``quotes-FSC-BASIC`` () = singleTestBuildAndRun "core/quotes" FSC_OPTIMIZED
-
-    [<Fact>]
-    let ``quotes-FSI-BASIC`` () = singleTestBuildAndRun "core/quotes" FSI
 #endif
 
 
@@ -819,12 +809,17 @@ module CoreTests =
 #endif
 
 #if !NETCOREAPP
-    [<Fact>]
-    let quotes () =
-        let cfg = testConfig "core/quotes"
 
+    let quotesCfg =
+        let cfg = testConfig "core/quotes"
 
+        // Ensure cslib.dll exists
         csc cfg """/nologo  /target:library /out:cslib.dll""" ["cslib.cs"]
+        cfg
+    
+    [<Fact>]
+    let quotes () =
+        let cfg = quotesCfg
 
         fsc cfg "%s  -o:test.exe -r cslib.dll -g" cfg.fsc_flags ["test.fsx"]
 
@@ -864,6 +859,23 @@ module CoreTests =
             testOkFile.CheckExists()
         end
 
+    // This test stays in FsharpSuite for a later migration phases, it uses hardcoded #r to a C# compiled cslib.dll inside
+    [<Fact>]
+    let ``quotes-FSC-FSC_DEBUG`` () =
+        // 
+        quotesCfg |> ignore
+        singleTestBuildAndRun "core/quotes" FSC_DEBUG
+
+    [<Fact>]
+    let ``quotes-FSC-BASIC`` () =
+        quotesCfg |> ignore
+        singleTestBuildAndRun "core/quotes" FSC_OPTIMIZED
+
+    [<Fact>]
+    let ``quotes-FSI-BASIC`` () =
+        quotesCfg |> ignore
+        singleTestBuildAndRun "core/quotes" FSI
+
     [<Fact; Trait("Category", "parsing")>]
     let parsing () =
         let cfg = testConfig "core/parsing"

From 1303fdfeb9805c0b5ed3a1c7bebd8c49bf14a424 Mon Sep 17 00:00:00 2001
From: Jakub Majocha <1760221+majocha@users.noreply.github.com>
Date: Wed, 4 Sep 2024 16:14:49 +0200
Subject: [PATCH 2/3] simply

---
 tests/fsharp/tests.fs | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/tests/fsharp/tests.fs b/tests/fsharp/tests.fs
index e15f62416c6..a7083bea991 100644
--- a/tests/fsharp/tests.fs
+++ b/tests/fsharp/tests.fs
@@ -808,18 +808,12 @@ module CoreTests =
 
 #endif
 
-#if !NETCOREAPP
-
-    let quotesCfg =
+#if !NETCOREAPP    
+    [<Fact>]
+    let quotes () =
         let cfg = testConfig "core/quotes"
 
-        // Ensure cslib.dll exists
         csc cfg """/nologo  /target:library /out:cslib.dll""" ["cslib.cs"]
-        cfg
-    
-    [<Fact>]
-    let quotes () =
-        let cfg = quotesCfg
 
         fsc cfg "%s  -o:test.exe -r cslib.dll -g" cfg.fsc_flags ["test.fsx"]
 
@@ -862,18 +856,23 @@ module CoreTests =
     // This test stays in FsharpSuite for a later migration phases, it uses hardcoded #r to a C# compiled cslib.dll inside
     [<Fact>]
     let ``quotes-FSC-FSC_DEBUG`` () =
-        // 
-        quotesCfg |> ignore
+        let cfg = testConfig "core/quotes"
+        csc cfg """/nologo  /target:library /out:cslib.dll""" ["cslib.cs"]
+
         singleTestBuildAndRun "core/quotes" FSC_DEBUG
 
     [<Fact>]
     let ``quotes-FSC-BASIC`` () =
-        quotesCfg |> ignore
+        let cfg = testConfig "core/quotes"
+        csc cfg """/nologo  /target:library /out:cslib.dll""" ["cslib.cs"]
+
         singleTestBuildAndRun "core/quotes" FSC_OPTIMIZED
 
     [<Fact>]
     let ``quotes-FSI-BASIC`` () =
-        quotesCfg |> ignore
+        let cfg = testConfig "core/quotes"
+        csc cfg """/nologo  /target:library /out:cslib.dll""" ["cslib.cs"]
+
         singleTestBuildAndRun "core/quotes" FSI
 
     [<Fact; Trait("Category", "parsing")>]

From e9e838aa15bde99d483c8c20ddc3c2d2d2544f24 Mon Sep 17 00:00:00 2001
From: Jakub Majocha <1760221+majocha@users.noreply.github.com>
Date: Wed, 4 Sep 2024 19:25:22 +0200
Subject: [PATCH 3/3] update comment

---
 tests/fsharp/tests.fs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/fsharp/tests.fs b/tests/fsharp/tests.fs
index a7083bea991..27a80b2e9e3 100644
--- a/tests/fsharp/tests.fs
+++ b/tests/fsharp/tests.fs
@@ -853,7 +853,9 @@ module CoreTests =
             testOkFile.CheckExists()
         end
 
-    // This test stays in FsharpSuite for a later migration phases, it uses hardcoded #r to a C# compiled cslib.dll inside
+    // Previously a comment here said:
+    // "This test stays in FsharpSuite for a later migration phases, it uses hardcoded #r to a C# compiled cslib.dll inside"
+    // This is resolved by compiling cslib.dll separately in each test. 
     [<Fact>]
     let ``quotes-FSC-FSC_DEBUG`` () =
         let cfg = testConfig "core/quotes"