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

[release/8.0] Update dependencies from dotnet/roslyn #92503

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
1198b9e
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 22, 2023
f0f3877
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 22, 2023
6745014
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 23, 2023
fb0f59a
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 23, 2023
e2d6c15
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 23, 2023
0fd343b
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 23, 2023
a56473c
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 23, 2023
3b19545
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 23, 2023
722dcbf
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 23, 2023
687ae4f
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 23, 2023
69be516
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 24, 2023
88ba015
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 24, 2023
5186a92
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 24, 2023
3110ecd
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 25, 2023
9c544dd
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 25, 2023
da0dbdd
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 25, 2023
e439423
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 25, 2023
4c5c6a9
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 25, 2023
93642f7
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 25, 2023
22b656b
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 25, 2023
d226def
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 25, 2023
7fca629
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 26, 2023
32c2a7f
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 26, 2023
9cbbbcf
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 26, 2023
18298e6
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 26, 2023
6119823
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 26, 2023
0b32a91
Small refactor to BuildElement to address NRT changes
GrabYourPitchforks Sep 26, 2023
c44f5ec
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 27, 2023
c9e80e9
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 27, 2023
53bcf18
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 27, 2023
e9eb103
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 27, 2023
a1924f3
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 27, 2023
958bdc9
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 27, 2023
442a659
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 28, 2023
e94d891
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 28, 2023
74b5346
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 28, 2023
9428490
Update dependencies from https://github.com/dotnet/roslyn build 20231…
dotnet-maestro[bot] Oct 2, 2023
35b0b61
Merge branch 'release/8.0' into darc-release/8.0-96bca17e-139a-4b61-b…
333fred Oct 2, 2023
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: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -358,18 +358,18 @@
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>99168dcff56809205e7ef8530d1256f3a07fab1f</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-3.23472.2">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-3.23501.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>aa7e4da5341196be494ca4bb0c719d7bef3e396a</Sha>
<Sha>0d735148bbb4cb511be547fbc1db63a2c81a821d</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis" Version="4.8.0-3.23472.2">
<Dependency Name="Microsoft.CodeAnalysis" Version="4.8.0-3.23501.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>aa7e4da5341196be494ca4bb0c719d7bef3e396a</Sha>
<Sha>0d735148bbb4cb511be547fbc1db63a2c81a821d</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-3.23472.2">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-3.23501.1">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>aa7e4da5341196be494ca4bb0c719d7bef3e396a</Sha>
<Sha>0d735148bbb4cb511be547fbc1db63a2c81a821d</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23472.1">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,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.8.0-3.23472.2</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisVersion>4.8.0-3.23472.2</MicrosoftCodeAnalysisVersion>
<MicrosoftNetCompilersToolsetVersion>4.8.0-3.23472.2</MicrosoftNetCompilersToolsetVersion>
<MicrosoftCodeAnalysisCSharpVersion>4.8.0-3.23501.1</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisVersion>4.8.0-3.23501.1</MicrosoftCodeAnalysisVersion>
<MicrosoftNetCompilersToolsetVersion>4.8.0-3.23501.1</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 @@ -348,16 +348,14 @@ private void BuildAndSetProperties((X509Certificate2, int)[] elementTuples)

for (int i = 0; i < elementTuples.Length; i++)
{
(X509Certificate2, int) tuple = elementTuples[i];
(X509Certificate2 cert, int chainStatus) = elementTuples[i];

elements[i] = BuildElement(tuple.Item1, tuple.Item2);
allStatus |= tuple.Item2;
elements[i] = new X509ChainElement(cert, BuildChainElementStatuses(cert, chainStatus), "");
allStatus |= chainStatus;
}

ChainElements = elements;

X509ChainElement rollupElement = BuildElement(null!, allStatus);
ChainStatus = rollupElement.ChainElementStatus;
ChainStatus = BuildChainElementStatuses(null, allStatus);
}

private static void FixupRevocationStatus(
Expand Down Expand Up @@ -457,11 +455,11 @@ private static X509ChainStatusFlags FindUntrustedRootReason(X509Certificate2 cer
return X509ChainStatusFlags.UntrustedRoot;
}

private X509ChainElement BuildElement(X509Certificate2 cert, int dwStatus)
private X509ChainStatus[] BuildChainElementStatuses(X509Certificate2? cert, int dwStatus)
{
if (dwStatus == 0)
{
return new X509ChainElement(cert, Array.Empty<X509ChainStatus>(), "");
return Array.Empty<X509ChainStatus>();
}

List<X509ChainStatus> statuses = new List<X509ChainStatus>();
Expand Down Expand Up @@ -499,7 +497,7 @@ private X509ChainElement BuildElement(X509Certificate2 cert, int dwStatus)
}
}

return new X509ChainElement(cert, statuses.ToArray(), "");
return statuses.ToArray();
}

private readonly struct X509ChainErrorMapping
Expand Down
Loading