Fix Azure Storage RunAsEmulator
#5084
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dotnet-issue-labeler
bot
added
the
area-codeflow
mitchdenny
approved these changes
Jul 26, 2024
tests/Aspire.Hosting.Azure.Tests/Aspire.Hosting.Azure.Tests.csproj
Outdated
Show resolved
Hide resolved
eerhardt
approved these changes
Jul 26, 2024
|
/backport to release/8.1 |
|
Started backporting to release/8.1: https://github.com/dotnet/aspire/actions/runs/10112049832 |
|
@eerhardt backporting to release/8.1 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: [tests] Add AzureStorageEmulatorFunctionalTests
Using index info to reconstruct a base tree...
A tests/Aspire.Hosting.Azure.Tests/Aspire.Hosting.Azure.Tests.csproj
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): tests/Aspire.Hosting.Azure.Tests/Aspire.Hosting.Azure.Tests.csproj deleted in HEAD and modified in [tests] Add AzureStorageEmulatorFunctionalTests. Version [tests] Add AzureStorageEmulatorFunctionalTests of tests/Aspire.Hosting.Azure.Tests/Aspire.Hosting.Azure.Tests.csproj left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 [tests] Add AzureStorageEmulatorFunctionalTests
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@eerhardt an error occurred while backporting to release/8.1, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
3 tasks
radical
commented
Jul 26, 2024
Comment on lines
+35
to
+41
| var blobContainer = (await serviceClient.CreateBlobContainerAsync("container")).Value; | ||
| var blobClient = blobContainer.GetBlobClient("testKey"); | ||
|
|
||
| await blobClient.UploadAsync(BinaryData.FromString("testValue")); | ||
|
|
||
| var downloadResult = (await blobClient.DownloadContentAsync()).Value; | ||
| Assert.Equal("testValue", downloadResult.Content.ToString()); |
radical
added a commit
to radical/aspire
that referenced
this pull request
Jul 30, 2024
commit c680699 Merge: 9e48bf0 8b603ea Author: Ankit Jain <radical@gmail.com> Date: Fri Jul 26 18:14:38 2024 -0400 Merge remote-tracking branch 'origin/main' into playground-tests-prep commit 9e48bf0 Author: Ankit Jain <radical@gmail.com> Date: Fri Jul 26 18:14:29 2024 -0400 Fix up import conditions commit b1726a2 Author: Ankit Jain <radical@gmail.com> Date: Fri Jul 26 17:54:59 2024 -0400 Update Aspire.sln to track the project name changes commit 8b603ea Author: Ankit Jain <radical@gmail.com> Date: Fri Jul 26 14:57:19 2024 -0400 Fix Azure Storage `RunAsEmulator` (dotnet#5084) * [tests] Add AzureStorageEmulatorFunctionalTests * Bump azurite from 3.30.0 to 3.31.0 Issue: dotnet#5078 * Address PR feedback --------- Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com> commit bc27dba Author: Ankit Jain <radical@gmail.com> Date: Thu Jul 25 18:20:53 2024 -0400 [playground] Update all ProjectReferences to AspireProjectOrPackageReference. And skip Dashboard.csproj when building for testing commit 13a1550 Author: Ankit Jain <radical@gmail.com> Date: Thu Jul 25 17:26:42 2024 -0400 [playground] Add top level Directory.Build.{props,targets} And use Aspire.RepoTesting.* to allow testing and this replaces the per-project sdk imports. commit 6d84aee Author: Ankit Jain <radical@gmail.com> Date: Thu Jul 25 17:31:49 2024 -0400 [playground] Rename AppHost projects to be named consistently .. with `.AppHost` suffix. `Aspire.Hosting.Testing` specifically looks for a `.AppHost` suffix to identify apphost assemblies. commit 2a2e2b9 Author: Ankit Jain <radical@gmail.com> Date: Thu Jul 25 17:27:06 2024 -0400 [playground] remove all the per-project Directory.Build.{props,targets} # Conflicts: # playground/Directory.Build.props # playground/Directory.Build.targets # playground/dapr/AppHost/DaprAppHost.csproj # playground/dapr/AppHost/Program.cs # playground/dapr/AppHost/Properties/launchSettings.json # playground/dapr/AppHost/aspire-manifest.json # playground/dapr/Dapr.AppHost/Dapr.AppHost.csproj # playground/dapr/Dapr.AppHost/Program.cs # playground/dapr/Dapr.AppHost/Properties/launchSettings.json # playground/dapr/Dapr.AppHost/appsettings.json # playground/dapr/Dapr.AppHost/aspire-manifest.json # playground/dapr/dapr.AppHost/Dapr.AppHost.csproj # playground/dapr/dapr.AppHost/Program.cs # playground/dapr/dapr.AppHost/Properties/launchSettings.json # playground/dapr/dapr.AppHost/appsettings.json # playground/dapr/dapr.AppHost/aspire-manifest.json # playground/orleans/OrleansAppHost/appsettings.json
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
And add a test for the same.
Fixes #5078.
Microsoft Reviewers: Open in CodeFlow