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

[main] Update dependencies from dotnet/source-build-reference-packages #8893

Merged
merged 22 commits into from
Aug 1, 2023

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jun 15, 2023

This pull request updates the following dependencies

From https://github.com/dotnet/source-build-reference-packages

  • Subscription: a86f9f27-acb1-4618-eed7-08db6775ce49
  • Build: 20230731.3
  • Date Produced: July 31, 2023 6:18:53 PM UTC
  • Commit: 5a1492557c8717b428b69fd4b7ca8c91d5d18cd3
  • Branch: refs/heads/main

Coherency Updates

The following updates ensure that dependencies with a CoherentParentDependency
attribute were produced in a build used as input to the parent dependency's build.
See Dependency Description Format

  • Coherency Updates:
    • Microsoft.SourceLink.GitHub: from 1.1.0-beta-21480-02 to 8.0.0-beta.23211.2 (parent: Microsoft.DotNet.Arcade.Sdk)
    • Microsoft.DotNet.XliffTasks: from 1.0.0-beta.21431.1 to 1.0.0-beta.23211.1 (parent: Microsoft.DotNet.Arcade.Sdk)

…ence-packages build 20230615.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.23219.1 -> To Version 8.0.0-alpha.1.23315.1
@JanKrivanek
Copy link
Member

…ence-packages build 20230616.2

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.23219.1 -> To Version 8.0.0-alpha.1.23316.2
@JanKrivanek
Copy link
Member

Transfering discussion from dotnet/sdk#33388, per the last comment:

While I think this issue should be fixed, I don't think the msbuild issue requires it.

msbuild references System.Configuration.ConfigurationManager 7.0.0 in it's repo source-build leg but not full product source-build because of the corresponding entry in the versions.details.xml file. In the product build, this reference cannot be satisfied by a reference package as indicated in dotnet/msbuild#8818. This is to say the repo level source-build and product source-build are referencing different versions. If this difference cannot be resolved, it would be appropriate to add the package to the prebuilt baseline. We should not be adding SBRPs that are only used in repo builds.

We should discuss in dotnet/msbuild#8893.

cc @mmitche, @oleksandr-didyk

@MichaelSimons I very appreciate your detailed look and help! I appologize, but I have hard time understanding the above message. Are you saying that MSBuild references ConfigurationManager 7.0.0, but SRBP v8 have a version 8.x, so either MSBuild should reference CM 8.x or add v 7.0.0 to it's source pre-builds? As I believe we cannot reference 8.x packages due to the need to be inserted to VS. As for the other option - I belieive this is already hapening: https://github.com/dotnet/msbuild/blob/main/eng/SourceBuildPrebuiltBaseline.xml#L19

But with my very shallow knowledge of SourceBuild and MSBuild build I might be just misunderstanding you - in such case can you try to elaborate further or point me to info source where I can learn about the rootcause of this issue?

…ence-packages build 20230619.4

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.23219.1 -> To Version 8.0.0-alpha.1.23319.4
@MichaelSimons
Copy link
Member

Are you saying that MSBuild references ConfigurationManager 7.0.0, but SRBP v8 have a version 8.x,

The microsoft build and the repo level source-build CI references 7.0.0, but in the full product source build, the 8.x version is referenced.

so either MSBuild should reference CM 8.x or add v 7.0.0 to it's source pre-builds? As I believe we cannot reference 8.x packages due to the need to be inserted to VS.

I figured that was the case.

Since this is already in the prebuilt baseline, then there shouldn't be anything else needed for ConfigurationManager.

@JanKrivanek
Copy link
Member

Since this is already in the prebuilt baseline, then there shouldn't be anything else needed for ConfigurationManager.

Hmm - I however still see the missing ConfigurationManager types errors in the sourcebuild binlong (/__w/1/s/artifacts/source-build/self/src/src/Shared/ToolsetElement.cs(665,10): error CS0616: 'ConfigurationProperty' is not an attribute class [/__w/1/s/artifacts/source-build/self/src/src/Build/Microsoft.Build.csproj] etc.)

