From 2e40f7de6b6a5429add9aa10646eb5b85c9c48c3 Mon Sep 17 00:00:00 2001
From: James Thompson <thompson.tomo@outlook.com>
Date: Mon, 1 Apr 2024 09:37:16 +1100
Subject: [PATCH 1/3] #908 Optimize dependencies

---
 cs/src/core/FASTER.core.csproj | 35 ++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/cs/src/core/FASTER.core.csproj b/cs/src/core/FASTER.core.csproj
index 5f2efcd5e..884e4214b 100644
--- a/cs/src/core/FASTER.core.csproj
+++ b/cs/src/core/FASTER.core.csproj
@@ -20,7 +20,7 @@
     <StartupObject />
     <AssemblyOriginatorKeyFile>../../FASTER.snk</AssemblyOriginatorKeyFile>
     <DelaySign>false</DelaySign>
-	<EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <DocumentationFile>bin\$(Platform)\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
 
@@ -29,45 +29,48 @@
     <DebugType>full</DebugType>
     <OutputPath>bin\$(Platform)\Debug\</OutputPath>
   </PropertyGroup>
-  
+
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <DefineConstants></DefineConstants>
     <Optimize>true</Optimize>
     <OutputPath>bin\$(Platform)\Release\</OutputPath>
   </PropertyGroup>
-  
+
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0|AnyCPU'&#xD;&#xA;				 Or '$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0|AnyCPU'">
     <WarningsAsErrors>;NU1605</WarningsAsErrors>
   </PropertyGroup>
-  
+
   <ItemGroup>
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
-	<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
-  
-  <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.1'">
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="System.Memory" Version="4.5.5" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
     <PackageReference Include="System.Interactive.Async" Version="6.0.1" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' != 'netstandard2.1'">
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
+  </ItemGroup>
+
   <Choose>
-	<When Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netstandard2.1'">
+    <When Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netstandard2.1'">
       <ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.26" />
-	  </ItemGroup>
-	</When>
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.26" />
+      </ItemGroup>
+    </When>
     <When Condition="'$(TargetFramework)' == 'net6.0'">
       <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
       </ItemGroup>
     </When>
     <Otherwise>
-	  <ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-	  </ItemGroup>
-	</Otherwise>
+      <ItemGroup>
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+      </ItemGroup>
+    </Otherwise>
   </Choose>
 
 </Project>

From 0b84d7f6539f8753af6a880d0f0bd465d2aa98c4 Mon Sep 17 00:00:00 2001
From: James Thompson <thompson.tomo@outlook.com>
Date: Sun, 7 Apr 2024 18:51:09 +1000
Subject: [PATCH 2/3] Remove System.Runtime.CompilerServices.Unsafe package

---
 cs/src/core/FASTER.core.csproj | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/cs/src/core/FASTER.core.csproj b/cs/src/core/FASTER.core.csproj
index 884e4214b..6293b9549 100644
--- a/cs/src/core/FASTER.core.csproj
+++ b/cs/src/core/FASTER.core.csproj
@@ -51,10 +51,6 @@
     <PackageReference Include="System.Interactive.Async" Version="6.0.1" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' != 'netstandard2.1'">
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
-  </ItemGroup>
-
   <Choose>
     <When Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netstandard2.1'">
       <ItemGroup>

From e49284d28afce328615a13c48f3b99ee10b0a632 Mon Sep 17 00:00:00 2001
From: James Thompson <thompson.tomo@outlook.com>
Date: Wed, 17 Apr 2024 08:07:41 +1000
Subject: [PATCH 3/3] Tweak when System.Interactive.Async is included

---
 cs/src/core/FASTER.core.csproj                                  | 1 -
 .../AzureStorageDevice/FASTER.devices.AzureStorageDevice.csproj | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/cs/src/core/FASTER.core.csproj b/cs/src/core/FASTER.core.csproj
index 6293b9549..db84ac1ff 100644
--- a/cs/src/core/FASTER.core.csproj
+++ b/cs/src/core/FASTER.core.csproj
@@ -48,7 +48,6 @@
     <PackageReference Include="System.Memory" Version="4.5.5" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
-    <PackageReference Include="System.Interactive.Async" Version="6.0.1" />
   </ItemGroup>
 
   <Choose>
diff --git a/cs/src/devices/AzureStorageDevice/FASTER.devices.AzureStorageDevice.csproj b/cs/src/devices/AzureStorageDevice/FASTER.devices.AzureStorageDevice.csproj
index e92cb0a5e..f9d4184f4 100644
--- a/cs/src/devices/AzureStorageDevice/FASTER.devices.AzureStorageDevice.csproj
+++ b/cs/src/devices/AzureStorageDevice/FASTER.devices.AzureStorageDevice.csproj
@@ -36,7 +36,7 @@
     <OutputPath>bin\$(Platform)\Release\</OutputPath>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
+  <ItemGroup>
     <PackageReference Include="System.Interactive.Async" Version="6.0.1" />
   </ItemGroup>