Upgrade BCL assembly to 8.0.0 #71444

Cosifne · 2024-01-02T18:10:18Z

Requested because VS updated to 8.0.0.

…oftBclAsyncInterface to 8.0.0

Cosifne · 2024-01-02T18:10:26Z

cc @jaredpar

Cosifne · 2024-01-02T23:20:41Z

/azp run

azure-pipelines · 2024-01-02T23:21:01Z

Azure Pipelines successfully started running 4 pipeline(s).

…ion metadata

ViktorHofer · 2024-01-03T10:51:18Z

...erProtocol.Framework.Example/Microsoft.CommonLanguageServerProtocol.Framework.Example.csproj

@@ -11,6 +11,7 @@

  <ItemGroup Label="Package References">
    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" />


You shouldn't reference this package on .NETCoreApp.

I don't want to add this but I get this

.dotnet/sdk/8.0.100/Microsoft.Common.CurrentVersion.targets(2382,5): error MSB3277: (NETCORE_ENGINEERING_TELEMETRY=Build) Found conflicts between different versions of "Microsoft.Bcl.AsyncInterfaces" that could not be resolved. There was a conflict between "Microsoft.Bcl.AsyncInterfaces, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" and "Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51". "Microsoft.Bcl.AsyncInterfaces, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" was chosen because it was primary and "Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" was not. References which depend on "Microsoft.Bcl.AsyncInterfaces, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" [/mnt/vss/_work/1/s/.packages/microsoft.bcl.asyncinterfaces/7.0.0/lib/netstandard2.1/Microsoft.Bcl.AsyncInterfaces.dll]. /mnt/vss/_work/1/s/.packages/microsoft.bcl.asyncinterfaces/7.0.0/lib/netstandard2.1/Microsoft.Bcl.AsyncInterfaces.dll Project file item includes which caused reference "/mnt/vss/_work/1/s/.packages/microsoft.bcl.asyncinterfaces/7.0.0/lib/netstandard2.1/Microsoft.Bcl.AsyncInterfaces.dll". /mnt/vss/_work/1/s/.packages/microsoft.bcl.asyncinterfaces/7.0.0/lib/netstandard2.1/Microsoft.Bcl.AsyncInterfaces.dll References which depend on "Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" []. /mnt/vss/_work/1/s/artifacts/bin/Microsoft.CodeAnalysis.LanguageServer.Protocol/Debug/netstandard2.0/Microsoft.CodeAnalysis.LanguageServer.Protocol.dll Project file item includes which caused reference "/mnt/vss/_work/1/s/artifacts/bin/Microsoft.CodeAnalysis.LanguageServer.Protocol/Debug/netstandard2.0/Microsoft.CodeAnalysis.LanguageServer.Protocol.dll". /mnt/vss/_work/1/s/artifacts/bin/Microsoft.CodeAnalysis.LanguageServer.Protocol/Debug/netstandard2.0/Microsoft.CodeAnalysis.LanguageServer.Protocol.dll /mnt/vss/_work/1/s/artifacts/bin/Microsoft.CommonLanguageServerProtocol.Framework/Debug/netstandard2.0/Microsoft.CommonLanguageServerProtocol.Framework.dll Project file item includes which caused reference "/mnt/vss/_work/1/s/artifacts/bin/Microsoft.CommonLanguageServerProtocol.Framework/Debug/netstandard2.0/Microsoft.CommonLanguageServerProtocol.Framework.dll". /mnt/vss/_work/1/s/artifacts/bin/Microsoft.CommonLanguageServerProtocol.Framework/Debug/netstandard2.0/Microsoft.CommonLanguageServerProtocol.Framework.dll /mnt/vss/_work/1/s/artifacts/bin/Microsoft.CodeAnalysis.LanguageServer.Protocol/Debug/netstandard2.0/Microsoft.CodeAnalysis.LanguageServer.Protocol.dll

From project.assets.json file I see it the project is referencing the 7.0.0 BCL in net6.0 TFM. My guess is it might be introduced by other packages used in project. And Roslyn is referencing 8.0.0 BCL in other referenced projects so it causes the conflict.
This is by far the easiest way I found to solve the issue.

I believe the request here is to add it to a conditional item group:

