Skip to content

Use RuntimeIdentifierGraphPath if available in runtime copy of Microsoft.NET.CrossGen.targets - #91077

Merged
elinor-fung merged 1 commit into
dotnet:mainfrom
elinor-fung:fix90977
Aug 24, 2023
Merged

Use RuntimeIdentifierGraphPath if available in runtime copy of Microsoft.NET.CrossGen.targets#91077
elinor-fung merged 1 commit into
dotnet:mainfrom
elinor-fung:fix90977

Conversation

@elinor-fung

@elinor-fungelinor-fung commented Aug 24, 2023

Copy link
Copy Markdown
Member

The sdk (shipping) version of this target was updated to use the new trimmed graph as part of dotnet/sdk#34279. This makes the equivalent change here such that it uses the RuntimeIdentifierGraphPath if set (SDK always sets starting with .NET 8 RC1), otherwise BundledRuntimeIdentifierGraphFile.

From what I can tell, the runtime repo does not actually use this particular ResolveReadyToRunCompilers target right now. The only place I found pulling in this target file is

runtime/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props

Line 176 in 658bdd0

<ImportProject="$(Crossgen2SdkOverrideTargetsPath)"Condition="'$(BuildNativeAOTRuntimePack)' != 'true' and '$(Crossgen2SdkOverrideTargetsPath)' != ''" />

but the project also pulls in ReadyToRun.targets

runtime/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj

Line 29 in 658bdd0

<Import Project="ReadyToRun.targets" />

which overrides ResolveReadyToRunCompilers

runtime/src/installer/pkg/sfx/Microsoft.NETCore.App/ReadyToRun.targets

Line 2 in 658bdd0

<TargetName="ResolveReadyToRunCompilers"DependsOnTargets="ResolveRuntimeFilesFromLocalBuild">

Fixes#90977

cc @dsplaisted@tmds

@ghostghost added the area-ReadyToRun label Aug 24, 2023
@ViktorHofer

ViktorHofer commented Aug 24, 2023

Copy link
Copy Markdown
Member

We should backport this into release/8.0.

@elinor-fung

elinor-fung commented Aug 24, 2023

Copy link
Copy Markdown
MemberAuthor

Yep, will backport.

@elinor-fung

elinor-fung commented Aug 24, 2023

Copy link
Copy Markdown
MemberAuthor

Failures are known: #82837, #90834

@elinor-fung
elinor-fung merged commit 31e99c2 into dotnet:mainAug 24, 2023
@elinor-fung
elinor-fung deleted the fix90977 branch August 24, 2023 19:54
@elinor-fung

elinor-fung commented Aug 24, 2023

Copy link
Copy Markdown
MemberAuthor

/backport to release/8.0

@github-actions

github-actionsBot commented Aug 24, 2023

Copy link
Copy Markdown
Contributor

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

@github-actionsgithub-actionsBot mentioned this pull request Aug 24, 2023
Merged
This was referenced Aug 24, 2023
Open
Closed
am11
am11 reviewed Aug 24, 2023
View reviewed changes
Comment threadsrc/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets
Crossgen2Packs="@(ResolvedCrossgen2Pack)"
TargetingPacks="@(ResolvedTargetingPack)"
RuntimeGraphPath="$(BundledRuntimeIdentifierGraphFile)"
RuntimeGraphPath="$([MSBuild]::ValueOrDefault('$(RuntimeIdentifierGraphPath)', '$(BundledRuntimeIdentifierGraphFile)'))"

@am11am11Aug 24, 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.

Another place using BundledRuntimeIdentifierGraphFile is in pretest.proj:

runtime/src/libraries/pretest.proj

Line 105 in f8d9b3c

RuntimeGraphFiles="$(BundledRuntimeIdentifierGraphFile)"
Can we update it as well?

@elinor-fungelinor-fungAug 25, 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.

Opened #91102

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

Reviewers

@ViktorHoferViktorHoferViktorHofer approved these changes
+1 more reviewer
@am11am11am11 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@elinor-fungelinor-fung

Labels

