[release/8.0] Update MicrosoftBuildVersion to latest - #100595

Merged
ericstj merged 3 commits into
release/8.0-stagingfrom
backport/pr-98006-to-release/8.0
Apr 16, 2024
Merged

[release/8.0] Update MicrosoftBuildVersion to latest#100595
ericstj merged 3 commits into
release/8.0-stagingfrom
backport/pr-98006-to-release/8.0

Conversation

@github-actions

@github-actionsgithub-actionsBot commented Apr 3, 2024•
edited by ericstj
Loading

Copy link
Copy Markdown
Contributor

Backport of #98006 to release/8.0

/cc @ericstj@LoopedBard3

Customer Impact

  • Customer reported
  • Found internally

Component governance issue in runtime, due to dependencies MSBuild tasks built in repo.

Regression

  • Yes
  • No

Testing

Built in main.

Risk

Low - build only dependency. Package version does not appear in shipping assets, nor is binary redistributed.

@ghostghost added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Apr 3, 2024
@ericstj

ericstj commented Apr 3, 2024•
edited
Loading

Copy link
Copy Markdown
Member

@ViktorHofer@MichaelSimons do we need a corresponding SBRP change in servicing to take this? I know we needed changes in main for SBRP when this was made - not sure if we branch that for servicing or not.

I think the SBRP changes were
dotnet/source-build-assets#885
dotnet/source-build-assets#886

@ericstj
ericstj requested a review from ViktorHoferApril 3, 2024 17:29
@MichaelSimons

MichaelSimons commented Apr 3, 2024

Copy link
Copy Markdown
Member

Yes those will need to be backported. Because of all the infrastructure changes made in 9.0, a simple backport will not work without some changes to the project files.

This was referenced Apr 3, 2024
Closed
Open
Closed
Closed
@ericstj
ericstj changed the base branch from release/8.0 to release/8.0-stagingApril 8, 2024 17:37
@ericstj

ericstj commented Apr 8, 2024

Copy link
Copy Markdown
Member

Source build leg is failing because it needs dotnet/source-build-assets#932.

@ericstj
ericstjforce-pushed the backport/pr-98006-to-release/8.0 branch from 1678a6f to b5223b0CompareApril 8, 2024 23:54
@ericstj
ericstj requested a review from steveisokApril 8, 2024 23:55
@build-analysisbuild-analysisBot mentioned this pull request Apr 9, 2024
Closed
3 tasks
@MichaelSimons

MichaelSimons commented Apr 9, 2024

Copy link
Copy Markdown
Member

Yes those will need to be backported. Because of all the infrastructure changes made in 9.0, a simple backport will not work without some changes to the project files.

I retract this statement after seeing that 4.8.3 is targeting net8.0. Instead, I think we should build with n-1 in source-build (currently 4.8.5). To do this, we would need to add this dependency in the Version.Detail.xml in order to allow source-build to lift it. See https://github.com/dotnet/runtime/blob/release/8.0/eng/Version.Details.xml#L403.

@ericstjericstj mentioned this pull request Apr 9, 2024
Closed
@ericstj

ericstj commented Apr 9, 2024

Copy link
Copy Markdown
Member

So it sounds like we need a ToolsetDependencies entry. Can you let me know which version that should be? You're saying 4.8.5 and 4.8.3 - did you mean 17.9.5 and 17.8.3? cc @rainersigwald

@MichaelSimons

MichaelSimons commented Apr 9, 2024

Copy link
Copy Markdown
Member

So it sounds like we need a ToolsetDependencies entry.

Yes.

Can you let me know which version that should be? You're saying 4.8.5 and 4.8.3 - did you mean 17.9.5 and 17.8.3?

Sorry I mixed up the version numbers. I meant 17.8.3 and 17.8.5.

It is fine to use 17.8.3.

To conclude, I think the following toolset dependencies should be added. The second is to prevent prebuilts from being reported in the runtime's source-build leg.

<Dependency Name="Microsoft.Build" Version="17.8.3">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.3-preview-23613-06">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>

@ericstj

ericstj commented Apr 9, 2024

Copy link
Copy Markdown
Member

I see - so simply adding those to VersionDetails.xml is enough? Because we're already using MicrosoftBuildVersion for our property sourcebuild will know to set this with the actual version?

@ericstjericstj added Servicing-consider Issue for next servicing release review area-Infrastructure-libraries area-Infrastructure and removed needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners area-Infrastructure-libraries labels Apr 9, 2024
@MichaelSimons

MichaelSimons commented Apr 9, 2024

Copy link
Copy Markdown
Member

I see - so simply adding those to VersionDetails.xml is enough? Because we're already using MicrosoftBuildVersion for our property sourcebuild will know to set this with the actual version?

That's correct. The VersionDetails.xml entry signals to source-build to use the current version which it does by overriding the Version.props property.

@build-analysisbuild-analysisBot mentioned this pull request Apr 9, 2024
Open
3 tasks
@ericstj

ericstj commented Apr 12, 2024

Copy link
Copy Markdown
Member

@MichaelSimons -- looks like this MSBuild version did bring some new prebuilts:

System.Configuration.ConfigurationManager.7.0.0
System.Diagnostics.EventLog.7.0.0
System.Reflection.MetadataLoadContext.7.0.0
System.Security.Cryptography.ProtectedData.7.0.0

Should we resurrect the SBRP change for just those?

@ericstj

ericstj commented Apr 12, 2024

Copy link
Copy Markdown
Member

Looks like if we move to 17.9.5 it would have dependencies on 8.0.0 versions of these packages. I wonder if that's the better way to solve this?

@rbhandarbhanda added Servicing-approved Approved for servicing release and removed Servicing-consider Issue for next servicing release review labels Apr 16, 2024
@ericstj

ericstj commented Apr 16, 2024

Copy link
Copy Markdown
Member

@steveisok -- is there any reason to fast-track this into May release, or is it ok to go in June?

@steveisok

steveisok commented Apr 16, 2024

Copy link
Copy Markdown
Member

It resolves a cg alert so taking it now would be preferred.

@ericstjericstj added this to the 8.0.5 milestone Apr 16, 2024
@ericstj
ericstj merged commit dce1737 into release/8.0-stagingApr 16, 2024
@ericstj

ericstj commented Apr 16, 2024

Copy link
Copy Markdown
Member

/backport to release/8.0

@github-actions

github-actionsBot commented Apr 16, 2024

Copy link
Copy Markdown
ContributorAuthor

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

