Skip to content

DCS work nicely with collectible AssemblyLoadContext - #90437

Merged
StephenMolloy merged 6 commits into
dotnet:mainfrom
StephenMolloy:77877_DCS-with-ALC
Aug 14, 2023
Merged

DCS work nicely with collectible AssemblyLoadContext#90437
StephenMolloy merged 6 commits into
dotnet:mainfrom
StephenMolloy:77877_DCS-with-ALC

Conversation

@StephenMolloy

@StephenMolloyStephenMolloy commented Aug 11, 2023

Copy link
Copy Markdown
Member

This replaces the draft PR (#88791) that I was using earlier. The pre-requisite changes that were staged in the first few commits of that draft got checked in under their own PR with proper contributor attribution (#73893), so this PR cherry-picks the rest of that draft and then addresses the feedback.

Fixes#77877

@StephenMolloyStephenMolloy added this to the 8.0.0 milestone Aug 11, 2023
@StephenMolloyStephenMolloy mentioned this pull request Aug 11, 2023
Closed
mconnew
mconnew reviewed Aug 11, 2023
View reviewed changes
Comment thread...es/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ContextAware.cs
}

public DataContract? GetItem(int index) => _contracts[index].strong ?? (_contracts[index].weak?.TryGetTarget(out DataContract? ret) == true ? ret : null);

@mconnewmconnewAug 11, 2023

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.

It's only a style thing, but did you consider having providing an indexer property instead of switching to Get and Set methods?

@StephenMolloyStephenMolloyAug 14, 2023

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Sort of an evolution of the context-aware side of the design that got away from the original usage pattern. An indexer would fit the original code. But the nullable notation of the original code was incorrect, even if our code was dilligent about null-checking. Maybe I've still got Monday brain, but I don't know of a way to make the getter nullable and the setter non-nullable... notation-wise anyway.

@mconnew

mconnew commented Aug 12, 2023

Copy link
Copy Markdown
Member

The only change that needs to happen is move the second check inside of the locks then this is good to merge.

@build-analysisbuild-analysisBot mentioned this pull request Aug 12, 2023
Closed
3 tasks
@StephenMolloy
Upon further review, GetValue/GetOrAdd already do this check before r…
792fb91
…unning the 'create' delegate. Docs suggest this is intentional and will remain the case.
@StephenMolloy
StephenMolloy merged commit adaebca into dotnet:mainAug 14, 2023
@ghostghost locked as resolved and limited conversation to collaborators Sep 14, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@mconnewmconnewmconnew approved these changes
@HongGitHongGitAwaiting requested review from HongGit

Assignees

@StephenMolloyStephenMolloy

Labels

area-Serialization

Projects

None yet

Milestone

8.0.0

Development

Successfully merging this pull request may close these issues.

DataContractSerializer caches collectible types in statics

2 participants

@StephenMolloy@mconnew
, '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" + '
DCS work nicely with collectible AssemblyLoadContext by StephenMolloy · Pull Request #90437 · dotnet/runtime · GitHub
Skip to content
DCS work nicely with collectible AssemblyLoadContext - #90437
Merged
StephenMolloy merged 6 commits into
dotnet:mainfrom 
StephenMolloy:77877_DCS-with-ALC
Aug 14, 2023
Merged
DCS work nicely with collectible AssemblyLoadContext#90437
StephenMolloy merged 6 commits into
dotnet:mainfrom 
StephenMolloy:77877_DCS-with-ALC
Conversation
@StephenMolloy
@StephenMolloyStephenMolloy
commented
Aug 11, 2023

Copy link


Copy Markdown

