Merge pull request #42 from merge-api/fern-bot/02-25-2025-0516PM

rmkonnur · web-flow · commit 067165f5dba4 · 2025-02-25T09:18:29.000-08:00
Adjust TrackingCategories property types
diff --git a/reference.md b/reference.md
@@ -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>
diff --git 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", "{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
@@ -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
diff --git a/src/Merge.Client/Accounting/Types/GeneralLedgerTransactionLine.cs b/src/Merge.Client/Accounting/Types/GeneralLedgerTransactionLine.cs
@@ -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; }
diff --git a/src/Merge.Client/Accounting/Types/RemoteField.cs b/src/Merge.Client/Accounting/Types/RemoteField.cs
@@ -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; }
diff --git a/src/Merge.Client/Core/Public/Version.cs b/src/Merge.Client/Core/Public/Version.cs
@@ -2,5 +2,5 @@ namespace Merge.Client;
 
 internal class Version
 {
-    public const string Current = "1.0.1";
+    public const string Current = "1.0.2";
 }
diff --git a/src/Merge.Client/Crm/Types/RemoteField.cs b/src/Merge.Client/Crm/Types/RemoteField.cs
@@ -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()
     {
diff --git a/src/Merge.Client/Merge.Client.csproj b/src/Merge.Client/Merge.Client.csproj
@@ -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>
diff --git a/src/Merge.Client/Merge.cs b/src/Merge.Client/Merge.cs
@@ -26,7 +26,7 @@ public Merge(
                 { "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();
diff --git a/src/Merge.Client/Ticketing/Types/RemoteField.cs b/src/Merge.Client/Ticketing/Types/RemoteField.cs
@@ -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()
     {
diff --git a/src/Merge.Client/Ticketing/Types/RemoteFieldRequest.cs b/src/Merge.Client/Ticketing/Types/RemoteFieldRequest.cs
@@ -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()
     {

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@ namespace Merge.Client;`
`2`	`2`
`3`	`3`	`internal class Version`
`4`	`4`	`{`
`5`		`- public const string Current = "1.0.1";`
	`5`	`+ public const string Current = "1.0.2";`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public record RemoteField`
`10`	`10`	`public required OneOf<string, RemoteFieldClass> RemoteFieldClass { get; set; }`
`11`	`11`
`12`	`12`	`[JsonPropertyName("value")]`
`13`		`- public object? Value { get; set; }`
	`13`	`+ public Dictionary<string, object?>? Value { get; set; }`
`14`	`14`
`15`	`15`	`public override string ToString()`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public Merge(`
`26`	`26`	`{ "X-Fern-Language", "C#" },`
`27`	`27`	`{ "X-Fern-SDK-Name", "Merge.Client" },`
`28`	`28`	`{ "X-Fern-SDK-Version", Version.Current },`
`29`		`- { "User-Agent", "Merge.Client/1.0.1" },`
	`29`	`+ { "User-Agent", "Merge.Client/1.0.2" },`
`30`	`30`	`}`
`31`	`31`	`);`
`32`	`32`	`clientOptions ??= new ClientOptions();`