@github-actionsgithub-actionsBot mentioned this pull request Apr 16, 2024
Merged
4 tasks
ericstj added a commit that referenced this pull request Apr 16, 2024
@github-actions@LoopedBard3
@ericstj@MichaelSimons
[release/8.0] Update MicrosoftBuildVersion to latest (#100595)
402655c
* Update MicrosoftBuildVersion to latest to fix System.Security.Cryptography.XML component governance alert.
* Add info to VersionDetails to allow sourcebuild to update the MSBuild dependency
* Update SourceBuildPrebuiltBaseline.xml
---------
Co-authored-by: Parker Bibus <parkerbibus@microsoft.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
ericstj added a commit that referenced this pull request Apr 16, 2024
@github-actions@LoopedBard3
@ericstj@MichaelSimons
[release/8.0] Update MicrosoftBuildVersion to latest (#100595) (#101145)
ca4f0fe
* Update MicrosoftBuildVersion to latest to fix System.Security.Cryptography.XML component governance alert.
* Add info to VersionDetails to allow sourcebuild to update the MSBuild dependency
* Update SourceBuildPrebuiltBaseline.xml
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Parker Bibus <parkerbibus@microsoft.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
@jkotas
jkotas deleted the backport/pr-98006-to-release/8.0 branch April 17, 2024 01:25
@MichaelSimonsMichaelSimons mentioned this pull request Apr 19, 2024
Closed
This was referenced Apr 22, 2024
Closed
Closed
Closed
dotnet-bot pushed a commit to dotnet/installer that referenced this pull request May 14, 2024
@NikolaMilosavljevic
Merged PR 39154: Update MSBuild dependencies
63a6ed3
Fixes: dotnet/source-build#4344dotnet/runtime#100595 introduced two issues:
- Lower MSBuild version dependency - 17.8.3, instead of 17.8.5. This caused transitive package downgrade errors.
- Source-build dependency for MSBuild, in runtime repo. This caused downgrade of MSBuild repo in VMR, from 17.8.5 to 17.8.3.
Besides removing direct package references, the fix is to add a direct MSBuild source-build dependency in `installer` repo.
I'm also adding the missing MSBuild dependencies to runtime, for proper PVP flow. Without the explicit dependencies, my validation build was hitting an issue with `Microsoft.Build.Framework` package downgrade in
`src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj`:
```
/vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605: Warning As Error: Detected package downgrade: Microsoft.Build.Framework from 17.8.5 to 17.8.3. Reference the package directly from the project to select a different version. [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
/vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605: Microsoft.NET.Sdk.WebAssembly.Pack.Tasks -> Microsoft.Build 17.8.5 -> Microsoft.Build.Framework (>= 17.8.5) [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
/vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605: Microsoft.NET.Sdk.WebAssembly.Pack.Tasks -> Microsoft.Build.Framework (>= 17.8.3) [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
```
Fully validated with an internal pipeline run: https://dev.azure.com/dnceng/internal/_build/results?buildId=2436369&view=results
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 17, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@steveisoksteveisoksteveisok approved these changes
@ViktorHoferViktorHoferAwaiting requested review from ViktorHofer

Assignees

No one assigned

Labels

area-InfrastructureServicing-approvedApproved for servicing release

Projects

None yet

Milestone

8.0.5

Development

Successfully merging this pull request may close these issues.

5 participants

@ericstj@MichaelSimons@steveisok@rbhanda@LoopedBard3
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[release/8.0] Update MicrosoftBuildVersion to latest - #100595
Merged
ericstj merged 3 commits into
release/8.0-stagingfrom 
backport/pr-98006-to-release/8.0
Apr 16, 2024
Merged
[release/8.0] Update MicrosoftBuildVersion to latest#100595
ericstj merged 3 commits into
release/8.0-stagingfrom 
backport/pr-98006-to-release/8.0
Conversation
@github-actions
@github-actionsgithub-actionsBot
commented
Apr 3, 2024•

edited by ericstj

Loading

Copy link


Copy Markdown

Contributor
Backport of #98006 to release/8.0
/cc @ericstj@LoopedBard3
Customer Impact
  •  Customer reported
  •  Found internally
Component governance issue in runtime, due to dependencies MSBuild tasks built in repo.
Regression
  •  Yes
  •  No
Testing
Built in main.
Risk
Low - build only dependency. Package version does not appear in shipping assets, nor is binary redistributed.
@ghostghost
added
the 
needs-area-label
An area label is needed to ensure this gets routed to the appropriate area owners
label
Apr 3, 2024
@ericstj
ericstj
commented
Apr 3, 2024•

edited

Loading

Copy link


Copy Markdown

Member
@ViktorHofer@MichaelSimons do we need a corresponding SBRP change in servicing to take this? I know we needed changes in main for SBRP when this was made - not sure if we branch that for servicing or not.
I think the SBRP changes were
dotnet/source-build-assets#885
dotnet/source-build-assets#886
@ericstj
ericstj
requested a review
from ViktorHoferApril 3, 2024 17:29
@MichaelSimons
MichaelSimons
commented
Apr 3, 2024

Copy link


Copy Markdown

Member
Yes those will need to be backported. Because of all the infrastructure changes made in 9.0, a simple backport will not work without some changes to the project files.

This was referenced Apr 3, 2024

Closed


Open


Closed


Closed

@ericstj
ericstj
changed the base branch from
release/8.0
to
release/8.0-stagingApril 8, 2024 17:37
@ericstj
ericstj
commented
Apr 8, 2024

Copy link


Copy Markdown

Member
Source build leg is failing because it needs dotnet/source-build-assets#932.
@ericstj
ericstjforce-pushed
the
backport/pr-98006-to-release/8.0
branch
from
1678a6f to
b5223b0CompareApril 8, 2024 23:54
@ericstj
ericstj
requested a review
from steveisokApril 8, 2024 23:55
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 9, 2024

Closed

3 tasks
@MichaelSimons
MichaelSimons
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
Yes those will need to be backported. Because of all the infrastructure changes made in 9.0, a simple backport will not work without some changes to the project files.
I retract this statement after seeing that 4.8.3 is targeting net8.0. Instead, I think we should build with n-1 in source-build (currently 4.8.5). To do this, we would need to add this dependency in the Version.Detail.xml in order to allow source-build to lift it. See https://github.com/dotnet/runtime/blob/release/8.0/eng/Version.Details.xml#L403.
@ericstjericstj
mentioned this pull request
Apr 9, 2024
 Closed

@ericstj
ericstj
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
So it sounds like we need a ToolsetDependencies entry. Can you let me know which version that should be? You're saying 4.8.5 and 4.8.3 - did you mean 17.9.5 and 17.8.3? cc @rainersigwald
@MichaelSimons
MichaelSimons
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
So it sounds like we need a ToolsetDependencies entry.
Yes.
Can you let me know which version that should be? You're saying 4.8.5 and 4.8.3 - did you mean 17.9.5 and 17.8.3?
Sorry I mixed up the version numbers. I meant 17.8.3 and 17.8.5.
It is fine to use 17.8.3.
To conclude, I think the following toolset dependencies should be added. The second is to prevent prebuilts from being reported in the runtime's source-build leg.
<Dependency Name="Microsoft.Build" Version="17.8.3">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.3-preview-23613-06">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>

@ericstj
ericstj
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
I see - so simply adding those to VersionDetails.xml is enough? Because we're already using MicrosoftBuildVersion for our property sourcebuild will know to set this with the actual version?
@ericstjericstj
added

Servicing-consider
Issue for next servicing release review
area-Infrastructure-libraries

area-Infrastructure

and removed

needs-area-label
An area label is needed to ensure this gets routed to the appropriate area owners
area-Infrastructure-libraries

labels
Apr 9, 2024
@MichaelSimons
MichaelSimons
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
I see - so simply adding those to VersionDetails.xml is enough? Because we're already using MicrosoftBuildVersion for our property sourcebuild will know to set this with the actual version?
That's correct. The VersionDetails.xml entry signals to source-build to use the current version which it does by overriding the Version.props property.
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 9, 2024

Open

3 tasks
@ericstj
ericstj
commented
Apr 12, 2024

Copy link


Copy Markdown

Member
@MichaelSimons -- looks like this MSBuild version did bring some new prebuilts:
System.Configuration.ConfigurationManager.7.0.0
System.Diagnostics.EventLog.7.0.0
System.Reflection.MetadataLoadContext.7.0.0
System.Security.Cryptography.ProtectedData.7.0.0

Should we resurrect the SBRP change for just those?
@ericstj
ericstj
commented
Apr 12, 2024

Copy link


Copy Markdown

Member
Looks like if we move to 17.9.5 it would have dependencies on 8.0.0 versions of these packages. I wonder if that's the better way to solve this?
@rbhandarbhanda
added

Servicing-approved
Approved for servicing release
and removed

Servicing-consider
Issue for next servicing release review
labels
Apr 16, 2024
@ericstj
ericstj
commented
Apr 16, 2024

Copy link


Copy Markdown

Member
@steveisok -- is there any reason to fast-track this into May release, or is it ok to go in June?
@steveisok
steveisok
commented
Apr 16, 2024

Copy link


Copy Markdown

Member
It resolves a cg alert so taking it now would be preferred.
@ericstjericstj
added this to the 8.0.5 milestone
Apr 16, 2024
@ericstj
ericstj
merged commit dce1737
into
release/8.0-stagingApr 16, 2024
@ericstj
ericstj
commented
Apr 16, 2024

Copy link


Copy Markdown

Member
/backport to release/8.0
@github-actions
github-actionsBot
commented
Apr 16, 2024

Copy link


Copy Markdown

ContributorAuthor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/8712642220
@github-actionsgithub-actionsBot
mentioned this pull request
Apr 16, 2024
 Merged

4 tasks
ericstj added a commit
that referenced
this pull request
Apr 16, 2024
@github-actions@LoopedBard3
@ericstj@MichaelSimons
[release/8.0] Update MicrosoftBuildVersion to latest (#100595)
402655c
* Update MicrosoftBuildVersion to latest to fix System.Security.Cryptography.XML component governance alert.
* Add info to VersionDetails to allow sourcebuild to update the MSBuild dependency
* Update SourceBuildPrebuiltBaseline.xml
---------
Co-authored-by: Parker Bibus <parkerbibus@microsoft.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
ericstj added a commit
that referenced
this pull request
Apr 16, 2024
@github-actions@LoopedBard3
@ericstj@MichaelSimons
[release/8.0] Update MicrosoftBuildVersion to latest (#100595) (#101145)
ca4f0fe
* Update MicrosoftBuildVersion to latest to fix System.Security.Cryptography.XML component governance alert.
* Add info to VersionDetails to allow sourcebuild to update the MSBuild dependency
* Update SourceBuildPrebuiltBaseline.xml
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Parker Bibus <parkerbibus@microsoft.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
@jkotas
jkotas
deleted the

backport/pr-98006-to-release/8.0

branch
April 17, 2024 01:25
@MichaelSimonsMichaelSimons
mentioned this pull request
Apr 19, 2024

Closed


This was referenced Apr 22, 2024
 Closed

 Closed


Closed

dotnet-bot pushed a commit
to dotnet/installer
that referenced
this pull request
May 14, 2024
@NikolaMilosavljevic
Merged PR 39154: Update MSBuild dependencies
63a6ed3
Fixes: dotnet/source-build#4344dotnet/runtime#100595 introduced two issues:
- Lower MSBuild version dependency - 17.8.3, instead of 17.8.5. This caused transitive package downgrade errors.
- Source-build dependency for MSBuild, in runtime repo. This caused downgrade of MSBuild repo in VMR, from 17.8.5 to 17.8.3.
Besides removing direct package references, the fix is to add a direct MSBuild source-build dependency in `installer` repo.
I'm also adding the missing MSBuild dependencies to runtime, for proper PVP flow. Without the explicit dependencies, my validation build was hitting an issue with `Microsoft.Build.Framework` package downgrade in
`src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj`:
```
/vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605: Warning As Error: Detected package downgrade: Microsoft.Build.Framework from 17.8.5 to 17.8.3. Reference the package directly from the project to select a different version. [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
/vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605: Microsoft.NET.Sdk.WebAssembly.Pack.Tasks -> Microsoft.Build 17.8.5 -> Microsoft.Build.Framework (>= 17.8.5) [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
/vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605: Microsoft.NET.Sdk.WebAssembly.Pack.Tasks -> Microsoft.Build.Framework (>= 17.8.3) [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
```
Fully validated with an internal pipeline run: https://dev.azure.com/dnceng/internal/_build/results?buildId=2436369&view=results
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
May 17, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@steveisoksteveisoksteveisok approved these changes
@ViktorHoferViktorHoferAwaiting requested review from ViktorHofer

Assignees


No one assigned


Labels

area-InfrastructureServicing-approvedApproved for servicing release

Projects


None yet


Milestone

8.0.5

Development

Successfully merging this pull request may close these issues.

5 participants

@ericstj@MichaelSimons@steveisok@rbhanda@LoopedBard3

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/8.0] Update MicrosoftBuildVersion to latest - #100595
Merged
ericstj merged 3 commits into
release/8.0-stagingfrom 
backport/pr-98006-to-release/8.0
Apr 16, 2024
Merged
[release/8.0] Update MicrosoftBuildVersion to latest#100595
ericstj merged 3 commits into
release/8.0-stagingfrom 
backport/pr-98006-to-release/8.0
Conversation
@github-actions
@github-actionsgithub-actionsBot
commented
Apr 3, 2024•

edited by ericstj

Loading

Copy link


Copy Markdown

Contributor
Backport of #98006 to release/8.0
/cc @ericstj@LoopedBard3
Customer Impact
  •  Customer reported
  •  Found internally
Component governance issue in runtime, due to dependencies MSBuild tasks built in repo.
Regression
  •  Yes
  •  No
Testing
Built in main.
Risk
Low - build only dependency. Package version does not appear in shipping assets, nor is binary redistributed.
@ghostghost
added
the 
needs-area-label
An area label is needed to ensure this gets routed to the appropriate area owners
label
Apr 3, 2024
@ericstj
ericstj
commented
Apr 3, 2024•

edited

Loading

Copy link


Copy Markdown

Member
@ViktorHofer@MichaelSimons do we need a corresponding SBRP change in servicing to take this? I know we needed changes in main for SBRP when this was made - not sure if we branch that for servicing or not.
I think the SBRP changes were
dotnet/source-build-assets#885
dotnet/source-build-assets#886
@ericstj
ericstj
requested a review
from ViktorHoferApril 3, 2024 17:29
@MichaelSimons
MichaelSimons
commented
Apr 3, 2024

Copy link


Copy Markdown

Member
Yes those will need to be backported. Because of all the infrastructure changes made in 9.0, a simple backport will not work without some changes to the project files.

This was referenced Apr 3, 2024

Closed


Open


Closed


Closed

@ericstj
ericstj
changed the base branch from
release/8.0
to
release/8.0-stagingApril 8, 2024 17:37
@ericstj
ericstj
commented
Apr 8, 2024

Copy link


Copy Markdown

Member
Source build leg is failing because it needs dotnet/source-build-assets#932.
@ericstj
ericstjforce-pushed
the
backport/pr-98006-to-release/8.0
branch
from
1678a6f to
b5223b0CompareApril 8, 2024 23:54
@ericstj
ericstj
requested a review
from steveisokApril 8, 2024 23:55
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 9, 2024

Closed

3 tasks
@MichaelSimons
MichaelSimons
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
Yes those will need to be backported. Because of all the infrastructure changes made in 9.0, a simple backport will not work without some changes to the project files.
I retract this statement after seeing that 4.8.3 is targeting net8.0. Instead, I think we should build with n-1 in source-build (currently 4.8.5). To do this, we would need to add this dependency in the Version.Detail.xml in order to allow source-build to lift it. See https://github.com/dotnet/runtime/blob/release/8.0/eng/Version.Details.xml#L403.
@ericstjericstj
mentioned this pull request
Apr 9, 2024
 Closed

@ericstj
ericstj
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
So it sounds like we need a ToolsetDependencies entry. Can you let me know which version that should be? You're saying 4.8.5 and 4.8.3 - did you mean 17.9.5 and 17.8.3? cc @rainersigwald
@MichaelSimons
MichaelSimons
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
So it sounds like we need a ToolsetDependencies entry.
Yes.
Can you let me know which version that should be? You're saying 4.8.5 and 4.8.3 - did you mean 17.9.5 and 17.8.3?
Sorry I mixed up the version numbers. I meant 17.8.3 and 17.8.5.
It is fine to use 17.8.3.
To conclude, I think the following toolset dependencies should be added. The second is to prevent prebuilts from being reported in the runtime's source-build leg.
<Dependency Name="Microsoft.Build" Version="17.8.3">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.3-preview-23613-06">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>

@ericstj
ericstj
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
I see - so simply adding those to VersionDetails.xml is enough? Because we're already using MicrosoftBuildVersion for our property sourcebuild will know to set this with the actual version?
@ericstjericstj
added

Servicing-consider
Issue for next servicing release review
area-Infrastructure-libraries

area-Infrastructure

and removed

needs-area-label
An area label is needed to ensure this gets routed to the appropriate area owners
area-Infrastructure-libraries

labels
Apr 9, 2024
@MichaelSimons
MichaelSimons
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
I see - so simply adding those to VersionDetails.xml is enough? Because we're already using MicrosoftBuildVersion for our property sourcebuild will know to set this with the actual version?
That's correct. The VersionDetails.xml entry signals to source-build to use the current version which it does by overriding the Version.props property.
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 9, 2024

Open

3 tasks
@ericstj
ericstj
commented
Apr 12, 2024

Copy link


Copy Markdown

Member
@MichaelSimons -- looks like this MSBuild version did bring some new prebuilts:
System.Configuration.ConfigurationManager.7.0.0
System.Diagnostics.EventLog.7.0.0
System.Reflection.MetadataLoadContext.7.0.0
System.Security.Cryptography.ProtectedData.7.0.0

Should we resurrect the SBRP change for just those?
@ericstj
ericstj
commented
Apr 12, 2024

Copy link


Copy Markdown

Member
Looks like if we move to 17.9.5 it would have dependencies on 8.0.0 versions of these packages. I wonder if that's the better way to solve this?
@rbhandarbhanda
added

Servicing-approved
Approved for servicing release
and removed

Servicing-consider
Issue for next servicing release review
labels
Apr 16, 2024
@ericstj
ericstj
commented
Apr 16, 2024

Copy link


Copy Markdown

Member
@steveisok -- is there any reason to fast-track this into May release, or is it ok to go in June?
@steveisok
steveisok
commented
Apr 16, 2024

Copy link


Copy Markdown

Member
It resolves a cg alert so taking it now would be preferred.
@ericstjericstj
added this to the 8.0.5 milestone
Apr 16, 2024
@ericstj
ericstj
merged commit dce1737
into
release/8.0-stagingApr 16, 2024
@ericstj
ericstj
commented
Apr 16, 2024

Copy link


Copy Markdown

Member
/backport to release/8.0
@github-actions
github-actionsBot
commented
Apr 16, 2024

Copy link


Copy Markdown

ContributorAuthor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/8712642220
@github-actionsgithub-actionsBot
mentioned this pull request
Apr 16, 2024
 Merged

4 tasks
ericstj added a commit
that referenced
this pull request
Apr 16, 2024
@github-actions@LoopedBard3
@ericstj@MichaelSimons
[release/8.0] Update MicrosoftBuildVersion to latest (#100595)
402655c
* Update MicrosoftBuildVersion to latest to fix System.Security.Cryptography.XML component governance alert.
* Add info to VersionDetails to allow sourcebuild to update the MSBuild dependency
* Update SourceBuildPrebuiltBaseline.xml
---------
Co-authored-by: Parker Bibus <parkerbibus@microsoft.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
ericstj added a commit
that referenced
this pull request
Apr 16, 2024
@github-actions@LoopedBard3
@ericstj@MichaelSimons
[release/8.0] Update MicrosoftBuildVersion to latest (#100595) (#101145)
ca4f0fe
* Update MicrosoftBuildVersion to latest to fix System.Security.Cryptography.XML component governance alert.
* Add info to VersionDetails to allow sourcebuild to update the MSBuild dependency
* Update SourceBuildPrebuiltBaseline.xml
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Parker Bibus <parkerbibus@microsoft.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
@jkotas
jkotas
deleted the

backport/pr-98006-to-release/8.0

branch
April 17, 2024 01:25
@MichaelSimonsMichaelSimons
mentioned this pull request
Apr 19, 2024

Closed


This was referenced Apr 22, 2024
 Closed

 Closed


Closed

dotnet-bot pushed a commit
to dotnet/installer
that referenced
this pull request
May 14, 2024
@NikolaMilosavljevic
Merged PR 39154: Update MSBuild dependencies
63a6ed3
Fixes: dotnet/source-build#4344dotnet/runtime#100595 introduced two issues:
- Lower MSBuild version dependency - 17.8.3, instead of 17.8.5. This caused transitive package downgrade errors.
- Source-build dependency for MSBuild, in runtime repo. This caused downgrade of MSBuild repo in VMR, from 17.8.5 to 17.8.3.
Besides removing direct package references, the fix is to add a direct MSBuild source-build dependency in `installer` repo.
I'm also adding the missing MSBuild dependencies to runtime, for proper PVP flow. Without the explicit dependencies, my validation build was hitting an issue with `Microsoft.Build.Framework` package downgrade in
`src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj`:
```
/vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605: Warning As Error: Detected package downgrade: Microsoft.Build.Framework from 17.8.5 to 17.8.3. Reference the package directly from the project to select a different version. [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
/vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605: Microsoft.NET.Sdk.WebAssembly.Pack.Tasks -> Microsoft.Build 17.8.5 -> Microsoft.Build.Framework (>= 17.8.5) [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
/vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605: Microsoft.NET.Sdk.WebAssembly.Pack.Tasks -> Microsoft.Build.Framework (>= 17.8.3) [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
```
Fully validated with an internal pipeline run: https://dev.azure.com/dnceng/internal/_build/results?buildId=2436369&view=results
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
May 17, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@steveisoksteveisoksteveisok approved these changes
@ViktorHoferViktorHoferAwaiting requested review from ViktorHofer

Assignees


No one assigned


Labels

area-InfrastructureServicing-approvedApproved for servicing release

Projects


None yet


Milestone

8.0.5

Development

Successfully merging this pull request may close these issues.

5 participants

@ericstj@MichaelSimons@steveisok@rbhanda@LoopedBard3

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/8.0] Update MicrosoftBuildVersion to latest - #100595
Merged
ericstj merged 3 commits into
release/8.0-stagingfrom 
backport/pr-98006-to-release/8.0
Apr 16, 2024
Merged
[release/8.0] Update MicrosoftBuildVersion to latest#100595
ericstj merged 3 commits into
release/8.0-stagingfrom 
backport/pr-98006-to-release/8.0
Conversation
@github-actions
@github-actionsgithub-actionsBot
commented
Apr 3, 2024•

edited by ericstj

Loading

Copy link


Copy Markdown

Contributor
Backport of #98006 to release/8.0
/cc @ericstj@LoopedBard3
Customer Impact
  •  Customer reported
  •  Found internally
Component governance issue in runtime, due to dependencies MSBuild tasks built in repo.
Regression
  •  Yes
  •  No
Testing
Built in main.
Risk
Low - build only dependency. Package version does not appear in shipping assets, nor is binary redistributed.
@ghostghost
added
the 
needs-area-label
An area label is needed to ensure this gets routed to the appropriate area owners
label
Apr 3, 2024
@ericstj
ericstj
commented
Apr 3, 2024•

edited

Loading

Copy link


Copy Markdown

Member
@ViktorHofer@MichaelSimons do we need a corresponding SBRP change in servicing to take this? I know we needed changes in main for SBRP when this was made - not sure if we branch that for servicing or not.
I think the SBRP changes were
dotnet/source-build-assets#885
dotnet/source-build-assets#886
@ericstj
ericstj
requested a review
from ViktorHoferApril 3, 2024 17:29
@MichaelSimons
MichaelSimons
commented
Apr 3, 2024

Copy link


Copy Markdown

Member
Yes those will need to be backported. Because of all the infrastructure changes made in 9.0, a simple backport will not work without some changes to the project files.

This was referenced Apr 3, 2024

Closed


Open


Closed


Closed

@ericstj
ericstj
changed the base branch from
release/8.0
to
release/8.0-stagingApril 8, 2024 17:37
@ericstj
ericstj
commented
Apr 8, 2024

Copy link


Copy Markdown

Member
Source build leg is failing because it needs dotnet/source-build-assets#932.
@ericstj
ericstjforce-pushed
the
backport/pr-98006-to-release/8.0
branch
from
1678a6f to
b5223b0CompareApril 8, 2024 23:54
@ericstj
ericstj
requested a review
from steveisokApril 8, 2024 23:55
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 9, 2024

Closed

3 tasks
@MichaelSimons
MichaelSimons
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
Yes those will need to be backported. Because of all the infrastructure changes made in 9.0, a simple backport will not work without some changes to the project files.
I retract this statement after seeing that 4.8.3 is targeting net8.0. Instead, I think we should build with n-1 in source-build (currently 4.8.5). To do this, we would need to add this dependency in the Version.Detail.xml in order to allow source-build to lift it. See https://github.com/dotnet/runtime/blob/release/8.0/eng/Version.Details.xml#L403.
@ericstjericstj
mentioned this pull request
Apr 9, 2024
 Closed

@ericstj
ericstj
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
So it sounds like we need a ToolsetDependencies entry. Can you let me know which version that should be? You're saying 4.8.5 and 4.8.3 - did you mean 17.9.5 and 17.8.3? cc @rainersigwald
@MichaelSimons
MichaelSimons
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
So it sounds like we need a ToolsetDependencies entry.
Yes.
Can you let me know which version that should be? You're saying 4.8.5 and 4.8.3 - did you mean 17.9.5 and 17.8.3?
Sorry I mixed up the version numbers. I meant 17.8.3 and 17.8.5.
It is fine to use 17.8.3.
To conclude, I think the following toolset dependencies should be added. The second is to prevent prebuilts from being reported in the runtime's source-build leg.
<Dependency Name="Microsoft.Build" Version="17.8.3">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.3-preview-23613-06">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>

@ericstj
ericstj
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
I see - so simply adding those to VersionDetails.xml is enough? Because we're already using MicrosoftBuildVersion for our property sourcebuild will know to set this with the actual version?
@ericstjericstj
added

Servicing-consider
Issue for next servicing release review
area-Infrastructure-libraries

area-Infrastructure

and removed

needs-area-label
An area label is needed to ensure this gets routed to the appropriate area owners
area-Infrastructure-libraries

labels
Apr 9, 2024
@MichaelSimons
MichaelSimons
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
I see - so simply adding those to VersionDetails.xml is enough? Because we're already using MicrosoftBuildVersion for our property sourcebuild will know to set this with the actual version?
That's correct. The VersionDetails.xml entry signals to source-build to use the current version which it does by overriding the Version.props property.
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 9, 2024

Open

3 tasks
@ericstj
ericstj
commented
Apr 12, 2024

Copy link


Copy Markdown

Member
@MichaelSimons -- looks like this MSBuild version did bring some new prebuilts:
System.Configuration.ConfigurationManager.7.0.0
System.Diagnostics.EventLog.7.0.0
System.Reflection.MetadataLoadContext.7.0.0
System.Security.Cryptography.ProtectedData.7.0.0

Should we resurrect the SBRP change for just those?
@ericstj
ericstj
commented
Apr 12, 2024

Copy link


Copy Markdown

Member
Looks like if we move to 17.9.5 it would have dependencies on 8.0.0 versions of these packages. I wonder if that's the better way to solve this?
@rbhandarbhanda
added

Servicing-approved
Approved for servicing release
and removed

Servicing-consider
Issue for next servicing release review
labels
Apr 16, 2024
@ericstj
ericstj
commented
Apr 16, 2024

Copy link


Copy Markdown

Member
@steveisok -- is there any reason to fast-track this into May release, or is it ok to go in June?
@steveisok
steveisok
commented
Apr 16, 2024

Copy link


Copy Markdown

Member
It resolves a cg alert so taking it now would be preferred.
@ericstjericstj
added this to the 8.0.5 milestone
Apr 16, 2024
@ericstj
ericstj
merged commit dce1737
into
release/8.0-stagingApr 16, 2024
@ericstj
ericstj
commented
Apr 16, 2024

Copy link


Copy Markdown

Member
/backport to release/8.0
@github-actions
github-actionsBot
commented
Apr 16, 2024

Copy link


Copy Markdown

ContributorAuthor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/8712642220
@github-actionsgithub-actionsBot
mentioned this pull request
Apr 16, 2024
 Merged

4 tasks
ericstj added a commit
that referenced
this pull request
Apr 16, 2024
@github-actions@LoopedBard3
@ericstj@MichaelSimons
[release/8.0] Update MicrosoftBuildVersion to latest (#100595)
402655c
* Update MicrosoftBuildVersion to latest to fix System.Security.Cryptography.XML component governance alert.
* Add info to VersionDetails to allow sourcebuild to update the MSBuild dependency
* Update SourceBuildPrebuiltBaseline.xml
---------
Co-authored-by: Parker Bibus <parkerbibus@microsoft.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
ericstj added a commit
that referenced
this pull request
Apr 16, 2024
@github-actions@LoopedBard3
@ericstj@MichaelSimons
[release/8.0] Update MicrosoftBuildVersion to latest (#100595) (#101145)
ca4f0fe
* Update MicrosoftBuildVersion to latest to fix System.Security.Cryptography.XML component governance alert.
* Add info to VersionDetails to allow sourcebuild to update the MSBuild dependency
* Update SourceBuildPrebuiltBaseline.xml
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Parker Bibus <parkerbibus@microsoft.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
@jkotas
jkotas
deleted the

backport/pr-98006-to-release/8.0

branch
April 17, 2024 01:25
@MichaelSimonsMichaelSimons
mentioned this pull request
Apr 19, 2024

Closed


This was referenced Apr 22, 2024
 Closed

 Closed


Closed

dotnet-bot pushed a commit
to dotnet/installer
that referenced
this pull request
May 14, 2024
@NikolaMilosavljevic
Merged PR 39154: Update MSBuild dependencies
63a6ed3
Fixes: dotnet/source-build#4344dotnet/runtime#100595 introduced two issues:
- Lower MSBuild version dependency - 17.8.3, instead of 17.8.5. This caused transitive package downgrade errors.
- Source-build dependency for MSBuild, in runtime repo. This caused downgrade of MSBuild repo in VMR, from 17.8.5 to 17.8.3.
Besides removing direct package references, the fix is to add a direct MSBuild source-build dependency in `installer` repo.
I'm also adding the missing MSBuild dependencies to runtime, for proper PVP flow. Without the explicit dependencies, my validation build was hitting an issue with `Microsoft.Build.Framework` package downgrade in
`src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj`:
```
/vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605: Warning As Error: Detected package downgrade: Microsoft.Build.Framework from 17.8.5 to 17.8.3. Reference the package directly from the project to select a different version. [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
/vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605: Microsoft.NET.Sdk.WebAssembly.Pack.Tasks -> Microsoft.Build 17.8.5 -> Microsoft.Build.Framework (>= 17.8.5) [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
/vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605: Microsoft.NET.Sdk.WebAssembly.Pack.Tasks -> Microsoft.Build.Framework (>= 17.8.3) [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
```
Fully validated with an internal pipeline run: https://dev.azure.com/dnceng/internal/_build/results?buildId=2436369&view=results
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
May 17, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@steveisoksteveisoksteveisok approved these changes
@ViktorHoferViktorHoferAwaiting requested review from ViktorHofer

Assignees


No one assigned


Labels

area-InfrastructureServicing-approvedApproved for servicing release

Projects


None yet


Milestone

8.0.5

Development

Successfully merging this pull request may close these issues.

5 participants

@ericstj@MichaelSimons@steveisok@rbhanda@LoopedBard3

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[release/8.0] Update MicrosoftBuildVersion to latest - #100595
Merged
ericstj merged 3 commits into
release/8.0-stagingfrom 
backport/pr-98006-to-release/8.0
Apr 16, 2024
Merged
[release/8.0] Update MicrosoftBuildVersion to latest#100595
ericstj merged 3 commits into
release/8.0-stagingfrom 
backport/pr-98006-to-release/8.0
Conversation
@github-actions
@github-actionsgithub-actionsBot
commented
Apr 3, 2024•

edited by ericstj

Loading

Copy link


Copy Markdown

Contributor
Backport of #98006 to release/8.0
/cc @ericstj@LoopedBard3
Customer Impact
  •  Customer reported
  •  Found internally
Component governance issue in runtime, due to dependencies MSBuild tasks built in repo.
Regression
  •  Yes
  •  No
Testing
Built in main.
Risk
Low - build only dependency. Package version does not appear in shipping assets, nor is binary redistributed.
@ghostghost
added
the 
needs-area-label
An area label is needed to ensure this gets routed to the appropriate area owners
label
Apr 3, 2024
@ericstj
ericstj
commented
Apr 3, 2024•

edited

Loading

Copy link


Copy Markdown

Member
@ViktorHofer@MichaelSimons do we need a corresponding SBRP change in servicing to take this? I know we needed changes in main for SBRP when this was made - not sure if we branch that for servicing or not.
I think the SBRP changes were
dotnet/source-build-assets#885
dotnet/source-build-assets#886
@ericstj
ericstj
requested a review
from ViktorHoferApril 3, 2024 17:29
@MichaelSimons
MichaelSimons
commented
Apr 3, 2024

Copy link


Copy Markdown

Member
Yes those will need to be backported. Because of all the infrastructure changes made in 9.0, a simple backport will not work without some changes to the project files.

This was referenced Apr 3, 2024

Closed


Open


Closed


Closed

@ericstj
ericstj
changed the base branch from
release/8.0
to
release/8.0-stagingApril 8, 2024 17:37
@ericstj
ericstj
commented
Apr 8, 2024

Copy link


Copy Markdown

Member
Source build leg is failing because it needs dotnet/source-build-assets#932.
@ericstj
ericstjforce-pushed
the
backport/pr-98006-to-release/8.0
branch
from
1678a6f to
b5223b0CompareApril 8, 2024 23:54
@ericstj
ericstj
requested a review
from steveisokApril 8, 2024 23:55
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 9, 2024

Closed

3 tasks
@MichaelSimons
MichaelSimons
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
Yes those will need to be backported. Because of all the infrastructure changes made in 9.0, a simple backport will not work without some changes to the project files.
I retract this statement after seeing that 4.8.3 is targeting net8.0. Instead, I think we should build with n-1 in source-build (currently 4.8.5). To do this, we would need to add this dependency in the Version.Detail.xml in order to allow source-build to lift it. See https://github.com/dotnet/runtime/blob/release/8.0/eng/Version.Details.xml#L403.
@ericstjericstj
mentioned this pull request
Apr 9, 2024
 Closed

@ericstj
ericstj
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
So it sounds like we need a ToolsetDependencies entry. Can you let me know which version that should be? You're saying 4.8.5 and 4.8.3 - did you mean 17.9.5 and 17.8.3? cc @rainersigwald
@MichaelSimons
MichaelSimons
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
So it sounds like we need a ToolsetDependencies entry.
Yes.
Can you let me know which version that should be? You're saying 4.8.5 and 4.8.3 - did you mean 17.9.5 and 17.8.3?
Sorry I mixed up the version numbers. I meant 17.8.3 and 17.8.5.
It is fine to use 17.8.3.
To conclude, I think the following toolset dependencies should be added. The second is to prevent prebuilts from being reported in the runtime's source-build leg.
<Dependency Name="Microsoft.Build" Version="17.8.3">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.3-preview-23613-06">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>

@ericstj
ericstj
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
I see - so simply adding those to VersionDetails.xml is enough? Because we're already using MicrosoftBuildVersion for our property sourcebuild will know to set this with the actual version?
@ericstjericstj
added

Servicing-consider
Issue for next servicing release review
area-Infrastructure-libraries

area-Infrastructure

and removed

needs-area-label
An area label is needed to ensure this gets routed to the appropriate area owners
area-Infrastructure-libraries

labels
Apr 9, 2024
@MichaelSimons
MichaelSimons
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
I see - so simply adding those to VersionDetails.xml is enough? Because we're already using MicrosoftBuildVersion for our property sourcebuild will know to set this with the actual version?
That's correct. The VersionDetails.xml entry signals to source-build to use the current version which it does by overriding the Version.props property.
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 9, 2024

Open

3 tasks
@ericstj
ericstj
commented
Apr 12, 2024

Copy link


Copy Markdown

Member
@MichaelSimons -- looks like this MSBuild version did bring some new prebuilts:
System.Configuration.ConfigurationManager.7.0.0
System.Diagnostics.EventLog.7.0.0
System.Reflection.MetadataLoadContext.7.0.0
System.Security.Cryptography.ProtectedData.7.0.0

Should we resurrect the SBRP change for just those?
@ericstj
ericstj
commented
Apr 12, 2024

Copy link


Copy Markdown

Member
Looks like if we move to 17.9.5 it would have dependencies on 8.0.0 versions of these packages. I wonder if that's the better way to solve this?
@rbhandarbhanda
added

Servicing-approved
Approved for servicing release
and removed

Servicing-consider
Issue for next servicing release review
labels
Apr 16, 2024
@ericstj
ericstj
commented
Apr 16, 2024

Copy link


Copy Markdown

Member
@steveisok -- is there any reason to fast-track this into May release, or is it ok to go in June?
@steveisok
steveisok
commented
Apr 16, 2024

Copy link


Copy Markdown

Member
It resolves a cg alert so taking it now would be preferred.
@ericstjericstj
added this to the 8.0.5 milestone
Apr 16, 2024
@ericstj
ericstj
merged commit dce1737
into
release/8.0-stagingApr 16, 2024
@ericstj
ericstj
commented
Apr 16, 2024

Copy link


Copy Markdown

Member
/backport to release/8.0
@github-actions
github-actionsBot
commented
Apr 16, 2024

Copy link


Copy Markdown

ContributorAuthor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/8712642220
@github-actionsgithub-actionsBot
mentioned this pull request
Apr 16, 2024
 Merged

4 tasks
ericstj added a commit
that referenced
this pull request
Apr 16, 2024
@github-actions@LoopedBard3
@ericstj@MichaelSimons
[release/8.0] Update MicrosoftBuildVersion to latest (#100595)
402655c
* Update MicrosoftBuildVersion to latest to fix System.Security.Cryptography.XML component governance alert.
* Add info to VersionDetails to allow sourcebuild to update the MSBuild dependency
* Update SourceBuildPrebuiltBaseline.xml
---------
Co-authored-by: Parker Bibus <parkerbibus@microsoft.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
ericstj added a commit
that referenced
this pull request
Apr 16, 2024
@github-actions@LoopedBard3
@ericstj@MichaelSimons
[release/8.0] Update MicrosoftBuildVersion to latest (#100595) (#101145)
ca4f0fe
* Update MicrosoftBuildVersion to latest to fix System.Security.Cryptography.XML component governance alert.
* Add info to VersionDetails to allow sourcebuild to update the MSBuild dependency
* Update SourceBuildPrebuiltBaseline.xml
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Parker Bibus <parkerbibus@microsoft.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
@jkotas
jkotas
deleted the

backport/pr-98006-to-release/8.0

branch
April 17, 2024 01:25
@MichaelSimonsMichaelSimons
mentioned this pull request
Apr 19, 2024

Closed


This was referenced Apr 22, 2024
 Closed

 Closed


Closed

dotnet-bot pushed a commit
to dotnet/installer
that referenced
this pull request
May 14, 2024
@NikolaMilosavljevic
Merged PR 39154: Update MSBuild dependencies
63a6ed3
Fixes: dotnet/source-build#4344dotnet/runtime#100595 introduced two issues:
- Lower MSBuild version dependency - 17.8.3, instead of 17.8.5. This caused transitive package downgrade errors.
- Source-build dependency for MSBuild, in runtime repo. This caused downgrade of MSBuild repo in VMR, from 17.8.5 to 17.8.3.
Besides removing direct package references, the fix is to add a direct MSBuild source-build dependency in `installer` repo.
I'm also adding the missing MSBuild dependencies to runtime, for proper PVP flow. Without the explicit dependencies, my validation build was hitting an issue with `Microsoft.Build.Framework` package downgrade in
`src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj`:
```
/vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605: Warning As Error: Detected package downgrade: Microsoft.Build.Framework from 17.8.5 to 17.8.3. Reference the package directly from the project to select a different version. [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
/vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605: Microsoft.NET.Sdk.WebAssembly.Pack.Tasks -> Microsoft.Build 17.8.5 -> Microsoft.Build.Framework (>= 17.8.5) [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
/vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605: Microsoft.NET.Sdk.WebAssembly.Pack.Tasks -> Microsoft.Build.Framework (>= 17.8.3) [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
```
Fully validated with an internal pipeline run: https://dev.azure.com/dnceng/internal/_build/results?buildId=2436369&view=results
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
May 17, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@steveisoksteveisoksteveisok approved these changes
@ViktorHoferViktorHoferAwaiting requested review from ViktorHofer

Assignees


No one assigned


Labels

area-InfrastructureServicing-approvedApproved for servicing release

Projects


None yet


Milestone

8.0.5

Development

Successfully merging this pull request may close these issues.

5 participants

@ericstj@MichaelSimons@steveisok@rbhanda@LoopedBard3

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/8.0] Update MicrosoftBuildVersion to latest - #100595
Merged
ericstj merged 3 commits into
release/8.0-stagingfrom 
backport/pr-98006-to-release/8.0
Apr 16, 2024
Merged
[release/8.0] Update MicrosoftBuildVersion to latest#100595
ericstj merged 3 commits into
release/8.0-stagingfrom 
backport/pr-98006-to-release/8.0
Conversation
@github-actions
@github-actionsgithub-actionsBot
commented
Apr 3, 2024•

edited by ericstj

Loading

Copy link


Copy Markdown

Contributor
Backport of #98006 to release/8.0
/cc @ericstj@LoopedBard3
Customer Impact
  •  Customer reported
  •  Found internally
Component governance issue in runtime, due to dependencies MSBuild tasks built in repo.
Regression
  •  Yes
  •  No
Testing
Built in main.
Risk
Low - build only dependency. Package version does not appear in shipping assets, nor is binary redistributed.
@ghostghost
added
the 
needs-area-label
An area label is needed to ensure this gets routed to the appropriate area owners
label
Apr 3, 2024
@ericstj
ericstj
commented
Apr 3, 2024•

edited

Loading

Copy link


Copy Markdown

Member
@ViktorHofer@MichaelSimons do we need a corresponding SBRP change in servicing to take this? I know we needed changes in main for SBRP when this was made - not sure if we branch that for servicing or not.
I think the SBRP changes were
dotnet/source-build-assets#885
dotnet/source-build-assets#886
@ericstj
ericstj
requested a review
from ViktorHoferApril 3, 2024 17:29
@MichaelSimons
MichaelSimons
commented
Apr 3, 2024

Copy link


Copy Markdown

Member
Yes those will need to be backported. Because of all the infrastructure changes made in 9.0, a simple backport will not work without some changes to the project files.

This was referenced Apr 3, 2024

Closed


Open


Closed


Closed

@ericstj
ericstj
changed the base branch from
release/8.0
to
release/8.0-stagingApril 8, 2024 17:37
@ericstj
ericstj
commented
Apr 8, 2024

Copy link


Copy Markdown

Member
Source build leg is failing because it needs dotnet/source-build-assets#932.
@ericstj
ericstjforce-pushed
the
backport/pr-98006-to-release/8.0
branch
from
1678a6f to
b5223b0CompareApril 8, 2024 23:54
@ericstj
ericstj
requested a review
from steveisokApril 8, 2024 23:55
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 9, 2024

Closed

3 tasks
@MichaelSimons
MichaelSimons
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
Yes those will need to be backported. Because of all the infrastructure changes made in 9.0, a simple backport will not work without some changes to the project files.
I retract this statement after seeing that 4.8.3 is targeting net8.0. Instead, I think we should build with n-1 in source-build (currently 4.8.5). To do this, we would need to add this dependency in the Version.Detail.xml in order to allow source-build to lift it. See https://github.com/dotnet/runtime/blob/release/8.0/eng/Version.Details.xml#L403.
@ericstjericstj
mentioned this pull request
Apr 9, 2024
 Closed

@ericstj
ericstj
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
So it sounds like we need a ToolsetDependencies entry. Can you let me know which version that should be? You're saying 4.8.5 and 4.8.3 - did you mean 17.9.5 and 17.8.3? cc @rainersigwald
@MichaelSimons
MichaelSimons
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
So it sounds like we need a ToolsetDependencies entry.
Yes.
Can you let me know which version that should be? You're saying 4.8.5 and 4.8.3 - did you mean 17.9.5 and 17.8.3?
Sorry I mixed up the version numbers. I meant 17.8.3 and 17.8.5.
It is fine to use 17.8.3.
To conclude, I think the following toolset dependencies should be added. The second is to prevent prebuilts from being reported in the runtime's source-build leg.
<Dependency Name="Microsoft.Build" Version="17.8.3">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.3-preview-23613-06">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>

@ericstj
ericstj
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
I see - so simply adding those to VersionDetails.xml is enough? Because we're already using MicrosoftBuildVersion for our property sourcebuild will know to set this with the actual version?
@ericstjericstj
added

Servicing-consider
Issue for next servicing release review
area-Infrastructure-libraries

area-Infrastructure

and removed

needs-area-label
An area label is needed to ensure this gets routed to the appropriate area owners
area-Infrastructure-libraries

labels
Apr 9, 2024
@MichaelSimons
MichaelSimons
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
I see - so simply adding those to VersionDetails.xml is enough? Because we're already using MicrosoftBuildVersion for our property sourcebuild will know to set this with the actual version?
That's correct. The VersionDetails.xml entry signals to source-build to use the current version which it does by overriding the Version.props property.
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 9, 2024

Open

3 tasks
@ericstj
ericstj
commented
Apr 12, 2024

Copy link


Copy Markdown

Member
@MichaelSimons -- looks like this MSBuild version did bring some new prebuilts:
System.Configuration.ConfigurationManager.7.0.0
System.Diagnostics.EventLog.7.0.0
System.Reflection.MetadataLoadContext.7.0.0
System.Security.Cryptography.ProtectedData.7.0.0

Should we resurrect the SBRP change for just those?
@ericstj
ericstj
commented
Apr 12, 2024

Copy link


Copy Markdown

Member
Looks like if we move to 17.9.5 it would have dependencies on 8.0.0 versions of these packages. I wonder if that's the better way to solve this?
@rbhandarbhanda
added

Servicing-approved
Approved for servicing release
and removed

Servicing-consider
Issue for next servicing release review
labels
Apr 16, 2024
@ericstj
ericstj
commented
Apr 16, 2024

Copy link


Copy Markdown

Member
@steveisok -- is there any reason to fast-track this into May release, or is it ok to go in June?
@steveisok
steveisok
commented
Apr 16, 2024

Copy link


Copy Markdown

Member
It resolves a cg alert so taking it now would be preferred.
@ericstjericstj
added this to the 8.0.5 milestone
Apr 16, 2024
@ericstj
ericstj
merged commit dce1737
into
release/8.0-stagingApr 16, 2024
@ericstj
ericstj
commented
Apr 16, 2024

Copy link


Copy Markdown

Member
/backport to release/8.0
@github-actions
github-actionsBot
commented
Apr 16, 2024

Copy link


Copy Markdown

ContributorAuthor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/8712642220
@github-actionsgithub-actionsBot
mentioned this pull request
Apr 16, 2024
 Merged

4 tasks
ericstj added a commit
that referenced
this pull request
Apr 16, 2024
@github-actions@LoopedBard3
@ericstj@MichaelSimons
[release/8.0] Update MicrosoftBuildVersion to latest (#100595)
402655c
* Update MicrosoftBuildVersion to latest to fix System.Security.Cryptography.XML component governance alert.
* Add info to VersionDetails to allow sourcebuild to update the MSBuild dependency
* Update SourceBuildPrebuiltBaseline.xml
---------
Co-authored-by: Parker Bibus <parkerbibus@microsoft.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
ericstj added a commit
that referenced
this pull request
Apr 16, 2024
@github-actions@LoopedBard3
@ericstj@MichaelSimons
[release/8.0] Update MicrosoftBuildVersion to latest (#100595) (#101145)
ca4f0fe
* Update MicrosoftBuildVersion to latest to fix System.Security.Cryptography.XML component governance alert.
* Add info to VersionDetails to allow sourcebuild to update the MSBuild dependency
* Update SourceBuildPrebuiltBaseline.xml
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Parker Bibus <parkerbibus@microsoft.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
@jkotas
jkotas
deleted the

backport/pr-98006-to-release/8.0

branch
April 17, 2024 01:25
@MichaelSimonsMichaelSimons
mentioned this pull request
Apr 19, 2024

Closed


This was referenced Apr 22, 2024
 Closed

 Closed


Closed

dotnet-bot pushed a commit
to dotnet/installer
that referenced
this pull request
May 14, 2024
@NikolaMilosavljevic
Merged PR 39154: Update MSBuild dependencies
63a6ed3
Fixes: dotnet/source-build#4344dotnet/runtime#100595 introduced two issues:
- Lower MSBuild version dependency - 17.8.3, instead of 17.8.5. This caused transitive package downgrade errors.
- Source-build dependency for MSBuild, in runtime repo. This caused downgrade of MSBuild repo in VMR, from 17.8.5 to 17.8.3.
Besides removing direct package references, the fix is to add a direct MSBuild source-build dependency in `installer` repo.
I'm also adding the missing MSBuild dependencies to runtime, for proper PVP flow. Without the explicit dependencies, my validation build was hitting an issue with `Microsoft.Build.Framework` package downgrade in
`src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj`:
```
/vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605: Warning As Error: Detected package downgrade: Microsoft.Build.Framework from 17.8.5 to 17.8.3. Reference the package directly from the project to select a different version. [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
/vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605: Microsoft.NET.Sdk.WebAssembly.Pack.Tasks -> Microsoft.Build 17.8.5 -> Microsoft.Build.Framework (>= 17.8.5) [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
/vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605: Microsoft.NET.Sdk.WebAssembly.Pack.Tasks -> Microsoft.Build.Framework (>= 17.8.3) [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
```
Fully validated with an internal pipeline run: https://dev.azure.com/dnceng/internal/_build/results?buildId=2436369&view=results
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
May 17, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@steveisoksteveisoksteveisok approved these changes
@ViktorHoferViktorHoferAwaiting requested review from ViktorHofer

Assignees


No one assigned


Labels

area-InfrastructureServicing-approvedApproved for servicing release

Projects


None yet


Milestone

8.0.5

Development

Successfully merging this pull request may close these issues.

5 participants

@ericstj@MichaelSimons@steveisok@rbhanda@LoopedBard3

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/8.0] Update MicrosoftBuildVersion to latest - #100595
Merged
ericstj merged 3 commits into
release/8.0-stagingfrom 
backport/pr-98006-to-release/8.0
Apr 16, 2024
Merged
[release/8.0] Update MicrosoftBuildVersion to latest#100595
ericstj merged 3 commits into
release/8.0-stagingfrom 
backport/pr-98006-to-release/8.0
Conversation
@github-actions
@github-actionsgithub-actionsBot
commented
Apr 3, 2024•

edited by ericstj

Loading

Copy link


Copy Markdown

Contributor
Backport of #98006 to release/8.0
/cc @ericstj@LoopedBard3
Customer Impact
  •  Customer reported
  •  Found internally
Component governance issue in runtime, due to dependencies MSBuild tasks built in repo.
Regression
  •  Yes
  •  No
Testing
Built in main.
Risk
Low - build only dependency. Package version does not appear in shipping assets, nor is binary redistributed.
@ghostghost
added
the 
needs-area-label
An area label is needed to ensure this gets routed to the appropriate area owners
label
Apr 3, 2024
@ericstj
ericstj
commented
Apr 3, 2024•

edited

Loading

Copy link


Copy Markdown

Member
@ViktorHofer@MichaelSimons do we need a corresponding SBRP change in servicing to take this? I know we needed changes in main for SBRP when this was made - not sure if we branch that for servicing or not.
I think the SBRP changes were
dotnet/source-build-assets#885
dotnet/source-build-assets#886
@ericstj
ericstj
requested a review
from ViktorHoferApril 3, 2024 17:29
@MichaelSimons
MichaelSimons
commented
Apr 3, 2024

Copy link


Copy Markdown

Member
Yes those will need to be backported. Because of all the infrastructure changes made in 9.0, a simple backport will not work without some changes to the project files.

This was referenced Apr 3, 2024

Closed


Open


Closed


Closed

@ericstj
ericstj
changed the base branch from
release/8.0
to
release/8.0-stagingApril 8, 2024 17:37
@ericstj
ericstj
commented
Apr 8, 2024

Copy link


Copy Markdown

Member
Source build leg is failing because it needs dotnet/source-build-assets#932.
@ericstj
ericstjforce-pushed
the
backport/pr-98006-to-release/8.0
branch
from
1678a6f to
b5223b0CompareApril 8, 2024 23:54
@ericstj
ericstj
requested a review
from steveisokApril 8, 2024 23:55
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 9, 2024

Closed

3 tasks
@MichaelSimons
MichaelSimons
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
Yes those will need to be backported. Because of all the infrastructure changes made in 9.0, a simple backport will not work without some changes to the project files.
I retract this statement after seeing that 4.8.3 is targeting net8.0. Instead, I think we should build with n-1 in source-build (currently 4.8.5). To do this, we would need to add this dependency in the Version.Detail.xml in order to allow source-build to lift it. See https://github.com/dotnet/runtime/blob/release/8.0/eng/Version.Details.xml#L403.
@ericstjericstj
mentioned this pull request
Apr 9, 2024
 Closed

@ericstj
ericstj
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
So it sounds like we need a ToolsetDependencies entry. Can you let me know which version that should be? You're saying 4.8.5 and 4.8.3 - did you mean 17.9.5 and 17.8.3? cc @rainersigwald
@MichaelSimons
MichaelSimons
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
So it sounds like we need a ToolsetDependencies entry.
Yes.
Can you let me know which version that should be? You're saying 4.8.5 and 4.8.3 - did you mean 17.9.5 and 17.8.3?
Sorry I mixed up the version numbers. I meant 17.8.3 and 17.8.5.
It is fine to use 17.8.3.
To conclude, I think the following toolset dependencies should be added. The second is to prevent prebuilts from being reported in the runtime's source-build leg.
<Dependency Name="Microsoft.Build" Version="17.8.3">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.3-preview-23613-06">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>

@ericstj
ericstj
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
I see - so simply adding those to VersionDetails.xml is enough? Because we're already using MicrosoftBuildVersion for our property sourcebuild will know to set this with the actual version?
@ericstjericstj
added

Servicing-consider
Issue for next servicing release review
area-Infrastructure-libraries

area-Infrastructure

and removed

needs-area-label
An area label is needed to ensure this gets routed to the appropriate area owners
area-Infrastructure-libraries

labels
Apr 9, 2024
@MichaelSimons
MichaelSimons
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
I see - so simply adding those to VersionDetails.xml is enough? Because we're already using MicrosoftBuildVersion for our property sourcebuild will know to set this with the actual version?
That's correct. The VersionDetails.xml entry signals to source-build to use the current version which it does by overriding the Version.props property.
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 9, 2024

Open

3 tasks
@ericstj
ericstj
commented
Apr 12, 2024

Copy link


Copy Markdown

Member
@MichaelSimons -- looks like this MSBuild version did bring some new prebuilts:
System.Configuration.ConfigurationManager.7.0.0
System.Diagnostics.EventLog.7.0.0
System.Reflection.MetadataLoadContext.7.0.0
System.Security.Cryptography.ProtectedData.7.0.0

Should we resurrect the SBRP change for just those?
@ericstj
ericstj
commented
Apr 12, 2024

Copy link


Copy Markdown

Member
Looks like if we move to 17.9.5 it would have dependencies on 8.0.0 versions of these packages. I wonder if that's the better way to solve this?
@rbhandarbhanda
added

Servicing-approved
Approved for servicing release
and removed

Servicing-consider
Issue for next servicing release review
labels
Apr 16, 2024
@ericstj
ericstj
commented
Apr 16, 2024

Copy link


Copy Markdown

Member
@steveisok -- is there any reason to fast-track this into May release, or is it ok to go in June?
@steveisok
steveisok
commented
Apr 16, 2024

Copy link


Copy Markdown

Member
It resolves a cg alert so taking it now would be preferred.
@ericstjericstj
added this to the 8.0.5 milestone
Apr 16, 2024
@ericstj
ericstj
merged commit dce1737
into
release/8.0-stagingApr 16, 2024
@ericstj
ericstj
commented
Apr 16, 2024

Copy link


Copy Markdown

Member
/backport to release/8.0
@github-actions
github-actionsBot
commented
Apr 16, 2024

Copy link


Copy Markdown

ContributorAuthor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/8712642220
@github-actionsgithub-actionsBot
mentioned this pull request
Apr 16, 2024
 Merged

4 tasks
ericstj added a commit
that referenced
this pull request
Apr 16, 2024
@github-actions@LoopedBard3
@ericstj@MichaelSimons
[release/8.0] Update MicrosoftBuildVersion to latest (#100595)
402655c
* Update MicrosoftBuildVersion to latest to fix System.Security.Cryptography.XML component governance alert.
* Add info to VersionDetails to allow sourcebuild to update the MSBuild dependency
* Update SourceBuildPrebuiltBaseline.xml
---------
Co-authored-by: Parker Bibus <parkerbibus@microsoft.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
ericstj added a commit
that referenced
this pull request
Apr 16, 2024
@github-actions@LoopedBard3
@ericstj@MichaelSimons
[release/8.0] Update MicrosoftBuildVersion to latest (#100595) (#101145)
ca4f0fe
* Update MicrosoftBuildVersion to latest to fix System.Security.Cryptography.XML component governance alert.
* Add info to VersionDetails to allow sourcebuild to update the MSBuild dependency
* Update SourceBuildPrebuiltBaseline.xml
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Parker Bibus <parkerbibus@microsoft.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
@jkotas
jkotas
deleted the

backport/pr-98006-to-release/8.0

branch
April 17, 2024 01:25
@MichaelSimonsMichaelSimons
mentioned this pull request
Apr 19, 2024

Closed


This was referenced Apr 22, 2024
 Closed

 Closed


Closed

dotnet-bot pushed a commit
to dotnet/installer
that referenced
this pull request
May 14, 2024
@NikolaMilosavljevic
Merged PR 39154: Update MSBuild dependencies
63a6ed3
Fixes: dotnet/source-build#4344dotnet/runtime#100595 introduced two issues:
- Lower MSBuild version dependency - 17.8.3, instead of 17.8.5. This caused transitive package downgrade errors.
- Source-build dependency for MSBuild, in runtime repo. This caused downgrade of MSBuild repo in VMR, from 17.8.5 to 17.8.3.
Besides removing direct package references, the fix is to add a direct MSBuild source-build dependency in `installer` repo.
I'm also adding the missing MSBuild dependencies to runtime, for proper PVP flow. Without the explicit dependencies, my validation build was hitting an issue with `Microsoft.Build.Framework` package downgrade in
`src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj`:
```
/vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605: Warning As Error: Detected package downgrade: Microsoft.Build.Framework from 17.8.5 to 17.8.3. Reference the package directly from the project to select a different version. [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
/vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605: Microsoft.NET.Sdk.WebAssembly.Pack.Tasks -> Microsoft.Build 17.8.5 -> Microsoft.Build.Framework (>= 17.8.5) [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
/vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605: Microsoft.NET.Sdk.WebAssembly.Pack.Tasks -> Microsoft.Build.Framework (>= 17.8.3) [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
```
Fully validated with an internal pipeline run: https://dev.azure.com/dnceng/internal/_build/results?buildId=2436369&view=results
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
May 17, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@steveisoksteveisoksteveisok approved these changes
@ViktorHoferViktorHoferAwaiting requested review from ViktorHofer

Assignees


No one assigned


Labels

area-InfrastructureServicing-approvedApproved for servicing release

Projects


None yet


Milestone

8.0.5

Development

Successfully merging this pull request may close these issues.

5 participants

@ericstj@MichaelSimons@steveisok@rbhanda@LoopedBard3

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

Skip to content
[release/8.0] Update MicrosoftBuildVersion to latest - #100595
Merged
ericstj merged 3 commits into
release/8.0-stagingfrom 
backport/pr-98006-to-release/8.0
Apr 16, 2024
Merged
[release/8.0] Update MicrosoftBuildVersion to latest#100595
ericstj merged 3 commits into
release/8.0-stagingfrom 
backport/pr-98006-to-release/8.0
Conversation
@github-actions
@github-actionsgithub-actionsBot
commented
Apr 3, 2024•

edited by ericstj

Loading

Copy link


Copy Markdown

Contributor
Backport of #98006 to release/8.0
/cc @ericstj@LoopedBard3
Customer Impact
  •  Customer reported
  •  Found internally
Component governance issue in runtime, due to dependencies MSBuild tasks built in repo.
Regression
  •  Yes
  •  No
Testing
Built in main.
Risk
Low - build only dependency. Package version does not appear in shipping assets, nor is binary redistributed.
@ghostghost
added
the 
needs-area-label
An area label is needed to ensure this gets routed to the appropriate area owners
label
Apr 3, 2024
@ericstj
ericstj
commented
Apr 3, 2024•

edited

Loading

Copy link


Copy Markdown

Member
@ViktorHofer@MichaelSimons do we need a corresponding SBRP change in servicing to take this? I know we needed changes in main for SBRP when this was made - not sure if we branch that for servicing or not.
I think the SBRP changes were
dotnet/source-build-assets#885
dotnet/source-build-assets#886
@ericstj
ericstj
requested a review
from ViktorHoferApril 3, 2024 17:29
@MichaelSimons
MichaelSimons
commented
Apr 3, 2024

Copy link


Copy Markdown

Member
Yes those will need to be backported. Because of all the infrastructure changes made in 9.0, a simple backport will not work without some changes to the project files.

This was referenced Apr 3, 2024

Closed


Open


Closed


Closed

@ericstj
ericstj
changed the base branch from
release/8.0
to
release/8.0-stagingApril 8, 2024 17:37
@ericstj
ericstj
commented
Apr 8, 2024

Copy link


Copy Markdown

Member
Source build leg is failing because it needs dotnet/source-build-assets#932.
@ericstj
ericstjforce-pushed
the
backport/pr-98006-to-release/8.0
branch
from
1678a6f to
b5223b0CompareApril 8, 2024 23:54
@ericstj
ericstj
requested a review
from steveisokApril 8, 2024 23:55
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 9, 2024

Closed

3 tasks
@MichaelSimons
MichaelSimons
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
Yes those will need to be backported. Because of all the infrastructure changes made in 9.0, a simple backport will not work without some changes to the project files.
I retract this statement after seeing that 4.8.3 is targeting net8.0. Instead, I think we should build with n-1 in source-build (currently 4.8.5). To do this, we would need to add this dependency in the Version.Detail.xml in order to allow source-build to lift it. See https://github.com/dotnet/runtime/blob/release/8.0/eng/Version.Details.xml#L403.
@ericstjericstj
mentioned this pull request
Apr 9, 2024
 Closed

@ericstj
ericstj
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
So it sounds like we need a ToolsetDependencies entry. Can you let me know which version that should be? You're saying 4.8.5 and 4.8.3 - did you mean 17.9.5 and 17.8.3? cc @rainersigwald
@MichaelSimons
MichaelSimons
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
So it sounds like we need a ToolsetDependencies entry.
Yes.
Can you let me know which version that should be? You're saying 4.8.5 and 4.8.3 - did you mean 17.9.5 and 17.8.3?
Sorry I mixed up the version numbers. I meant 17.8.3 and 17.8.5.
It is fine to use 17.8.3.
To conclude, I think the following toolset dependencies should be added. The second is to prevent prebuilts from being reported in the runtime's source-build leg.
<Dependency Name="Microsoft.Build" Version="17.8.3">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.3-preview-23613-06">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>

@ericstj
ericstj
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
I see - so simply adding those to VersionDetails.xml is enough? Because we're already using MicrosoftBuildVersion for our property sourcebuild will know to set this with the actual version?
@ericstjericstj
added

Servicing-consider
Issue for next servicing release review
area-Infrastructure-libraries

area-Infrastructure

and removed

needs-area-label
An area label is needed to ensure this gets routed to the appropriate area owners
area-Infrastructure-libraries

labels
Apr 9, 2024
@MichaelSimons
MichaelSimons
commented
Apr 9, 2024

Copy link


Copy Markdown

Member
I see - so simply adding those to VersionDetails.xml is enough? Because we're already using MicrosoftBuildVersion for our property sourcebuild will know to set this with the actual version?
That's correct. The VersionDetails.xml entry signals to source-build to use the current version which it does by overriding the Version.props property.
@build-analysisbuild-analysisBot
mentioned this pull request
Apr 9, 2024

Open

3 tasks
@ericstj
ericstj
commented
Apr 12, 2024

Copy link


Copy Markdown

Member
@MichaelSimons -- looks like this MSBuild version did bring some new prebuilts:
System.Configuration.ConfigurationManager.7.0.0
System.Diagnostics.EventLog.7.0.0
System.Reflection.MetadataLoadContext.7.0.0
System.Security.Cryptography.ProtectedData.7.0.0

Should we resurrect the SBRP change for just those?
@ericstj
ericstj
commented
Apr 12, 2024

Copy link


Copy Markdown

Member
Looks like if we move to 17.9.5 it would have dependencies on 8.0.0 versions of these packages. I wonder if that's the better way to solve this?
@rbhandarbhanda
added

Servicing-approved
Approved for servicing release
and removed

Servicing-consider
Issue for next servicing release review
labels
Apr 16, 2024
@ericstj
ericstj
commented
Apr 16, 2024

Copy link


Copy Markdown

Member
@steveisok -- is there any reason to fast-track this into May release, or is it ok to go in June?
@steveisok
steveisok
commented
Apr 16, 2024

Copy link


Copy Markdown

Member
It resolves a cg alert so taking it now would be preferred.
@ericstjericstj
added this to the 8.0.5 milestone
Apr 16, 2024
@ericstj
ericstj
merged commit dce1737
into
release/8.0-stagingApr 16, 2024
@ericstj
ericstj
commented
Apr 16, 2024

Copy link


Copy Markdown

Member
/backport to release/8.0
@github-actions
github-actionsBot
commented
Apr 16, 2024

Copy link


Copy Markdown

ContributorAuthor
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/8712642220
@github-actionsgithub-actionsBot
mentioned this pull request
Apr 16, 2024
 Merged

4 tasks
ericstj added a commit
that referenced
this pull request
Apr 16, 2024
@github-actions@LoopedBard3
@ericstj@MichaelSimons
[release/8.0] Update MicrosoftBuildVersion to latest (#100595)
402655c
* Update MicrosoftBuildVersion to latest to fix System.Security.Cryptography.XML component governance alert.
* Add info to VersionDetails to allow sourcebuild to update the MSBuild dependency
* Update SourceBuildPrebuiltBaseline.xml
---------
Co-authored-by: Parker Bibus <parkerbibus@microsoft.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
ericstj added a commit
that referenced
this pull request
Apr 16, 2024
@github-actions@LoopedBard3
@ericstj@MichaelSimons
[release/8.0] Update MicrosoftBuildVersion to latest (#100595) (#101145)
ca4f0fe
* Update MicrosoftBuildVersion to latest to fix System.Security.Cryptography.XML component governance alert.
* Add info to VersionDetails to allow sourcebuild to update the MSBuild dependency
* Update SourceBuildPrebuiltBaseline.xml
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Parker Bibus <parkerbibus@microsoft.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
@jkotas
jkotas
deleted the

backport/pr-98006-to-release/8.0

branch
April 17, 2024 01:25
@MichaelSimonsMichaelSimons
mentioned this pull request
Apr 19, 2024

Closed


This was referenced Apr 22, 2024
 Closed

 Closed


Closed

dotnet-bot pushed a commit
to dotnet/installer
that referenced
this pull request
May 14, 2024
@NikolaMilosavljevic
Merged PR 39154: Update MSBuild dependencies
63a6ed3
Fixes: dotnet/source-build#4344dotnet/runtime#100595 introduced two issues:
- Lower MSBuild version dependency - 17.8.3, instead of 17.8.5. This caused transitive package downgrade errors.
- Source-build dependency for MSBuild, in runtime repo. This caused downgrade of MSBuild repo in VMR, from 17.8.5 to 17.8.3.
Besides removing direct package references, the fix is to add a direct MSBuild source-build dependency in `installer` repo.
I'm also adding the missing MSBuild dependencies to runtime, for proper PVP flow. Without the explicit dependencies, my validation build was hitting an issue with `Microsoft.Build.Framework` package downgrade in
`src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj`:
```
/vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605: Warning As Error: Detected package downgrade: Microsoft.Build.Framework from 17.8.5 to 17.8.3. Reference the package directly from the project to select a different version. [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
/vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605: Microsoft.NET.Sdk.WebAssembly.Pack.Tasks -> Microsoft.Build 17.8.5 -> Microsoft.Build.Framework (>= 17.8.5) [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
/vmr/src/runtime/artifacts/source-build/self/src/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj : error NU1605: Microsoft.NET.Sdk.WebAssembly.Pack.Tasks -> Microsoft.Build.Framework (>= 17.8.3) [/vmr/src/runtime/artifacts/source-build/self/src/Build.proj]
```
Fully validated with an internal pipeline run: https://dev.azure.com/dnceng/internal/_build/results?buildId=2436369&view=results
@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
May 17, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@steveisoksteveisoksteveisok approved these changes
@ViktorHoferViktorHoferAwaiting requested review from ViktorHofer

Assignees


No one assigned


Labels

area-InfrastructureServicing-approvedApproved for servicing release

Projects


None yet


Milestone

8.0.5

Development

Successfully merging this pull request may close these issues.

5 participants

@ericstj@MichaelSimons@steveisok@rbhanda@LoopedBard3