Skip to content

Emit interceptor info correctly when invocation expr is on separate line - #91107

Merged
layomia merged 2 commits into
dotnet:mainfrom
layomia:binder-gen-interceptor-locations
Aug 25, 2023
Merged

Emit interceptor info correctly when invocation expr is on separate line#91107
layomia merged 2 commits into
dotnet:mainfrom
layomia:binder-gen-interceptor-locations

Conversation

@layomia

@layomialayomia commented Aug 25, 2023

Copy link
Copy Markdown
Contributor

Addresses #90851. RC2 candidate.

@layomialayomia added this to the 8.0.0 milestone Aug 25, 2023
@layomia
layomia requested a review from tarekghAugust 25, 2023 04:43
@layomialayomia self-assigned this Aug 25, 2023
@ghost

ghost commented Aug 25, 2023

Copy link
Copy Markdown

Tagging subscribers to this area: @dotnet/area-extensions-configuration
See info in area-owners.md if you want to be subscribed.

Issue Details

Addresses #90851. RC2 candidate.

Author:layomia
Assignees:layomia
Labels:

area-Extensions-Configuration

Milestone:8.0.0

@tarekgh

tarekgh commented Aug 25, 2023•
edited
Loading

Copy link
Copy Markdown
Member

Looks somehow this change affected the binding to the static properties on Mono?

https://helixre107v0xdcypoyl9e7f.blob.core.windows.net/dotnet-runtime-refs-pull-91107-merge-2933836994b843458b/Microsoft.Extensions.Configuration.Binder.SourceGeneration.Tests/1/console.7dc38e07.log?helixlogtype=result

 Microsoft.Extensions.SourceGeneration.Configuration.Binder.Tests.ConfigurationBinderTests.GetCanReadStaticProperty [FAIL]
Assert.Equal() Failure
Expected: stuff
Actual: (null)
Stack Trace:
/_/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Common/ConfigurationBinderTests.cs(751,0): at Microsoft.Extensions.SourceGeneration.Configuration.Binder.Tests.ConfigurationBinderTests.GetCanReadStaticProperty()
/_/src/mono/System.Private.CoreLib/src/System/Reflection/MethodBaseInvoker.Mono.cs(22,0): at System.Reflection.MethodBaseInvoker.InterpretedInvoke_Method(Object obj, IntPtr* args)
/_/src/libraries/System.Private.CoreLib/src/System/Reflection/MethodBaseInvoker.cs(57,0): at System.Reflection.MethodBaseInvoker.InvokeWithNoArgs(Object obj, BindingFlags invokeAttr)
Microsoft.Extensions.SourceGeneration.Configuration.Binder.Tests.ConfigurationBinderCollectionTests.DoesNotBindUninstantiatedISetWithUnsupportedKeys [SKIP]

[Fact]publicvoidGetCanReadStaticProperty(){vardic=newDictionary<string,string>{{"StaticProperty","stuff"},};varconfigurationBuilder=newConfigurationBuilder();configurationBuilder.AddInMemoryCollection(dic);varconfig=configurationBuilder.Build();varoptions=newComplexOptions();config.Bind(options);Assert.Equal("stuff",ComplexOptions.StaticProperty);}

@layomia

layomia commented Aug 25, 2023

Copy link
Copy Markdown
ContributorAuthor

@tarekgh hmm don't think so. We maintain the same binding behavior. Taking a look; might file an issue.

@layomia
layomiaforce-pushed the binder-gen-interceptor-locations branch from 1332b64 to a644d59CompareAugust 25, 2023 19:52
This was referenced Aug 25, 2023
Closed
Closed
@layomia

layomia commented Aug 25, 2023

Copy link
Copy Markdown
ContributorAuthor

@tarekgh mono issues don't surface after rebasing on top of main.

Test failure appears related to #87783.

@layomia
layomia merged commit a8a8a13 into dotnet:mainAug 25, 2023
@layomialayomia modified the milestones: 8.0.0, 9.0.0Aug 25, 2023
@layomia

layomia commented Aug 25, 2023

Copy link
Copy Markdown
ContributorAuthor

Needs backport to RC2 to consider fixed for 8.0.

@layomia

layomia commented Aug 25, 2023

Copy link
Copy Markdown
ContributorAuthor

/backport to release/8.0

@github-actions

github-actionsBot commented Aug 25, 2023

Copy link
Copy Markdown
Contributor

Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/5980937731

@github-actions

github-actionsBot commented Aug 25, 2023

Copy link
Copy Markdown
Contributor

@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!

@github-actions

github-actionsBot commented Aug 25, 2023

Copy link
Copy Markdown
Contributor

@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.

@layomia

layomia commented Aug 28, 2023

Copy link
Copy Markdown
ContributorAuthor

/backport to release/8.0

@github-actions

github-actionsBot commented Aug 28, 2023