<ItemGroup Condition="'$(TargetFramework)' == 'net472'"> <PackageReference ... /> </ItemGroup>

Looks like the following packages bring M.Bcl.AsyncInterfaces in on .NETCoreApp:

Microsoft.VisualStudio.Threading/17.7.35

Nerdbank.Streams/2.10.69

StreamJsonRpc/2.17.8

Those packages should be updated to not reference M.Bcl.AsyncInterfaces. I submitted microsoft/vs-threading#1269, dotnet/Nerdbank.Streams#723 and microsoft/vs-streamjsonrpc#987 to fix that.

Meanwhile I understand that you want to upgrade the transitive package dependency. Did you consider using NuGet Central Package Management with the transitive pinning feature? That would allow you to do that automatically without needing to add an extra PackageReference in this project.

I am thinking about this. The main purpose of this PR is Roslyn also ships a few dlls, which needs to match the dlls version in msbuild. (e.g SystemCollectionsImmutableVersion and SystemReflectionMetadataVersion)
Even other packages in VS move to the new version (like BCL) it might be fine since we don't ship that dlls. We can wait for the upstream packages to update and later update all other stuff here.
So here we just want to find a sweet point without too many other tricks. Testing now..

src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj

Cosifne · 2024-01-03T19:11:22Z

src/Compilers/Core/CodeAnalysisTest/Analyzers/AnalyzerFileReferenceAppDomainTests.cs

@@ -43,6 +44,7 @@ public void TestAnalyzerLoading_AppDomain()
            var dir = Temp.CreateDirectory();
            dir.CopyFile(typeof(AppDomainUtils).Assembly.Location);
            dir.CopyFile(typeof(RemoteAnalyzerFileReferenceTest).Assembly.Location);
+            dir.CopyFile(typeof(Vector).Assembly.Location);


This test would fail on line 54. Exception shows it can't find System.Numerics assembly.

Cosifne · 2024-01-03T19:11:35Z

src/Compilers/Core/CodeAnalysisTest/Analyzers/AnalyzerFileReferenceAppDomainTests.cs

@@ -85,6 +87,7 @@ public class TestAnalyzer : DiagnosticAnalyzer
            var immutable = dir.CopyFile(typeof(ImmutableArray).Assembly.Location);
            var analyzer = dir.CopyFile(typeof(DiagnosticAnalyzer).Assembly.Location);
            dir.CopyFile(typeof(RemoteAnalyzerFileReferenceTest).Assembly.Location);
+            dir.CopyFile(typeof(Vector).Assembly.Location);


Same as above comment

This reverts commit b18ab1b.

This reverts commit 0be6aa1.

Cosifne · 2024-01-03T21:45:07Z

A few things need to be checked before this is good to merge.

Do we only need to update S.C.I and S.R.M. (Waiting others reply)
Fix the source build.
There is a compiler side change after updating S.R.M. (Needs a signed off from compiler folks)

There are many undo/redo commits in the PR, will squash them when merging.

Cosifne · 2024-01-03T23:17:19Z

Retargeting 17.9, this is needed in P3

Cosifne · 2024-01-04T20:18:39Z

src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenReadOnlySpanConstructionTest.cs

@@ -1586,7 +1586,7 @@ .maxstack  2
 ");
        }

-        [Fact]
+        [ConditionalFact(typeof(IsEnglishLocal))]


Failed in Spanish VM

Loosk like it is asserting Error message, and the message is localized now.
So I changed this to English only

Talked to Compiler folks offline and verifed this is OK

@Cosifne

Talked to Compiler folks offline and verifed this is OK

I think we should open an issue for the test infrastructure. It should make sure that verification errors are obtained in English. Then this change should be reverted

Opened #71509.

Upgrade SystemCollectionImmutable, SystemRelectionMetadata and Micros…

848076b

…oftBclAsyncInterface to 8.0.0

Cosifne requested a review from a team as a code owner January 2, 2024 18:10

dotnet-issue-labeler bot added Area-Infrastructure untriaged Issues and PRs which have not yet been triaged by a lead labels Jan 2, 2024

jaredpar approved these changes Jan 2, 2024

View reviewed changes

Upgrade other packages

fb5a1a7

Add reference to Bcl.AsyncInterfaces

20ce649

