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/roslyn #97388

Merged
merged 18 commits into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
36214ca
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Jan 23, 2024
4501ac9
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Jan 24, 2024
b8e4cd7
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Jan 25, 2024
b0bd5f5
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Jan 26, 2024
de7f12e
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Jan 27, 2024
aa295e5
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Jan 28, 2024
b5cf56a
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Jan 29, 2024
3486666
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Jan 30, 2024
f638372
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Jan 31, 2024
6e12d5d
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Feb 1, 2024
4e39125
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Feb 2, 2024
5ab62ee
Merge branch 'main' into darc-main-141717df-cf2b-4f45-84bc-aeeeff6e6ba6
lewing Feb 9, 2024
655c2d5
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Feb 9, 2024
8970173
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Feb 10, 2024
b5e5086
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Feb 11, 2024
908a408
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Feb 12, 2024
a839f1c
Comment out tests which fail to compile due to C# breaking change
akoeplinger Feb 12, 2024
f18afa4
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Feb 13, 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
17 changes: 9 additions & 8 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -388,17 +388,18 @@
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>a321e366dc8783b4b84127eb50d7feeda6702c0f</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-1.24069.13">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-2.24112.13">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>2fe96bca1092f880e91eea6eb17ea3487d89309a</Sha>
<Sha>892d5f01f7f41dfe7fcd82522276c5628255ef74</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis" Version="4.10.0-1.24069.13">
<Dependency Name="Microsoft.CodeAnalysis" Version="4.10.0-2.24112.13">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>2fe96bca1092f880e91eea6eb17ea3487d89309a</Sha>
<Sha>892d5f01f7f41dfe7fcd82522276c5628255ef74</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.10.0-1.24069.13">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.10.0-2.24112.13">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>2fe96bca1092f880e91eea6eb17ea3487d89309a</Sha>
<Sha>892d5f01f7f41dfe7fcd82522276c5628255ef74</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.24072.1">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
Expand All @@ -409,9 +410,9 @@
<Sha>e39798fc8357615ab319c81b20acfb036ef7b513</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.10.0-1.24069.13">
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.10.0-2.24112.13">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>2fe96bca1092f880e91eea6eb17ea3487d89309a</Sha>
<Sha>892d5f01f7f41dfe7fcd82522276c5628255ef74</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="9.0.100-alpha.1.24072.3">
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
they do not break the local dev experience.
-->
<MicrosoftCodeAnalysisCSharpVersion>4.10.0-1.24069.13</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisVersion>4.10.0-1.24069.13</MicrosoftCodeAnalysisVersion>
<MicrosoftNetCompilersToolsetVersion>4.10.0-1.24069.13</MicrosoftNetCompilersToolsetVersion>
<MicrosoftCodeAnalysisCSharpVersion>4.10.0-2.24112.13</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisVersion>4.10.0-2.24112.13</MicrosoftCodeAnalysisVersion>
<MicrosoftNetCompilersToolsetVersion>4.10.0-2.24112.13</MicrosoftNetCompilersToolsetVersion>
</PropertyGroup>
<!--
For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2394,56 +2394,58 @@ public static int MainMethod()
}



namespace ManagedTests.DynamicCSharp.Conformance.dynamic.namedandoptional.usage.other.ref03a.ref03a
{
// <Area>Declaration of Methods with Optional Parameters</Area>
// <Title>calling with a ref parameter </Title>
// <Description>Should be able to call a ref parameter</Description>
// <Expects status=success></Expects>
// <Code>
using System.Runtime.InteropServices;

public class Parent
{
public int Foo(
[Optional]
ref int x)
{
if (x == 2)
return 1;
return 1;
}
}

public class Test
{
[Fact]
public static void DynamicCSharpRunTest()
{
Assert.Equal(0, MainMethod());
}

public static int MainMethod()
{
Parent p = new Parent();
dynamic i = 2;
try
{
p.Foo(x: i);
}
catch (Microsoft.CSharp.RuntimeBinder.RuntimeBinderException e)
{
bool ret = ErrorVerifier.Verify(ErrorMessageId.BadArgTypes, e.Message, "Parent.Foo(ref int)");
if (ret)
return 0;
}

return 1;
}
}
//</Code>
}
// This test is failing to compile now due to this C# breaking change:
// https://github.com/dotnet/roslyn/blob/291255bc40c2ccd8ef1ca12ed580820c79f527cc/docs/compilers/CSharp/Compiler%20Breaking%20Changes%20-%20DotNet%208.md#ref-modifiers-of-dynamic-arguments-should-be-compatible-with-ref-modifiers-of-corresponding-parameters