Copy link
Copy Markdown
Contributor

Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6002565435

@github-actionsgithub-actionsBot mentioned this pull request Aug 28, 2023
Merged
@tarekghtarekgh modified the milestones: 9.0.0, 8.0.0Aug 28, 2023
@layomialayomia mentioned this pull request Aug 30, 2023
Closed
@ghostghost locked as resolved and limited conversation to collaborators Sep 27, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@ericstjericstjericstj left review comments
@tarekghtarekghtarekgh approved these changes

Assignees

@layomialayomia

Labels

area-Extensions-Configuration

Projects

None yet

Milestone

8.0.0

Development

Successfully merging this pull request may close these issues.

3 participants

@layomia@tarekgh@ericstj
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Emit interceptor info correctly when invocation expr is on separate line by layomia · Pull Request #91107 · dotnet/runtime · GitHub
Skip to content
Emit interceptor info correctly when invocation expr is on separate line - #91107
Merged
layomia merged 2 commits into
dotnet:mainfrom 
layomia:binder-gen-interceptor-locations
Aug 25, 2023
Merged
Emit interceptor info correctly when invocation expr is on separate line#91107
layomia merged 2 commits into
dotnet:mainfrom 
layomia:binder-gen-interceptor-locations
Conversation
@layomia
@layomialayomia
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
Addresses #90851. RC2 candidate.
@layomialayomia
added this to the 8.0.0 milestone
Aug 25, 2023
@layomia
layomia
requested a review
from tarekghAugust 25, 2023 04:43
@layomialayomia
self-assigned this
Aug 25, 2023
@ghost
ghost
commented
Aug 25, 2023

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/area-extensions-configuration

See info in area-owners.md if you want to be subscribed.
Issue Details
Addresses #90851. RC2 candidate.
Author:layomia
Assignees:layomia
Labels:
area-Extensions-Configuration
Milestone:8.0.0
@tarekgh
tarekgh
commented
Aug 25, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Looks somehow this change affected the binding to the static properties on Mono?
https://helixre107v0xdcypoyl9e7f.blob.core.windows.net/dotnet-runtime-refs-pull-91107-merge-2933836994b843458b/Microsoft.Extensions.Configuration.Binder.SourceGeneration.Tests/1/console.7dc38e07.log?helixlogtype=result
 Microsoft.Extensions.SourceGeneration.Configuration.Binder.Tests.ConfigurationBinderTests.GetCanReadStaticProperty [FAIL]
Assert.Equal() Failure
Expected: stuff
Actual: (null)
Stack Trace:
/_/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Common/ConfigurationBinderTests.cs(751,0): at Microsoft.Extensions.SourceGeneration.Configuration.Binder.Tests.ConfigurationBinderTests.GetCanReadStaticProperty()
/_/src/mono/System.Private.CoreLib/src/System/Reflection/MethodBaseInvoker.Mono.cs(22,0): at System.Reflection.MethodBaseInvoker.InterpretedInvoke_Method(Object obj, IntPtr* args)
/_/src/libraries/System.Private.CoreLib/src/System/Reflection/MethodBaseInvoker.cs(57,0): at System.Reflection.MethodBaseInvoker.InvokeWithNoArgs(Object obj, BindingFlags invokeAttr)
Microsoft.Extensions.SourceGeneration.Configuration.Binder.Tests.ConfigurationBinderCollectionTests.DoesNotBindUninstantiatedISetWithUnsupportedKeys [SKIP]

[Fact]publicvoidGetCanReadStaticProperty(){vardic=newDictionary<string,string>{{"StaticProperty","stuff"},};varconfigurationBuilder=newConfigurationBuilder();configurationBuilder.AddInMemoryCollection(dic);varconfig=configurationBuilder.Build();varoptions=newComplexOptions();config.Bind(options);Assert.Equal("stuff",ComplexOptions.StaticProperty);}
@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
@tarekgh hmm don't think so. We maintain the same binding behavior. Taking a look; might file an issue.
@layomia
layomiaforce-pushed
the
binder-gen-interceptor-locations
branch
from
1332b64 to
a644d59CompareAugust 25, 2023 19:52

This was referenced Aug 25, 2023

Closed


Closed

@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
@tarekgh mono issues don't surface after rebasing on top of main.
Test failure appears related to #87783.
@layomia
layomia
merged commit a8a8a13
into
dotnet:mainAug 25, 2023
@layomialayomia
modified the milestones:
8.0.0, 9.0.0Aug 25, 2023
@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
Needs backport to RC2 to consider fixed for 8.0.
@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/5980937731
@github-actions
github-actionsBot
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
@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!
@github-actions
github-actionsBot
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
@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.
@layomia
layomia
commented
Aug 28, 2023

Copy link


Copy Markdown

ContributorAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 28, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6002565435
@github-actionsgithub-actionsBot
mentioned this pull request
Aug 28, 2023
 Merged

@tarekghtarekgh
modified the milestones:
9.0.0, 8.0.0Aug 28, 2023
@layomialayomia
mentioned this pull request
Aug 30, 2023

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Sep 27, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@ericstjericstjericstj left review comments
@tarekghtarekghtarekgh approved these changes

Assignees

@layomialayomia

Labels

area-Extensions-Configuration

Projects


None yet


Milestone

8.0.0

Development

Successfully merging this pull request may close these issues.

3 participants

@layomia@tarekgh@ericstj

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Emit interceptor info correctly when invocation expr is on separate line by layomia · Pull Request #91107 · dotnet/runtime · GitHub
Skip to content
Emit interceptor info correctly when invocation expr is on separate line - #91107
Merged
layomia merged 2 commits into
dotnet:mainfrom 
layomia:binder-gen-interceptor-locations
Aug 25, 2023
Merged
Emit interceptor info correctly when invocation expr is on separate line#91107
layomia merged 2 commits into
dotnet:mainfrom 
layomia:binder-gen-interceptor-locations
Conversation
@layomia
@layomialayomia
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
Addresses #90851. RC2 candidate.
@layomialayomia
added this to the 8.0.0 milestone
Aug 25, 2023
@layomia
layomia
requested a review
from tarekghAugust 25, 2023 04:43
@layomialayomia
self-assigned this
Aug 25, 2023
@ghost
ghost
commented
Aug 25, 2023

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/area-extensions-configuration

See info in area-owners.md if you want to be subscribed.
Issue Details
Addresses #90851. RC2 candidate.
Author:layomia
Assignees:layomia
Labels:
area-Extensions-Configuration
Milestone:8.0.0
@tarekgh
tarekgh
commented
Aug 25, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Looks somehow this change affected the binding to the static properties on Mono?
https://helixre107v0xdcypoyl9e7f.blob.core.windows.net/dotnet-runtime-refs-pull-91107-merge-2933836994b843458b/Microsoft.Extensions.Configuration.Binder.SourceGeneration.Tests/1/console.7dc38e07.log?helixlogtype=result
 Microsoft.Extensions.SourceGeneration.Configuration.Binder.Tests.ConfigurationBinderTests.GetCanReadStaticProperty [FAIL]
Assert.Equal() Failure
Expected: stuff
Actual: (null)
Stack Trace:
/_/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Common/ConfigurationBinderTests.cs(751,0): at Microsoft.Extensions.SourceGeneration.Configuration.Binder.Tests.ConfigurationBinderTests.GetCanReadStaticProperty()
/_/src/mono/System.Private.CoreLib/src/System/Reflection/MethodBaseInvoker.Mono.cs(22,0): at System.Reflection.MethodBaseInvoker.InterpretedInvoke_Method(Object obj, IntPtr* args)
/_/src/libraries/System.Private.CoreLib/src/System/Reflection/MethodBaseInvoker.cs(57,0): at System.Reflection.MethodBaseInvoker.InvokeWithNoArgs(Object obj, BindingFlags invokeAttr)
Microsoft.Extensions.SourceGeneration.Configuration.Binder.Tests.ConfigurationBinderCollectionTests.DoesNotBindUninstantiatedISetWithUnsupportedKeys [SKIP]

[Fact]publicvoidGetCanReadStaticProperty(){vardic=newDictionary<string,string>{{"StaticProperty","stuff"},};varconfigurationBuilder=newConfigurationBuilder();configurationBuilder.AddInMemoryCollection(dic);varconfig=configurationBuilder.Build();varoptions=newComplexOptions();config.Bind(options);Assert.Equal("stuff",ComplexOptions.StaticProperty);}
@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
@tarekgh hmm don't think so. We maintain the same binding behavior. Taking a look; might file an issue.
@layomia
layomiaforce-pushed
the
binder-gen-interceptor-locations
branch
from
1332b64 to
a644d59CompareAugust 25, 2023 19:52

This was referenced Aug 25, 2023

Closed


Closed

@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
@tarekgh mono issues don't surface after rebasing on top of main.
Test failure appears related to #87783.
@layomia
layomia
merged commit a8a8a13
into
dotnet:mainAug 25, 2023
@layomialayomia
modified the milestones:
8.0.0, 9.0.0Aug 25, 2023
@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
Needs backport to RC2 to consider fixed for 8.0.
@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/5980937731
@github-actions
github-actionsBot
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
@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!
@github-actions
github-actionsBot
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
@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.
@layomia
layomia
commented
Aug 28, 2023

Copy link


Copy Markdown

ContributorAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 28, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6002565435
@github-actionsgithub-actionsBot
mentioned this pull request
Aug 28, 2023
 Merged