area-ReadyToRun

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Microsoft.NET.CrossGen.targets: stop using legacy runtime graph

3 participants

@elinor-fung@ViktorHofer@am11
, '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" + '
Use RuntimeIdentifierGraphPath if available in runtime copy of Microsoft.NET.CrossGen.targets by elinor-fung · Pull Request #91077 · dotnet/runtime · GitHub
Skip to content
Use RuntimeIdentifierGraphPath if available in runtime copy of Microsoft.NET.CrossGen.targets - #91077
Merged
elinor-fung merged 1 commit into
dotnet:mainfrom 
elinor-fung:fix90977
Aug 24, 2023
Merged
Use RuntimeIdentifierGraphPath if available in runtime copy of Microsoft.NET.CrossGen.targets#91077
elinor-fung merged 1 commit into
dotnet:mainfrom 
elinor-fung:fix90977
Conversation
@elinor-fung
@elinor-fungelinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

Member
The sdk (shipping) version of this target was updated to use the new trimmed graph as part of dotnet/sdk#34279. This makes the equivalent change here such that it uses the RuntimeIdentifierGraphPath if set (SDK always sets starting with .NET 8 RC1), otherwise BundledRuntimeIdentifierGraphFile.
From what I can tell, the runtime repo does not actually use this particular ResolveReadyToRunCompilers target right now. The only place I found pulling in this target file is 
runtime/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props

Line 176
in
658bdd0
 <ImportProject="$(Crossgen2SdkOverrideTargetsPath)"Condition="'$(BuildNativeAOTRuntimePack)' != 'true' and '$(Crossgen2SdkOverrideTargetsPath)' != ''" /> 


but the project also pulls in ReadyToRun.targets
runtime/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj

Line 29
in
658bdd0
 <Import Project="ReadyToRun.targets" /> 


which overrides ResolveReadyToRunCompilers
runtime/src/installer/pkg/sfx/Microsoft.NETCore.App/ReadyToRun.targets

Line 2
in
658bdd0
 <TargetName="ResolveReadyToRunCompilers"DependsOnTargets="ResolveRuntimeFilesFromLocalBuild"> 
Fixes#90977
cc @dsplaisted@tmds
@ghostghost
added
the 
area-ReadyToRun

label
Aug 24, 2023
@ViktorHofer
ViktorHofer
commented
Aug 24, 2023

Copy link


Copy Markdown

Member
We should backport this into release/8.0.
@elinor-fung
elinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

MemberAuthor
Yep, will backport.
@elinor-fung
elinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

MemberAuthor
Failures are known: #82837, #90834
@elinor-fung
elinor-fung
merged commit 31e99c2
into
dotnet:mainAug 24, 2023
@elinor-fung
elinor-fung
deleted the

fix90977

branch
August 24, 2023 19:54
@elinor-fung
elinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 24, 2023

Copy link


Copy Markdown

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


This was referenced Aug 24, 2023

Open


Closed

am11
am11
reviewed
Aug 24, 2023
View reviewed changes
Comment threadsrc/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets
 Crossgen2Packs="@(ResolvedCrossgen2Pack)"
 TargetingPacks="@(ResolvedTargetingPack)"
 RuntimeGraphPath="$(BundledRuntimeIdentifierGraphFile)"
 RuntimeGraphPath="$([MSBuild]::ValueOrDefault('$(RuntimeIdentifierGraphPath)', '$(BundledRuntimeIdentifierGraphFile)'))"
@am11am11Aug 24, 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.

Another place using BundledRuntimeIdentifierGraphFile is in pretest.proj: 
runtime/src/libraries/pretest.proj

Line 105
in
f8d9b3c
RuntimeGraphFiles="$(BundledRuntimeIdentifierGraphFile)"

Can we update it as well?
@elinor-fungelinor-fungAug 25, 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.

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


Reviewers

@ViktorHoferViktorHoferViktorHofer approved these changes

+1 more reviewer

@am11am11am11 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@elinor-fungelinor-fung

Labels

area-ReadyToRun

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Microsoft.NET.CrossGen.targets: stop using legacy runtime graph