Member
This replaces the draft PR (#88791) that I was using earlier. The pre-requisite changes that were staged in the first few commits of that draft got checked in under their own PR with proper contributor attribution (#73893), so this PR cherry-picks the rest of that draft and then addresses the feedback.
Fixes#77877
@StephenMolloyStephenMolloy
added this to the 8.0.0 milestone
Aug 11, 2023
@StephenMolloyStephenMolloy
mentioned this pull request
Aug 11, 2023
 Closed

mconnew
mconnew
reviewed
Aug 11, 2023
View reviewed changes
Comment thread...es/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ContextAware.cs
 }

 public DataContract? GetItem(int index) => _contracts[index].strong ?? (_contracts[index].weak?.TryGetTarget(out DataContract? ret) == true ? ret : null);

@mconnewmconnewAug 11, 2023

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.

It's only a style thing, but did you consider having providing an indexer property instead of switching to Get and Set methods?
@StephenMolloyStephenMolloyAug 14, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Sort of an evolution of the context-aware side of the design that got away from the original usage pattern. An indexer would fit the original code. But the nullable notation of the original code was incorrect, even if our code was dilligent about null-checking. Maybe I've still got Monday brain, but I don't know of a way to make the getter nullable and the setter non-nullable... notation-wise anyway.
@mconnew
mconnew
commented
Aug 12, 2023

Copy link


Copy Markdown

Member
The only change that needs to happen is move the second check inside of the locks then this is good to merge.
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 12, 2023

Closed

3 tasks
@StephenMolloy
Upon further review, GetValue/GetOrAdd already do this check before r…
792fb91
…unning the 'create' delegate. Docs suggest this is intentional and will remain the case.
@StephenMolloy
StephenMolloy
merged commit adaebca
into
dotnet:mainAug 14, 2023
@ghostghost
locked as resolved and limited conversation to collaborators
Sep 14, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@mconnewmconnewmconnew approved these changes
@HongGitHongGitAwaiting requested review from HongGit

Assignees

@StephenMolloyStephenMolloy

Labels

area-Serialization

Projects


None yet


Milestone

8.0.0

Development

Successfully merging this pull request may close these issues.

DataContractSerializer caches collectible types in statics


2 participants

@StephenMolloy@mconnew

, '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('^' + ".*" + '
DCS work nicely with collectible AssemblyLoadContext by StephenMolloy · Pull Request #90437 · dotnet/runtime · GitHub
Skip to content
DCS work nicely with collectible AssemblyLoadContext - #90437
Merged
StephenMolloy merged 6 commits into
dotnet:mainfrom 
StephenMolloy:77877_DCS-with-ALC
Aug 14, 2023
Merged
DCS work nicely with collectible AssemblyLoadContext#90437
StephenMolloy merged 6 commits into
dotnet:mainfrom 
StephenMolloy:77877_DCS-with-ALC
Conversation
@StephenMolloy
@StephenMolloyStephenMolloy
commented
Aug 11, 2023

Copy link


Copy Markdown

Member
This replaces the draft PR (#88791) that I was using earlier. The pre-requisite changes that were staged in the first few commits of that draft got checked in under their own PR with proper contributor attribution (#73893), so this PR cherry-picks the rest of that draft and then addresses the feedback.
Fixes#77877
@StephenMolloyStephenMolloy
added this to the 8.0.0 milestone
Aug 11, 2023
@StephenMolloyStephenMolloy
mentioned this pull request
Aug 11, 2023
 Closed

mconnew
mconnew
reviewed
Aug 11, 2023
View reviewed changes
Comment thread...es/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ContextAware.cs
 }

 public DataContract? GetItem(int index) => _contracts[index].strong ?? (_contracts[index].weak?.TryGetTarget(out DataContract? ret) == true ? ret : null);

@mconnewmconnewAug 11, 2023

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.

It's only a style thing, but did you consider having providing an indexer property instead of switching to Get and Set methods?
@StephenMolloyStephenMolloyAug 14, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Sort of an evolution of the context-aware side of the design that got away from the original usage pattern. An indexer would fit the original code. But the nullable notation of the original code was incorrect, even if our code was dilligent about null-checking. Maybe I've still got Monday brain, but I don't know of a way to make the getter nullable and the setter non-nullable... notation-wise anyway.
@mconnew
mconnew
commented
Aug 12, 2023

Copy link


