Skip to content

Commit daa12f2

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/roslyn (#45731)
[main] Update dependencies from dotnet/roslyn - Remove roslyn patches - Merge branch 'main' into darc-main-6c9e9d84-a767-433b-9b1f-58e862a8c66b
1 parent 8a48532 commit daa12f2

File tree

4 files changed

+26
-114
lines changed

4 files changed

+26
-114
lines changed

‎eng/Version.Details.xml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -97,43 +97,43 @@
9797
<Sha>63a09289745da5c256e7baf5f4194a750b1ec878</Sha>
9898
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
9999
</Dependency>
100-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.13.0-3.25055.1">
100+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.13.0-3.25056.21">
101101
<Uri>https://github.com/dotnet/roslyn</Uri>
102-
<Sha>f7e10cf53040607a22a61376e5c3d827184699d8</Sha>
102+
<Sha>d7b0a8c4b320a592e6b81dc5a40bc724cd8b71ba</Sha>
103103
</Dependency>
104104
<!-- Intermediate is necessary for source build. -->
105-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.13.0-3.25055.1">
105+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.13.0-3.25056.21">
106106
<Uri>https://github.com/dotnet/roslyn</Uri>
107-
<Sha>f7e10cf53040607a22a61376e5c3d827184699d8</Sha>
107+
<Sha>d7b0a8c4b320a592e6b81dc5a40bc724cd8b71ba</Sha>
108108
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
109109
</Dependency>
110-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.13.0-3.25055.1">
110+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.13.0-3.25056.21">
111111
<Uri>https://github.com/dotnet/roslyn</Uri>
112-
<Sha>f7e10cf53040607a22a61376e5c3d827184699d8</Sha>
112+
<Sha>d7b0a8c4b320a592e6b81dc5a40bc724cd8b71ba</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.13.0-3.25055.1">
114+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.13.0-3.25056.21">
115115
<Uri>https://github.com/dotnet/roslyn</Uri>
116-
<Sha>f7e10cf53040607a22a61376e5c3d827184699d8</Sha>
116+
<Sha>d7b0a8c4b320a592e6b81dc5a40bc724cd8b71ba</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.13.0-3.25055.1">
118+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.13.0-3.25056.21">
119119
<Uri>https://github.com/dotnet/roslyn</Uri>
120-
<Sha>f7e10cf53040607a22a61376e5c3d827184699d8</Sha>
120+
<Sha>d7b0a8c4b320a592e6b81dc5a40bc724cd8b71ba</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.13.0-3.25055.1">
122+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.13.0-3.25056.21">
123123
<Uri>https://github.com/dotnet/roslyn</Uri>
124-
<Sha>f7e10cf53040607a22a61376e5c3d827184699d8</Sha>
124+
<Sha>d7b0a8c4b320a592e6b81dc5a40bc724cd8b71ba</Sha>
125125
</Dependency>
126-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.13.0-3.25055.1">
126+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.13.0-3.25056.21">
127127
<Uri>https://github.com/dotnet/roslyn</Uri>
128-
<Sha>f7e10cf53040607a22a61376e5c3d827184699d8</Sha>
128+
<Sha>d7b0a8c4b320a592e6b81dc5a40bc724cd8b71ba</Sha>
129129
</Dependency>
130-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0-3.25055.1">
130+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0-3.25056.21">
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132-
<Sha>f7e10cf53040607a22a61376e5c3d827184699d8</Sha>
132+
<Sha>d7b0a8c4b320a592e6b81dc5a40bc724cd8b71ba</Sha>
133133
</Dependency>
134-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.13.0-3.25055.1">
134+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.13.0-3.25056.21">
135135
<Uri>https://github.com/dotnet/roslyn</Uri>
136-
<Sha>f7e10cf53040607a22a61376e5c3d827184699d8</Sha>
136+
<Sha>d7b0a8c4b320a592e6b81dc5a40bc724cd8b71ba</Sha>
137137
</Dependency>
138138
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="10.0.0-alpha.2.25056.9">
139139
<Uri>https://github.com/dotnet/aspnetcore</Uri>

‎eng/Versions.props

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -209,14 +209,14 @@
209209
</PropertyGroup>
210210
<PropertyGroup>
211211
<!-- Dependencies from https://github.com/dotnet/roslyn -->
212-
<MicrosoftNetCompilersToolsetVersion>4.13.0-3.25055.1</MicrosoftNetCompilersToolsetVersion>
213-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.13.0-3.25055.1</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
214-
<MicrosoftCodeAnalysisPackageVersion>4.13.0-3.25055.1</MicrosoftCodeAnalysisPackageVersion>
215-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.13.0-3.25055.1</MicrosoftCodeAnalysisCSharpPackageVersion>
216-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.13.0-3.25055.1</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
217-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.13.0-3.25055.1</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
218-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.13.0-3.25055.1</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
219-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.13.0-3.25055.1</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
212+
<MicrosoftNetCompilersToolsetVersion>4.13.0-3.25056.21</MicrosoftNetCompilersToolsetVersion>
213+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.13.0-3.25056.21</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
214+
<MicrosoftCodeAnalysisPackageVersion>4.13.0-3.25056.21</MicrosoftCodeAnalysisPackageVersion>
215+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.13.0-3.25056.21</MicrosoftCodeAnalysisCSharpPackageVersion>
216+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.13.0-3.25056.21</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
217+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.13.0-3.25056.21</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
218+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.13.0-3.25056.21</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
219+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.13.0-3.25056.21</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
220220
</PropertyGroup>
221221
<PropertyGroup>
222222
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->

‎src/SourceBuild/patches/roslyn/0001-fix-compiler-errors-downgraded-sci-and-other-deps-again.patch

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎src/SourceBuild/patches/roslyn/0002-Only-target-NetCurrent-for-source-build.patch

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)