Skip to content

Update binder gen emitted-interceptor nullability to match framework impl - #91180

Merged
layomia merged 1 commit into
dotnet:mainfrom
layomia:binder-gen-input-handling
Aug 28, 2023
Merged

Update binder gen emitted-interceptor nullability to match framework impl#91180
layomia merged 1 commit into
dotnet:mainfrom
layomia:binder-gen-input-handling

Conversation

@layomia

@layomialayomia commented Aug 27, 2023

Copy link
Copy Markdown
Contributor

Addresses #90987. RC 2 candidate.

@layomialayomia added this to the 9.0.0 milestone Aug 27, 2023
@layomialayomia self-assigned this Aug 27, 2023
@ghost

ghost commented Aug 27, 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 #90987. RC 2 candidate.

Author:layomia
Assignees:layomia
Labels:

area-Extensions-Configuration

Milestone:9.0.0

eerhardt
eerhardt approved these changes Aug 28, 2023
View reviewed changes

@eerhardteerhardt left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@tarekgh

tarekgh commented Aug 28, 2023

Copy link
Copy Markdown
Member

@layomia you marked this PR with 9.0, I think you are planning to backport it to 8.0, right?

@layomia

layomia commented Aug 28, 2023

Copy link
Copy Markdown
ContributorAuthor

Yeah, I'm going to backport it.

@layomia
layomia merged commit e1453f5 into dotnet:mainAug 28, 2023
@layomialayomia mentioned this pull request Aug 28, 2023
Merged
@layomialayomia modified the milestones: 9.0.0, 8.0.0Aug 28, 2023
@layomialayomia mentioned this pull request Aug 29, 2023
Closed
@martincostellomartincostello mentioned this pull request Aug 30, 2023
Closed
@layomia

layomia commented Aug 30, 2023

Copy link
Copy Markdown
ContributorAuthor

/backport to release/8.0

@github-actions

github-actionsBot commented Aug 30, 2023

Copy link
Copy Markdown
Contributor

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

@github-actions