Copy Markdown

Member
The only change that needs to happen is move the second check inside of the locks then this is good to merge.
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 12, 2023

Closed

3 tasks
@StephenMolloy
Upon further review, GetValue/GetOrAdd already do this check before r…
792fb91
…unning the 'create' delegate. Docs suggest this is intentional and will remain the case.
@StephenMolloy
StephenMolloy
merged commit adaebca
into
dotnet:mainAug 14, 2023
@ghostghost
locked as resolved and limited conversation to collaborators
Sep 14, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@mconnewmconnewmconnew approved these changes
@HongGitHongGitAwaiting requested review from HongGit

Assignees

@StephenMolloyStephenMolloy

Labels

area-Serialization

Projects


None yet


Milestone

8.0.0

Development

Successfully merging this pull request may close these issues.

DataContractSerializer caches collectible types in statics


2 participants

@StephenMolloy@mconnew

, '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('^' + ".*" + '
DCS work nicely with collectible AssemblyLoadContext by StephenMolloy · Pull Request #90437 · dotnet/runtime · GitHub
Skip to content
DCS work nicely with collectible AssemblyLoadContext - #90437
Merged
StephenMolloy merged 6 commits into
dotnet:mainfrom 
StephenMolloy:77877_DCS-with-ALC
Aug 14, 2023
Merged
DCS work nicely with collectible AssemblyLoadContext#90437
StephenMolloy merged 6 commits into
dotnet:mainfrom 
StephenMolloy:77877_DCS-with-ALC
Conversation
@StephenMolloy
@StephenMolloyStephenMolloy
commented
Aug 11, 2023

Copy link


Copy Markdown

Member
This replaces the draft PR (#88791) that I was using earlier. The pre-requisite changes that were staged in the first few commits of that draft got checked in under their own PR with proper contributor attribution (#73893), so this PR cherry-picks the rest of that draft and then addresses the feedback.
Fixes#77877
@StephenMolloyStephenMolloy
added this to the 8.0.0 milestone
Aug 11, 2023
@StephenMolloyStephenMolloy
mentioned this pull request
Aug 11, 2023
 Closed

mconnew
mconnew
reviewed
Aug 11, 2023
View reviewed changes
Comment thread...es/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ContextAware.cs
 }

 public DataContract? GetItem(int index) => _contracts[index].strong ?? (_contracts[index].weak?.TryGetTarget(out DataContract? ret) == true ? ret : null);

@mconnewmconnewAug 11, 2023

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.

It's only a style thing, but did you consider having providing an indexer property instead of switching to Get and Set methods?
@StephenMolloyStephenMolloyAug 14, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Sort of an evolution of the context-aware side of the design that got away from the original usage pattern. An indexer would fit the original code. But the nullable notation of the original code was incorrect, even if our code was dilligent about null-checking. Maybe I've still got Monday brain, but I don't know of a way to make the getter nullable and the setter non-nullable... notation-wise anyway.
@mconnew
mconnew
commented
Aug 12, 2023

Copy link


Copy Markdown

Member
The only change that needs to happen is move the second check inside of the locks then this is good to merge.
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 12, 2023

Closed

3 tasks
@StephenMolloy
Upon further review, GetValue/GetOrAdd already do this check before r…
792fb91
…unning the 'create' delegate. Docs suggest this is intentional and will remain the case.
@StephenMolloy
StephenMolloy
merged commit adaebca
into
dotnet:mainAug 14, 2023
@ghostghost
locked as resolved and limited conversation to collaborators
Sep 14, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@mconnewmconnewmconnew approved these changes
@HongGitHongGitAwaiting requested review from HongGit

Assignees

@StephenMolloyStephenMolloy

Labels

area-Serialization

Projects


None yet


Milestone

8.0.0

Development

Successfully merging this pull request may close these issues.

DataContractSerializer caches collectible types in statics


2 participants

@StephenMolloy@mconnew

