Skip to content
Closed
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
20 changes: 10 additions & 10 deletions src/Merge.Client.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Merge.Client", "Merge.Client\Merge.Client.csproj", "{B6D1B0E2-D97A-443B-9EDE-45F05162E3BA}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Merge.Client", "Merge.Client\Merge.Client.csproj", "{21F4F628-3068-4159-A268-50FF3F0D7B60}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Merge.Client.Test", "Merge.Client.Test\Merge.Client.Test.csproj", "{B4268653-60AD-476A-A46A-EB5175F708D5}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Merge.Client.Test", "Merge.Client.Test\Merge.Client.Test.csproj", "{08A8AD25-8B34-4DA3-A8C2-9DAB3CE47529}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -16,13 +16,13 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B6D1B0E2-D97A-443B-9EDE-45F05162E3BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B6D1B0E2-D97A-443B-9EDE-45F05162E3BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B6D1B0E2-D97A-443B-9EDE-45F05162E3BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B6D1B0E2-D97A-443B-9EDE-45F05162E3BA}.Release|Any CPU.Build.0 = Release|Any CPU
{B4268653-60AD-476A-A46A-EB5175F708D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B4268653-60AD-476A-A46A-EB5175F708D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B4268653-60AD-476A-A46A-EB5175F708D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B4268653-60AD-476A-A46A-EB5175F708D5}.Release|Any CPU.Build.0 = Release|Any CPU
{21F4F628-3068-4159-A268-50FF3F0D7B60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{21F4F628-3068-4159-A268-50FF3F0D7B60}.Debug|Any CPU.Build.0 = Debug|Any CPU
{21F4F628-3068-4159-A268-50FF3F0D7B60}.Release|Any CPU.ActiveCfg = Release|Any CPU
{21F4F628-3068-4159-A268-50FF3F0D7B60}.Release|Any CPU.Build.0 = Release|Any CPU
{08A8AD25-8B34-4DA3-A8C2-9DAB3CE47529}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{08A8AD25-8B34-4DA3-A8C2-9DAB3CE47529}.Debug|Any CPU.Build.0 = Debug|Any CPU
{08A8AD25-8B34-4DA3-A8C2-9DAB3CE47529}.Release|Any CPU.ActiveCfg = Release|Any CPU
{08A8AD25-8B34-4DA3-A8C2-9DAB3CE47529}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
4 changes: 2 additions & 2 deletions src/Merge.Client/Merge.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
<TargetFrameworks>net8.0;net7.0;net6.0;</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<NuGetAudit>false</NuGetAudit>
<Version>0.0.10</Version>
<Version>0.0.11</Version>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageProjectUrl>https://github.com/merge-api/merge-csharp-client</PackageProjectUrl>
Expand Down
14 changes: 7 additions & 7 deletions src/Merge.Client/Merge.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,33 +27,33 @@ public Merge(
{ "X-Account-Token", accountToken },
{ "X-Fern-Language", "C#" },
{ "X-Fern-SDK-Name", "Merge.Client" },
{ "X-Fern-SDK-Version", "0.0.10" },
{ "X-Fern-SDK-Version", "0.0.11" },
},
clientOptions ?? new ClientOptions()
);
Ats = new AtsClient(_client);
Filestorage = new FilestorageClient(_client);
Crm = new CrmClient(_client);
Ticketing = new TicketingClient(_client);
Filestorage = new FilestorageClient(_client);
Hris = new HrisClient(_client);
Ticketing = new TicketingClient(_client);
Accounting = new AccountingClient(_client);
}

public AtsClient Ats { get; }

public FilestorageClient Filestorage { get; }

public CrmClient Crm { get; }

public TicketingClient Ticketing { get; }
public FilestorageClient Filestorage { get; }

public HrisClient Hris { get; }

public TicketingClient Ticketing { get; }

public AccountingClient Accounting { get; }

private string GetFromEnvironmentOrThrow(string env, string message)
{
var value = Environment.GetEnvironmentVariable(env);
var value = System.Environment.GetEnvironmentVariable(env);
if (value == null)
{
throw new Exception(message);
Expand Down