3 participants

@elinor-fung@ViktorHofer@am11

, '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('^' + ".*" + '
Use RuntimeIdentifierGraphPath if available in runtime copy of Microsoft.NET.CrossGen.targets by elinor-fung · Pull Request #91077 · dotnet/runtime · GitHub
Skip to content
Use RuntimeIdentifierGraphPath if available in runtime copy of Microsoft.NET.CrossGen.targets - #91077
Merged
elinor-fung merged 1 commit into
dotnet:mainfrom 
elinor-fung:fix90977
Aug 24, 2023
Merged
Use RuntimeIdentifierGraphPath if available in runtime copy of Microsoft.NET.CrossGen.targets#91077
elinor-fung merged 1 commit into
dotnet:mainfrom 
elinor-fung:fix90977
Conversation
@elinor-fung
@elinor-fungelinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

Member
The sdk (shipping) version of this target was updated to use the new trimmed graph as part of dotnet/sdk#34279. This makes the equivalent change here such that it uses the RuntimeIdentifierGraphPath if set (SDK always sets starting with .NET 8 RC1), otherwise BundledRuntimeIdentifierGraphFile.
From what I can tell, the runtime repo does not actually use this particular ResolveReadyToRunCompilers target right now. The only place I found pulling in this target file is 
runtime/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props

Line 176
in
658bdd0
 <ImportProject="$(Crossgen2SdkOverrideTargetsPath)"Condition="'$(BuildNativeAOTRuntimePack)' != 'true' and '$(Crossgen2SdkOverrideTargetsPath)' != ''" /> 


but the project also pulls in ReadyToRun.targets
runtime/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj

Line 29
in
658bdd0
 <Import Project="ReadyToRun.targets" /> 


which overrides ResolveReadyToRunCompilers
runtime/src/installer/pkg/sfx/Microsoft.NETCore.App/ReadyToRun.targets

Line 2
in
658bdd0
 <TargetName="ResolveReadyToRunCompilers"DependsOnTargets="ResolveRuntimeFilesFromLocalBuild"> 
Fixes#90977
cc @dsplaisted@tmds
@ghostghost
added
the 
area-ReadyToRun

label
Aug 24, 2023
@ViktorHofer
ViktorHofer
commented
Aug 24, 2023

Copy link


Copy Markdown

Member
We should backport this into release/8.0.
@elinor-fung
elinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

MemberAuthor
Yep, will backport.
@elinor-fung
elinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

MemberAuthor
Failures are known: #82837, #90834
@elinor-fung
elinor-fung
merged commit 31e99c2
into
dotnet:mainAug 24, 2023
@elinor-fung
elinor-fung
deleted the

fix90977

branch
August 24, 2023 19:54
@elinor-fung
elinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 24, 2023

Copy link


Copy Markdown

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


This was referenced Aug 24, 2023

Open


Closed

am11
am11
reviewed
Aug 24, 2023
View reviewed changes
Comment threadsrc/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets
 Crossgen2Packs="@(ResolvedCrossgen2Pack)"
 TargetingPacks="@(ResolvedTargetingPack)"
 RuntimeGraphPath="$(BundledRuntimeIdentifierGraphFile)"
 RuntimeGraphPath="$([MSBuild]::ValueOrDefault('$(RuntimeIdentifierGraphPath)', '$(BundledRuntimeIdentifierGraphFile)'))"
@am11am11Aug 24, 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.

Another place using BundledRuntimeIdentifierGraphFile is in pretest.proj: 
runtime/src/libraries/pretest.proj

Line 105
in
f8d9b3c
RuntimeGraphFiles="$(BundledRuntimeIdentifierGraphFile)"

Can we update it as well?
@elinor-fungelinor-fungAug 25, 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.

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


Reviewers

@ViktorHoferViktorHoferViktorHofer approved these changes

+1 more reviewer

@am11am11am11 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@elinor-fungelinor-fung

Labels

area-ReadyToRun

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Microsoft.NET.CrossGen.targets: stop using legacy runtime graph


3 participants