, '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" + '
DCS work nicely with collectible AssemblyLoadContext by StephenMolloy · Pull Request #90437 · dotnet/runtime · GitHub
Skip to content
DCS work nicely with collectible AssemblyLoadContext - #90437
Merged
StephenMolloy merged 6 commits into
dotnet:mainfrom 
StephenMolloy:77877_DCS-with-ALC
Aug 14, 2023
Merged
DCS work nicely with collectible AssemblyLoadContext#90437
StephenMolloy merged 6 commits into
dotnet:mainfrom 
StephenMolloy:77877_DCS-with-ALC
Conversation
@StephenMolloy
@StephenMolloyStephenMolloy
commented
Aug 11, 2023

Copy link


Copy Markdown

Member
This replaces the draft PR (#88791) that I was using earlier. The pre-requisite changes that were staged in the first few commits of that draft got checked in under their own PR with proper contributor attribution (#73893), so this PR cherry-picks the rest of that draft and then addresses the feedback.
Fixes#77877
@StephenMolloyStephenMolloy
added this to the 8.0.0 milestone
Aug 11, 2023
@StephenMolloyStephenMolloy
mentioned this pull request
Aug 11, 2023
 Closed

mconnew
mconnew
reviewed
Aug 11, 2023
View reviewed changes
Comment thread...es/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ContextAware.cs
 }

 public DataContract? GetItem(int index) => _contracts[index].strong ?? (_contracts[index].weak?.TryGetTarget(out DataContract? ret) == true ? ret : null);

@mconnewmconnewAug 11, 2023

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.

It's only a style thing, but did you consider having providing an indexer property instead of switching to Get and Set methods?
@StephenMolloyStephenMolloyAug 14, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Sort of an evolution of the context-aware side of the design that got away from the original usage pattern. An indexer would fit the original code. But the nullable notation of the original code was incorrect, even if our code was dilligent about null-checking. Maybe I've still got Monday brain, but I don't know of a way to make the getter nullable and the setter non-nullable... notation-wise anyway.
@mconnew
mconnew
commented
Aug 12, 2023

Copy link


Copy Markdown

Member
The only change that needs to happen is move the second check inside of the locks then this is good to merge.
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 12, 2023

Closed

3 tasks
@StephenMolloy
Upon further review, GetValue/GetOrAdd already do this check before r…
792fb91
…unning the 'create' delegate. Docs suggest this is intentional and will remain the case.
@StephenMolloy
StephenMolloy
merged commit adaebca
into
dotnet:mainAug 14, 2023
@ghostghost
locked as resolved and limited conversation to collaborators
Sep 14, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@mconnewmconnewmconnew approved these changes
@HongGitHongGitAwaiting requested review from HongGit

Assignees

@StephenMolloyStephenMolloy

Labels

area-Serialization

Projects


None yet


Milestone

8.0.0

Development

Successfully merging this pull request may close these issues.

DataContractSerializer caches collectible types in statics


2 participants

@StephenMolloy@mconnew

, '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('^' + ".*" + '
DCS work nicely with collectible AssemblyLoadContext by StephenMolloy · Pull Request #90437 · dotnet/runtime · GitHub
Skip to content
DCS work nicely with collectible AssemblyLoadContext - #90437
Merged
StephenMolloy merged 6 commits into
dotnet:mainfrom 
StephenMolloy:77877_DCS-with-ALC
Aug 14, 2023
Merged
DCS work nicely with collectible AssemblyLoadContext#90437
StephenMolloy merged 6 commits into
dotnet:mainfrom 
StephenMolloy:77877_DCS-with-ALC
Conversation
@StephenMolloy
@StephenMolloyStephenMolloy
commented
Aug 11, 2023

Copy link


Copy Markdown

