fix: Revert back to NetStandard2.0

Switching to net6 was not necessary
TopperDEL · Dec 21, 2023 · fb4da65 · fb4da65
1 parent 0d82161
commit fb4da65
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git a/nuspec/uplink.NET.nuspec b/nuspec/uplink.NET.nuspec
@@ -22,7 +22,6 @@ Works with .Net/UWP/Linux/Xamarin.Android/Xamarin.iOS/MacOS. Please add the addi
       <group targetFramework=".NETStandard2.0">
         <dependency id="sqlite-net-pcl" version="1.7.335"/>
       </group>
-	  <group targetFramework="net6.0" />
     </dependencies>
   </metadata>
   <files>

diff --git a/uplink.NET/pipelines/azure-pipelines-build-uplink.yml b/uplink.NET/pipelines/azure-pipelines-build-uplink.yml
@@ -59,8 +59,8 @@ steps:
   inputs:
     targetType: 'inline'
     script: |
-      mv uplink.NET/uplink.NET/bin/Release/net6.0/uplink.NET.dll uplink.NET.dll
-      mv uplink.NET/uplink.NET/bin/Release/net6.0/uplink.NET.pdb uplink.NET.pdb
+      mv uplink.NET/uplink.NET/bin/Release/netstandard2.0/uplink.NET.dll uplink.NET.dll
+      mv uplink.NET/uplink.NET/bin/Release/netstandard2.0/uplink.NET.pdb uplink.NET.pdb
   displayName: 'Place uplink-DLL at nuget-location'
 
 - task: NuGetToolInstaller@1

diff --git a/uplink.NET/uplink.NET.Test/TestConstants.cs b/uplink.NET/uplink.NET.Test/TestConstants.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace uplink.NET.Test
+{
+    class TestConstants
+    {
+        public const string VALID_API_KEY = "1FkahBKy3PeTFzpgntwEubptFb7j7QGY7SW1F89Y9BHynmvKoPTecteVQoPjF3dBpLv1Rf6ZCruNWkK1MHii1i2pEMij9yG9Q9PwgxK1nLcFmDBH7FpLDAfkSAffvVTtJLbssVw37gNdrfAvx1ZJW";
+        public const string ENCRYPTION_SECRET = "i_am_so_secret_you_cant_imagine";
+        public const string INVALID_API_KEY = "This is not a valid API-Key";
+        public const string SATELLITE_URL = "europe-west-1.tardigrade.io:7777"; //Use the address of your satellite
+    }
+}
diff --git a/uplink.NET/uplink.NET.Test/uplink.NET.Test.csproj b/uplink.NET/uplink.NET.Test/uplink.NET.Test.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <Platforms>AnyCPU;x86</Platforms>
   </PropertyGroup>

diff --git a/uplink.NET/uplink.NET/uplink.NET.csproj b/uplink.NET/uplink.NET/uplink.NET.csproj
@@ -2,19 +2,19 @@
   <PropertyGroup>
     <Description>
     </Description>
-    <AssemblyVersion>2.7.0.0</AssemblyVersion>
+    <AssemblyVersion>2.12.0.0</AssemblyVersion>
     <Authors>
     </Authors>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DebugType>portable</DebugType>
     <AssemblyName>uplink.NET</AssemblyName>
     <RootNamespace>uplink.NET</RootNamespace>
-    <FileVersion>2.7.0.0</FileVersion>
-    <Version>2.7.0</Version>
+    <FileVersion>2.12.0.0</FileVersion>
+    <Version>2.12.0</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>
@@ -28,6 +28,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="System.Text.Json" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="SWIG-Generated\" />