@elinor-fung@ViktorHofer@am11

, '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('^' + ".*" + '
Use RuntimeIdentifierGraphPath if available in runtime copy of Microsoft.NET.CrossGen.targets by elinor-fung · Pull Request #91077 · dotnet/runtime · GitHub
Skip to content
Use RuntimeIdentifierGraphPath if available in runtime copy of Microsoft.NET.CrossGen.targets - #91077
Merged
elinor-fung merged 1 commit into
dotnet:mainfrom 
elinor-fung:fix90977
Aug 24, 2023
Merged
Use RuntimeIdentifierGraphPath if available in runtime copy of Microsoft.NET.CrossGen.targets#91077
elinor-fung merged 1 commit into
dotnet:mainfrom 
elinor-fung:fix90977
Conversation
@elinor-fung
@elinor-fungelinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

Member
The sdk (shipping) version of this target was updated to use the new trimmed graph as part of dotnet/sdk#34279. This makes the equivalent change here such that it uses the RuntimeIdentifierGraphPath if set (SDK always sets starting with .NET 8 RC1), otherwise BundledRuntimeIdentifierGraphFile.
From what I can tell, the runtime repo does not actually use this particular ResolveReadyToRunCompilers target right now. The only place I found pulling in this target file is 
runtime/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props

Line 176
in
658bdd0
 <ImportProject="$(Crossgen2SdkOverrideTargetsPath)"Condition="'$(BuildNativeAOTRuntimePack)' != 'true' and '$(Crossgen2SdkOverrideTargetsPath)' != ''" /> 


but the project also pulls in ReadyToRun.targets
runtime/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj

Line 29
in
658bdd0
 <Import Project="ReadyToRun.targets" /> 


which overrides ResolveReadyToRunCompilers
runtime/src/installer/pkg/sfx/Microsoft.NETCore.App/ReadyToRun.targets

Line 2
in
658bdd0
 <TargetName="ResolveReadyToRunCompilers"DependsOnTargets="ResolveRuntimeFilesFromLocalBuild"> 
Fixes#90977
cc @dsplaisted@tmds
@ghostghost
added
the 
area-ReadyToRun

label
Aug 24, 2023
@ViktorHofer
ViktorHofer
commented
Aug 24, 2023

Copy link


Copy Markdown

Member
We should backport this into release/8.0.
@elinor-fung
elinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

MemberAuthor
Yep, will backport.
@elinor-fung
elinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

MemberAuthor
Failures are known: #82837, #90834
@elinor-fung
elinor-fung
merged commit 31e99c2
into
dotnet:mainAug 24, 2023
@elinor-fung
elinor-fung
deleted the

fix90977

branch
August 24, 2023 19:54
@elinor-fung
elinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 24, 2023

Copy link


Copy Markdown

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


This was referenced Aug 24, 2023

Open


Closed

am11
am11
reviewed
Aug 24, 2023
View reviewed changes
Comment threadsrc/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets
 Crossgen2Packs="@(ResolvedCrossgen2Pack)"
 TargetingPacks="@(ResolvedTargetingPack)"
 RuntimeGraphPath="$(BundledRuntimeIdentifierGraphFile)"
 RuntimeGraphPath="$([MSBuild]::ValueOrDefault('$(RuntimeIdentifierGraphPath)', '$(BundledRuntimeIdentifierGraphFile)'))"
@am11am11Aug 24, 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.

Another place using BundledRuntimeIdentifierGraphFile is in pretest.proj: 
runtime/src/libraries/pretest.proj

Line 105
in
f8d9b3c
RuntimeGraphFiles="$(BundledRuntimeIdentifierGraphFile)"

Can we update it as well?
@elinor-fungelinor-fungAug 25, 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.

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


Reviewers

@ViktorHoferViktorHoferViktorHofer approved these changes

+1 more reviewer

@am11am11am11 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@elinor-fungelinor-fung

Labels

area-ReadyToRun

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Microsoft.NET.CrossGen.targets: stop using legacy runtime graph


3 participants

@elinor-fung@ViktorHofer@am11

, '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" + '
Use RuntimeIdentifierGraphPath if available in runtime copy of Microsoft.NET.CrossGen.targets by elinor-fung · Pull Request #91077 · dotnet/runtime · GitHub
Skip to content
Use RuntimeIdentifierGraphPath if available in runtime copy of Microsoft.NET.CrossGen.targets - #91077
Merged
elinor-fung merged 1 commit into
dotnet:mainfrom 
elinor-fung:fix90977
Aug 24, 2023
Merged
Use RuntimeIdentifierGraphPath if available in runtime copy of Microsoft.NET.CrossGen.targets#91077
elinor-fung merged 1 commit into
dotnet:mainfrom 
elinor-fung:fix90977
Conversation
@elinor-fung
@elinor-fungelinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

Member
The sdk (shipping) version of this target was updated to use the new trimmed graph as part of dotnet/sdk#34279. This makes the equivalent change here such that it uses the RuntimeIdentifierGraphPath if set (SDK always sets starting with .NET 8 RC1), otherwise BundledRuntimeIdentifierGraphFile.
From what I can tell, the runtime repo does not actually use this particular ResolveReadyToRunCompilers target right now. The only place I found pulling in this target file is 
runtime/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props

Line 176
in
658bdd0
 <ImportProject="$(Crossgen2SdkOverrideTargetsPath)"Condition="'$(BuildNativeAOTRuntimePack)' != 'true' and '$(Crossgen2SdkOverrideTargetsPath)' != ''" /> 


but the project also pulls in ReadyToRun.targets
runtime/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj

Line 29
in
658bdd0
 <Import Project="ReadyToRun.targets" /> 


which overrides ResolveReadyToRunCompilers
runtime/src/installer/pkg/sfx/Microsoft.NETCore.App/ReadyToRun.targets

Line 2
in
658bdd0
 <TargetName="ResolveReadyToRunCompilers"DependsOnTargets="ResolveRuntimeFilesFromLocalBuild"> 
Fixes#90977
cc @dsplaisted@tmds
@ghostghost
added
the 
area-ReadyToRun

label
Aug 24, 2023
@ViktorHofer
ViktorHofer
commented
Aug 24, 2023

Copy link


Copy Markdown

Member
We should backport this into release/8.0.
@elinor-fung
elinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

MemberAuthor
Yep, will backport.
@elinor-fung
elinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

MemberAuthor
Failures are known: #82837, #90834
@elinor-fung
elinor-fung
merged commit 31e99c2
into
dotnet:mainAug 24, 2023
@elinor-fung
elinor-fung
deleted the

fix90977

branch
August 24, 2023 19:54
@elinor-fung
elinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 24, 2023

Copy link


Copy Markdown

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


This was referenced Aug 24, 2023

Open


Closed

am11
am11
reviewed
Aug 24, 2023
View reviewed changes
Comment threadsrc/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets
 Crossgen2Packs="@(ResolvedCrossgen2Pack)"
 TargetingPacks="@(ResolvedTargetingPack)"
 RuntimeGraphPath="$(BundledRuntimeIdentifierGraphFile)"
 RuntimeGraphPath="$([MSBuild]::ValueOrDefault('$(RuntimeIdentifierGraphPath)', '$(BundledRuntimeIdentifierGraphFile)'))"
@am11am11Aug 24, 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.

Another place using BundledRuntimeIdentifierGraphFile is in pretest.proj: 
runtime/src/libraries/pretest.proj

Line 105
in
f8d9b3c
RuntimeGraphFiles="$(BundledRuntimeIdentifierGraphFile)"

Can we update it as well?
@elinor-fungelinor-fungAug 25, 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.

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


Reviewers

@ViktorHoferViktorHoferViktorHofer approved these changes

+1 more reviewer

@am11am11am11 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@elinor-fungelinor-fung

Labels

area-ReadyToRun

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Microsoft.NET.CrossGen.targets: stop using legacy runtime graph


3 participants

@elinor-fung@ViktorHofer@am11

