From de4d9319b1da4be42380cbf7999561e36a45dbaf Mon Sep 17 00:00:00 2001 From: fern-api <115122769+fern-api[bot]@users.noreply.github.com> Date: Wed, 22 May 2024 16:15:03 +0000 Subject: [PATCH] SDK regeneration --- .github/workflows/ci.yml | 6 ++++-- src/Merge.Client.sln | 20 ++++++++++---------- src/Merge.Client/Merge.Client.csproj | 11 ++++++++--- src/Merge.Client/Merge.cs | 14 +++++++------- 4 files changed, 29 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e8e9fde1..d87e5074 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,6 +24,7 @@ jobs: - name: Build Release run: dotnet build src -c Release /p:ContinuousIntegrationBuild=true + publish: needs: [compile] if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') @@ -40,6 +41,7 @@ jobs: - name: Publish env: - NUGET_API_KEY: ${{ secrets.MERGE_NUGET_TOKEN }} + NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }} run: | - dotnet nuget push nuget/*.nupkg --api-key ${{ secrets.MERGE_NUGET_TOKEN }} --source "nuget.org" + dotnet pack src -c Release + dotnet nuget push src/Merge.Client/bin/Release/*.nupkg --api-key $NUGET_API_KEY --source "nuget.org" diff --git a/src/Merge.Client.sln b/src/Merge.Client.sln index 71ff8c23..5d2ed4af 100644 --- a/src/Merge.Client.sln +++ b/src/Merge.Client.sln @@ -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", "{EF167235-17EB-4623-8F0B-669EFF416B01}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Merge.Client", "Merge.Client\Merge.Client.csproj", "{BCAADF75-9A76-493F-A657-694B631F7E13}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Merge.Client.Test", "Merge.Client.Test\Merge.Client.Test.csproj", "{DAFC2B0B-AF43-4879-B81B-6D6F20DC9D50}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Merge.Client.Test", "Merge.Client.Test\Merge.Client.Test.csproj", "{5F0D4BA3-F521-4AE0-B71C-CD8FB6E082BF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -16,13 +16,13 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EF167235-17EB-4623-8F0B-669EFF416B01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF167235-17EB-4623-8F0B-669EFF416B01}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF167235-17EB-4623-8F0B-669EFF416B01}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF167235-17EB-4623-8F0B-669EFF416B01}.Release|Any CPU.Build.0 = Release|Any CPU - {DAFC2B0B-AF43-4879-B81B-6D6F20DC9D50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DAFC2B0B-AF43-4879-B81B-6D6F20DC9D50}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DAFC2B0B-AF43-4879-B81B-6D6F20DC9D50}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DAFC2B0B-AF43-4879-B81B-6D6F20DC9D50}.Release|Any CPU.Build.0 = Release|Any CPU + {BCAADF75-9A76-493F-A657-694B631F7E13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BCAADF75-9A76-493F-A657-694B631F7E13}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BCAADF75-9A76-493F-A657-694B631F7E13}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BCAADF75-9A76-493F-A657-694B631F7E13}.Release|Any CPU.Build.0 = Release|Any CPU + {5F0D4BA3-F521-4AE0-B71C-CD8FB6E082BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5F0D4BA3-F521-4AE0-B71C-CD8FB6E082BF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5F0D4BA3-F521-4AE0-B71C-CD8FB6E082BF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5F0D4BA3-F521-4AE0-B71C-CD8FB6E082BF}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal diff --git a/src/Merge.Client/Merge.Client.csproj b/src/Merge.Client/Merge.Client.csproj index 4e30294b..3e88e833 100644 --- a/src/Merge.Client/Merge.Client.csproj +++ b/src/Merge.Client/Merge.Client.csproj @@ -1,18 +1,23 @@ + net7.0 enable false - 0.0.3 + v0.0.5 README.md LICENSE - https://github.com/merge/merge-csharp-client + https://github.com/merge-api/merge-csharp-client + + + + - \ No newline at end of file + diff --git a/src/Merge.Client/Merge.cs b/src/Merge.Client/Merge.cs index c6f8d851..c4774195 100644 --- a/src/Merge.Client/Merge.cs +++ b/src/Merge.Client/Merge.cs @@ -24,29 +24,29 @@ public Merge( { "Authorization", $"Bearer {apiKey}" }, { "X-Account-Token", accountToken }, { "X-Fern-Language", "C#" }, - { "X-Fern-SDK-Name", "Merge.Client" }, - { "X-Fern-SDK-Version", "0.0.3" }, + { "X-Fern-SDK-Name", "merge_fern_api_sdk" }, + { "X-Fern-SDK-Version", "v0.0.5" }, }, 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)