Skip to content

Commit

Permalink
Merge pull request #71444 from Cosifne/dev/shech/updateTo8.0.0
Browse files Browse the repository at this point in the history
Upgrade BCL assembly to 8.0.0
  • Loading branch information
Cosifne authored Jan 4, 2024
2 parents 237fb52 + c024453 commit 9613053
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 6 deletions.
12 changes: 10 additions & 2 deletions eng/Version.Details.xml
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -1586,7 +1586,7 @@ .locals init (System.ReadOnlySpan<byte> V_0, //s1
");
}

[Fact]
[ConditionalFact(typeof(IsEnglishLocal))]
public void MultipleArrays_InPlaceAndUsed()
{
string csharp = @$"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3760,7 +3760,7 @@ .maxstack 1
");
}

[Fact]
[ConditionalFact(typeof(IsEnglishLocal))]
[WorkItem("https://github.com/dotnet/roslyn/issues/67494")]
public void WhenWithAlwaysThrowingExpression_01()
{
Expand Down
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);
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);

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

0 comments on commit 9613053

Please sign in to comment.