Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/6.0.1xx] Bump System.Security.Cryptography.Xml to 6.0.1 and System.Security.Cryptography.Pkcs to 6.0.4 #9867

Conversation

YuliiaKovalova
Copy link
Member

@YuliiaKovalova YuliiaKovalova commented Mar 14, 2024

Summary

This is a security fix after the recent scanner results for sdk repo.

Customer Impact

No impact is expected.

Regression?

No

Testing

N/A

Risk

Minimal - no risks, it's just package version update + data from arcade .Net 6 Eng channel

@YuliiaKovalova YuliiaKovalova requested a review from a team as a code owner March 14, 2024 16:53
@YuliiaKovalova YuliiaKovalova changed the base branch from main to vs17.0 March 14, 2024 16:53
@YuliiaKovalova
Copy link
Member Author

Hi @premun,

Could you help us with that? We need a build with the dependency bump .

@premun
Copy link
Member

premun commented Mar 15, 2024

Sorry, I don't follow. Help with what exactly?

@YuliiaKovalova
Copy link
Member Author

YuliiaKovalova commented Mar 15, 2024

Sorry, I don't follow. Help with what exactly?

@premun , I apologize for confusion.
This build fails on source-build step and I don't know how to propagate the arcade version that can fix it and not break sdk.
Do you have any ideas?

@premun
Copy link
Member

premun commented Mar 15, 2024

Sorry, I am not the best person for SB problems. @dotnet/source-build-internal Yulia has some issues with restoring Microsoft.DotNet.SourceBuild.Tasks. Can you help?

@mthalman
Copy link
Member

##[error].packages/microsoft.dotnet.arcade.sdk/6.0.0-beta.21460.7/tools/Tools.proj(0,0): error NU1603: (NETCORE_ENGINEERING_TELEMETRY=Restore) Tools depends on Microsoft.DotNet.SourceBuild.Tasks (>= 6.0.0-beta.21460.7) but Microsoft.DotNet.SourceBuild.Tasks 6.0.0-beta.21460.7 was not found. An approximate best match of Microsoft.DotNet.SourceBuild.Tasks 6.0.0-beta.21620.3 was resolved.
  /__w/1/s/.packages/microsoft.dotnet.arcade.sdk/6.0.0-beta.21460.7/tools/Tools.proj : error NU1102: Unable to find package Microsoft.SourceBuild.Intermediate.arcade with version (= 6.0.0-beta.21460.7)
  /__w/1/s/.packages/microsoft.dotnet.arcade.sdk/6.0.0-beta.21460.7/tools/Tools.proj : error NU1102:   - Found 1002 version(s) in arcade [ Nearest version: 6.0.0-beta.22431.8 ]
  /__w/1/s/.packages/microsoft.dotnet.arcade.sdk/6.0.0-beta.21460.7/tools/Tools.proj : error NU1102:   - Found 0 version(s) in dotnet-public
  /__w/1/s/.packages/microsoft.dotnet.arcade.sdk/6.0.0-beta.21460.7/tools/Tools.proj : error NU1102:   - Found 0 version(s) in dotnet-tools
  /__w/1/s/.packages/microsoft.dotnet.arcade.sdk/6.0.0-beta.21460.7/tools/Tools.proj : error NU1102:   - Found 0 version(s) in dotnet6
##[error].packages/microsoft.dotnet.arcade.sdk/6.0.0-beta.21460.7/tools/Tools.proj(0,0): error NU1102: (NETCORE_ENGINEERING_TELEMETRY=Restore) Unable to find package Microsoft.SourceBuild.Intermediate.arcade with version (= 6.0.0-beta.21460.7)
  - Found 1002 version(s) in arcade [ Nearest version: 6.0.0-beta.22431.8 ]
  - Found 0 version(s) in dotnet-public
  - Found 0 version(s) in dotnet-tools
  - Found 0 version(s) in dotnet6
    Failed to restore /__w/1/s/.packages/microsoft.dotnet.arcade.sdk/6.0.0-beta.21460.7/tools/Tools.proj (in 968 ms).

The error seems completely unrelated to the changes. Are you sure this branch is building without these changes?

Do you have the latest 6.0 Arcade in this branch? /cc @mmitche

@premun
Copy link
Member

premun commented Mar 15, 2024

There was no commit on the target branch for some time:

image

global.json Outdated Show resolved Hide resolved
@YuliiaKovalova
Copy link
Member Author

YuliiaKovalova commented Mar 18, 2024

@GangWang01 please look at the tests failures.

update: it's related to vs-image update. Hopefully, @rainersigwald will resolve it.

@YuliiaKovalova YuliiaKovalova changed the title Bump System.Security.Cryptography.Xml and System.Security.Cryptography.Pkcs to 6.0.1 Bump System.Security.Cryptography.Xml and System.Security.Cryptography.Pkcs to 6.0.1 [Tests failures] Mar 18, 2024
@YuliiaKovalova YuliiaKovalova changed the title Bump System.Security.Cryptography.Xml and System.Security.Cryptography.Pkcs to 6.0.1 [Tests failures] [release/6.0.1xx] Bump System.Security.Cryptography.Xml and System.Security.Cryptography.Pkcs to 6.0.1 [Tests failures] Mar 18, 2024
This was breaking builds but 17.0 really did build on and ship from
VS2019, so we should keep doing so for servicing.
eng/Versions.props Outdated Show resolved Hide resolved
@GangWang01
Copy link
Member

GangWang01 commented Mar 19, 2024

@GangWang01 please look at the tests failures.

update: it's related to vs-image update. Hopefully, @rainersigwald will resolve it.

It looks like the test failures were resolved by Rainer. Thanks Rainer!

YuliiaKovalova and others added 3 commits March 20, 2024 14:27
Co-authored-by: Rainer Sigwald <raines@microsoft.com>
@YuliiaKovalova YuliiaKovalova changed the title [release/6.0.1xx] Bump System.Security.Cryptography.Xml and System.Security.Cryptography.Pkcs to 6.0.1 [Tests failures] [release/6.0.1xx] Bump System.Security.Cryptography.Xml and System.Security.Cryptography.Pkcs to 6.0.1 Mar 20, 2024
Copy link
Member

@JanKrivanek JanKrivanek left a comment

Choose a reason for hiding this comment

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

I suppose changes in eng.. were automatic via the arcade update - correct? Or is there any specific manual changes that should be reviewed with care?

@YuliiaKovalova
Copy link
Member Author

I suppose changes in eng.. were automatic via the arcade update - correct? Or is there any specific manual changes that should be reviewed with care?

Nope, these changes were added by running
darc update-dependencies --source-repo "dotnet/arcade" --channel ".NET 6 Eng"

@KevinRansom
Copy link
Member

@YuliiaKovalova will you be merging this anytime soon. I'm hoping for F# to use the nuget packages from it.

Copy link
Contributor

Hello! I noticed that you're targeting one of our servicing branches. Please consider updating the version.

eng/Packages.props Outdated Show resolved Hide resolved
@YuliiaKovalova YuliiaKovalova changed the title [release/6.0.1xx] Bump System.Security.Cryptography.Xml and System.Security.Cryptography.Pkcs to 6.0.1 [release/6.0.1xx] Bump System.Security.Cryptography.Xml to 6.0.1 and System.Security.Cryptography.Pkcs to 6.0.4 Mar 28, 2024
@YuliiaKovalova YuliiaKovalova merged commit d679d20 into dotnet:vs17.0 Mar 28, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.