@tarekghtarekgh
modified the milestones:
9.0.0, 8.0.0Aug 28, 2023
@layomialayomia
mentioned this pull request
Aug 30, 2023

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Sep 27, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@ericstjericstjericstj left review comments
@tarekghtarekghtarekgh approved these changes

Assignees

@layomialayomia

Labels

area-Extensions-Configuration

Projects


None yet


Milestone

8.0.0

Development

Successfully merging this pull request may close these issues.

3 participants

@layomia@tarekgh@ericstj

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Emit interceptor info correctly when invocation expr is on separate line by layomia · Pull Request #91107 · dotnet/runtime · GitHub
Skip to content
Emit interceptor info correctly when invocation expr is on separate line - #91107
Merged
layomia merged 2 commits into
dotnet:mainfrom 
layomia:binder-gen-interceptor-locations
Aug 25, 2023
Merged
Emit interceptor info correctly when invocation expr is on separate line#91107
layomia merged 2 commits into
dotnet:mainfrom 
layomia:binder-gen-interceptor-locations
Conversation
@layomia
@layomialayomia
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
Addresses #90851. RC2 candidate.
@layomialayomia
added this to the 8.0.0 milestone
Aug 25, 2023
@layomia
layomia
requested a review
from tarekghAugust 25, 2023 04:43
@layomialayomia
self-assigned this
Aug 25, 2023
@ghost
ghost
commented
Aug 25, 2023

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/area-extensions-configuration

See info in area-owners.md if you want to be subscribed.
Issue Details
Addresses #90851. RC2 candidate.
Author:layomia
Assignees:layomia
Labels:
area-Extensions-Configuration
Milestone:8.0.0
@tarekgh
tarekgh
commented
Aug 25, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Looks somehow this change affected the binding to the static properties on Mono?
https://helixre107v0xdcypoyl9e7f.blob.core.windows.net/dotnet-runtime-refs-pull-91107-merge-2933836994b843458b/Microsoft.Extensions.Configuration.Binder.SourceGeneration.Tests/1/console.7dc38e07.log?helixlogtype=result
 Microsoft.Extensions.SourceGeneration.Configuration.Binder.Tests.ConfigurationBinderTests.GetCanReadStaticProperty [FAIL]
Assert.Equal() Failure
Expected: stuff
Actual: (null)
Stack Trace:
/_/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Common/ConfigurationBinderTests.cs(751,0): at Microsoft.Extensions.SourceGeneration.Configuration.Binder.Tests.ConfigurationBinderTests.GetCanReadStaticProperty()
/_/src/mono/System.Private.CoreLib/src/System/Reflection/MethodBaseInvoker.Mono.cs(22,0): at System.Reflection.MethodBaseInvoker.InterpretedInvoke_Method(Object obj, IntPtr* args)
/_/src/libraries/System.Private.CoreLib/src/System/Reflection/MethodBaseInvoker.cs(57,0): at System.Reflection.MethodBaseInvoker.InvokeWithNoArgs(Object obj, BindingFlags invokeAttr)
Microsoft.Extensions.SourceGeneration.Configuration.Binder.Tests.ConfigurationBinderCollectionTests.DoesNotBindUninstantiatedISetWithUnsupportedKeys [SKIP]

[Fact]publicvoidGetCanReadStaticProperty(){vardic=newDictionary<string,string>{{"StaticProperty","stuff"},};varconfigurationBuilder=newConfigurationBuilder();configurationBuilder.AddInMemoryCollection(dic);varconfig=configurationBuilder.Build();varoptions=newComplexOptions();config.Bind(options);Assert.Equal("stuff",ComplexOptions.StaticProperty);}
@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
@tarekgh hmm don't think so. We maintain the same binding behavior. Taking a look; might file an issue.
@layomia
layomiaforce-pushed
the
binder-gen-interceptor-locations
branch
from
1332b64 to
a644d59CompareAugust 25, 2023 19:52

This was referenced Aug 25, 2023

Closed


Closed

@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
@tarekgh mono issues don't surface after rebasing on top of main.
Test failure appears related to #87783.
@layomia
layomia
merged commit a8a8a13
into
dotnet:mainAug 25, 2023
@layomialayomia
modified the milestones:
8.0.0, 9.0.0Aug 25, 2023
@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
Needs backport to RC2 to consider fixed for 8.0.
@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/5980937731
@github-actions
github-actionsBot
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
@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!
@github-actions
github-actionsBot
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
@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.
@layomia
layomia
commented
Aug 28, 2023

Copy link


Copy Markdown

ContributorAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 28, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6002565435
@github-actionsgithub-actionsBot
mentioned this pull request
Aug 28, 2023
 Merged

@tarekghtarekgh
modified the milestones:
9.0.0, 8.0.0Aug 28, 2023
@layomialayomia
mentioned this pull request
Aug 30, 2023

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Sep 27, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@ericstjericstjericstj left review comments
@tarekghtarekghtarekgh approved these changes

