From e544c6fa9e15e7277da79e2464243e90b2706b8c Mon Sep 17 00:00:00 2001
From: StevenWdV <stevenwdv@gmail.com>
Date: Mon, 24 Jan 2022 14:59:25 +0100
Subject: Cleanup Added variables to Makefiles to specify custom exports/
 directory; Split exception classes in Java & C#; Added more comments; Renamed
 library and Go package; Removed real (pure) tests; Added generate_lib.ps1 to
 generate import .lib for Windows (Swift); Moved built Go libraries to
 exports/lib/; Switch to hopefully faster Swift GitHub Action.

---
 wrappers/csharp/EduVpnCommon.csproj | 57 +++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

(limited to 'wrappers/csharp/EduVpnCommon.csproj')

diff --git a/wrappers/csharp/EduVpnCommon.csproj b/wrappers/csharp/EduVpnCommon.csproj
index 4643da2..587601c 100644
--- a/wrappers/csharp/EduVpnCommon.csproj
+++ b/wrappers/csharp/EduVpnCommon.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
@@ -13,58 +13,59 @@
 
 	<ItemGroup>
 		<Compile Remove="EduVpnCommonTests/**" />
-	</ItemGroup>
-
-	<ItemGroup>
 		<EmbeddedResource Remove="EduVpnCommonTests/**" />
+		<None Remove="EduVpnCommonTests/**" />
 	</ItemGroup>
 
+	<!-- Include EXPORTS_LIB_PATH, LIB_NAME definitions -->
+	<ImportGroup Label="PropertySheets">
+		<Import Project="EduVpnCommon.props" />
+	</ImportGroup>
+
 	<Target Name="Build library for current OS" BeforeTargets="PrepareForBuild"
-	        Condition="!(Exists('../../exports/windows/amd64/eduvpn_verify.dll')
-				Or Exists('../../exports/windows/386/eduvpn_verify.dll')
-				Or Exists('../../exports/windows/arm/eduvpn_verify.dll')
-				Or Exists('../../exports/windows/arm64/eduvpn_verify.dll')
-				Or Exists('../../exports/linux/amd64/libeduvpn_verify.so')
-				Or Exists('../../exports/linux/arm/libeduvpn_verify.so')
-				Or Exists('../../exports/linux/arm64/libeduvpn_verify.so'))">
-		<Message Text="Shared eduvpn_verify library not found, you should build that one first" Importance="high" />
+	        Condition="!(Exists('$(EXPORTS_LIB_PATH)/windows/amd64/$(LIB_NAME).dll')
+				Or Exists('$(EXPORTS_LIB_PATH)/windows/386/$(LIB_NAME).dll')
+				Or Exists('$(EXPORTS_LIB_PATH)/windows/arm/$(LIB_NAME).dll')
+				Or Exists('$(EXPORTS_LIB_PATH)/windows/arm64/$(LIB_NAME).dll')
+				Or Exists('$(EXPORTS_LIB_PATH)/linux/amd64/lib$(LIB_NAME).so')
+				Or Exists('$(EXPORTS_LIB_PATH)/linux/arm/lib$(LIB_NAME).so')
+				Or Exists('$(EXPORTS_LIB_PATH)/linux/arm64/lib$(LIB_NAME).so'))">
+		<Message Text="!! Shared $(LIB_NAME) library not found, you should build that one first" Importance="high" />
 	</Target>
 
 	<ItemGroup>
-		<None Remove="EduVpnCommonTests/**" />
-
 		<!--
 			See https://docs.microsoft.com/en-us/nuget/create-packages/supporting-multiple-target-frameworks#architecture-specific-folders
 			and https://docs.microsoft.com/en-us/dotnet/core/rid-catalog
 		-->
 
-		<None Condition="Exists('../../exports/windows/amd64/eduvpn_verify.dll')"
-		      Include="../../exports/windows/amd64/eduvpn_verify.dll" Pack="true" PackagePath="runtimes/win-x64/native/">
+		<None Condition="Exists('$(EXPORTS_LIB_PATH)/windows/amd64/$(LIB_NAME).dll')"
+		      Include="$(EXPORTS_LIB_PATH)/windows/amd64/$(LIB_NAME).dll" Pack="true" PackagePath="runtimes/win-x64/native/">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>
-		<None Condition="Exists('../../exports/windows/386/eduvpn_verify.dll')"
-		      Include="../../exports/windows/386/eduvpn_verify.dll" Pack="true" PackagePath="runtimes/win-x86/native/">
+		<None Condition="Exists('$(EXPORTS_LIB_PATH)/windows/386/$(LIB_NAME).dll')"
+		      Include="$(EXPORTS_LIB_PATH)/windows/386/$(LIB_NAME).dll" Pack="true" PackagePath="runtimes/win-x86/native/">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>
-		<None Condition="Exists('../../exports/windows/arm/eduvpn_verify.dll')"
-		      Include="../../exports/windows/arm/eduvpn_verify.dll" Pack="true" PackagePath="runtimes/win-arm/native/">
+		<None Condition="Exists('$(EXPORTS_LIB_PATH)/windows/arm/$(LIB_NAME).dll')"
+		      Include="$(EXPORTS_LIB_PATH)/windows/arm/$(LIB_NAME).dll" Pack="true" PackagePath="runtimes/win-arm/native/">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>
-		<None Condition="Exists('../../exports/windows/arm64/eduvpn_verify.dll')"
-		      Include="../../exports/windows/arm64/eduvpn_verify.dll" Pack="true" PackagePath="runtimes/win-arm64/native/">
+		<None Condition="Exists('$(EXPORTS_LIB_PATH)/windows/arm64/$(LIB_NAME).dll')"
+		      Include="$(EXPORTS_LIB_PATH)/windows/arm64/$(LIB_NAME).dll" Pack="true" PackagePath="runtimes/win-arm64/native/">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>
 
-		<None Condition="Exists('../../exports/linux/amd64/libeduvpn_verify.so')"
-		      Include="../../exports/linux/amd64/libeduvpn_verify.so" Pack="true" PackagePath="runtimes/linux-x64/native/">
+		<None Condition="Exists('$(EXPORTS_LIB_PATH)/linux/amd64/lib$(LIB_NAME).so')"
+		      Include="$(EXPORTS_LIB_PATH)/linux/amd64/lib$(LIB_NAME).so" Pack="true" PackagePath="runtimes/linux-x64/native/">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>
-		<None Condition="Exists('../../exports/linux/arm/libeduvpn_verify.so')"
-		      Include="../../exports/linux/arm/libeduvpn_verify.so" Pack="true" PackagePath="runtimes/linux-arm/native/">
+		<None Condition="Exists('$(EXPORTS_LIB_PATH)/linux/arm/lib$(LIB_NAME).so')"
+		      Include="$(EXPORTS_LIB_PATH)/linux/arm/lib$(LIB_NAME).so" Pack="true" PackagePath="runtimes/linux-arm/native/">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>
-		<None Condition="Exists('../../exports/linux/arm64/libeduvpn_verify.so')"
-		      Include="../../exports/linux/arm64/libeduvpn_verify.so" Pack="true" PackagePath="runtimes/linux-arm64/native/">
+		<None Condition="Exists('$(EXPORTS_LIB_PATH)/linux/arm64/lib$(LIB_NAME).so')"
+		      Include="$(EXPORTS_LIB_PATH)/linux/arm64/lib$(LIB_NAME).so" Pack="true" PackagePath="runtimes/linux-arm64/native/">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>
 	</ItemGroup>
-- 
cgit v1.2.3