// namespace ManagedTests.DynamicCSharp.Conformance.dynamic.namedandoptional.usage.other.ref03a.ref03a
// {
// // <Area>Declaration of Methods with Optional Parameters</Area>
// // <Title>calling with a ref parameter </Title>
// // <Description>Should be able to call a ref parameter</Description>
// // <Expects status=success></Expects>
// // <Code>
// using System.Runtime.InteropServices;

// public class Parent
// {
// public int Foo(
// [Optional]
// ref int x)
// {
// if (x == 2)
// return 1;
// return 1;
// }
// }

// public class Test
// {
// [Fact]
// public static void DynamicCSharpRunTest()
// {
// Assert.Equal(0, MainMethod());
// }

// public static int MainMethod()
// {
// Parent p = new Parent();
// dynamic i = 2;
// try
// {
// p.Foo(x: i);
// }
// catch (Microsoft.CSharp.RuntimeBinder.RuntimeBinderException e)
// {
// bool ret = ErrorVerifier.Verify(ErrorMessageId.BadArgTypes, e.Message, "Parent.Foo(ref int)");
// if (ret)
// return 0;
// }

// return 1;
// }
// }
// //</Code>
// }



Expand Down Expand Up @@ -2498,56 +2500,58 @@ public static int MainMethod()
}



namespace ManagedTests.DynamicCSharp.Conformance.dynamic.namedandoptional.usage.other.ref03c.ref03c
{
// <Area>Declaration of Methods with Optional Parameters</Area>
// <Title>calling with a ref parameter </Title>
// <Description>Should be able to call a ref parameter</Description>
// <Expects status=success></Expects>
// <Code>
using System.Runtime.InteropServices;

public class Parent
{
public int Foo(
[Optional]
ref dynamic x)
{
if (x == 2)
return 1;
return 1;
}
}

public class Test
{
[Fact]
public static void DynamicCSharpRunTest()
{
Assert.Equal(0, MainMethod());
}

public static int MainMethod()
{
Parent p = new Parent();
dynamic i = 2;
try
{
p.Foo(x: i);
}
catch (Microsoft.CSharp.RuntimeBinder.RuntimeBinderException e)
{
bool ret = ErrorVerifier.Verify(ErrorMessageId.BadArgTypes, e.Message, "Parent.Foo(ref object)");
if (ret)
return 0;
}

return 1;
}
}
//</Code>
}
// This test is failing to compile now due to this C# breaking change:
// https://github.com/dotnet/roslyn/blob/291255bc40c2ccd8ef1ca12ed580820c79f527cc/docs/compilers/CSharp/Compiler%20Breaking%20Changes%20-%20DotNet%208.md#ref-modifiers-of-dynamic-arguments-should-be-compatible-with-ref-modifiers-of-corresponding-parameters

// namespace ManagedTests.DynamicCSharp.Conformance.dynamic.namedandoptional.usage.other.ref03c.ref03c
// {
// // <Area>Declaration of Methods with Optional Parameters</Area>
// // <Title>calling with a ref parameter </Title>
// // <Description>Should be able to call a ref parameter</Description>
// // <Expects status=success></Expects>
// // <Code>
// using System.Runtime.InteropServices;

// public class Parent
// {
// public int Foo(
// [Optional]
// ref dynamic x)
// {
// if (x == 2)
// return 1;
// return 1;
// }
// }

// public class Test
// {
// [Fact]
// public static void DynamicCSharpRunTest()
// {
// Assert.Equal(0, MainMethod());
// }

// public static int MainMethod()
// {
// Parent p = new Parent();
// dynamic i = 2;
// try
// {
// p.Foo(x: i);
// }
// catch (Microsoft.CSharp.RuntimeBinder.RuntimeBinderException e)
// {
// bool ret = ErrorVerifier.Verify(ErrorMessageId.BadArgTypes, e.Message, "Parent.Foo(ref object)");
// if (ret)
// return 0;
// }

// return 1;
// }
// }
// //</Code>
// }



Expand Down
Loading