From 042ad02994d665ed2eea448fe8321fa6c7a72c60 Mon Sep 17 00:00:00 2001 From: fh-daniel Date: Tue, 10 May 2022 11:15:35 +1200 Subject: [PATCH] Updated to netstandard2.0 portable targets are obsolete: https://docs.microsoft.com/en-us/nuget/reference/target-frameworks#portable-class-libraries --- .../Models/AccountPreferences.cs | 12 +-- .../ShareFile.Api.Client.csproj | 77 ++----------------- .../AsyncMemoryMappedFileDownloader.cs | 1 - .../Transfers/StreamWrapper.cs | 5 +- .../AsyncMemoryMappedFileUploader.cs | 1 - 5 files changed, 14 insertions(+), 82 deletions(-) diff --git a/src/ShareFile.Api.Client/Models/AccountPreferences.cs b/src/ShareFile.Api.Client/Models/AccountPreferences.cs index d3775ed..a747c5a 100644 --- a/src/ShareFile.Api.Client/Models/AccountPreferences.cs +++ b/src/ShareFile.Api.Client/Models/AccountPreferences.cs @@ -653,27 +653,27 @@ public override void Copy(ODataObject source, JsonSerializer serializer) } if(source.TryGetProperty("PasswordMaxAgeDays", out token) && token.Type != JTokenType.Null) { - PasswordMaxAgeDays = (int)serializer.Deserialize(token.CreateReader(), typeof(int)); + PasswordMaxAgeDays = PasswordPolicy.MaxAgeDays.GetValueOrDefault(); } if(source.TryGetProperty("PasswordHistoryCount", out token) && token.Type != JTokenType.Null) { - PasswordHistoryCount = (int)serializer.Deserialize(token.CreateReader(), typeof(int)); + PasswordHistoryCount = PasswordPolicy.HistoryCount.GetValueOrDefault(); } if(source.TryGetProperty("MinimumLength", out token) && token.Type != JTokenType.Null) { - MinimumLength = (int)serializer.Deserialize(token.CreateReader(), typeof(int)); + MinimumLength = PasswordPolicy.MinimumLength.GetValueOrDefault(); } if(source.TryGetProperty("MinimumSpecialCharacters", out token) && token.Type != JTokenType.Null) { - MinimumSpecialCharacters = (int)serializer.Deserialize(token.CreateReader(), typeof(int)); + MinimumSpecialCharacters = PasswordPolicy.MinimumSpecialCharacters.GetValueOrDefault(); } if(source.TryGetProperty("MinimumNumeric", out token) && token.Type != JTokenType.Null) { - MinimumNumeric = (int)serializer.Deserialize(token.CreateReader(), typeof(int)); + MinimumNumeric = PasswordPolicy.MinimumNumeric.GetValueOrDefault(); } if(source.TryGetProperty("AllowedSpecialCharacters", out token) && token.Type != JTokenType.Null) { - AllowedSpecialCharacters = (string)serializer.Deserialize(token.CreateReader(), typeof(string)); + AllowedSpecialCharacters = PasswordPolicy.AllowedSpecialCharacters; } if(source.TryGetProperty("PasswordPolicy", out token) && token.Type != JTokenType.Null) { diff --git a/src/ShareFile.Api.Client/ShareFile.Api.Client.csproj b/src/ShareFile.Api.Client/ShareFile.Api.Client.csproj index 079913f..8d77570 100644 --- a/src/ShareFile.Api.Client/ShareFile.Api.Client.csproj +++ b/src/ShareFile.Api.Client/ShareFile.Api.Client.csproj @@ -3,92 +3,29 @@ - net45;net462;netstandard1.3;portable-net45+win8+wpa81 + netstandard2.0 true ShareFile.Api.Client ShareFile.Api.Client ShareFile True - 1701;1702;1705;1591;1571;1572;1573;1570 + 1701;1702;1705;1591;1571;1572;1573;1570;AD0001 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .NETPortable - v4.5 - Profile111 - .NETPortable,Version=v0.0,Profile=Profile111 - $(DefineConstants);PORTABLE;ASYNC;NETFX_CORE - $(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets - - - + $(DefineConstants);ASYNC;NETFX_CORE - - - $(DefineConstants);ASYNC;NETFX_CORE - - - - $(DefineConstants);ASYNC;NETFX_CORE - - - - - - - All + + All - + + diff --git a/src/ShareFile.Api.Client/Transfers/Downloaders/AsyncMemoryMappedFileDownloader.cs b/src/ShareFile.Api.Client/Transfers/Downloaders/AsyncMemoryMappedFileDownloader.cs index e936f0b..7a9f87e 100644 --- a/src/ShareFile.Api.Client/Transfers/Downloaders/AsyncMemoryMappedFileDownloader.cs +++ b/src/ShareFile.Api.Client/Transfers/Downloaders/AsyncMemoryMappedFileDownloader.cs @@ -38,7 +38,6 @@ private MemoryMappedFile CreateMemoryMappedFile(FileStream fileStream) mapName: null, capacity: fileSize, access: MemoryMappedFileAccess.ReadWrite, - memoryMappedFileSecurity: null, inheritability: HandleInheritability.None, leaveOpen: false); } diff --git a/src/ShareFile.Api.Client/Transfers/StreamWrapper.cs b/src/ShareFile.Api.Client/Transfers/StreamWrapper.cs index 62cf636..9dcc87e 100644 --- a/src/ShareFile.Api.Client/Transfers/StreamWrapper.cs +++ b/src/ShareFile.Api.Client/Transfers/StreamWrapper.cs @@ -2,9 +2,6 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -#if !PORTABLE && !NETSTANDARD1_3 -using System.Runtime.Remoting; -#endif namespace ShareFile.Api.Client.Transfers { @@ -45,7 +42,7 @@ public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, Asy public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state) => stream.BeginWrite(buffer, offset, count, callback, state); public override void Close() => stream.Close(); - public override ObjRef CreateObjRef(Type requestedType) => stream.CreateObjRef(requestedType); + //public System.Runtime.Remoting.ObjRef CreateObjRef(Type requestedType) => stream.CreateObjRef(requestedType); public override int EndRead(IAsyncResult asyncResult) => stream.EndRead(asyncResult); public override void EndWrite(IAsyncResult asyncResult) => stream.EndWrite(asyncResult); public override object InitializeLifetimeService() => stream.InitializeLifetimeService(); diff --git a/src/ShareFile.Api.Client/Transfers/Uploaders/AsyncMemoryMappedFileUploader.cs b/src/ShareFile.Api.Client/Transfers/Uploaders/AsyncMemoryMappedFileUploader.cs index 2521a26..b623910 100644 --- a/src/ShareFile.Api.Client/Transfers/Uploaders/AsyncMemoryMappedFileUploader.cs +++ b/src/ShareFile.Api.Client/Transfers/Uploaders/AsyncMemoryMappedFileUploader.cs @@ -75,7 +75,6 @@ private MemoryMappedFile CreateMemoryMappedFile() mapName: Guid.NewGuid().ToString(), // no collisions with other files capacity: 0, // disk file size access: MemoryMappedFileAccess.Read, - memoryMappedFileSecurity: null, // docs say ok inheritability: HandleInheritability.None, // single process leaveOpen: true); // caller disposes filestream }