Cosifne requested a review from a team as a code owner January 2, 2024 20:46

Copy System.Numerics.Vectors in test, because of the update of refect…

24b2014

…ion metadata

Cosifne requested a review from a team as a code owner January 3, 2024 02:29

Cosifne added 2 commits January 2, 2024 23:13

Try fix the compiler test

3df1aa6

Add the missing source build version in Version.Details.xml

b18ab1b

ViktorHofer reviewed Jan 3, 2024

View reviewed changes

src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj Outdated Show resolved Hide resolved

Fix the analyzer issue

c555956

Cosifne force-pushed the dev/shech/updateTo8.0.0 branch from 43ac484 to c555956 Compare January 3, 2024 18:56

Cosifne commented Jan 3, 2024

View reviewed changes

Cosifne added 6 commits January 3, 2024 11:34

Revert "Add the missing source build version in Version.Details.xml"

038ab52

This reverts commit b18ab1b.

Use darc to update the dependency

257fb25

Add versions by darc

0be6aa1

Revert "Add versions by darc"

6ddff8a

This reverts commit 0be6aa1.

Revert the bcl changes

f4cd26e

Revert more

5159608

Cosifne force-pushed the dev/shech/updateTo8.0.0 branch from 628f42c to 5159608 Compare January 3, 2024 20:32

Cosifne added 2 commits January 3, 2024 12:47

More revert

2f402a7

Add S.R.M and S.C.I to details.xml

4ce2da8

Update source-build-reference-packages version

b3b449a

jaredpar approved these changes Jan 3, 2024

View reviewed changes

Cosifne changed the base branch from main to release/dev17.9 January 3, 2024 23:16

dibarbet approved these changes Jan 4, 2024

View reviewed changes

Only run two tests in English env

c024453

Cosifne commented Jan 4, 2024

View reviewed changes

Cosifne merged commit 9613053 into dotnet:release/dev17.9 Jan 4, 2024
31 checks passed

AlekseyTs mentioned this pull request Jan 5, 2024

PEVerify/ILVerify test helpers should make sure that verification errors are obtained in English regardless of the current UI culture. #71509

Open

allisonchou mentioned this pull request Jan 5, 2024

[Automated] PRs inserted in VS build main-34505.47 #71513

Closed

Cosifne mentioned this pull request Jan 5, 2024

[release/8.0.2xx] Update dependencies from dotnet/roslyn dotnet/sdk#37801

Merged

Forgind mentioned this pull request Jan 5, 2024

[main] Update dependencies from dotnet/roslyn dotnet/sdk#37781

Closed

ellahathaway mentioned this pull request Jan 12, 2024

VMR Stage 2 leg failing in arcade with dependency downgrades dotnet/source-build#3968

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade BCL assembly to 8.0.0 #71444

Upgrade BCL assembly to 8.0.0 #71444

Cosifne commented Jan 2, 2024

Cosifne commented Jan 2, 2024

Cosifne commented Jan 2, 2024

azure-pipelines bot commented Jan 2, 2024

ViktorHofer Jan 3, 2024

Cosifne Jan 3, 2024

sharwell Jan 3, 2024

ViktorHofer Jan 3, 2024 •

edited

Loading

Cosifne Jan 3, 2024

Cosifne Jan 3, 2024

Cosifne Jan 3, 2024

Cosifne commented Jan 3, 2024 •

edited

Loading

Cosifne commented Jan 3, 2024

Cosifne Jan 4, 2024 •

edited

Loading

Cosifne Jan 4, 2024

AlekseyTs Jan 4, 2024

AlekseyTs Jan 5, 2024

Upgrade BCL assembly to 8.0.0 #71444

Upgrade BCL assembly to 8.0.0 #71444

Conversation

Cosifne commented Jan 2, 2024

Cosifne commented Jan 2, 2024

Cosifne commented Jan 2, 2024

azure-pipelines bot commented Jan 2, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ViktorHofer Jan 3, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Cosifne commented Jan 3, 2024 • edited Loading

Cosifne commented Jan 3, 2024

Cosifne Jan 4, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ViktorHofer Jan 3, 2024 •

edited

Loading

Cosifne commented Jan 3, 2024 •

edited

Loading

Cosifne Jan 4, 2024 •

edited

Loading