Member
This replaces the draft PR (#88791) that I was using earlier. The pre-requisite changes that were staged in the first few commits of that draft got checked in under their own PR with proper contributor attribution (#73893), so this PR cherry-picks the rest of that draft and then addresses the feedback.
Fixes#77877
@StephenMolloyStephenMolloy
added this to the 8.0.0 milestone
Aug 11, 2023
@StephenMolloyStephenMolloy
mentioned this pull request
Aug 11, 2023
 Closed

mconnew
mconnew
reviewed
Aug 11, 2023
View reviewed changes
Comment thread...es/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ContextAware.cs
 }

 public DataContract? GetItem(int index) => _contracts[index].strong ?? (_contracts[index].weak?.TryGetTarget(out DataContract? ret) == true ? ret : null);

@mconnewmconnewAug 11, 2023

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.

It's only a style thing, but did you consider having providing an indexer property instead of switching to Get and Set methods?
@StephenMolloyStephenMolloyAug 14, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Sort of an evolution of the context-aware side of the design that got away from the original usage pattern. An indexer would fit the original code. But the nullable notation of the original code was incorrect, even if our code was dilligent about null-checking. Maybe I've still got Monday brain, but I don't know of a way to make the getter nullable and the setter non-nullable... notation-wise anyway.
@mconnew
mconnew
commented
Aug 12, 2023

Copy link


Copy Markdown

Member
The only change that needs to happen is move the second check inside of the locks then this is good to merge.
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 12, 2023

Closed

3 tasks
@StephenMolloy
Upon further review, GetValue/GetOrAdd already do this check before r…
792fb91
…unning the 'create' delegate. Docs suggest this is intentional and will remain the case.
@StephenMolloy
StephenMolloy
merged commit adaebca
into
dotnet:mainAug 14, 2023
@ghostghost
locked as resolved and limited conversation to collaborators
Sep 14, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@mconnewmconnewmconnew approved these changes
@HongGitHongGitAwaiting requested review from HongGit

Assignees

@StephenMolloyStephenMolloy

Labels

area-Serialization

Projects


None yet


Milestone

8.0.0

Development

Successfully merging this pull request may close these issues.

DataContractSerializer caches collectible types in statics


2 participants

@StephenMolloy@mconnew

, '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('^' + ".*" + '
DCS work nicely with collectible AssemblyLoadContext by StephenMolloy · Pull Request #90437 · dotnet/runtime · GitHub
Skip to content
DCS work nicely with collectible AssemblyLoadContext - #90437
Merged
StephenMolloy merged 6 commits into
dotnet:mainfrom 
StephenMolloy:77877_DCS-with-ALC
Aug 14, 2023
Merged
DCS work nicely with collectible AssemblyLoadContext#90437
StephenMolloy merged 6 commits into
dotnet:mainfrom 
StephenMolloy:77877_DCS-with-ALC
Conversation
@StephenMolloy
@StephenMolloyStephenMolloy
commented
Aug 11, 2023

Copy link


Copy Markdown

Member
This replaces the draft PR (#88791) that I was using earlier. The pre-requisite changes that were staged in the first few commits of that draft got checked in under their own PR with proper contributor attribution (#73893), so this PR cherry-picks the rest of that draft and then addresses the feedback.
Fixes#77877
@StephenMolloyStephenMolloy
added this to the 8.0.0 milestone
Aug 11, 2023
@StephenMolloyStephenMolloy
mentioned this pull request
Aug 11, 2023
 Closed

mconnew
mconnew
reviewed
Aug 11, 2023
View reviewed changes
Comment thread...es/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ContextAware.cs
 }

 public DataContract? GetItem(int index) => _contracts[index].strong ?? (_contracts[index].weak?.TryGetTarget(out DataContract? ret) == true ? ret : null);

@mconnewmconnewAug 11, 2023

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.

It's only a style thing, but did you consider having providing an indexer property instead of switching to Get and Set methods?
@StephenMolloyStephenMolloyAug 14, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Sort of an evolution of the context-aware side of the design that got away from the original usage pattern. An indexer would fit the original code. But the nullable notation of the original code was incorrect, even if our code was dilligent about null-checking. Maybe I've still got Monday brain, but I don't know of a way to make the getter nullable and the setter non-nullable... notation-wise anyway.
@mconnew
mconnew
commented
Aug 12, 2023

