Skip to content

🌿 Fern Regeneration -- May 27, 2024 #16

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

Merged
merged 1 commit into from
May 27, 2024
Merged

🌿 Fern Regeneration -- May 27, 2024 #16

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
20 changes: 10 additions & 10 deletions src/Merge.Client.sln
View file
Open in desktop
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", "{07D9AD3E-9BCE-488C-A44A-C0A3C8310C24}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Merge.Client", "Merge.Client\Merge.Client.csproj", "{31F9475D-AC14-401A-8ED2-A9BACF4FA24D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Merge.Client.Test", "Merge.Client.Test\Merge.Client.Test.csproj", "{D045D7B7-4D24-4F41-A9C7-DE88A421B6FC}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Merge.Client.Test", "Merge.Client.Test\Merge.Client.Test.csproj", "{C7706E95-22FC-4F98-B44D-9D683BE2289F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -16,13 +16,13 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{07D9AD3E-9BCE-488C-A44A-C0A3C8310C24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{07D9AD3E-9BCE-488C-A44A-C0A3C8310C24}.Debug|Any CPU.Build.0 = Debug|Any CPU
{07D9AD3E-9BCE-488C-A44A-C0A3C8310C24}.Release|Any CPU.ActiveCfg = Release|Any CPU
{07D9AD3E-9BCE-488C-A44A-C0A3C8310C24}.Release|Any CPU.Build.0 = Release|Any CPU
{D045D7B7-4D24-4F41-A9C7-DE88A421B6FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D045D7B7-4D24-4F41-A9C7-DE88A421B6FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D045D7B7-4D24-4F41-A9C7-DE88A421B6FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D045D7B7-4D24-4F41-A9C7-DE88A421B6FC}.Release|Any CPU.Build.0 = Release|Any CPU
{31F9475D-AC14-401A-8ED2-A9BACF4FA24D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{31F9475D-AC14-401A-8ED2-A9BACF4FA24D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{31F9475D-AC14-401A-8ED2-A9BACF4FA24D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{31F9475D-AC14-401A-8ED2-A9BACF4FA24D}.Release|Any CPU.Build.0 = Release|Any CPU
{C7706E95-22FC-4F98-B44D-9D683BE2289F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C7706E95-22FC-4F98-B44D-9D683BE2289F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C7706E95-22FC-4F98-B44D-9D683BE2289F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C7706E95-22FC-4F98-B44D-9D683BE2289F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
6 changes: 3 additions & 3 deletions src/Merge.Client/Core/Environments.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ namespace Merge.Client.Core;

public class Environments
{
public static string PRODUCTION = "https://api.merge.dev";
public static string PRODUCTION = "https://api.merge.dev/api";

public static string SANDBOX = "https://api-sandbox.merge.dev";
public static string SANDBOX = "https://api-sandbox.merge.dev/api";

public static string PRODUCTION_EU = "https://api-eu.merge.dev";
public static string PRODUCTION_EU = "https://api-eu.merge.dev/api";
}
2 changes: 1 addition & 1 deletion src/Merge.Client/Merge.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<NuGetAudit>false</NuGetAudit>
<Version>0.0.7</Version>
<Version>0.0.8</Version>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageProjectUrl>https://github.com/merge-api/merge-csharp-client</PackageProjectUrl>
Expand Down
12 changes: 6 additions & 6 deletions src/Merge.Client/Merge.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,27 +25,27 @@ public Merge(
{ "X-Account-Token", accountToken },
{ "X-Fern-Language", "C#" },
{ "X-Fern-SDK-Name", "Merge.Client" },
{ "X-Fern-SDK-Version", "0.0.7" },
{ "X-Fern-SDK-Version", "0.0.8" },
},
clientOptions ?? new ClientOptions()
);
Ats = new AtsClient(_client);
Crm = new CrmClient(_client);
Filestorage = new FilestorageClient(_client);
Hris = new HrisClient(_client);
Ticketing = new TicketingClient(_client);
Crm = new CrmClient(_client);
Hris = new HrisClient(_client);
Accounting = new AccountingClient(_client);
}

public AtsClient Ats { get; }

public FilestorageClient Filestorage { get; }
public CrmClient Crm { get; }

public HrisClient Hris { get; }
public FilestorageClient Filestorage { get; }

public TicketingClient Ticketing { get; }

public CrmClient Crm { get; }
public HrisClient Hris { get; }

public AccountingClient Accounting { get; }

Expand Down