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.

Sign up for GitHub

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

Jump to bottom

Upgrade BCL assembly to 8.0.0 #71444

Merged
merged 17 commits into from
Jan 4, 2024
Merged

Upgrade BCL assembly to 8.0.0 #71444

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
848076b
Upgrade SystemCollectionImmutable, SystemRelectionMetadata and Micros…
Cosifne Jan 2, 2024
fb5a1a7
Upgrade other packages
Cosifne Jan 2, 2024
20ce649
Add reference to Bcl.AsyncInterfaces
Cosifne Jan 2, 2024
24b2014
Copy System.Numerics.Vectors in test, because of the update of refect…
Cosifne Jan 3, 2024
3df1aa6
Try fix the compiler test
Cosifne Jan 3, 2024
b18ab1b
Add the missing source build version in Version.Details.xml
Cosifne Jan 3, 2024
c555956
Fix the analyzer issue
Cosifne Jan 3, 2024
038ab52
Revert "Add the missing source build version in Version.Details.xml"
Cosifne Jan 3, 2024
257fb25
Use darc to update the dependency
Cosifne Jan 3, 2024
0be6aa1
Add versions by darc
Cosifne Jan 3, 2024
6ddff8a
Revert "Add versions by darc"
Cosifne Jan 3, 2024
f4cd26e
Revert the bcl changes
Cosifne Jan 3, 2024
5159608
Revert more
Cosifne Jan 3, 2024
2f402a7
More revert
Cosifne Jan 3, 2024
4ce2da8
Add S.R.M and S.C.I to details.xml
Cosifne Jan 3, 2024
b3b449a
Update source-build-reference-packages version
Cosifne Jan 3, 2024
c024453
Only run two tests in English env
Cosifne Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<Sha>e844aa02a05b90d8cbe499676ec6ee0f19ec4980</Sha>
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23461.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.23627.2">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>264d80ed1ee84b458328b2df68f9930deac08bff</Sha>
<Sha>2a008ae4f42c0db384db5a4864752b2ff52d720b</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.23407.1">
Expand Down Expand Up @@ -41,6 +41,14 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0a2bda10e81d901396c3cff95533529e3a93ad47</Sha>
</Dependency>
<Dependency Name="System.Reflection.Metadata" Version="8.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="System.Collections.Immutable" Version="8.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23613.3">
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,8 @@
When updating the S.C.I or S.R.M version please let the MSBuild team know in advance so they
can update to the same version. Version changes require a VS test insertion for validation.
-->
<SystemCollectionsImmutableVersion>7.0.0</SystemCollectionsImmutableVersion>
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
<MicrosoftBclAsyncInterfacesVersion>7.0.0</MicrosoftBclAsyncInterfacesVersion>
</PropertyGroup>
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
Expand Down
3 changes: 3 additions & 0 deletions src/Compilers/Core/CodeAnalysisTest/Analyzers/AnalyzerFileReferenceAppDomainTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
using Roslyn.Test.Utilities.Desktop;
using Xunit;
using Basic.Reference.Assemblies;
using System.Numerics;

namespace Microsoft.CodeAnalysis.UnitTests
{
Expand Down Expand Up @@ -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);
Copy link
Member Author

Choose a reason for hiding this comment

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

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

var analyzerFile = DesktopTestHelpers.CreateCSharpAnalyzerAssemblyWithTestAnalyzer(dir, "MyAnalyzer");
var loadDomain = AppDomainUtils.Create("AnalyzerTestDomain", basePath: dir.Path);
try
Expand Down Expand Up @@ -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);
Copy link
Member Author

Choose a reason for hiding this comment

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

Same as above comment


var analyzerCompilation = CSharp.CSharpCompilation.Create(
"MyAnalyzer",
Expand Down
Loading