Skip to content

[release/6.0] Fix VS component versions - #74324

Merged
lewing merged 8 commits into
dotnet:release/6.0from
joeloff:workload-versions
Sep 9, 2022
Merged

[release/6.0] Fix VS component versions#74324
lewing merged 8 commits into
dotnet:release/6.0from
joeloff:workload-versions

Conversation

@joeloff

@joeloffjoeloff commented Aug 22, 2022

Copy link
Copy Markdown
Member

This update contains multiple fixes for issues that were identified during the last servicing release.

  • ItemDefinitionGroup is evaluated globally while the FileVersion property is only set after the GetAssemblyVersion target runs. This causes the VS components to assume the default workload version, which doesn't play well with upgrades in VS. The assembly file version value is preferred because it can change between builds, allow consecutive insertions into VS that can be upgraded.
  • The updated task now provides metadata that will allow us to split the VSDROP generation into two separate archives. One which only contains workload packs (needed to share DROPs across VS versions to support multi-targeting) and another that only contains the manifest installers and workload components.
  • The ZIP archive names have been updated to disambiguate its contents and support automatic drop creation during staging.

@ghost

Copy link
Copy Markdown

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

Issue Details

ItemDefinitionGroup is evaluated globally while the FileVersion property is only set after the GetAssemblyVersion target runs. This causes the VS components to assume the default workload version, which doesn't play well with upgrades in VS. The assembly file version value is preferred because it can change between builds, allow consecutive insertions into VS that can be upgraded.

Author:joeloff
Assignees:joeloff
Labels:

area-Infrastructure-libraries

Milestone:-

@joeloff
joeloff requested a review from hoyosjsAugust 22, 2022 04:11
@joeloff

Copy link
Copy Markdown
MemberAuthor

We don't need this until the next servicing release as we can fix this up manually when we publish to VS.

@hoyosjshoyosjs added the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Aug 22, 2022
@hoyosjs

Copy link
Copy Markdown
Member

@carlossanlop Let's hold this one for 6.0.10

Comment threadsrc/workloads/workloads.csproj Outdated
@lewinglewing added this to the 6.0.x milestone Aug 22, 2022
@lewinglewing changed the title Fix VS component versions[release/6.0] Fix VS component versionsAug 22, 2022
@ghost

Copy link
Copy Markdown

Tagging subscribers to this area: @directhex
See info in area-owners.md if you want to be subscribed.

Issue Details

ItemDefinitionGroup is evaluated globally while the FileVersion property is only set after the GetAssemblyVersion target runs. This causes the VS components to assume the default workload version, which doesn't play well with upgrades in VS. The assembly file version value is preferred because it can change between builds, allow consecutive insertions into VS that can be upgraded.

Author:joeloff
Assignees:joeloff
Labels:

NO-MERGE, area-Infrastructure-libraries, area-Infrastructure-mono

Milestone:6.0.x

@lewing

Copy link
Copy Markdown
Member

Is there any reason not to do the 7.0 version of this now?

@joeloff

Copy link
Copy Markdown
MemberAuthor

Is there any reason not to do the 7.0 version of this now?

None that I can think of

@joeloff

Copy link
Copy Markdown
MemberAuthor

I'm going to continue pushing more of the 6.0 changes here so we can get everything ready in one go

@carlossanlop

Copy link
Copy Markdown
Contributor

I'm going to continue pushing more of the 6.0 changes here so we can get everything ready in one go

Hope you don't mind if I convert it to draft.

@carlossanlop
carlossanlop marked this pull request as draft August 31, 2022 19:07
@joeloff

joeloff commented Sep 7, 2022

Copy link
Copy Markdown
MemberAuthor

This PR is blocked on dotnet/arcade#10582 We likely need to update it to include the Arcade changes once we have a validation build.

Below is an example of what the new archives will look like

image

@joeloff

Copy link
Copy Markdown
MemberAuthor

@hoyosjs can you take another look at the PR. The darc update dependencies touched a bunch of Arcade related files.

@hoyosjs

Copy link
Copy Markdown
Member

The changes LGTM.

@lewing

Copy link
Copy Markdown
Member

ci is blocked on #75294

@hoyosjs

Copy link
Copy Markdown
Member