I know we should update to arcade8 to tackle the other issue (clashing types from microsoft.win32.registry) - but I'd like to have the ConfigurationManager issue sorted as well, as it seems to independent on arcade version

@MichaelSimons
Copy link
Member

Where are you seeing the CS0616 error? I am not seeing in the output of the source-build leg in this PR.

@JanKrivanek
Copy link
Member

Where are you seeing the CS0616 error? I am not seeing in the output of the source-build leg in this PR.

Oh sorry - I haven't noticed there was a recent maestro push that resolved this. It happened only with the SBRP v 8.0.0-alpha.1.23316.2 (run https://github.com/dotnet/msbuild/runs/14343270323)
With update to 8.0.0-alpha.1.23319.4 it disappeared (run https://github.com/dotnet/msbuild/runs/14405558761)

@MichaelSimons
Copy link
Member

With update to 8.0.0-alpha.1.23319.4 it disappeared

Thanks for clarifying, that is what I was expecting. That package was recently removed because it wasn't being referenced in the product source-build.

@JanKrivanek
Copy link
Member

Once this is fixed - we should remove System.Security.Cryptography.Pkcs/*7.0.2* from prebuilds (added by #8903)

…ence-packages build 20230619.4

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.23219.1 -> To Version 8.0.0-alpha.1.23319.4
@rainersigwald rainersigwald added this to the VS 17.8 milestone Jun 22, 2023
…ence-packages build 20230623.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.23219.1 -> To Version 8.0.0-alpha.1.23323.1
…ence-packages build 20230626.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.23219.1 -> To Version 8.0.0-alpha.1.23326.1
…ence-packages build 20230628.2

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.23219.1 -> To Version 8.0.0-alpha.1.23328.2
…ence-packages build 20230629.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.23219.1 -> To Version 8.0.0-alpha.1.23329.1
…ence-packages build 20230630.2

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.23219.1 -> To Version 8.0.0-alpha.1.23330.2
…ence-packages build 20230705.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.23219.1 -> To Version 8.0.0-alpha.1.23355.1
…ence-packages build 20230706.4

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.23219.1 -> To Version 8.0.0-alpha.1.23356.4
…ence-packages build 20230710.2

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.23219.1 -> To Version 8.0.0-alpha.1.23360.2
…ence-packages build 20230711.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.23219.1 -> To Version 8.0.0-alpha.1.23361.1
…ence-packages build 20230712.3

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.23219.1 -> To Version 8.0.0-alpha.1.23362.3
…ence-packages build 20230712.3

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.23219.1 -> To Version 8.0.0-alpha.1.23362.3

Dependency coherency updates

Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 1.1.0-beta-21480-02 -> To Version 8.0.0-beta.23211.2 (parent: Microsoft.DotNet.Arcade.Sdk
dotnet-maestro bot and others added 5 commits July 20, 2023 12:33
…ence-packages build 20230718.2

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.23219.1 -> To Version 8.0.0-alpha.1.23368.2
…ence-packages build 20230721.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.23219.1 -> To Version 8.0.0-alpha.1.23371.1
…ence-packages build 20230724.3

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.23368.2 -> To Version 8.0.0-alpha.1.23374.3
…ence-packages build 20230728.3

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.23368.2 -> To Version 8.0.0-alpha.1.23378.3
@YuliiaKovalova
Copy link
Member

Once this is fixed - we should remove System.Security.Cryptography.Pkcs/*7.0.2* from prebuilds (added by #8903)

addressed in scope of 5410bf3

…ence-packages build 20230731.3

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.23368.2 -> To Version 8.0.0-alpha.1.23381.3
@YuliiaKovalova YuliiaKovalova merged commit 843d4e1 into main Aug 1, 2023
9 checks passed
@YuliiaKovalova YuliiaKovalova deleted the darc-main-1aa1c615-64ec-4219-94e9-25360e4937f9 branch August 1, 2023 13:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants