From 51685f038c7560e3e4d03d5023a73f3d70471648 Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Mon, 13 May 2024 21:39:16 +0200
Subject: [PATCH] fix paths, also build main library automatically for C#
 binding

---
 examples/lang_cs/lang_cs.csproj               |  2 +-
 servicepoint2-binding-cs/ServicePoint2.sln    |  4 ++--
 servicepoint2-binding-cs/build.rs             |  4 ++--
 .../{ => src}/ServicePoint2.csproj            | 21 ++++++++++++++-----
 4 files changed, 21 insertions(+), 10 deletions(-)
 rename servicepoint2-binding-cs/{ => src}/ServicePoint2.csproj (78%)

diff --git a/examples/lang_cs/lang_cs.csproj b/examples/lang_cs/lang_cs.csproj
index 1bf0ac8..b7d2828 100644
--- a/examples/lang_cs/lang_cs.csproj
+++ b/examples/lang_cs/lang_cs.csproj
@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\servicepoint2-binding-cs\ServicePoint2\ServicePoint2.csproj"/>
+        <ProjectReference Include="..\..\servicepoint2-binding-cs\src\ServicePoint2.csproj"/>
     </ItemGroup>
 
 </Project>
diff --git a/servicepoint2-binding-cs/ServicePoint2.sln b/servicepoint2-binding-cs/ServicePoint2.sln
index 51b016d..5fa11f6 100644
--- a/servicepoint2-binding-cs/ServicePoint2.sln
+++ b/servicepoint2-binding-cs/ServicePoint2.sln
@@ -1,8 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServicePoint2", "ServicePoint2.csproj", "{70EFFA3F-012A-4518-9627-466BEAE4252E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServicePoint2", "src/ServicePoint2.csproj", "{70EFFA3F-012A-4518-9627-466BEAE4252E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "lang-cs", "..\..\examples\lang_cs\lang_cs.csproj", "{DA3B8B6E-993A-47DA-844B-F92AF520FF59}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "lang-cs", "../examples/lang_cs/lang_cs.csproj", "{DA3B8B6E-993A-47DA-844B-F92AF520FF59}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/servicepoint2-binding-cs/build.rs b/servicepoint2-binding-cs/build.rs
index 3629935..43e61ae 100644
--- a/servicepoint2-binding-cs/build.rs
+++ b/servicepoint2-binding-cs/build.rs
@@ -12,6 +12,6 @@ fn main() {
         .csharp_namespace("ServicePoint2.BindGen")
         .csharp_use_nint_types(true)
         .csharp_class_accessibility("public")
-        .generate_csharp_file("ServicePoint2/BindGen/ServicePoint2.g.cs")
+        .generate_csharp_file("src/BindGen/ServicePoint2.g.cs")
         .unwrap();
-}
\ No newline at end of file
+}
diff --git a/servicepoint2-binding-cs/ServicePoint2.csproj b/servicepoint2-binding-cs/src/ServicePoint2.csproj
similarity index 78%
rename from servicepoint2-binding-cs/ServicePoint2.csproj
rename to servicepoint2-binding-cs/src/ServicePoint2.csproj
index 5af4484..2e5eaa8 100644
--- a/servicepoint2-binding-cs/ServicePoint2.csproj
+++ b/servicepoint2-binding-cs/src/ServicePoint2.csproj
@@ -2,7 +2,6 @@
 
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
-        <RuntimeIdentifiers>linux-x64;linux-x64-musl;win-x64;</RuntimeIdentifiers>
         <ImplicitUsings>disable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -27,9 +26,13 @@
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
     </PropertyGroup>
 
-    <ItemGroup>
-        <None Include="../../README.md" Pack="true" PackagePath="\"/>
-    </ItemGroup>
+    <Target Name="BuildLibrary" Condition="'$(Configuration)'=='Release'" BeforeTargets="PrepareForBuild">
+        <Exec Command="cargo build --manifest-path ../../servicepoint2/Cargo.toml --all-features --release"/>
+    </Target>
+
+    <Target Name="BuildLibrary" Condition="'$(Configuration)'=='Debug'" BeforeTargets="PrepareForBuild">
+        <Exec Command="cargo build --manifest-path ../../servicepoint2/Cargo.toml --all-features"/>
+    </Target>
 
     <Target Name="BuildBindings" Condition="'$(Configuration)'=='Release'" BeforeTargets="PrepareForBuild">
         <Exec Command="cargo build --release"/>
@@ -51,9 +54,17 @@
         </Content>
     </ItemGroup>
 
-    <!-- include link to source code at revision -->
     <ItemGroup>
+        <!-- include link to source code at revision -->
+        <None Include="../../README.md" Pack="true" PackagePath="\"/>
+        <!-- add README.md to package -->
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
     </ItemGroup>
 
+    <ItemGroup>
+      <Content Include="..\build.rs">
+        <Link>build.rs</Link>
+      </Content>
+    </ItemGroup>
+
 </Project>