Use nuget for IronRSLClient

secure-foundations · Jun 7, 2021 · e962efb · e962efb
1 parent d94ec67
commit e962efb
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 10 deletions.
diff --git a/ironfleet/src/IronRSLClient/IronRSLClient.csproj b/ironfleet/src/IronRSLClient/IronRSLClient.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <PackageId>IronRSLClient</PackageId>
+    <Version>1.0.2</Version>
+    <Authors>Jay Lorch and Chris Hawblitzel</Authors>
+    <Company>Microsoft Corporation</Company>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\IronfleetCommon\Networking.cs" />
+    <Compile Include="..\Dafny\Distributed\Common\Native\IoFramework.cs" />
+  </ItemGroup>
+
+</Project>
diff --git a/ironfleet/src/IronRSLClient/IronRSLClient.sln b/ironfleet/src/IronRSLClient/IronRSLClient.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31321.278
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronRSLClient", "IronRSLClient.csproj", "{0AC4042E-CFAF-41AD-86DD-C91B39D06CB5}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{0AC4042E-CFAF-41AD-86DD-C91B39D06CB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0AC4042E-CFAF-41AD-86DD-C91B39D06CB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0AC4042E-CFAF-41AD-86DD-C91B39D06CB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0AC4042E-CFAF-41AD-86DD-C91B39D06CB5}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {AFC77FFD-EE03-4482-A506-7F4B3A3B4431}
+	EndGlobalSection
+EndGlobal
diff --git a/ironfleet/src/IronfleetCommon/RSLClient.cs → ironfleet/src/IronRSLClient/RSLClient.cs b/ironfleet/src/IronfleetCommon/RSLClient.cs → ironfleet/src/IronRSLClient/RSLClient.cs
@@ -5,9 +5,9 @@
 using System.Linq;
 using System.Net;
 
-namespace IronfleetCommon
+namespace IronRSLClient
 {
-  class RSLClient
+  public class RSLClient
   {
     IPEndPoint[] serverEps;
     int myPort;

diff --git a/ironfleet/src/IronRSLCounterClient/Client.cs b/ironfleet/src/IronRSLCounterClient/Client.cs
@@ -1,5 +1,6 @@
 using IronfleetCommon;
 using IronfleetIoFramework;
+using IronRSLClient;
 using System;
 using System.Collections.Generic;
 using System.IO;

diff --git a/ironfleet/src/IronRSLCounterClient/IronRSLCounterClient.csproj b/ironfleet/src/IronRSLCounterClient/IronRSLCounterClient.csproj
@@ -6,10 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\IronfleetCommon\Networking.cs" />
-    <Compile Include="..\IronfleetCommon\RSLClient.cs" />
     <Compile Include="..\IronfleetCommon\Timer.cs" />
-    <Compile Include="..\Dafny\Distributed\Common\Native\IoFramework.cs" />
+    <PackageReference Include="IronRSLClient" Version="1.0.2" />
   </ItemGroup>
 
 </Project>
diff --git a/ironfleet/src/IronRSLKVClient/Client.cs b/ironfleet/src/IronRSLKVClient/Client.cs
@@ -1,4 +1,5 @@
 using IronfleetCommon;
+using IronRSLClient;
 using IronfleetIoFramework;
 using KVMessages;
 using System;

diff --git a/ironfleet/src/IronRSLKVClient/IronRSLKVClient.csproj b/ironfleet/src/IronRSLKVClient/IronRSLKVClient.csproj
@@ -6,11 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\IronfleetCommon\Networking.cs" />
-    <Compile Include="..\IronfleetCommon\RSLClient.cs" />
-    <Compile Include="..\IronfleetCommon\Timer.cs" />
     <Compile Include="..\IronRSLKVServer\KVMessages.cs" />
-    <Compile Include="..\Dafny\Distributed\Common\Native\IoFramework.cs" />
+    <PackageReference Include="IronRSLClient" Version="1.0.2" />
+    <Compile Include="..\IronfleetCommon\Timer.cs" />
   </ItemGroup>
 
 </Project>
diff --git a/ironfleet/src/IronfleetCommon/Networking.cs b/ironfleet/src/IronfleetCommon/Networking.cs
@@ -4,7 +4,7 @@
 
 namespace IronfleetCommon
 {
-  class Networking
+  public class Networking
   {
     public static IPEndPoint ResolveIPEndpoint(string s)
     {