Skip to content

Adjust TrackingCategories property types #42

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
Feb 25, 2025
Merged

Adjust TrackingCategories property types #42

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
62 changes: 1 addition & 61 deletions reference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11475,64 +11475,4 @@ await client.Filestorage.Passthrough.CreateAsync(


</dd>
</dl>
</details>

## Filestorage RegenerateKey
<details><summary><code>client.Filestorage.RegenerateKey.<a href="/src/Merge.Client/Filestorage/RegenerateKey/RegenerateKeyClient.cs">CreateAsync</a>(RemoteKeyForRegenerationRequest { ... }) -> Filestorage.RemoteKey</code></summary>
<dl>
<dd>

#### 📝 Description

<dl>
<dd>

<dl>
<dd>

Exchange remote keys.
</dd>
</dl>
</dd>
</dl>

#### 🔌 Usage

<dl>
<dd>

<dl>
<dd>

```csharp
await client.Filestorage.RegenerateKey.CreateAsync(
new RemoteKeyForRegenerationRequest { Name = "Remote Deployment Key 1" }
);
```
</dd>
</dl>
</dd>
</dl>

#### ⚙️ Parameters

<dl>
<dd>

<dl>
<dd>

**request:** `RemoteKeyForRegenerationRequest`

</dd>
</dl>
</dd>
</dl>


</dd>
</dl>
</details>

## Filestorage SyncStatus
</dl>
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", "{B4C8E526-3750-4397-987D-39CB13E87572}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Merge.Client", "Merge.Client\Merge.Client.csproj", "{99CD0E0D-82DE-4D05-9ABF-5B67B4058FC8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Merge.Client.Test", "Merge.Client.Test\Merge.Client.Test.csproj", "{05522DC0-DBF4-4703-984E-24331AAF6D41}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Merge.Client.Test", "Merge.Client.Test\Merge.Client.Test.csproj", "{EF07BAED-762B-45DE-A732-0FA850FDEB9C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -16,13 +16,13 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B4C8E526-3750-4397-987D-39CB13E87572}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B4C8E526-3750-4397-987D-39CB13E87572}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B4C8E526-3750-4397-987D-39CB13E87572}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B4C8E526-3750-4397-987D-39CB13E87572}.Release|Any CPU.Build.0 = Release|Any CPU
{05522DC0-DBF4-4703-984E-24331AAF6D41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{05522DC0-DBF4-4703-984E-24331AAF6D41}.Debug|Any CPU.Build.0 = Debug|Any CPU
{05522DC0-DBF4-4703-984E-24331AAF6D41}.Release|Any CPU.ActiveCfg = Release|Any CPU
{05522DC0-DBF4-4703-984E-24331AAF6D41}.Release|Any CPU.Build.0 = Release|Any CPU
{99CD0E0D-82DE-4D05-9ABF-5B67B4058FC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{99CD0E0D-82DE-4D05-9ABF-5B67B4058FC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{99CD0E0D-82DE-4D05-9ABF-5B67B4058FC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{99CD0E0D-82DE-4D05-9ABF-5B67B4058FC8}.Release|Any CPU.Build.0 = Release|Any CPU
{EF07BAED-762B-45DE-A732-0FA850FDEB9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EF07BAED-762B-45DE-A732-0FA850FDEB9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EF07BAED-762B-45DE-A732-0FA850FDEB9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EF07BAED-762B-45DE-A732-0FA850FDEB9C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion src/Merge.Client/Accounting/Types/GeneralLedgerTransactionLine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ public record GeneralLedgerTransactionLine
public string? Description { get; set; }

[JsonPropertyName("tracking_categories")]
public IEnumerable<TrackingCategory>? TrackingCategories { get; set; }
public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; set; }

[JsonPropertyName("debit_amount")]
public required string DebitAmount { get; set; }
Expand Down
3 changes: 2 additions & 1 deletion src/Merge.Client/Accounting/Types/RemoteField.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
using System.Text.Json.Serialization;
using Merge.Client.Core;
using OneOf;

namespace Merge.Client.Accounting;

public record RemoteField
{
[JsonPropertyName("remote_field_class")]
public required RemoteFieldClass RemoteFieldClass { get; set; }
public required OneOf<string, RemoteFieldClass> RemoteFieldClass { get; set; }

[JsonPropertyName("value")]
public Dictionary<string, object?>? Value { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion src/Merge.Client/Core/Public/Version.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ namespace Merge.Client;

internal class Version
{
public const string Current = "1.0.1";
public const string Current = "1.0.2";
}
2 changes: 1 addition & 1 deletion src/Merge.Client/Crm/Types/RemoteField.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public record RemoteField
public required OneOf<string, RemoteFieldClass> RemoteFieldClass { get; set; }

[JsonPropertyName("value")]
public object? Value { get; set; }
public Dictionary<string, object?>? Value { get; set; }

public override string ToString()
{
Expand Down
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 @@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>12</LangVersion>
<Nullable>enable</Nullable>
<Version>1.0.1</Version>
<Version>1.0.2</Version>
<AssemblyVersion>$(Version)</AssemblyVersion>
<FileVersion>$(Version)</FileVersion>
<PackageReadmeFile>README.md</PackageReadmeFile>
Expand Down
2 changes: 1 addition & 1 deletion src/Merge.Client/Merge.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
new Dictionary<string, string>()
{
{ "Authorization", $"Bearer {apiKey}" },
{ "X-Account-Token", accountToken },

Check warning on line 25 in src/Merge.Client/Merge.cs

View workflow job for this annotation

GitHub Actions / compile 

Possible null reference argument for parameter 'value' in 'void Dictionary<string, string>.Add(string key, string value)'.

Check warning on line 25 in src/Merge.Client/Merge.cs

View workflow job for this annotation

GitHub Actions / compile 

Possible null reference argument for parameter 'value' in 'void Dictionary<string, string>.Add(string key, string value)'.

Check warning on line 25 in src/Merge.Client/Merge.cs

View workflow job for this annotation

GitHub Actions / compile 

Possible null reference argument for parameter 'value' in 'void Dictionary<string, string>.Add(string key, string value)'.

Check warning on line 25 in src/Merge.Client/Merge.cs

View workflow job for this annotation

GitHub Actions / unit-tests 

Possible null reference argument for parameter 'value' in 'void Dictionary<string, string>.Add(string key, string value)'.

Check warning on line 25 in src/Merge.Client/Merge.cs

View workflow job for this annotation

GitHub Actions / unit-tests 

Possible null reference argument for parameter 'value' in 'void Dictionary<string, string>.Add(string key, string value)'.

Check warning on line 25 in src/Merge.Client/Merge.cs

View workflow job for this annotation

GitHub Actions / unit-tests 

Possible null reference argument for parameter 'value' in 'void Dictionary<string, string>.Add(string key, string value)'.
{ "X-Fern-Language", "C#" },
{ "X-Fern-SDK-Name", "Merge.Client" },
{ "X-Fern-SDK-Version", Version.Current },
{ "User-Agent", "Merge.Client/1.0.1" },
{ "User-Agent", "Merge.Client/1.0.2" },
}
);
clientOptions ??= new ClientOptions();
Expand Down
2 changes: 1 addition & 1 deletion src/Merge.Client/Ticketing/Types/RemoteField.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public record RemoteField
public required OneOf<string, RemoteFieldClass> RemoteFieldClass { get; set; }

[JsonPropertyName("value")]
public object? Value { get; set; }
public Dictionary<string, object?>? Value { get; set; }

public override string ToString()
{
Expand Down
2 changes: 1 addition & 1 deletion src/Merge.Client/Ticketing/Types/RemoteFieldRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public record RemoteFieldRequest
public required OneOf<string, RemoteFieldClass> RemoteFieldClass { get; set; }

[JsonPropertyName("value")]
public string? Value { get; set; }
public object? Value { get; set; }

public override string ToString()
{
Expand Down
Loading