, '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('^' + ".*" + '
Use RuntimeIdentifierGraphPath if available in runtime copy of Microsoft.NET.CrossGen.targets by elinor-fung · Pull Request #91077 · dotnet/runtime · GitHub
Skip to content
Use RuntimeIdentifierGraphPath if available in runtime copy of Microsoft.NET.CrossGen.targets - #91077
Merged
elinor-fung merged 1 commit into
dotnet:mainfrom 
elinor-fung:fix90977
Aug 24, 2023
Merged
Use RuntimeIdentifierGraphPath if available in runtime copy of Microsoft.NET.CrossGen.targets#91077
elinor-fung merged 1 commit into
dotnet:mainfrom 
elinor-fung:fix90977
Conversation
@elinor-fung
@elinor-fungelinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

Member
The sdk (shipping) version of this target was updated to use the new trimmed graph as part of dotnet/sdk#34279. This makes the equivalent change here such that it uses the RuntimeIdentifierGraphPath if set (SDK always sets starting with .NET 8 RC1), otherwise BundledRuntimeIdentifierGraphFile.
From what I can tell, the runtime repo does not actually use this particular ResolveReadyToRunCompilers target right now. The only place I found pulling in this target file is 
runtime/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props

Line 176
in
658bdd0
 <ImportProject="$(Crossgen2SdkOverrideTargetsPath)"Condition="'$(BuildNativeAOTRuntimePack)' != 'true' and '$(Crossgen2SdkOverrideTargetsPath)' != ''" /> 


but the project also pulls in ReadyToRun.targets
runtime/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj

Line 29
in
658bdd0
 <Import Project="ReadyToRun.targets" /> 


which overrides ResolveReadyToRunCompilers
runtime/src/installer/pkg/sfx/Microsoft.NETCore.App/ReadyToRun.targets

Line 2
in
658bdd0
 <TargetName="ResolveReadyToRunCompilers"DependsOnTargets="ResolveRuntimeFilesFromLocalBuild"> 
Fixes#90977
cc @dsplaisted@tmds
@ghostghost
added
the 
area-ReadyToRun

label
Aug 24, 2023
@ViktorHofer
ViktorHofer
commented
Aug 24, 2023

Copy link


Copy Markdown

Member
We should backport this into release/8.0.
@elinor-fung
elinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

MemberAuthor
Yep, will backport.
@elinor-fung
elinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

MemberAuthor
Failures are known: #82837, #90834
@elinor-fung
elinor-fung
merged commit 31e99c2
into
dotnet:mainAug 24, 2023
@elinor-fung
elinor-fung
deleted the

fix90977

branch
August 24, 2023 19:54
@elinor-fung
elinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 24, 2023

Copy link


Copy Markdown

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


This was referenced Aug 24, 2023

Open


Closed

am11
am11
reviewed
Aug 24, 2023
View reviewed changes
Comment threadsrc/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets
 Crossgen2Packs="@(ResolvedCrossgen2Pack)"
 TargetingPacks="@(ResolvedTargetingPack)"
 RuntimeGraphPath="$(BundledRuntimeIdentifierGraphFile)"
 RuntimeGraphPath="$([MSBuild]::ValueOrDefault('$(RuntimeIdentifierGraphPath)', '$(BundledRuntimeIdentifierGraphFile)'))"
@am11am11Aug 24, 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.

Another place using BundledRuntimeIdentifierGraphFile is in pretest.proj: 
runtime/src/libraries/pretest.proj

Line 105
in
f8d9b3c
RuntimeGraphFiles="$(BundledRuntimeIdentifierGraphFile)"

Can we update it as well?
@elinor-fungelinor-fungAug 25, 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.

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


Reviewers

@ViktorHoferViktorHoferViktorHofer approved these changes

+1 more reviewer

@am11am11am11 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@elinor-fungelinor-fung

Labels

area-ReadyToRun

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Microsoft.NET.CrossGen.targets: stop using legacy runtime graph


3 participants

@elinor-fung@ViktorHofer@am11

