From eb801af6f66d7cbb75f219202f8bc8b7d37458be Mon Sep 17 00:00:00 2001 From: TopperDEL Date: Thu, 21 Dec 2023 09:26:32 +0100 Subject: [PATCH] fix: Revert back to NetStandard2.0 Switching to net6 was not necessary --- nuspec/uplink.NET.nuspec | 1 - uplink.NET/pipelines/azure-pipelines-build-uplink.yml | 4 ++-- uplink.NET/uplink.NET.Test/TestConstants.cs | 2 +- uplink.NET/uplink.NET.Test/uplink.NET.Test.csproj | 2 +- uplink.NET/uplink.NET/uplink.NET.csproj | 9 +++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nuspec/uplink.NET.nuspec b/nuspec/uplink.NET.nuspec index 3eb7a64a..daa47f72 100644 --- 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 - diff --git a/uplink.NET/pipelines/azure-pipelines-build-uplink.yml b/uplink.NET/pipelines/azure-pipelines-build-uplink.yml index 6d28db26..72fd2935 100644 --- 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 index 32038775..9d077429 100644 --- a/uplink.NET/uplink.NET.Test/TestConstants.cs +++ b/uplink.NET/uplink.NET.Test/TestConstants.cs @@ -6,7 +6,7 @@ namespace uplink.NET.Test { class TestConstants { - public const string VALID_API_KEY = "YOUR_API_KEY_HERE"; + 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 index 7cbf6631..43cc767a 100644 --- a/uplink.NET/uplink.NET.Test/uplink.NET.Test.csproj +++ b/uplink.NET/uplink.NET.Test/uplink.NET.Test.csproj @@ -1,6 +1,6 @@  - net6.0 + netcoreapp3.1 false AnyCPU;x86 diff --git a/uplink.NET/uplink.NET/uplink.NET.csproj b/uplink.NET/uplink.NET/uplink.NET.csproj index eaa496ff..deb2b0e1 100644 --- a/uplink.NET/uplink.NET/uplink.NET.csproj +++ b/uplink.NET/uplink.NET/uplink.NET.csproj @@ -2,10 +2,10 @@ - 2.7.0.0 + 2.12.0.0 - net6.0 + netstandard2.0 true true snupkg @@ -13,8 +13,8 @@ portable uplink.NET uplink.NET - 2.7.0.0 - 2.7.0 + 2.12.0.0 + 2.12.0 @@ -28,6 +28,7 @@ +