github-actionsBot commented Aug 30, 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: Update binder gen emitted-interceptor nullability to match framework impl
.git/rebase-apply/patch:899: trailing whitespace.
Assert.Throws<ArgumentNullException>(() => configuration.GetValue(typeof(Geolocation), key, default(Geolocation))); warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsConfigurationServiceCollectionExtensions.cs
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T_BinderOptions.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_BinderOptions.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name_BinderOptions.generated.txt
M	src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj
CONFLICT (add/add): Merge conflict in src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/Common/ConfigurationExtensionsTests.cs
Auto-merging src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/Common/ConfigurationExtensionsTests.cs
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name_BinderOptions.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name_BinderOptions.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_BinderOptions.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_BinderOptions.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T_BinderOptions.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T_BinderOptions.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsConfigurationServiceCollectionExtensions.cs
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsConfigurationServiceCollectionExtensions.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update binder gen emitted-interceptor nullability to match framework impl
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 30, 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 added a commit to layomia/dotnet_runtime that referenced this pull request Aug 30, 2023
@layomia
Update binder gen emitted-interceptor nullability to match framework …
8e14319
…impl (dotnet#91180)
@layomialayomia mentioned this pull request Aug 30, 2023
Merged
carlossanlop pushed a commit that referenced this pull request Aug 31, 2023
@layomia
Update binder gen emitted-interceptor nullability to match framework …
35f043f
…impl (#91180) (#91359)
@tonesandtonestonesandtones mentioned this pull request Sep 22, 2023
Closed
@radicalradical mentioned this pull request Sep 26, 2023
Closed
@ghostghost locked as resolved and limited conversation to collaborators Sep 30, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@eerhardteerhardteerhardt approved these changes
@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@eerhardt
, '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" + '
Update binder gen emitted-interceptor nullability to match framework impl by layomia · Pull Request #91180 · dotnet/runtime · GitHub
Skip to content
Update binder gen emitted-interceptor nullability to match framework impl - #91180
Merged
layomia merged 1 commit into
dotnet:mainfrom 
layomia:binder-gen-input-handling
Aug 28, 2023
Merged
Update binder gen emitted-interceptor nullability to match framework impl#91180
layomia merged 1 commit into
dotnet:mainfrom 
layomia:binder-gen-input-handling
Conversation
@layomia
@layomialayomia
commented
Aug 27, 2023

Copy link


Copy Markdown

Contributor
Addresses #90987. RC 2 candidate.
@layomialayomia
added this to the 9.0.0 milestone
Aug 27, 2023
@layomialayomia
self-assigned this
Aug 27, 2023
@ghost
ghost
commented
Aug 27, 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 #90987. RC 2 candidate.
Author:layomia
Assignees:layomia
Labels:
area-Extensions-Configuration
Milestone:9.0.0
eerhardt
eerhardt
approved these changes
Aug 28, 2023
View reviewed changes
@eerhardteerhardt
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@tarekgh
tarekgh
commented
Aug 28, 2023

Copy link


Copy Markdown

Member
@layomia you marked this PR with 9.0, I think you are planning to backport it to 8.0, right?
@layomia
layomia
commented
Aug 28, 2023

Copy link


Copy Markdown

ContributorAuthor
Yeah, I'm going to backport it.
@layomia
layomia
merged commit e1453f5
into
dotnet:mainAug 28, 2023
@layomialayomia
mentioned this pull request
Aug 28, 2023
 Merged

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

Closed

@martincostellomartincostello
mentioned this pull request
Aug 30, 2023
 Closed

@layomia
layomia
commented
Aug 30, 2023

Copy link


Copy Markdown

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

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6030151013
@github-actions
github-actionsBot
commented
Aug 30, 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: Update binder gen emitted-interceptor nullability to match framework impl
.git/rebase-apply/patch:899: trailing whitespace.
Assert.Throws<ArgumentNullException>(() => configuration.GetValue(typeof(Geolocation), key, default(Geolocation))); warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsConfigurationServiceCollectionExtensions.cs
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T_BinderOptions.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_BinderOptions.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name_BinderOptions.generated.txt
M	src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj
CONFLICT (add/add): Merge conflict in src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/Common/ConfigurationExtensionsTests.cs
Auto-merging src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/Common/ConfigurationExtensionsTests.cs
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name_BinderOptions.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name_BinderOptions.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_BinderOptions.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_BinderOptions.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T_BinderOptions.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T_BinderOptions.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsConfigurationServiceCollectionExtensions.cs
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsConfigurationServiceCollectionExtensions.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update binder gen emitted-interceptor nullability to match framework impl
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 30, 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 added a commit
to layomia/dotnet_runtime
that referenced
this pull request
Aug 30, 2023
@layomia
Update binder gen emitted-interceptor nullability to match framework …
8e14319
…impl (dotnet#91180)
@layomialayomia
mentioned this pull request
Aug 30, 2023
 Merged

carlossanlop pushed a commit
that referenced
this pull request
Aug 31, 2023
@layomia
Update binder gen emitted-interceptor nullability to match framework …
35f043f
…impl (#91180) (#91359)
@tonesandtonestonesandtones
mentioned this pull request
Sep 22, 2023

Closed

@radicalradical
mentioned this pull request
Sep 26, 2023
 Closed

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


Reviewers

@eerhardteerhardteerhardt approved these changes
@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@eerhardt

, '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('^' + ".*" + '
Update binder gen emitted-interceptor nullability to match framework impl by layomia · Pull Request #91180 · dotnet/runtime · GitHub
Skip to content
Update binder gen emitted-interceptor nullability to match framework impl - #91180
Merged
layomia merged 1 commit into
dotnet:mainfrom 
layomia:binder-gen-input-handling
Aug 28, 2023
Merged
Update binder gen emitted-interceptor nullability to match framework impl#91180
layomia merged 1 commit into
dotnet:mainfrom 
layomia:binder-gen-input-handling
Conversation
@layomia
@layomialayomia
commented
Aug 27, 2023

Copy link


Copy Markdown

Contributor
Addresses #90987. RC 2 candidate.
@layomialayomia
added this to the 9.0.0 milestone
Aug 27, 2023
@layomialayomia
self-assigned this
Aug 27, 2023
@ghost
ghost
commented
Aug 27, 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 #90987. RC 2 candidate.
Author:layomia
Assignees:layomia
Labels:
area-Extensions-Configuration
Milestone:9.0.0
eerhardt
eerhardt
approved these changes
Aug 28, 2023
View reviewed changes
@eerhardteerhardt
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@tarekgh
tarekgh
commented
Aug 28, 2023

Copy link


Copy Markdown

Member
@layomia you marked this PR with 9.0, I think you are planning to backport it to 8.0, right?
@layomia
layomia
commented
Aug 28, 2023

Copy link


Copy Markdown

ContributorAuthor
Yeah, I'm going to backport it.
@layomia
layomia
merged commit e1453f5
into
dotnet:mainAug 28, 2023
@layomialayomia
mentioned this pull request
Aug 28, 2023
 Merged

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

Closed

@martincostellomartincostello
mentioned this pull request
Aug 30, 2023
 Closed

@layomia
layomia
commented
Aug 30, 2023

Copy link


Copy Markdown

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

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6030151013
@github-actions
github-actionsBot
commented
Aug 30, 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: Update binder gen emitted-interceptor nullability to match framework impl
.git/rebase-apply/patch:899: trailing whitespace.
Assert.Throws<ArgumentNullException>(() => configuration.GetValue(typeof(Geolocation), key, default(Geolocation))); warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsConfigurationServiceCollectionExtensions.cs
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T_BinderOptions.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_BinderOptions.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name_BinderOptions.generated.txt
M	src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj
CONFLICT (add/add): Merge conflict in src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/Common/ConfigurationExtensionsTests.cs
Auto-merging src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/Common/ConfigurationExtensionsTests.cs
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name_BinderOptions.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name_BinderOptions.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_BinderOptions.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_BinderOptions.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T_BinderOptions.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T_BinderOptions.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsConfigurationServiceCollectionExtensions.cs
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsConfigurationServiceCollectionExtensions.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update binder gen emitted-interceptor nullability to match framework impl
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 30, 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 added a commit
to layomia/dotnet_runtime
that referenced
this pull request
Aug 30, 2023
@layomia
Update binder gen emitted-interceptor nullability to match framework …
8e14319
…impl (dotnet#91180)
@layomialayomia
mentioned this pull request
Aug 30, 2023
 Merged

carlossanlop pushed a commit
that referenced
this pull request
Aug 31, 2023
@layomia
Update binder gen emitted-interceptor nullability to match framework …
35f043f
…impl (#91180) (#91359)
@tonesandtonestonesandtones
mentioned this pull request
Sep 22, 2023

Closed

@radicalradical
mentioned this pull request
Sep 26, 2023
 Closed

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


Reviewers

@eerhardteerhardteerhardt approved these changes
@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@eerhardt

, '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('^' + ".*" + '
Update binder gen emitted-interceptor nullability to match framework impl by layomia · Pull Request #91180 · dotnet/runtime · GitHub
Skip to content
Update binder gen emitted-interceptor nullability to match framework impl - #91180
Merged
layomia merged 1 commit into
dotnet:mainfrom 
layomia:binder-gen-input-handling
Aug 28, 2023
Merged
Update binder gen emitted-interceptor nullability to match framework impl#91180
layomia merged 1 commit into
dotnet:mainfrom 
layomia:binder-gen-input-handling
Conversation
@layomia
@layomialayomia
commented
Aug 27, 2023

Copy link


Copy Markdown

Contributor
Addresses #90987. RC 2 candidate.
@layomialayomia
added this to the 9.0.0 milestone
Aug 27, 2023
@layomialayomia
self-assigned this
Aug 27, 2023
@ghost
ghost
commented
Aug 27, 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 #90987. RC 2 candidate.
Author:layomia
Assignees:layomia
Labels:
area-Extensions-Configuration
Milestone:9.0.0
eerhardt
eerhardt
approved these changes
Aug 28, 2023
View reviewed changes
@eerhardteerhardt
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@tarekgh
tarekgh
commented
Aug 28, 2023

Copy link


Copy Markdown

Member
@layomia you marked this PR with 9.0, I think you are planning to backport it to 8.0, right?
@layomia
layomia
commented
Aug 28, 2023

Copy link


Copy Markdown

ContributorAuthor
Yeah, I'm going to backport it.
@layomia
layomia
merged commit e1453f5
into
dotnet:mainAug 28, 2023
@layomialayomia
mentioned this pull request
Aug 28, 2023
 Merged

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

Closed

@martincostellomartincostello
mentioned this pull request
Aug 30, 2023
 Closed

@layomia
layomia
commented
Aug 30, 2023

Copy link


Copy Markdown

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

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6030151013
@github-actions
github-actionsBot
commented
Aug 30, 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: Update binder gen emitted-interceptor nullability to match framework impl
.git/rebase-apply/patch:899: trailing whitespace.
Assert.Throws<ArgumentNullException>(() => configuration.GetValue(typeof(Geolocation), key, default(Geolocation))); warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsConfigurationServiceCollectionExtensions.cs
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T_BinderOptions.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_BinderOptions.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name_BinderOptions.generated.txt
M	src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj
CONFLICT (add/add): Merge conflict in src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/Common/ConfigurationExtensionsTests.cs
Auto-merging src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/Common/ConfigurationExtensionsTests.cs
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name_BinderOptions.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name_BinderOptions.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_BinderOptions.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_BinderOptions.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T_BinderOptions.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T_BinderOptions.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsConfigurationServiceCollectionExtensions.cs
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsConfigurationServiceCollectionExtensions.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update binder gen emitted-interceptor nullability to match framework impl
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 30, 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 added a commit
to layomia/dotnet_runtime
that referenced
this pull request
Aug 30, 2023
@layomia
Update binder gen emitted-interceptor nullability to match framework …
8e14319
…impl (dotnet#91180)
@layomialayomia
mentioned this pull request
Aug 30, 2023
 Merged

carlossanlop pushed a commit
that referenced
this pull request
Aug 31, 2023
@layomia
Update binder gen emitted-interceptor nullability to match framework …
35f043f
…impl (#91180) (#91359)
@tonesandtonestonesandtones
mentioned this pull request
Sep 22, 2023

Closed

@radicalradical
mentioned this pull request
Sep 26, 2023
 Closed

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


Reviewers

@eerhardteerhardteerhardt approved these changes
@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@eerhardt

, '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" + '
Update binder gen emitted-interceptor nullability to match framework impl by layomia · Pull Request #91180 · dotnet/runtime · GitHub
Skip to content
Update binder gen emitted-interceptor nullability to match framework impl - #91180
Merged
layomia merged 1 commit into
dotnet:mainfrom 
layomia:binder-gen-input-handling
Aug 28, 2023
Merged
Update binder gen emitted-interceptor nullability to match framework impl#91180
layomia merged 1 commit into
dotnet:mainfrom 
layomia:binder-gen-input-handling
Conversation
@layomia
@layomialayomia
commented
Aug 27, 2023

Copy link


Copy Markdown

Contributor
Addresses #90987. RC 2 candidate.
@layomialayomia
added this to the 9.0.0 milestone
Aug 27, 2023
@layomialayomia
self-assigned this
Aug 27, 2023
@ghost
ghost
commented
Aug 27, 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 #90987. RC 2 candidate.
Author:layomia
Assignees:layomia
Labels:
area-Extensions-Configuration
Milestone:9.0.0
eerhardt
eerhardt
approved these changes
Aug 28, 2023
View reviewed changes
@eerhardteerhardt
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@tarekgh
tarekgh
commented
Aug 28, 2023

Copy link


Copy Markdown

Member
@layomia you marked this PR with 9.0, I think you are planning to backport it to 8.0, right?
@layomia
layomia
commented
Aug 28, 2023

Copy link


Copy Markdown

ContributorAuthor
Yeah, I'm going to backport it.
@layomia
layomia
merged commit e1453f5
into
dotnet:mainAug 28, 2023
@layomialayomia
mentioned this pull request
Aug 28, 2023
 Merged

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

Closed

@martincostellomartincostello
mentioned this pull request
Aug 30, 2023
 Closed

@layomia
layomia
commented
Aug 30, 2023

Copy link


Copy Markdown

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

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6030151013
@github-actions
github-actionsBot
commented
Aug 30, 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: Update binder gen emitted-interceptor nullability to match framework impl
.git/rebase-apply/patch:899: trailing whitespace.
Assert.Throws<ArgumentNullException>(() => configuration.GetValue(typeof(Geolocation), key, default(Geolocation))); warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsConfigurationServiceCollectionExtensions.cs
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T_BinderOptions.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_BinderOptions.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name_BinderOptions.generated.txt
M	src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj
CONFLICT (add/add): Merge conflict in src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/Common/ConfigurationExtensionsTests.cs
Auto-merging src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/Common/ConfigurationExtensionsTests.cs
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name_BinderOptions.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name_BinderOptions.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_BinderOptions.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_BinderOptions.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T_BinderOptions.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T_BinderOptions.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsConfigurationServiceCollectionExtensions.cs
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsConfigurationServiceCollectionExtensions.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update binder gen emitted-interceptor nullability to match framework impl
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 30, 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 added a commit
to layomia/dotnet_runtime
that referenced
this pull request
Aug 30, 2023
@layomia
Update binder gen emitted-interceptor nullability to match framework …
8e14319
…impl (dotnet#91180)
@layomialayomia
mentioned this pull request
Aug 30, 2023
 Merged

carlossanlop pushed a commit
that referenced
this pull request
Aug 31, 2023
@layomia
Update binder gen emitted-interceptor nullability to match framework …
35f043f
…impl (#91180) (#91359)
@tonesandtonestonesandtones
mentioned this pull request
Sep 22, 2023

Closed

@radicalradical
mentioned this pull request
Sep 26, 2023
 Closed

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


Reviewers

@eerhardteerhardteerhardt approved these changes
@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@eerhardt

, '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('^' + ".*" + '
Update binder gen emitted-interceptor nullability to match framework impl by layomia · Pull Request #91180 · dotnet/runtime · GitHub
Skip to content
Update binder gen emitted-interceptor nullability to match framework impl - #91180
Merged
layomia merged 1 commit into
dotnet:mainfrom 
layomia:binder-gen-input-handling
Aug 28, 2023
Merged
Update binder gen emitted-interceptor nullability to match framework impl#91180
layomia merged 1 commit into
dotnet:mainfrom 
layomia:binder-gen-input-handling
Conversation
@layomia
@layomialayomia
commented
Aug 27, 2023

Copy link


Copy Markdown

Contributor
Addresses #90987. RC 2 candidate.
@layomialayomia
added this to the 9.0.0 milestone
Aug 27, 2023
@layomialayomia
self-assigned this
Aug 27, 2023
@ghost
ghost
commented
Aug 27, 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 #90987. RC 2 candidate.
Author:layomia
Assignees:layomia
Labels:
area-Extensions-Configuration
Milestone:9.0.0
eerhardt
eerhardt
approved these changes
Aug 28, 2023
View reviewed changes
@eerhardteerhardt
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@tarekgh
tarekgh
commented
Aug 28, 2023

Copy link


Copy Markdown

Member
@layomia you marked this PR with 9.0, I think you are planning to backport it to 8.0, right?
@layomia
layomia
commented
Aug 28, 2023

Copy link


Copy Markdown

ContributorAuthor
Yeah, I'm going to backport it.
@layomia
layomia
merged commit e1453f5
into
dotnet:mainAug 28, 2023
@layomialayomia
mentioned this pull request
Aug 28, 2023
 Merged

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

Closed

@martincostellomartincostello
mentioned this pull request
Aug 30, 2023
 Closed

@layomia
layomia
commented
Aug 30, 2023

Copy link


Copy Markdown

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

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6030151013
@github-actions
github-actionsBot
commented
Aug 30, 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: Update binder gen emitted-interceptor nullability to match framework impl
.git/rebase-apply/patch:899: trailing whitespace.
Assert.Throws<ArgumentNullException>(() => configuration.GetValue(typeof(Geolocation), key, default(Geolocation))); warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsConfigurationServiceCollectionExtensions.cs
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T_BinderOptions.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_BinderOptions.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name_BinderOptions.generated.txt
M	src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj
CONFLICT (add/add): Merge conflict in src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/Common/ConfigurationExtensionsTests.cs
Auto-merging src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/Common/ConfigurationExtensionsTests.cs
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name_BinderOptions.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name_BinderOptions.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_BinderOptions.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_BinderOptions.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T_BinderOptions.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T_BinderOptions.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsConfigurationServiceCollectionExtensions.cs
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsConfigurationServiceCollectionExtensions.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update binder gen emitted-interceptor nullability to match framework impl
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 30, 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 added a commit
to layomia/dotnet_runtime
that referenced
this pull request
Aug 30, 2023
@layomia
Update binder gen emitted-interceptor nullability to match framework …
8e14319
…impl (dotnet#91180)
@layomialayomia
mentioned this pull request
Aug 30, 2023
 Merged

carlossanlop pushed a commit
that referenced
this pull request
Aug 31, 2023
@layomia
Update binder gen emitted-interceptor nullability to match framework …
35f043f
…impl (#91180) (#91359)
@tonesandtonestonesandtones
mentioned this pull request
Sep 22, 2023

Closed

@radicalradical
mentioned this pull request
Sep 26, 2023
 Closed

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


Reviewers

@eerhardteerhardteerhardt approved these changes
@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@eerhardt

, '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); }
})();
})();
Update binder gen emitted-interceptor nullability to match framework impl by layomia · Pull Request #91180 · dotnet/runtime · GitHub
Skip to content
Update binder gen emitted-interceptor nullability to match framework impl - #91180
Merged
layomia merged 1 commit into
dotnet:mainfrom 
layomia:binder-gen-input-handling
Aug 28, 2023
Merged
Update binder gen emitted-interceptor nullability to match framework impl#91180
layomia merged 1 commit into
dotnet:mainfrom 
layomia:binder-gen-input-handling
Conversation
@layomia
@layomialayomia
commented
Aug 27, 2023

Copy link


Copy Markdown

Contributor
Addresses #90987. RC 2 candidate.
@layomialayomia
added this to the 9.0.0 milestone
Aug 27, 2023
@layomialayomia
self-assigned this
Aug 27, 2023
@ghost
ghost
commented
Aug 27, 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 #90987. RC 2 candidate.
Author:layomia
Assignees:layomia
Labels:
area-Extensions-Configuration
Milestone:9.0.0
eerhardt
eerhardt
approved these changes
Aug 28, 2023
View reviewed changes
@eerhardteerhardt
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@tarekgh
tarekgh
commented
Aug 28, 2023

Copy link


Copy Markdown

Member
@layomia you marked this PR with 9.0, I think you are planning to backport it to 8.0, right?
@layomia
layomia
commented
Aug 28, 2023

Copy link


Copy Markdown

ContributorAuthor
Yeah, I'm going to backport it.
@layomia
layomia
merged commit e1453f5
into
dotnet:mainAug 28, 2023
@layomialayomia
mentioned this pull request
Aug 28, 2023
 Merged

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

Closed

@martincostellomartincostello
mentioned this pull request
Aug 30, 2023
 Closed

@layomia
layomia
commented
Aug 30, 2023

Copy link


Copy Markdown

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

Copy link


Copy Markdown

Contributor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6030151013
@github-actions
github-actionsBot
commented
Aug 30, 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: Update binder gen emitted-interceptor nullability to match framework impl
.git/rebase-apply/patch:899: trailing whitespace.
Assert.Throws<ArgumentNullException>(() => configuration.GetValue(typeof(Geolocation), key, default(Geolocation))); warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsConfigurationServiceCollectionExtensions.cs
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T_BinderOptions.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_BinderOptions.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name.generated.txt
M	src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name_BinderOptions.generated.txt
M	src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj
CONFLICT (add/add): Merge conflict in src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/Common/ConfigurationExtensionsTests.cs
Auto-merging src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/Common/ConfigurationExtensionsTests.cs
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name_BinderOptions.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name_BinderOptions.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_BinderOptions.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_BinderOptions.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T_BinderOptions.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T_BinderOptions.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T.generated.txt
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T.generated.txt
Auto-merging src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsConfigurationServiceCollectionExtensions.cs
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/OptionsConfigurationServiceCollectionExtensions.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update binder gen emitted-interceptor nullability to match framework impl
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 30, 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 added a commit
to layomia/dotnet_runtime
that referenced
this pull request
Aug 30, 2023
@layomia
Update binder gen emitted-interceptor nullability to match framework …
8e14319
…impl (dotnet#91180)
@layomialayomia
mentioned this pull request
Aug 30, 2023
 Merged

carlossanlop pushed a commit
that referenced
this pull request
Aug 31, 2023
@layomia
Update binder gen emitted-interceptor nullability to match framework …
35f043f
…impl (#91180) (#91359)
@tonesandtonestonesandtones
mentioned this pull request
Sep 22, 2023

Closed

@radicalradical
mentioned this pull request
Sep 26, 2023
 Closed

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


Reviewers

@eerhardteerhardteerhardt approved these changes
@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@eerhardt