Skip to content

Updated to netstandard2.0 #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fh-daniel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated to netstandard2.0 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/ShareFile.Api.Client/Models/AccountPreferences.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
77 changes: 7 additions & 70 deletions src/ShareFile.Api.Client/ShareFile.Api.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,92 +3,29 @@
<Import Project="..\NuGetInfo.props" />

<PropertyGroup>
<TargetFrameworks>net45;net462;netstandard1.3;portable-net45+win8+wpa81</TargetFrameworks>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AssemblyName>ShareFile.Api.Client</AssemblyName>
<PackageId>ShareFile.Api.Client</PackageId>
<PackageTags>ShareFile</PackageTags>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<NoWarn>1701;1702;1705;1591;1571;1572;1573;1570</NoWarn>
<NoWarn>1701;1702;1705;1591;1571;1572;1573;1570;AD0001</NoWarn>
</PropertyGroup>

<ItemGroup>
<Compile Remove="Internal\**\*.cs" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'portable-net45+win8+wpa81' ">
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<Reference Include="mscorlib" />
<Reference Include="System.Collections" />
<Reference Include="System.ComponentModel" />
<Reference Include="System.Diagnostics.Debug" />
<Reference Include="System.Dynamic.Runtime" />
<Reference Include="System.Globalization" />
<Reference Include="System.IO" />
<Reference Include="System.Linq" />
<Reference Include="System.Linq.Expressions" />
<Reference Include="System.Linq.Queryable" />
<Reference Include="System.Net" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Primitives" />
<Reference Include="System.Net.Requests" />
<Reference Include="System.ObjectModel" />
<Reference Include="System.Reflection" />
<Reference Include="System.Reflection.Extensions" />
<Reference Include="System.Runtime" />
<Reference Include="System.Runtime.Extensions" />
<Reference Include="System.Text.Encoding" />
<Reference Include="System.Text.RegularExpressions" />
<Reference Include="System.Threading" />
<Reference Include="System.Threading.Tasks" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Security" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Security" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'portable-net45+win8+wpa81' ">
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
<NugetTargetMoniker>.NETPortable,Version=v0.0,Profile=Profile111</NugetTargetMoniker>
<DefineConstants>$(DefineConstants);PORTABLE;ASYNC;NETFX_CORE</DefineConstants>
<LanguageTargets>$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets</LanguageTargets>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<DefineConstants>$(DefineConstants);ASYNC;NETFX_CORE</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net462' ">
<DefineConstants>$(DefineConstants);ASYNC;NETFX_CORE</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<DefineConstants>$(DefineConstants);ASYNC;NETFX_CORE</DefineConstants>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="FUR10N.NullContracts" Version="1.0.0-beta5">
<PrivateAssets>All</PrivateAssets>
<PackageReference Include="FUR10N.NullContracts" Version="1.3.4">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Buffers" Version="4.4.0" />
<PackageReference Include="System.Buffers" Version="4.5.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>

</Project>
1 change: 0 additions & 1 deletion src/ShareFile.Api.Client/Transfers/Downloaders/AsyncMemoryMappedFileDownloader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ private MemoryMappedFile CreateMemoryMappedFile(FileStream fileStream)
mapName: null,
capacity: fileSize,
access: MemoryMappedFileAccess.ReadWrite,
memoryMappedFileSecurity: null,
inheritability: HandleInheritability.None,
leaveOpen: false);
}
Expand Down
5 changes: 1 addition & 4 deletions src/ShareFile.Api.Client/Transfers/StreamWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -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();
Expand Down
1 change: 0 additions & 1 deletion src/ShareFile.Api.Client/Transfers/Uploaders/AsyncMemoryMappedFileUploader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down