Skip to content
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.

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

Added clean support for .net standard 2.0... thus .NET CORE #167

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions MYOB.API.SDK.sln
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
MYOB.API.SDK\SDK.Package\Package.nuspec = MYOB.API.SDK\SDK.Package\Package.nuspec
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SDK.FULL", "MYOB.API.SDK\SDK.FULL\SDK.FULL.csproj", "{4BAA30E0-3CBA-4150-A478-71306B659E6E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -52,6 +54,10 @@ Global
{33DD5156-E3B7-47FC-913D-5216019146A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{33DD5156-E3B7-47FC-913D-5216019146A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{33DD5156-E3B7-47FC-913D-5216019146A7}.Release|Any CPU.Build.0 = Release|Any CPU
{4BAA30E0-3CBA-4150-A478-71306B659E6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4BAA30E0-3CBA-4150-A478-71306B659E6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4BAA30E0-3CBA-4150-A478-71306B659E6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4BAA30E0-3CBA-4150-A478-71306B659E6E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
523 changes: 523 additions & 0 deletions MYOB.API.SDK/SDK.FULL/SDK.FULL.csproj

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions MYOB.API.SDK/SDK.NET35/SDK.NET35.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>$(SolutionDir)\Artefacts\SDK\Ship\NET35\</OutputPath>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<DefineConstants>TRACE;DEBUG;NET35</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>$(SolutionDir)\Artefacts\SDK\Ship\NET35\MYOB.AccountRight.SDK.XML</DocumentationFile>
Expand All @@ -31,7 +31,7 @@
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>$(SolutionDir)\Artefacts\SDK\Ship\NET35\</OutputPath>
<DefineConstants>TRACE;COMPRESSION</DefineConstants>
<DefineConstants>TRACE;NET35;COMPRESSION</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>$(SolutionDir)\Artefacts\SDK\Ship\NET35\MYOB.AccountRight.SDK.XML</DocumentationFile>
Expand Down
4 changes: 2 additions & 2 deletions MYOB.API.SDK/SDK.NET40/SDK.NET40.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>$(SolutionDir)\Artefacts\SDK\Ship\NET40\</OutputPath>
<DefineConstants>TRACE;DEBUG;ASYNC</DefineConstants>
<DefineConstants>TRACE;DEBUG;ASYNC;NET40</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>$(SolutionDir)\Artefacts\SDK\Ship\NET40\MYOB.AccountRight.SDK.XML</DocumentationFile>
Expand All @@ -31,7 +31,7 @@
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>$(SolutionDir)\Artefacts\SDK\Ship\NET40\</OutputPath>
<DefineConstants>TRACE;ASYNC, COMPRESSION</DefineConstants>
<DefineConstants>TRACE;ASYNC;NET40, COMPRESSION</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>$(SolutionDir)\Artefacts\SDK\Ship\NET40\MYOB.AccountRight.SDK.XML</DocumentationFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#if NET35
#else
#if NET40
#else
namespace MYOB.AccountRight.SDK.Contracts.Version2.Banking
{
/// <summary>
Expand Down Expand Up @@ -26,3 +30,5 @@ public class SpendMoneyAttachmentData : BaseEntity
public string FileBase64Content { get; set; }
}
}
#endif
#endif
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#if NET35
#else
#if NET40
#else
using System;
using System.Collections.Generic;

Expand All @@ -14,3 +18,5 @@ public class SpendMoneyAttachmentWrapper : BaseEntity
public List<SpendMoneyAttachmentData> Attachments;
}
}
#endif
#endif
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#if NET35
#else
#if NET40
#else
namespace MYOB.AccountRight.SDK.Contracts.Version2.Purchase
{
/// <summary>
Expand Down Expand Up @@ -26,3 +30,5 @@ public class BillAttachmentData : BaseEntity
public string FileBase64Content { get; set; }
}
}
#endif
#endif
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#if NET35
#else
#if NET40
#else
using System;
using System.Collections.Generic;

Expand All @@ -14,3 +18,5 @@ public class BillAttachmentWrapper : BaseEntity
public List<BillAttachmentData> Attachments;
}
}
#endif
#endif
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#if NET35
#else
#if NET40
#else
using System;
using System.Collections.Generic;

Expand All @@ -24,3 +28,5 @@ public class BillAttachmentsData : BaseEntity
public string BillLayout;
}
}
#endif
#endif

This file was deleted.

4 changes: 2 additions & 2 deletions MYOB.API.SDK/SDK.NET45/SDK.NET45.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>$(SolutionDir)\Artefacts\SDK\Ship\NET45\</OutputPath>
<DefineConstants>TRACE;DEBUG;ASYNC</DefineConstants>
<DefineConstants>TRACE;DEBUG;ASYNC;NET45</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
Expand All @@ -32,7 +32,7 @@
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>$(SolutionDir)\Artefacts\SDK\Ship\NET45\</OutputPath>
<DefineConstants>TRACE;ASYNC, COMPRESSION</DefineConstants>
<DefineConstants>TRACE;ASYNC;NET45, COMPRESSION</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#if NET35
#else
#if NET40
#else
using System;
using MYOB.AccountRight.SDK.Communication;
using MYOB.AccountRight.SDK.Contracts;
Expand Down Expand Up @@ -35,7 +39,7 @@ public override string Route
get { return "Banking/SpendMoney/{uid}/Attachment"; }
}