, '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('^' + ".*" + '
Use RuntimeIdentifierGraphPath if available in runtime copy of Microsoft.NET.CrossGen.targets by elinor-fung · Pull Request #91077 · dotnet/runtime · GitHub
Skip to content
Use RuntimeIdentifierGraphPath if available in runtime copy of Microsoft.NET.CrossGen.targets - #91077
Merged
elinor-fung merged 1 commit into
dotnet:mainfrom 
elinor-fung:fix90977
Aug 24, 2023
Merged
Use RuntimeIdentifierGraphPath if available in runtime copy of Microsoft.NET.CrossGen.targets#91077
elinor-fung merged 1 commit into
dotnet:mainfrom 
elinor-fung:fix90977
Conversation
@elinor-fung
@elinor-fungelinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

Member
The sdk (shipping) version of this target was updated to use the new trimmed graph as part of dotnet/sdk#34279. This makes the equivalent change here such that it uses the RuntimeIdentifierGraphPath if set (SDK always sets starting with .NET 8 RC1), otherwise BundledRuntimeIdentifierGraphFile.
From what I can tell, the runtime repo does not actually use this particular ResolveReadyToRunCompilers target right now. The only place I found pulling in this target file is 
runtime/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props

Line 176
in
658bdd0
 <ImportProject="$(Crossgen2SdkOverrideTargetsPath)"Condition="'$(BuildNativeAOTRuntimePack)' != 'true' and '$(Crossgen2SdkOverrideTargetsPath)' != ''" /> 


but the project also pulls in ReadyToRun.targets
runtime/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj

Line 29
in
658bdd0
 <Import Project="ReadyToRun.targets" /> 


which overrides ResolveReadyToRunCompilers
runtime/src/installer/pkg/sfx/Microsoft.NETCore.App/ReadyToRun.targets

Line 2
in
658bdd0
 <TargetName="ResolveReadyToRunCompilers"DependsOnTargets="ResolveRuntimeFilesFromLocalBuild"> 
Fixes#90977
cc @dsplaisted@tmds
@ghostghost
added
the 
area-ReadyToRun

label
Aug 24, 2023
@ViktorHofer
ViktorHofer
commented
Aug 24, 2023

Copy link


Copy Markdown

Member
We should backport this into release/8.0.
@elinor-fung
elinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

MemberAuthor
Yep, will backport.
@elinor-fung
elinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

MemberAuthor
Failures are known: #82837, #90834
@elinor-fung
elinor-fung
merged commit 31e99c2
into
dotnet:mainAug 24, 2023
@elinor-fung
elinor-fung
deleted the

fix90977

branch
August 24, 2023 19:54
@elinor-fung
elinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 24, 2023

Copy link


Copy Markdown

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


This was referenced Aug 24, 2023

Open


Closed

am11
am11
reviewed
Aug 24, 2023
View reviewed changes
Comment threadsrc/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets
 Crossgen2Packs="@(ResolvedCrossgen2Pack)"
 TargetingPacks="@(ResolvedTargetingPack)"
 RuntimeGraphPath="$(BundledRuntimeIdentifierGraphFile)"
 RuntimeGraphPath="$([MSBuild]::ValueOrDefault('$(RuntimeIdentifierGraphPath)', '$(BundledRuntimeIdentifierGraphFile)'))"
@am11am11Aug 24, 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.

Another place using BundledRuntimeIdentifierGraphFile is in pretest.proj: 
runtime/src/libraries/pretest.proj

Line 105
in
f8d9b3c
RuntimeGraphFiles="$(BundledRuntimeIdentifierGraphFile)"

Can we update it as well?
@elinor-fungelinor-fungAug 25, 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.

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


Reviewers

@ViktorHoferViktorHoferViktorHofer approved these changes

+1 more reviewer

@am11am11am11 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@elinor-fungelinor-fung

Labels

area-ReadyToRun

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Microsoft.NET.CrossGen.targets: stop using legacy runtime graph


3 participants

@elinor-fung@ViktorHofer@am11