Assignees

@layomialayomia

Labels

area-Extensions-Configuration

Projects


None yet


Milestone

8.0.0

Development

Successfully merging this pull request may close these issues.

3 participants

@layomia@tarekgh@ericstj

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Emit interceptor info correctly when invocation expr is on separate line by layomia · Pull Request #91107 · dotnet/runtime · GitHub
Skip to content
Emit interceptor info correctly when invocation expr is on separate line - #91107
Merged
layomia merged 2 commits into
dotnet:mainfrom 
layomia:binder-gen-interceptor-locations
Aug 25, 2023
Merged
Emit interceptor info correctly when invocation expr is on separate line#91107
layomia merged 2 commits into
dotnet:mainfrom 
layomia:binder-gen-interceptor-locations
Conversation
@layomia
@layomialayomia
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
Addresses #90851. RC2 candidate.
@layomialayomia
added this to the 8.0.0 milestone
Aug 25, 2023
@layomia
layomia
requested a review
from tarekghAugust 25, 2023 04:43
@layomialayomia
self-assigned this
Aug 25, 2023
@ghost
ghost
commented
Aug 25, 2023

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/area-extensions-configuration

See info in area-owners.md if you want to be subscribed.
Issue Details
Addresses #90851. RC2 candidate.
Author:layomia
Assignees:layomia
Labels:
area-Extensions-Configuration
Milestone:8.0.0
@tarekgh
tarekgh
commented
Aug 25, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Looks somehow this change affected the binding to the static properties on Mono?
https://helixre107v0xdcypoyl9e7f.blob.core.windows.net/dotnet-runtime-refs-pull-91107-merge-2933836994b843458b/Microsoft.Extensions.Configuration.Binder.SourceGeneration.Tests/1/console.7dc38e07.log?helixlogtype=result
 Microsoft.Extensions.SourceGeneration.Configuration.Binder.Tests.ConfigurationBinderTests.GetCanReadStaticProperty [FAIL]
Assert.Equal() Failure
Expected: stuff
Actual: (null)
Stack Trace:
/_/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Common/ConfigurationBinderTests.cs(751,0): at Microsoft.Extensions.SourceGeneration.Configuration.Binder.Tests.ConfigurationBinderTests.GetCanReadStaticProperty()
/_/src/mono/System.Private.CoreLib/src/System/Reflection/MethodBaseInvoker.Mono.cs(22,0): at System.Reflection.MethodBaseInvoker.InterpretedInvoke_Method(Object obj, IntPtr* args)
/_/src/libraries/System.Private.CoreLib/src/System/Reflection/MethodBaseInvoker.cs(57,0): at System.Reflection.MethodBaseInvoker.InvokeWithNoArgs(Object obj, BindingFlags invokeAttr)
Microsoft.Extensions.SourceGeneration.Configuration.Binder.Tests.ConfigurationBinderCollectionTests.DoesNotBindUninstantiatedISetWithUnsupportedKeys [SKIP]

[Fact]publicvoidGetCanReadStaticProperty(){vardic=newDictionary<string,string>{{"StaticProperty","stuff"},};varconfigurationBuilder=newConfigurationBuilder();configurationBuilder.AddInMemoryCollection(dic);varconfig=configurationBuilder.Build();varoptions=newComplexOptions();config.Bind(options);Assert.Equal("stuff",ComplexOptions.StaticProperty);}
@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
@tarekgh hmm don't think so. We maintain the same binding behavior. Taking a look; might file an issue.
@layomia
layomiaforce-pushed
the
binder-gen-interceptor-locations
branch
from
1332b64 to
a644d59CompareAugust 25, 2023 19:52

This was referenced Aug 25, 2023

Closed


Closed

@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
@tarekgh mono issues don't surface after rebasing on top of main.
Test failure appears related to #87783.
@layomia
layomia
merged commit a8a8a13
into
dotnet:mainAug 25, 2023
@layomialayomia
modified the milestones:
8.0.0, 9.0.0Aug 25, 2023
@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
Needs backport to RC2 to consider fixed for 8.0.
@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/5980937731
@github-actions
github-actionsBot
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
@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!
@github-actions
github-actionsBot
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
@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.
@layomia
layomia
commented
Aug 28, 2023

Copy link


Copy Markdown

ContributorAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 28, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6002565435
@github-actionsgithub-actionsBot
mentioned this pull request
Aug 28, 2023
 Merged

@tarekghtarekgh
modified the milestones:
9.0.0, 8.0.0Aug 28, 2023
@layomialayomia
mentioned this pull request
Aug 30, 2023

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Sep 27, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@ericstjericstjericstj left review comments
@tarekghtarekghtarekgh approved these changes

Assignees

@layomialayomia

Labels