#region Insert Operations
#region Insert Operations

/// <summary>
/// Adds an Attachment to a Spend Money
Expand Down Expand Up @@ -70,9 +74,9 @@ public Task<SpendMoneyAttachmentWrapper> InsertExAsync(CompanyFile cf, SpendMone


#endif
#endregion
#endregion

#region Delete Operations
#region Delete Operations


/// <summary>
Expand Down Expand Up @@ -106,9 +110,9 @@ public Task DeleteAsync(CompanyFile cf, Guid spendMoneyUid, Guid attachmentUid,
}
#endif

#endregion
#endregion

#region Get Operations
#region Get Operations

/// <summary>
/// Gets an Spend Money Attachment object
Expand Down Expand Up @@ -138,9 +142,9 @@ public Task<SpendMoneyAttachmentWrapper> GetAsync(CompanyFile cf, Guid spendMone
return MakeApiGetRequestAsync<SpendMoneyAttachmentWrapper>(BuildUri(cf, spendMoneyUid, attachmentUid), credentials, CancellationToken.None, eTag);
}

#endregion
#endregion

#region Base Class Overrides
#region Base Class Overrides

/// <summary>
/// DO NOT USE THIS INHERITED MEMBER
Expand Down Expand Up @@ -573,7 +577,7 @@ public override Task<SpendMoneyAttachmentWrapper> UpdateExAsync(CompanyFile cf,
throw new NotImplementedException();
}

#endregion
#endregion


/// <exclude/>
Expand Down Expand Up @@ -602,3 +606,5 @@ public Uri BuildUri(CompanyFile companyFile, Guid spendMoneyUid, Guid? attachmen
}
}
}
#endif
#endif
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#if NET35
#else
#if NET40
#else
using MYOB.AccountRight.SDK.Communication;
using MYOB.AccountRight.SDK.Contracts.Version2.Inventory;

Expand Down Expand Up @@ -28,3 +32,5 @@ public override string Route
}
}
}
#endif
#endif
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#if NET35
#else
#if NET40
#else
using MYOB.AccountRight.SDK.Communication;
using MYOB.AccountRight.SDK.Contracts;
using MYOB.AccountRight.SDK.Contracts.Version2.Purchase;
Expand Down Expand Up @@ -262,3 +266,5 @@ private string GenerateQueryString(ErrorLevel errorLevel, bool returnBody = fals
}
}
}
#endif
#endif
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#if NET35
#else
#if NET40
#else
using MYOB.AccountRight.SDK.Communication;
using MYOB.AccountRight.SDK.Contracts;
using MYOB.AccountRight.SDK.Contracts.Version2;
Expand Down Expand Up @@ -623,3 +627,5 @@ public Uri BuildUri(CompanyFile companyFile, Guid billUid, Guid? attachmentUid =
}
}
}
#endif
#endif
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#if NET35
#else
#if NET40
#else
using MYOB.AccountRight.SDK.Communication;
using MYOB.AccountRight.SDK.Contracts;
using MYOB.AccountRight.SDK.Contracts.Version2;
Expand Down Expand Up @@ -623,3 +627,5 @@ public Uri BuildUri(CompanyFile companyFile, Guid billUid, Guid? attachmentUid =
}
}
}
#endif
#endif
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#if NET35
#else
#if NET40
#else
using MYOB.AccountRight.SDK.Communication;
using MYOB.AccountRight.SDK.Contracts;
using MYOB.AccountRight.SDK.Contracts.Version2;
Expand Down Expand Up @@ -623,3 +627,5 @@ public Uri BuildUri(CompanyFile companyFile, Guid billUid, Guid? attachmentUid =
}
}
}
#endif
#endif
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#if NET35
#else
#if NET40
#else
using MYOB.AccountRight.SDK.Communication;
using MYOB.AccountRight.SDK.Contracts;
using MYOB.AccountRight.SDK.Contracts.Version2;
Expand Down Expand Up @@ -623,3 +627,5 @@ public Uri BuildUri(CompanyFile companyFile, Guid billUid, Guid? attachmentUid =
}
}
}
#endif
#endif
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
using MYOB.AccountRight.SDK.Communication;
#if NET35
#else
#if NET40
#else
using MYOB.AccountRight.SDK.Communication;
using MYOB.AccountRight.SDK.Contracts.Version2.Report.BalanceSheetSummary;

namespace MYOB.AccountRight.SDK.Services
Expand Down Expand Up @@ -28,3 +32,5 @@ public override string Route
}
}
}
#endif
#endif