And it broke :( This will likely need #68847

@joeloff
joeloff marked this pull request as ready for review September 9, 2022 04:25
@joeloffjoeloff removed the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Sep 9, 2022
@lewing

Copy link
Copy Markdown
Member

tell mode packaging fix

@lewing
lewing merged commit f2112e3 into dotnet:release/6.0Sep 9, 2022
@ghostghost locked as resolved and limited conversation to collaborators Oct 9, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@joeloff@hoyosjs@lewing@carlossanlop
, '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" + '
[release/6.0] Fix VS component versions by joeloff · Pull Request #74324 · dotnet/runtime · GitHub
Skip to content

[release/6.0] Fix VS component versions - #74324

Merged
lewing merged 8 commits into
dotnet:release/6.0from
joeloff:workload-versions
Sep 9, 2022
Merged

[release/6.0] Fix VS component versions#74324
lewing merged 8 commits into
dotnet:release/6.0from
joeloff:workload-versions

Conversation

@joeloff

@joeloffjoeloff commented Aug 22, 2022

Copy link
Copy Markdown
Member

This update contains multiple fixes for issues that were identified during the last servicing release.

  • ItemDefinitionGroup is evaluated globally while the FileVersion property is only set after the GetAssemblyVersion target runs. This causes the VS components to assume the default workload version, which doesn't play well with upgrades in VS. The assembly file version value is preferred because it can change between builds, allow consecutive insertions into VS that can be upgraded.
  • The updated task now provides metadata that will allow us to split the VSDROP generation into two separate archives. One which only contains workload packs (needed to share DROPs across VS versions to support multi-targeting) and another that only contains the manifest installers and workload components.
  • The ZIP archive names have been updated to disambiguate its contents and support automatic drop creation during staging.

@ghost

Copy link
Copy Markdown

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

Issue Details

ItemDefinitionGroup is evaluated globally while the FileVersion property is only set after the GetAssemblyVersion target runs. This causes the VS components to assume the default workload version, which doesn't play well with upgrades in VS. The assembly file version value is preferred because it can change between builds, allow consecutive insertions into VS that can be upgraded.

Author:joeloff
Assignees:joeloff
Labels:

area-Infrastructure-libraries

Milestone:-

@joeloff
joeloff requested a review from hoyosjsAugust 22, 2022 04:11
@joeloff

Copy link
Copy Markdown
MemberAuthor

We don't need this until the next servicing release as we can fix this up manually when we publish to VS.

@hoyosjshoyosjs added the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Aug 22, 2022
@hoyosjs

Copy link
Copy Markdown
Member

@carlossanlop Let's hold this one for 6.0.10

Comment threadsrc/workloads/workloads.csproj Outdated
@lewinglewing added this to the 6.0.x milestone Aug 22, 2022
@lewinglewing changed the title Fix VS component versions[release/6.0] Fix VS component versionsAug 22, 2022
@ghost

Copy link
Copy Markdown

Tagging subscribers to this area: @directhex
See info in area-owners.md if you want to be subscribed.

Issue Details

ItemDefinitionGroup is evaluated globally while the FileVersion property is only set after the GetAssemblyVersion target runs. This causes the VS components to assume the default workload version, which doesn't play well with upgrades in VS. The assembly file version value is preferred because it can change between builds, allow consecutive insertions into VS that can be upgraded.

Author:joeloff
Assignees:joeloff
Labels:

NO-MERGE, area-Infrastructure-libraries, area-Infrastructure-mono

Milestone:6.0.x

@lewing

Copy link
Copy Markdown
Member

Is there any reason not to do the 7.0 version of this now?

@joeloff

Copy link
Copy Markdown
MemberAuthor

Is there any reason not to do the 7.0 version of this now?

None that I can think of

@joeloff

Copy link
Copy Markdown
MemberAuthor

I'm going to continue pushing more of the 6.0 changes here so we can get everything ready in one go

@carlossanlop

Copy link
Copy Markdown
Contributor

I'm going to continue pushing more of the 6.0 changes here so we can get everything ready in one go

Hope you don't mind if I convert it to draft.

@carlossanlop
carlossanlop marked this pull request as draft August 31, 2022 19:07
@joeloff

joeloff commented Sep 7, 2022

Copy link
Copy Markdown
MemberAuthor

This PR is blocked on dotnet/arcade#10582 We likely need to update it to include the Arcade changes once we have a validation build.

Below is an example of what the new archives will look like

image

@joeloff

Copy link
Copy Markdown
MemberAuthor

@hoyosjs can you take another look at the PR. The darc update dependencies touched a bunch of Arcade related files.

@hoyosjs

Copy link
Copy Markdown
Member

The changes LGTM.

@lewing

Copy link
Copy Markdown
Member

ci is blocked on #75294

@hoyosjs

Copy link
Copy Markdown
Member

And it broke :( This will likely need #68847

@joeloff
joeloff marked this pull request as ready for review September 9, 2022 04:25
@joeloffjoeloff removed the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Sep 9, 2022
@lewing

Copy link
Copy Markdown
Member

tell mode packaging fix

@lewing
lewing merged commit f2112e3 into dotnet:release/6.0Sep 9, 2022
@ghostghost locked as resolved and limited conversation to collaborators Oct 9, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@joeloff@hoyosjs@lewing@carlossanlop
, '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('^' + ".*" + ' [release/6.0] Fix VS component versions by joeloff · Pull Request #74324 · dotnet/runtime · GitHub
Skip to content

[release/6.0] Fix VS component versions - #74324

Merged
lewing merged 8 commits into
dotnet:release/6.0from
joeloff:workload-versions
Sep 9, 2022
Merged

[release/6.0] Fix VS component versions#74324
lewing merged 8 commits into
dotnet:release/6.0from
joeloff:workload-versions

Conversation

@joeloff

@joeloffjoeloff commented Aug 22, 2022

Copy link
Copy Markdown
Member

This update contains multiple fixes for issues that were identified during the last servicing release.

  • ItemDefinitionGroup is evaluated globally while the FileVersion property is only set after the GetAssemblyVersion target runs. This causes the VS components to assume the default workload version, which doesn't play well with upgrades in VS. The assembly file version value is preferred because it can change between builds, allow consecutive insertions into VS that can be upgraded.
  • The updated task now provides metadata that will allow us to split the VSDROP generation into two separate archives. One which only contains workload packs (needed to share DROPs across VS versions to support multi-targeting) and another that only contains the manifest installers and workload components.
  • The ZIP archive names have been updated to disambiguate its contents and support automatic drop creation during staging.

@ghost

Copy link
Copy Markdown

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

Issue Details

ItemDefinitionGroup is evaluated globally while the FileVersion property is only set after the GetAssemblyVersion target runs. This causes the VS components to assume the default workload version, which doesn't play well with upgrades in VS. The assembly file version value is preferred because it can change between builds, allow consecutive insertions into VS that can be upgraded.

Author:joeloff
Assignees:joeloff
Labels:

area-Infrastructure-libraries

Milestone:-

@joeloff
joeloff requested a review from hoyosjsAugust 22, 2022 04:11
@joeloff

Copy link
Copy Markdown
MemberAuthor

We don't need this until the next servicing release as we can fix this up manually when we publish to VS.

@hoyosjshoyosjs added the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Aug 22, 2022
@hoyosjs

Copy link
Copy Markdown
Member

@carlossanlop Let's hold this one for 6.0.10

Comment threadsrc/workloads/workloads.csproj Outdated
@lewinglewing added this to the 6.0.x milestone Aug 22, 2022
@lewinglewing changed the title Fix VS component versions[release/6.0] Fix VS component versionsAug 22, 2022
@ghost

Copy link
Copy Markdown

Tagging subscribers to this area: @directhex
See info in area-owners.md if you want to be subscribed.

Issue Details

ItemDefinitionGroup is evaluated globally while the FileVersion property is only set after the GetAssemblyVersion target runs. This causes the VS components to assume the default workload version, which doesn't play well with upgrades in VS. The assembly file version value is preferred because it can change between builds, allow consecutive insertions into VS that can be upgraded.

Author:joeloff
Assignees:joeloff
Labels:

NO-MERGE, area-Infrastructure-libraries, area-Infrastructure-mono

Milestone:6.0.x

@lewing

Copy link
Copy Markdown
Member

Is there any reason not to do the 7.0 version of this now?

@joeloff

Copy link
Copy Markdown
MemberAuthor

Is there any reason not to do the 7.0 version of this now?

None that I can think of

@joeloff

Copy link
Copy Markdown
MemberAuthor

I'm going to continue pushing more of the 6.0 changes here so we can get everything ready in one go

@carlossanlop

Copy link
Copy Markdown
Contributor

I'm going to continue pushing more of the 6.0 changes here so we can get everything ready in one go

Hope you don't mind if I convert it to draft.

@carlossanlop
carlossanlop marked this pull request as draft August 31, 2022 19:07
@joeloff

joeloff commented Sep 7, 2022

Copy link
Copy Markdown
MemberAuthor

This PR is blocked on dotnet/arcade#10582 We likely need to update it to include the Arcade changes once we have a validation build.

Below is an example of what the new archives will look like

image

@joeloff

Copy link
Copy Markdown
MemberAuthor

@hoyosjs can you take another look at the PR. The darc update dependencies touched a bunch of Arcade related files.

@hoyosjs

Copy link
Copy Markdown
Member

The changes LGTM.

@lewing

Copy link
Copy Markdown
Member

ci is blocked on #75294

@hoyosjs

Copy link
Copy Markdown
Member

And it broke :( This will likely need #68847

@joeloff
joeloff marked this pull request as ready for review September 9, 2022 04:25
@joeloffjoeloff removed the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Sep 9, 2022
@lewing

Copy link
Copy Markdown
Member

tell mode packaging fix

@lewing
lewing merged commit f2112e3 into dotnet:release/6.0Sep 9, 2022
@ghostghost locked as resolved and limited conversation to collaborators Oct 9, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@joeloff@hoyosjs@lewing@carlossanlop
, '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('^' + ".*" + ' [release/6.0] Fix VS component versions by joeloff · Pull Request #74324 · dotnet/runtime · GitHub
Skip to content

[release/6.0] Fix VS component versions - #74324

Merged
lewing merged 8 commits into
dotnet:release/6.0from
joeloff:workload-versions
Sep 9, 2022
Merged

[release/6.0] Fix VS component versions#74324
lewing merged 8 commits into
dotnet:release/6.0from
joeloff:workload-versions

Conversation

@joeloff

@joeloffjoeloff commented Aug 22, 2022

Copy link
Copy Markdown
Member

This update contains multiple fixes for issues that were identified during the last servicing release.

  • ItemDefinitionGroup is evaluated globally while the FileVersion property is only set after the GetAssemblyVersion target runs. This causes the VS components to assume the default workload version, which doesn't play well with upgrades in VS. The assembly file version value is preferred because it can change between builds, allow consecutive insertions into VS that can be upgraded.
  • The updated task now provides metadata that will allow us to split the VSDROP generation into two separate archives. One which only contains workload packs (needed to share DROPs across VS versions to support multi-targeting) and another that only contains the manifest installers and workload components.
  • The ZIP archive names have been updated to disambiguate its contents and support automatic drop creation during staging.

@ghost

Copy link
Copy Markdown

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

Issue Details

ItemDefinitionGroup is evaluated globally while the FileVersion property is only set after the GetAssemblyVersion target runs. This causes the VS components to assume the default workload version, which doesn't play well with upgrades in VS. The assembly file version value is preferred because it can change between builds, allow consecutive insertions into VS that can be upgraded.

Author:joeloff
Assignees:joeloff
Labels:

area-Infrastructure-libraries

Milestone:-

@joeloff
joeloff requested a review from hoyosjsAugust 22, 2022 04:11
@joeloff

Copy link
Copy Markdown
MemberAuthor

We don't need this until the next servicing release as we can fix this up manually when we publish to VS.

@hoyosjshoyosjs added the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Aug 22, 2022
@hoyosjs

Copy link
Copy Markdown
Member

@carlossanlop Let's hold this one for 6.0.10

Comment threadsrc/workloads/workloads.csproj Outdated
@lewinglewing added this to the 6.0.x milestone Aug 22, 2022
@lewinglewing changed the title Fix VS component versions[release/6.0] Fix VS component versionsAug 22, 2022
@ghost

Copy link
Copy Markdown

Tagging subscribers to this area: @directhex
See info in area-owners.md if you want to be subscribed.

Issue Details

ItemDefinitionGroup is evaluated globally while the FileVersion property is only set after the GetAssemblyVersion target runs. This causes the VS components to assume the default workload version, which doesn't play well with upgrades in VS. The assembly file version value is preferred because it can change between builds, allow consecutive insertions into VS that can be upgraded.

Author:joeloff
Assignees:joeloff
Labels:

NO-MERGE, area-Infrastructure-libraries, area-Infrastructure-mono

Milestone:6.0.x

@lewing

Copy link
Copy Markdown
Member

Is there any reason not to do the 7.0 version of this now?

@joeloff

Copy link
Copy Markdown
MemberAuthor

Is there any reason not to do the 7.0 version of this now?

None that I can think of

@joeloff

Copy link
Copy Markdown
MemberAuthor

I'm going to continue pushing more of the 6.0 changes here so we can get everything ready in one go

@carlossanlop

Copy link
Copy Markdown
Contributor

I'm going to continue pushing more of the 6.0 changes here so we can get everything ready in one go

Hope you don't mind if I convert it to draft.

@carlossanlop
carlossanlop marked this pull request as draft August 31, 2022 19:07
@joeloff

joeloff commented Sep 7, 2022

Copy link
Copy Markdown
MemberAuthor

This PR is blocked on dotnet/arcade#10582 We likely need to update it to include the Arcade changes once we have a validation build.

Below is an example of what the new archives will look like

image

@joeloff

Copy link
Copy Markdown
MemberAuthor

@hoyosjs can you take another look at the PR. The darc update dependencies touched a bunch of Arcade related files.

@hoyosjs

Copy link
Copy Markdown
Member

The changes LGTM.

@lewing

Copy link
Copy Markdown
Member

ci is blocked on #75294

@hoyosjs

Copy link
Copy Markdown
Member

And it broke :( This will likely need #68847

@joeloff
joeloff marked this pull request as ready for review September 9, 2022 04:25
@joeloffjoeloff removed the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Sep 9, 2022
@lewing

Copy link
Copy Markdown
Member

tell mode packaging fix

@lewing
lewing merged commit f2112e3 into dotnet:release/6.0Sep 9, 2022
@ghostghost locked as resolved and limited conversation to collaborators Oct 9, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@joeloff@hoyosjs@lewing@carlossanlop
, '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" + ' [release/6.0] Fix VS component versions by joeloff · Pull Request #74324 · dotnet/runtime · GitHub
Skip to content

[release/6.0] Fix VS component versions - #74324

Merged
lewing merged 8 commits into
dotnet:release/6.0from
joeloff:workload-versions
Sep 9, 2022
Merged

[release/6.0] Fix VS component versions#74324
lewing merged 8 commits into
dotnet:release/6.0from
joeloff:workload-versions

Conversation

@joeloff

@joeloffjoeloff commented Aug 22, 2022

Copy link
Copy Markdown
Member

This update contains multiple fixes for issues that were identified during the last servicing release.

  • ItemDefinitionGroup is evaluated globally while the FileVersion property is only set after the GetAssemblyVersion target runs. This causes the VS components to assume the default workload version, which doesn't play well with upgrades in VS. The assembly file version value is preferred because it can change between builds, allow consecutive insertions into VS that can be upgraded.
  • The updated task now provides metadata that will allow us to split the VSDROP generation into two separate archives. One which only contains workload packs (needed to share DROPs across VS versions to support multi-targeting) and another that only contains the manifest installers and workload components.
  • The ZIP archive names have been updated to disambiguate its contents and support automatic drop creation during staging.

@ghost

Copy link
Copy Markdown

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

Issue Details

ItemDefinitionGroup is evaluated globally while the FileVersion property is only set after the GetAssemblyVersion target runs. This causes the VS components to assume the default workload version, which doesn't play well with upgrades in VS. The assembly file version value is preferred because it can change between builds, allow consecutive insertions into VS that can be upgraded.

Author:joeloff
Assignees:joeloff
Labels:

area-Infrastructure-libraries

Milestone:-

@joeloff
joeloff requested a review from hoyosjsAugust 22, 2022 04:11
@joeloff

Copy link
Copy Markdown
MemberAuthor

We don't need this until the next servicing release as we can fix this up manually when we publish to VS.

@hoyosjshoyosjs added the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Aug 22, 2022
@hoyosjs

Copy link
Copy Markdown
Member

@carlossanlop Let's hold this one for 6.0.10

Comment threadsrc/workloads/workloads.csproj Outdated
@lewinglewing added this to the 6.0.x milestone Aug 22, 2022
@lewinglewing changed the title Fix VS component versions[release/6.0] Fix VS component versionsAug 22, 2022
@ghost

Copy link
Copy Markdown

Tagging subscribers to this area: @directhex
See info in area-owners.md if you want to be subscribed.

Issue Details

ItemDefinitionGroup is evaluated globally while the FileVersion property is only set after the GetAssemblyVersion target runs. This causes the VS components to assume the default workload version, which doesn't play well with upgrades in VS. The assembly file version value is preferred because it can change between builds, allow consecutive insertions into VS that can be upgraded.

Author:joeloff
Assignees:joeloff
Labels:

NO-MERGE, area-Infrastructure-libraries, area-Infrastructure-mono

Milestone:6.0.x

@lewing

Copy link
Copy Markdown
Member

Is there any reason not to do the 7.0 version of this now?

@joeloff

Copy link
Copy Markdown
MemberAuthor

Is there any reason not to do the 7.0 version of this now?

None that I can think of

@joeloff

Copy link
Copy Markdown
MemberAuthor

I'm going to continue pushing more of the 6.0 changes here so we can get everything ready in one go

@carlossanlop

Copy link
Copy Markdown
Contributor

I'm going to continue pushing more of the 6.0 changes here so we can get everything ready in one go

Hope you don't mind if I convert it to draft.

@carlossanlop
carlossanlop marked this pull request as draft August 31, 2022 19:07
@joeloff

joeloff commented Sep 7, 2022

Copy link
Copy Markdown
MemberAuthor

This PR is blocked on dotnet/arcade#10582 We likely need to update it to include the Arcade changes once we have a validation build.

Below is an example of what the new archives will look like

image

@joeloff

Copy link
Copy Markdown
MemberAuthor

@hoyosjs can you take another look at the PR. The darc update dependencies touched a bunch of Arcade related files.

@hoyosjs

Copy link
Copy Markdown
Member

The changes LGTM.

@lewing

Copy link
Copy Markdown
Member

ci is blocked on #75294

@hoyosjs

Copy link
Copy Markdown
Member

And it broke :( This will likely need #68847

@joeloff
joeloff marked this pull request as ready for review September 9, 2022 04:25
@joeloffjoeloff removed the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Sep 9, 2022
@lewing

Copy link
Copy Markdown
Member

tell mode packaging fix

@lewing
lewing merged commit f2112e3 into dotnet:release/6.0Sep 9, 2022
@ghostghost locked as resolved and limited conversation to collaborators Oct 9, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@joeloff@hoyosjs@lewing@carlossanlop
, '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('^' + ".*" + ' [release/6.0] Fix VS component versions by joeloff · Pull Request #74324 · dotnet/runtime · GitHub
Skip to content

[release/6.0] Fix VS component versions - #74324

Merged
lewing merged 8 commits into
dotnet:release/6.0from
joeloff:workload-versions
Sep 9, 2022
Merged

[release/6.0] Fix VS component versions#74324
lewing merged 8 commits into
dotnet:release/6.0from
joeloff:workload-versions

Conversation

@joeloff

@joeloffjoeloff commented Aug 22, 2022

Copy link
Copy Markdown
Member

This update contains multiple fixes for issues that were identified during the last servicing release.

  • ItemDefinitionGroup is evaluated globally while the FileVersion property is only set after the GetAssemblyVersion target runs. This causes the VS components to assume the default workload version, which doesn't play well with upgrades in VS. The assembly file version value is preferred because it can change between builds, allow consecutive insertions into VS that can be upgraded.
  • The updated task now provides metadata that will allow us to split the VSDROP generation into two separate archives. One which only contains workload packs (needed to share DROPs across VS versions to support multi-targeting) and another that only contains the manifest installers and workload components.
  • The ZIP archive names have been updated to disambiguate its contents and support automatic drop creation during staging.

@ghost

Copy link
Copy Markdown

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

Issue Details

ItemDefinitionGroup is evaluated globally while the FileVersion property is only set after the GetAssemblyVersion target runs. This causes the VS components to assume the default workload version, which doesn't play well with upgrades in VS. The assembly file version value is preferred because it can change between builds, allow consecutive insertions into VS that can be upgraded.

Author:joeloff
Assignees:joeloff
Labels:

area-Infrastructure-libraries

Milestone:-

@joeloff
joeloff requested a review from hoyosjsAugust 22, 2022 04:11
@joeloff

Copy link
Copy Markdown
MemberAuthor

We don't need this until the next servicing release as we can fix this up manually when we publish to VS.

@hoyosjshoyosjs added the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Aug 22, 2022
@hoyosjs

Copy link
Copy Markdown
Member

@carlossanlop Let's hold this one for 6.0.10

Comment threadsrc/workloads/workloads.csproj Outdated
@lewinglewing added this to the 6.0.x milestone Aug 22, 2022
@lewinglewing changed the title Fix VS component versions[release/6.0] Fix VS component versionsAug 22, 2022
@ghost

Copy link
Copy Markdown

Tagging subscribers to this area: @directhex
See info in area-owners.md if you want to be subscribed.

Issue Details

ItemDefinitionGroup is evaluated globally while the FileVersion property is only set after the GetAssemblyVersion target runs. This causes the VS components to assume the default workload version, which doesn't play well with upgrades in VS. The assembly file version value is preferred because it can change between builds, allow consecutive insertions into VS that can be upgraded.

Author:joeloff
Assignees:joeloff
Labels:

NO-MERGE, area-Infrastructure-libraries, area-Infrastructure-mono

Milestone:6.0.x

@lewing

Copy link
Copy Markdown
Member

Is there any reason not to do the 7.0 version of this now?

@joeloff

Copy link
Copy Markdown
MemberAuthor

Is there any reason not to do the 7.0 version of this now?

None that I can think of

@joeloff

Copy link
Copy Markdown
MemberAuthor

I'm going to continue pushing more of the 6.0 changes here so we can get everything ready in one go

@carlossanlop

Copy link
Copy Markdown
Contributor

I'm going to continue pushing more of the 6.0 changes here so we can get everything ready in one go

Hope you don't mind if I convert it to draft.

@carlossanlop
carlossanlop marked this pull request as draft August 31, 2022 19:07
@joeloff

joeloff commented Sep 7, 2022

Copy link
Copy Markdown
MemberAuthor

This PR is blocked on dotnet/arcade#10582 We likely need to update it to include the Arcade changes once we have a validation build.

Below is an example of what the new archives will look like

image

@joeloff

Copy link
Copy Markdown
MemberAuthor

@hoyosjs can you take another look at the PR. The darc update dependencies touched a bunch of Arcade related files.

@hoyosjs

Copy link
Copy Markdown
Member

The changes LGTM.

@lewing

Copy link
Copy Markdown
Member

ci is blocked on #75294

@hoyosjs

Copy link
Copy Markdown
Member

And it broke :( This will likely need #68847

@joeloff
joeloff marked this pull request as ready for review September 9, 2022 04:25
@joeloffjoeloff removed the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Sep 9, 2022
@lewing

Copy link
Copy Markdown
Member

tell mode packaging fix

@lewing
lewing merged commit f2112e3 into dotnet:release/6.0Sep 9, 2022
@ghostghost locked as resolved and limited conversation to collaborators Oct 9, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@joeloff@hoyosjs@lewing@carlossanlop
, '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); } })(); })(); [release/6.0] Fix VS component versions by joeloff · Pull Request #74324 · dotnet/runtime · GitHub
Skip to content

[release/6.0] Fix VS component versions - #74324

Merged
lewing merged 8 commits into
dotnet:release/6.0from
joeloff:workload-versions
Sep 9, 2022
Merged

[release/6.0] Fix VS component versions#74324
lewing merged 8 commits into
dotnet:release/6.0from
joeloff:workload-versions

Conversation

@joeloff

@joeloffjoeloff commented Aug 22, 2022

Copy link
Copy Markdown
Member

This update contains multiple fixes for issues that were identified during the last servicing release.

  • ItemDefinitionGroup is evaluated globally while the FileVersion property is only set after the GetAssemblyVersion target runs. This causes the VS components to assume the default workload version, which doesn't play well with upgrades in VS. The assembly file version value is preferred because it can change between builds, allow consecutive insertions into VS that can be upgraded.
  • The updated task now provides metadata that will allow us to split the VSDROP generation into two separate archives. One which only contains workload packs (needed to share DROPs across VS versions to support multi-targeting) and another that only contains the manifest installers and workload components.
  • The ZIP archive names have been updated to disambiguate its contents and support automatic drop creation during staging.

@ghost

Copy link
Copy Markdown

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

Issue Details

ItemDefinitionGroup is evaluated globally while the FileVersion property is only set after the GetAssemblyVersion target runs. This causes the VS components to assume the default workload version, which doesn't play well with upgrades in VS. The assembly file version value is preferred because it can change between builds, allow consecutive insertions into VS that can be upgraded.

Author:joeloff
Assignees:joeloff
Labels:

area-Infrastructure-libraries

Milestone:-

@joeloff
joeloff requested a review from hoyosjsAugust 22, 2022 04:11
@joeloff

Copy link
Copy Markdown
MemberAuthor

We don't need this until the next servicing release as we can fix this up manually when we publish to VS.

@hoyosjshoyosjs added the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Aug 22, 2022
@hoyosjs

Copy link
Copy Markdown
Member

@carlossanlop Let's hold this one for 6.0.10

Comment threadsrc/workloads/workloads.csproj Outdated
@lewinglewing added this to the 6.0.x milestone Aug 22, 2022
@lewinglewing changed the title Fix VS component versions[release/6.0] Fix VS component versionsAug 22, 2022
@ghost

Copy link
Copy Markdown

Tagging subscribers to this area: @directhex
See info in area-owners.md if you want to be subscribed.

Issue Details

ItemDefinitionGroup is evaluated globally while the FileVersion property is only set after the GetAssemblyVersion target runs. This causes the VS components to assume the default workload version, which doesn't play well with upgrades in VS. The assembly file version value is preferred because it can change between builds, allow consecutive insertions into VS that can be upgraded.

Author:joeloff
Assignees:joeloff
Labels:

NO-MERGE, area-Infrastructure-libraries, area-Infrastructure-mono

Milestone:6.0.x

@lewing

Copy link
Copy Markdown
Member

Is there any reason not to do the 7.0 version of this now?

@joeloff

Copy link
Copy Markdown
MemberAuthor

Is there any reason not to do the 7.0 version of this now?

None that I can think of

@joeloff

Copy link
Copy Markdown
MemberAuthor

I'm going to continue pushing more of the 6.0 changes here so we can get everything ready in one go

@carlossanlop

Copy link
Copy Markdown
Contributor

I'm going to continue pushing more of the 6.0 changes here so we can get everything ready in one go

Hope you don't mind if I convert it to draft.

@carlossanlop
carlossanlop marked this pull request as draft August 31, 2022 19:07
@joeloff

joeloff commented Sep 7, 2022

Copy link
Copy Markdown
MemberAuthor

This PR is blocked on dotnet/arcade#10582 We likely need to update it to include the Arcade changes once we have a validation build.

Below is an example of what the new archives will look like

image

@joeloff

Copy link
Copy Markdown
MemberAuthor

@hoyosjs can you take another look at the PR. The darc update dependencies touched a bunch of Arcade related files.

@hoyosjs

Copy link
Copy Markdown
Member

The changes LGTM.

@lewing

Copy link
Copy Markdown
Member

ci is blocked on #75294

@hoyosjs

Copy link
Copy Markdown
Member

And it broke :( This will likely need #68847

@joeloff
joeloff marked this pull request as ready for review September 9, 2022 04:25
@joeloffjoeloff removed the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Sep 9, 2022
@lewing

Copy link
Copy Markdown
Member

tell mode packaging fix

@lewing
lewing merged commit f2112e3 into dotnet:release/6.0Sep 9, 2022
@ghostghost locked as resolved and limited conversation to collaborators Oct 9, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@joeloff@hoyosjs@lewing@carlossanlop