Copy link


Copy Markdown

Member
The only change that needs to happen is move the second check inside of the locks then this is good to merge.
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 12, 2023

Closed

3 tasks
@StephenMolloy
Upon further review, GetValue/GetOrAdd already do this check before r…
792fb91
…unning the 'create' delegate. Docs suggest this is intentional and will remain the case.
@StephenMolloy
StephenMolloy
merged commit adaebca
into
dotnet:mainAug 14, 2023
@ghostghost
locked as resolved and limited conversation to collaborators
Sep 14, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@mconnewmconnewmconnew approved these changes
@HongGitHongGitAwaiting requested review from HongGit

Assignees

@StephenMolloyStephenMolloy

Labels

area-Serialization

Projects


None yet


Milestone

8.0.0

Development

Successfully merging this pull request may close these issues.

DataContractSerializer caches collectible types in statics


2 participants

@StephenMolloy@mconnew

, '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); }
})();
})();
DCS work nicely with collectible AssemblyLoadContext by StephenMolloy · Pull Request #90437 · dotnet/runtime · GitHub
Skip to content
DCS work nicely with collectible AssemblyLoadContext - #90437
Merged
StephenMolloy merged 6 commits into
dotnet:mainfrom 
StephenMolloy:77877_DCS-with-ALC
Aug 14, 2023
Merged
DCS work nicely with collectible AssemblyLoadContext#90437
StephenMolloy merged 6 commits into
dotnet:mainfrom 
StephenMolloy:77877_DCS-with-ALC
Conversation
@StephenMolloy
@StephenMolloyStephenMolloy
commented
Aug 11, 2023

Copy link


Copy Markdown

Member
This replaces the draft PR (#88791) that I was using earlier. The pre-requisite changes that were staged in the first few commits of that draft got checked in under their own PR with proper contributor attribution (#73893), so this PR cherry-picks the rest of that draft and then addresses the feedback.
Fixes#77877
@StephenMolloyStephenMolloy
added this to the 8.0.0 milestone
Aug 11, 2023
@StephenMolloyStephenMolloy
mentioned this pull request
Aug 11, 2023
 Closed

mconnew
mconnew
reviewed
Aug 11, 2023
View reviewed changes
Comment thread...es/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ContextAware.cs
 }

 public DataContract? GetItem(int index) => _contracts[index].strong ?? (_contracts[index].weak?.TryGetTarget(out DataContract? ret) == true ? ret : null);

@mconnewmconnewAug 11, 2023

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.

It's only a style thing, but did you consider having providing an indexer property instead of switching to Get and Set methods?
@StephenMolloyStephenMolloyAug 14, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

Sort of an evolution of the context-aware side of the design that got away from the original usage pattern. An indexer would fit the original code. But the nullable notation of the original code was incorrect, even if our code was dilligent about null-checking. Maybe I've still got Monday brain, but I don't know of a way to make the getter nullable and the setter non-nullable... notation-wise anyway.
@mconnew
mconnew
commented
Aug 12, 2023

Copy link


Copy Markdown

Member
The only change that needs to happen is move the second check inside of the locks then this is good to merge.
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 12, 2023

Closed

3 tasks
@StephenMolloy
Upon further review, GetValue/GetOrAdd already do this check before r…
792fb91
…unning the 'create' delegate. Docs suggest this is intentional and will remain the case.
@StephenMolloy
StephenMolloy
merged commit adaebca
into
dotnet:mainAug 14, 2023
@ghostghost
locked as resolved and limited conversation to collaborators
Sep 14, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@mconnewmconnewmconnew approved these changes
@HongGitHongGitAwaiting requested review from HongGit

Assignees

@StephenMolloyStephenMolloy

Labels

area-Serialization

Projects


None yet


Milestone

8.0.0

Development

Successfully merging this pull request may close these issues.

DataContractSerializer caches collectible types in statics


2 participants

@StephenMolloy@mconnew