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

Jump to bottom

[release/8.0.2xx] Update dependencies from dotnet/roslyn #37801

Merged
merged 7 commits into from
Jan 11, 2024
Merged

[release/8.0.2xx] Update dependencies from dotnet/roslyn #37801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7a31a07
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Jan 5, 2024
f77abeb
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Jan 6, 2024
4a298da
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Jan 7, 2024
74f6ae4
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Jan 9, 2024
7ae5596
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Jan 10, 2024
59c5c61
Update dependencies from https://github.com/dotnet/roslyn build 20240…
dotnet-maestro[bot] Jan 11, 2024
5678bf0
Hide refs to CodeAnalysis.CSharp from SDK Tasks
rainersigwald Jan 11, 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 @@ -78,34 +78,34 @@
<Sha>2651752953c0d41c8c7b8d661cf2237151af33d0</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="8.0.0-rtm.23531.12">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
Expand Down
14 changes: 7 additions & 7 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,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
1 change: 1 addition & 0 deletions src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
<ProjectReference Include="..\Microsoft.DotNet.ApiCompatibility\Microsoft.DotNet.ApiCompatibility.csproj" />
<!-- We carry NuGet as part of the package in case the package is used with an older SDKs or with full framework MSBuild. -->
<PackageReference Include="NuGet.Packaging" PrivateAssets="All" Publish="true"/>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" ExcludeAssets="Runtime" PrivateAssets="all" />
Copy link
Member

Choose a reason for hiding this comment

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

This package ref only exists for PrivateAssets="all" to stop the flow, right? We should probably add a comment in a follow-up change.

Copy link
Member

Choose a reason for hiding this comment

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

Yes! #38086

</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" ExcludeAssets="Runtime" />
Copy link
Member

Choose a reason for hiding this comment

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

Why does this one not have PrivateAssets on it?

Copy link
Member

Choose a reason for hiding this comment

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

Oh I think maybe it should. IIRC I was hoping that dropping it here would flow to other places and mean we didn't need to change one of the other places, but that didn't work.


<ProjectReference Include="..\..\Microsoft.DotNet.ApiSymbolExtensions\Microsoft.DotNet.ApiSymbolExtensions.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.ApiSymbolExtensions/Microsoft.DotNet.ApiSymbolExtensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" ExcludeAssets="Runtime" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" ExcludeAssets="Runtime" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down