, '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); }
})();
})();
Use RuntimeIdentifierGraphPath if available in runtime copy of Microsoft.NET.CrossGen.targets by elinor-fung · Pull Request #91077 · dotnet/runtime · GitHub
Skip to content
Use RuntimeIdentifierGraphPath if available in runtime copy of Microsoft.NET.CrossGen.targets - #91077
Merged
elinor-fung merged 1 commit into
dotnet:mainfrom 
elinor-fung:fix90977
Aug 24, 2023
Merged
Use RuntimeIdentifierGraphPath if available in runtime copy of Microsoft.NET.CrossGen.targets#91077
elinor-fung merged 1 commit into
dotnet:mainfrom 
elinor-fung:fix90977
Conversation
@elinor-fung
@elinor-fungelinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

Member
The sdk (shipping) version of this target was updated to use the new trimmed graph as part of dotnet/sdk#34279. This makes the equivalent change here such that it uses the RuntimeIdentifierGraphPath if set (SDK always sets starting with .NET 8 RC1), otherwise BundledRuntimeIdentifierGraphFile.
From what I can tell, the runtime repo does not actually use this particular ResolveReadyToRunCompilers target right now. The only place I found pulling in this target file is 
runtime/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props

Line 176
in
658bdd0
 <ImportProject="$(Crossgen2SdkOverrideTargetsPath)"Condition="'$(BuildNativeAOTRuntimePack)' != 'true' and '$(Crossgen2SdkOverrideTargetsPath)' != ''" /> 


but the project also pulls in ReadyToRun.targets
runtime/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj

Line 29
in
658bdd0
 <Import Project="ReadyToRun.targets" /> 


which overrides ResolveReadyToRunCompilers
runtime/src/installer/pkg/sfx/Microsoft.NETCore.App/ReadyToRun.targets

Line 2
in
658bdd0
 <TargetName="ResolveReadyToRunCompilers"DependsOnTargets="ResolveRuntimeFilesFromLocalBuild"> 
Fixes#90977
cc @dsplaisted@tmds
@ghostghost
added
the 
area-ReadyToRun

label
Aug 24, 2023
@ViktorHofer
ViktorHofer
commented
Aug 24, 2023

Copy link


Copy Markdown

Member
We should backport this into release/8.0.
@elinor-fung
elinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

MemberAuthor
Yep, will backport.
@elinor-fung
elinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

MemberAuthor
Failures are known: #82837, #90834
@elinor-fung
elinor-fung
merged commit 31e99c2
into
dotnet:mainAug 24, 2023
@elinor-fung
elinor-fung
deleted the

fix90977

branch
August 24, 2023 19:54
@elinor-fung
elinor-fung
commented
Aug 24, 2023

Copy link


Copy Markdown

MemberAuthor
/backport to release/8.0
@github-actions
github-actionsBot
commented
Aug 24, 2023

Copy link


Copy Markdown

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


This was referenced Aug 24, 2023

Open


Closed

am11
am11
reviewed
Aug 24, 2023
View reviewed changes
Comment threadsrc/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets
 Crossgen2Packs="@(ResolvedCrossgen2Pack)"
 TargetingPacks="@(ResolvedTargetingPack)"
 RuntimeGraphPath="$(BundledRuntimeIdentifierGraphFile)"
 RuntimeGraphPath="$([MSBuild]::ValueOrDefault('$(RuntimeIdentifierGraphPath)', '$(BundledRuntimeIdentifierGraphFile)'))"
@am11am11Aug 24, 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.

Another place using BundledRuntimeIdentifierGraphFile is in pretest.proj: 
runtime/src/libraries/pretest.proj

Line 105
in
f8d9b3c
RuntimeGraphFiles="$(BundledRuntimeIdentifierGraphFile)"

Can we update it as well?
@elinor-fungelinor-fungAug 25, 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.

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


Reviewers

@ViktorHoferViktorHoferViktorHofer approved these changes

+1 more reviewer

@am11am11am11 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@elinor-fungelinor-fung

Labels

area-ReadyToRun

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Microsoft.NET.CrossGen.targets: stop using legacy runtime graph


3 participants

@elinor-fung@ViktorHofer@am11