area-Extensions-Configuration

Projects


None yet


Milestone

8.0.0

Development

Successfully merging this pull request may close these issues.

3 participants

@layomia@tarekgh@ericstj

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Emit interceptor info correctly when invocation expr is on separate line by layomia · Pull Request #91107 · dotnet/runtime · GitHub
Skip to content
Emit interceptor info correctly when invocation expr is on separate line - #91107
Merged
layomia merged 2 commits into
dotnet:mainfrom 
layomia:binder-gen-interceptor-locations
Aug 25, 2023
Merged
Emit interceptor info correctly when invocation expr is on separate line#91107
layomia merged 2 commits into
dotnet:mainfrom 
layomia:binder-gen-interceptor-locations
Conversation
@layomia
@layomialayomia
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
Addresses #90851. RC2 candidate.
@layomialayomia
added this to the 8.0.0 milestone
Aug 25, 2023
@layomia
layomia
requested a review
from tarekghAugust 25, 2023 04:43
@layomialayomia
self-assigned this
Aug 25, 2023
@ghost
ghost
commented
Aug 25, 2023

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/area-extensions-configuration

See info in area-owners.md if you want to be subscribed.
Issue Details
Addresses #90851. RC2 candidate.
Author:layomia
Assignees:layomia
Labels:
area-Extensions-Configuration
Milestone:8.0.0
@tarekgh
tarekgh
commented
Aug 25, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Looks somehow this change affected the binding to the static properties on Mono?
https://helixre107v0xdcypoyl9e7f.blob.core.windows.net/dotnet-runtime-refs-pull-91107-merge-2933836994b843458b/Microsoft.Extensions.Configuration.Binder.SourceGeneration.Tests/1/console.7dc38e07.log?helixlogtype=result
 Microsoft.Extensions.SourceGeneration.Configuration.Binder.Tests.ConfigurationBinderTests.GetCanReadStaticProperty [FAIL]
Assert.Equal() Failure
Expected: stuff
Actual: (null)
Stack Trace:
/_/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Common/ConfigurationBinderTests.cs(751,0): at Microsoft.Extensions.SourceGeneration.Configuration.Binder.Tests.ConfigurationBinderTests.GetCanReadStaticProperty()
/_/src/mono/System.Private.CoreLib/src/System/Reflection/MethodBaseInvoker.Mono.cs(22,0): at System.Reflection.MethodBaseInvoker.InterpretedInvoke_Method(Object obj, IntPtr* args)
/_/src/libraries/System.Private.CoreLib/src/System/Reflection/MethodBaseInvoker.cs(57,0): at System.Reflection.MethodBaseInvoker.InvokeWithNoArgs(Object obj, BindingFlags invokeAttr)
Microsoft.Extensions.SourceGeneration.Configuration.Binder.Tests.ConfigurationBinderCollectionTests.DoesNotBindUninstantiatedISetWithUnsupportedKeys [SKIP]

[Fact]publicvoidGetCanReadStaticProperty(){vardic=newDictionary<string,string>{{"StaticProperty","stuff"},};varconfigurationBuilder=newConfigurationBuilder();configurationBuilder.AddInMemoryCollection(dic);varconfig=configurationBuilder.Build();varoptions=newComplexOptions();config.Bind(options);Assert.Equal("stuff",ComplexOptions.StaticProperty);}
@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
@tarekgh hmm don't think so. We maintain the same binding behavior. Taking a look; might file an issue.
@layomia
layomiaforce-pushed
the
binder-gen-interceptor-locations
branch
from
1332b64 to
a644d59CompareAugust 25, 2023 19:52

This was referenced Aug 25, 2023

Closed


Closed

@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
@tarekgh mono issues don't surface after rebasing on top of main.
Test failure appears related to #87783.
@layomia
layomia
merged commit a8a8a13
into
dotnet:mainAug 25, 2023
@layomialayomia
modified the milestones:
8.0.0, 9.0.0Aug 25, 2023
@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
Needs backport to RC2 to consider fixed for 8.0.
@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/5980937731
@github-actions
github-actionsBot
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
@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!
@github-actions
github-actionsBot
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
@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.
@layomia
layomia
commented
Aug 28, 2023

Copy link


Copy Markdown

ContributorAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 28, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6002565435
@github-actionsgithub-actionsBot
mentioned this pull request
Aug 28, 2023
 Merged

@tarekghtarekgh
modified the milestones:
9.0.0, 8.0.0Aug 28, 2023
@layomialayomia
mentioned this pull request
Aug 30, 2023

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Sep 27, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@ericstjericstjericstj left review comments
@tarekghtarekghtarekgh approved these changes

Assignees

@layomialayomia

Labels

area-Extensions-Configuration

Projects


None yet


Milestone

8.0.0

Development

Successfully merging this pull request may close these issues.

3 participants

