Merge branch 'master' into owners

bitwarden · Sep 8, 2023 · 017120b · 017120b
2 parents bdee977 + 7196a66
commit 017120b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/crates/bitwarden/src/client/client_settings.rs b/crates/bitwarden/src/client/client_settings.rs
@@ -21,7 +21,7 @@ use serde::{Deserialize, Serialize};
 ///
 /// Targets `localhost:8080` for debug builds.
 #[derive(Serialize, Deserialize, Debug, JsonSchema)]
-#[serde(rename_all = "camelCase", deny_unknown_fields)]
+#[serde(default, rename_all = "camelCase", deny_unknown_fields)]
 #[cfg_attr(feature = "mobile", derive(uniffi::Record))]
 pub struct ClientSettings {
     /// The identity url of the targeted Bitwarden instance. Defaults to `https://identity.bitwarden.com`

diff --git a/languages/csharp/BitwardenSdk.cs b/languages/csharp/BitwardenSdk.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Bit.Sdk
+namespace Bitwarden.Sdk
 {
     internal class BitwardenSdk : IDisposable
     {

diff --git a/languages/csharp/Program.cs b/languages/csharp/Program.cs
@@ -1,4 +1,4 @@
-using Bit.Sdk;
+using Bitwarden.Sdk;
 
 var sdk = new BitwardenSdk();
 sdk.PasswordLogin("[email protected]", "asdfasdf");

diff --git a/languages/csharp/bitwardenSdk.csproj b/languages/csharp/bitwardenSdk.csproj
@@ -5,13 +5,14 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <RootNamespace>Bitwarden.Sdk</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="System.Text.Json" Version="7.0.3" />
   </ItemGroup>
 
-<PropertyGroup >
+<PropertyGroup>
     <!--Debugonly-->
 </PropertyGroup>
 

diff --git a/support/scripts/schemas.ts b/support/scripts/schemas.ts
@@ -56,7 +56,8 @@ async function main() {
     inputData,
     lang: "csharp",
     rendererOptions: {
-      namespace: "Bit.Sdk",
+      namespace: "Bitwarden.Sdk",
+      framework: "SystemTextJson",
       "csharp-version": "6",
     },
   });