Merge pull request #44 from SharpGrip/43-409-when-overwriting-existing-blobs-with-blobcontainerclient

mvdgun · web-flow · commit 9c844129faae · 2024-08-31T12:01:10.000-04:00
fix conflict when blob already exists
diff --git a/FileSystem.Adapters.AzureBlobStorage/src/AzureBlobStorageAdapter.cs b/FileSystem.Adapters.AzureBlobStorage/src/AzureBlobStorageAdapter.cs
@@ -237,7 +237,7 @@ public override async Task WriteFileAsync(string virtualPath, Stream contents, b
             {
                 contents.Seek(0, SeekOrigin.Begin);
 
-                await client.UploadBlobAsync(path, contents, cancellationToken);
+                await client.GetBlobClient(path).UploadAsync(contents, true, cancellationToken);
             }
             catch (Exception exception)
             {
diff --git a/FileSystem.Adapters.MicrosoftOneDrive/FileSystem.Adapters.MicrosoftOneDrive.csproj b/FileSystem.Adapters.MicrosoftOneDrive/FileSystem.Adapters.MicrosoftOneDrive.csproj
@@ -18,7 +18,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Graph" Version="4.54.0" />
-        <PackageReference Include="Microsoft.Identity.Client" Version="4.61.1" />
+        <PackageReference Include="Microsoft.Identity.Client" Version="4.64.0" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ public override async Task WriteFileAsync(string virtualPath, Stream contents, b`
`237`	`237`	`{`
`238`	`238`	`contents.Seek(0, SeekOrigin.Begin);`
`239`	`239`
`240`		`- await client.UploadBlobAsync(path, contents, cancellationToken);`
	`240`	`+ await client.GetBlobClient(path).UploadAsync(contents, true, cancellationToken);`
`241`	`241`	`}`
`242`	`242`	`catch (Exception exception)`
`243`	`243`	`{`