-
Notifications
You must be signed in to change notification settings - Fork 4.8k
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.
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
Emit interceptor info correctly when invocation expr is on separate line #91107
Emit interceptor info correctly when invocation expr is on separate line #91107
Conversation
Tagging subscribers to this area: @dotnet/area-extensions-configuration Issue DetailsAddresses #90851. RC2 candidate.
|
...sions.Configuration.Binder/tests/SourceGenerationTests/ConfigurationBinderTests.Generator.cs
Show resolved
Hide resolved
Looks somehow this change affected the binding to the static properties on Mono?
[Fact]
public void GetCanReadStaticProperty()
{
var dic = new Dictionary<string, string>
{
{"StaticProperty", "stuff"},
};
var configurationBuilder = new ConfigurationBuilder();
configurationBuilder.AddInMemoryCollection(dic);
var config = configurationBuilder.Build();
var options = new ComplexOptions();
config.Bind(options);
Assert.Equal("stuff", ComplexOptions.StaticProperty);
} |
@tarekgh hmm don't think so. We maintain the same binding behavior. Taking a look; might file an issue. |
1332b64
to
a644d59
Compare
Needs backport to RC2 to consider fixed for 8.0. |
/backport to release/8.0 |
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/5980937731 |
@layomia backporting to release/8.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Emit interceptor info correctly when invocation expr is on separate line
Using index info to reconstruct a base tree...
A src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/InterceptorLocationInfo.cs
M src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/ConfigurationBindingGeneratorTests.Baselines.Options.cs
M src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/ConfigurationBindingGeneratorTests.Baselines.cs
M src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/ConfigurationBindingGeneratorTests.cs
M src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Microsoft.Extensions.Configuration.Binder.SourceGeneration.Tests.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Microsoft.Extensions.Configuration.Binder.SourceGeneration.Tests.csproj
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/GeneratorTests.cs
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/GeneratorTests.Baselines.cs
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/GeneratorTests.Baselines.Options.cs
CONFLICT (modify/delete): src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/InterceptorLocationInfo.cs deleted in HEAD and modified in Emit interceptor info correctly when invocation expr is on separate line. Version Emit interceptor info correctly when invocation expr is on separate line of src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/InterceptorLocationInfo.cs left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Emit interceptor info correctly when invocation expr is on separate line
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
@layomia an error occurred while backporting to release/8.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
/backport to release/8.0 |
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6002565435 |
Addresses #90851. RC2 candidate.