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

[main] Update dependencies from dotnet/roslyn #37781

Closed
wants to merge 14 commits into from
Closed

[main] Update dependencies from dotnet/roslyn #37781

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7017f5c
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Jan 4, 2024
68a7a59
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Jan 5, 2024
43ad7ec
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Jan 5, 2024
57d9d44
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Jan 5, 2024
8572b31
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Jan 5, 2024
14b47f5
Update SRM and SCI
ViktorHofer Jan 10, 2024
1184f09
Merge branch 'main' into darc-main-8a7e000c-7b46-41df-8fbc-37d8a25cae57
ViktorHofer Jan 10, 2024
6ac86d2
Update msbuild expectations
ViktorHofer Jan 10, 2024
f172ee9
Merge branch 'darc-main-8a7e000c-7b46-41df-8fbc-37d8a25cae57' of http…
ViktorHofer Jan 10, 2024
35ecbaf
Merge branch 'main' into darc-main-8a7e000c-7b46-41df-8fbc-37d8a25cae57
ViktorHofer Jan 10, 2024
271a393
Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-8…
v-wuzhai Jan 12, 2024
ce1a7f8
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Jan 12, 2024
1119dbc
Merge branch 'main' into darc-main-8a7e000c-7b46-41df-8fbc-37d8a25cae57
ViktorHofer Jan 12, 2024
d134f27
Merge remote-tracking branch 'origin/main' into darc-main-8a7e000c-7b…
ViktorHofer Jan 12, 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
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,34 +79,34 @@
<Sha>f58bc29a159f43a71e6ac21fd2734f5d10807a72</Sha>
<SourceBuild RepoName="format" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.9.0-3.24053.1">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.9.0-3.24054.13">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>237fb52c683601ed639f1fdeaf38ceef0c768fbc</Sha>
<Sha>28e49407a6e4744819bd471707259b99964e441c</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis" Version="4.9.0-3.24053.1">
<Dependency Name="Microsoft.CodeAnalysis" Version="4.9.0-3.24054.13">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>237fb52c683601ed639f1fdeaf38ceef0c768fbc</Sha>
<Sha>28e49407a6e4744819bd471707259b99964e441c</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.9.0-3.24053.1">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.9.0-3.24054.13">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>237fb52c683601ed639f1fdeaf38ceef0c768fbc</Sha>
<Sha>28e49407a6e4744819bd471707259b99964e441c</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.9.0-3.24053.1">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.9.0-3.24054.13">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>237fb52c683601ed639f1fdeaf38ceef0c768fbc</Sha>
<Sha>28e49407a6e4744819bd471707259b99964e441c</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.9.0-3.24053.1">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.9.0-3.24054.13">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>237fb52c683601ed639f1fdeaf38ceef0c768fbc</Sha>
<Sha>28e49407a6e4744819bd471707259b99964e441c</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.9.0-3.24053.1">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.9.0-3.24054.13">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>237fb52c683601ed639f1fdeaf38ceef0c768fbc</Sha>
<Sha>28e49407a6e4744819bd471707259b99964e441c</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.9.0-3.24053.1">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.9.0-3.24054.13">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>237fb52c683601ed639f1fdeaf38ceef0c768fbc</Sha>
<Sha>28e49407a6e4744819bd471707259b99964e441c</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.0-alpha.1.24059.17">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
Expand Down
18 changes: 9 additions & 9 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
<NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</NETStandardLibraryNETFrameworkVersion>
<NewtonsoftJsonPackageVersion>13.0.3</NewtonsoftJsonPackageVersion>
<StyleCopAnalyzersPackageVersion>1.2.0-beta.435</StyleCopAnalyzersPackageVersion>
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
<SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0-alpha.1.24059.30</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
Expand Down Expand Up @@ -137,13 +137,13 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>4.9.0-3.24053.1</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>4.9.0-3.24053.1</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.9.0-3.24053.1</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.9.0-3.24053.1</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.9.0-3.24053.1</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.9.0-3.24053.1</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.9.0-3.24053.1</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.9.0-3.24054.13</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>4.9.0-3.24054.13</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.9.0-3.24054.13</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.9.0-3.24054.13</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.9.0-3.24054.13</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.9.0-3.24054.13</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.9.0-3.24054.13</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetCompilersToolsetVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
<ExpectedDependencies Include="Microsoft.Deployment.DotNet.Releases, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<ExpectedDependencies Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed" />
<ExpectedDependencies Include="Microsoft.Build.Framework, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<ExpectedDependencies Include="System.Collections.Immutable, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<ExpectedDependencies Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
Copy link
Member

Choose a reason for hiding this comment

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

cc @rainersigwald

In reaction to roslyn and msbuild now targeting SCI and SRM 8.0.0.

<ExpectedDependencies Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
<ExpectedDependencies Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<ExpectedDependencies Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
Expand Down
Loading