@layomia@tarekgh@ericstj

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Emit interceptor info correctly when invocation expr is on separate line by layomia · Pull Request #91107 · dotnet/runtime · GitHub
Skip to content
Emit interceptor info correctly when invocation expr is on separate line - #91107
Merged
layomia merged 2 commits into
dotnet:mainfrom 
layomia:binder-gen-interceptor-locations
Aug 25, 2023
Merged
Emit interceptor info correctly when invocation expr is on separate line#91107
layomia merged 2 commits into
dotnet:mainfrom 
layomia:binder-gen-interceptor-locations
Conversation
@layomia
@layomialayomia
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
Addresses #90851. RC2 candidate.
@layomialayomia
added this to the 8.0.0 milestone
Aug 25, 2023
@layomia
layomia
requested a review
from tarekghAugust 25, 2023 04:43
@layomialayomia
self-assigned this
Aug 25, 2023
@ghost
ghost
commented
Aug 25, 2023

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/area-extensions-configuration

See info in area-owners.md if you want to be subscribed.
Issue Details
Addresses #90851. RC2 candidate.
Author:layomia
Assignees:layomia
Labels:
area-Extensions-Configuration
Milestone:8.0.0
@tarekgh
tarekgh
commented
Aug 25, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Looks somehow this change affected the binding to the static properties on Mono?
https://helixre107v0xdcypoyl9e7f.blob.core.windows.net/dotnet-runtime-refs-pull-91107-merge-2933836994b843458b/Microsoft.Extensions.Configuration.Binder.SourceGeneration.Tests/1/console.7dc38e07.log?helixlogtype=result
 Microsoft.Extensions.SourceGeneration.Configuration.Binder.Tests.ConfigurationBinderTests.GetCanReadStaticProperty [FAIL]
Assert.Equal() Failure
Expected: stuff
Actual: (null)
Stack Trace:
/_/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Common/ConfigurationBinderTests.cs(751,0): at Microsoft.Extensions.SourceGeneration.Configuration.Binder.Tests.ConfigurationBinderTests.GetCanReadStaticProperty()
/_/src/mono/System.Private.CoreLib/src/System/Reflection/MethodBaseInvoker.Mono.cs(22,0): at System.Reflection.MethodBaseInvoker.InterpretedInvoke_Method(Object obj, IntPtr* args)
/_/src/libraries/System.Private.CoreLib/src/System/Reflection/MethodBaseInvoker.cs(57,0): at System.Reflection.MethodBaseInvoker.InvokeWithNoArgs(Object obj, BindingFlags invokeAttr)
Microsoft.Extensions.SourceGeneration.Configuration.Binder.Tests.ConfigurationBinderCollectionTests.DoesNotBindUninstantiatedISetWithUnsupportedKeys [SKIP]

[Fact]publicvoidGetCanReadStaticProperty(){vardic=newDictionary<string,string>{{"StaticProperty","stuff"},};varconfigurationBuilder=newConfigurationBuilder();configurationBuilder.AddInMemoryCollection(dic);varconfig=configurationBuilder.Build();varoptions=newComplexOptions();config.Bind(options);Assert.Equal("stuff",ComplexOptions.StaticProperty);}
@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
@tarekgh hmm don't think so. We maintain the same binding behavior. Taking a look; might file an issue.
@layomia
layomiaforce-pushed
the
binder-gen-interceptor-locations
branch
from
1332b64 to
a644d59CompareAugust 25, 2023 19:52

This was referenced Aug 25, 2023

Closed


Closed

@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
@tarekgh mono issues don't surface after rebasing on top of main.
Test failure appears related to #87783.
@layomia
layomia
merged commit a8a8a13
into
dotnet:mainAug 25, 2023
@layomialayomia
modified the milestones:
8.0.0, 9.0.0Aug 25, 2023
@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
Needs backport to RC2 to consider fixed for 8.0.
@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/5980937731
@github-actions
github-actionsBot
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
@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!
@github-actions
github-actionsBot
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
@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.
@layomia
layomia
commented
Aug 28, 2023

Copy link


Copy Markdown

ContributorAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 28, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6002565435
@github-actionsgithub-actionsBot
mentioned this pull request
Aug 28, 2023
 Merged

@tarekghtarekgh
modified the milestones:
9.0.0, 8.0.0Aug 28, 2023
@layomialayomia
mentioned this pull request
Aug 30, 2023

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Sep 27, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@ericstjericstjericstj left review comments
@tarekghtarekghtarekgh approved these changes

Assignees

@layomialayomia

Labels

area-Extensions-Configuration

Projects


None yet


Milestone

8.0.0

Development

Successfully merging this pull request may close these issues.

3 participants

