Merge remote-tracking branch 'origin/master' into frontend

To bring the legacy obj folder tweak (so that we can get rid of GWallet.Backend.NetStandard project). # Conflicts: # snap/snapcraft.yaml # src/GWallet.Backend/Properties/CommonAssemblyInfo.fs # src/GWallet.Backend/servers.json
nblockchain · Aug 9, 2023 · ba88450 · ba88450
2 parents 3e0a336 + 3ce54d5
commit ba88450
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/GWallet.Backend.Tests/packages.config b/src/GWallet.Backend.Tests/packages.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="FSharp.Core" version="4.7.0" targetFramework="net461" />
+  <package id="Fsdk" version="0.6.0--date20230530-1155.git-3bb8d08" targetFramework="net46" />
   <package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.2" targetFramework="net46" />
   <package id="NBitcoin" version="6.0.17" targetFramework="net471" />
   <package id="NBitcoin.Altcoins" version="3.0.8" targetFramework="net452" />

diff --git a/src/GWallet.Backend/GWallet.Backend-legacy.fsproj b/src/GWallet.Backend/GWallet.Backend-legacy.fsproj
@@ -18,6 +18,7 @@
         /warnon:3218
         /warnon:0193
     </OtherFlags>
+    <BaseIntermediateOutputPath>obj\legacy\</BaseIntermediateOutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>