@layomia@tarekgh@ericstj

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Emit interceptor info correctly when invocation expr is on separate line by layomia · Pull Request #91107 · dotnet/runtime · GitHub
Skip to content
Emit interceptor info correctly when invocation expr is on separate line - #91107
Merged
layomia merged 2 commits into
dotnet:mainfrom 
layomia:binder-gen-interceptor-locations
Aug 25, 2023
Merged
Emit interceptor info correctly when invocation expr is on separate line#91107
layomia merged 2 commits into
dotnet:mainfrom 
layomia:binder-gen-interceptor-locations
Conversation
@layomia
@layomialayomia
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
Addresses #90851. RC2 candidate.
@layomialayomia
added this to the 8.0.0 milestone
Aug 25, 2023
@layomia
layomia
requested a review
from tarekghAugust 25, 2023 04:43
@layomialayomia
self-assigned this
Aug 25, 2023
@ghost
ghost
commented
Aug 25, 2023

Copy link


Copy Markdown

Tagging subscribers to this area: @dotnet/area-extensions-configuration

See info in area-owners.md if you want to be subscribed.
Issue Details
Addresses #90851. RC2 candidate.
Author:layomia
Assignees:layomia
Labels:
area-Extensions-Configuration
Milestone:8.0.0
@tarekgh
tarekgh
commented
Aug 25, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Looks somehow this change affected the binding to the static properties on Mono?
https://helixre107v0xdcypoyl9e7f.blob.core.windows.net/dotnet-runtime-refs-pull-91107-merge-2933836994b843458b/Microsoft.Extensions.Configuration.Binder.SourceGeneration.Tests/1/console.7dc38e07.log?helixlogtype=result
 Microsoft.Extensions.SourceGeneration.Configuration.Binder.Tests.ConfigurationBinderTests.GetCanReadStaticProperty [FAIL]
Assert.Equal() Failure
Expected: stuff
Actual: (null)
Stack Trace:
/_/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Common/ConfigurationBinderTests.cs(751,0): at Microsoft.Extensions.SourceGeneration.Configuration.Binder.Tests.ConfigurationBinderTests.GetCanReadStaticProperty()
/_/src/mono/System.Private.CoreLib/src/System/Reflection/MethodBaseInvoker.Mono.cs(22,0): at System.Reflection.MethodBaseInvoker.InterpretedInvoke_Method(Object obj, IntPtr* args)
/_/src/libraries/System.Private.CoreLib/src/System/Reflection/MethodBaseInvoker.cs(57,0): at System.Reflection.MethodBaseInvoker.InvokeWithNoArgs(Object obj, BindingFlags invokeAttr)
Microsoft.Extensions.SourceGeneration.Configuration.Binder.Tests.ConfigurationBinderCollectionTests.DoesNotBindUninstantiatedISetWithUnsupportedKeys [SKIP]

[Fact]publicvoidGetCanReadStaticProperty(){vardic=newDictionary<string,string>{{"StaticProperty","stuff"},};varconfigurationBuilder=newConfigurationBuilder();configurationBuilder.AddInMemoryCollection(dic);varconfig=configurationBuilder.Build();varoptions=newComplexOptions();config.Bind(options);Assert.Equal("stuff",ComplexOptions.StaticProperty);}
@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
@tarekgh hmm don't think so. We maintain the same binding behavior. Taking a look; might file an issue.
@layomia
layomiaforce-pushed
the
binder-gen-interceptor-locations
branch
from
1332b64 to
a644d59CompareAugust 25, 2023 19:52

This was referenced Aug 25, 2023

Closed


Closed

@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
@tarekgh mono issues don't surface after rebasing on top of main.
Test failure appears related to #87783.
@layomia
layomia
merged commit a8a8a13
into
dotnet:mainAug 25, 2023
@layomialayomia
modified the milestones:
8.0.0, 9.0.0Aug 25, 2023
@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
Needs backport to RC2 to consider fixed for 8.0.
@layomia
layomia
commented
Aug 25, 2023

Copy link


Copy Markdown

ContributorAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/5980937731
@github-actions
github-actionsBot
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
@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!
@github-actions
github-actionsBot
commented
Aug 25, 2023

Copy link


Copy Markdown

Contributor
@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.
@layomia
layomia
commented
Aug 28, 2023

Copy link


Copy Markdown

ContributorAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 28, 2023

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6002565435
@github-actionsgithub-actionsBot
mentioned this pull request
Aug 28, 2023
 Merged

@tarekghtarekgh
modified the milestones:
9.0.0, 8.0.0Aug 28, 2023
@layomialayomia
mentioned this pull request
Aug 30, 2023

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Sep 27, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@ericstjericstjericstj left review comments
@tarekghtarekghtarekgh approved these changes

Assignees

@layomialayomia

Labels

area-Extensions-Configuration

Projects


None yet


Milestone

8.0.0

Development

Successfully merging this pull request may close these issues.

3 participants

@layomia@tarekgh@ericstj