Skip to content

[main] Source code updates from dotnet/dotnet #82735

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

Closed
dotnet-maestro wants to merge 2 commits into from
+15 −15
Closed

[main] Source code updates from dotnet/dotnet #82735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ca6a26
Backflow from https://github.com/dotnet/dotnet / e959381 build 305927
dotnet-maestro[bot] Mar 13, 2026
680cec5
Update dependencies from build 305927
dotnet-maestro[bot] Mar 13, 2026
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
4 changes: 2 additions & 2 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ This file should be imported by eng/Versions.props
<MicrosoftExtensionsOptionsPackageVersion>10.0.1</MicrosoftExtensionsOptionsPackageVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionPackageVersion>10.0.1</MicrosoftExtensionsOptionsConfigurationExtensionPackageVersion>
<MicrosoftExtensionsPrimitivesPackageVersion>10.0.1</MicrosoftExtensionsPrimitivesPackageVersion>
<RoslynDiagnosticsAnalyzersPackageVersion>5.6.0-2.26160.112</RoslynDiagnosticsAnalyzersPackageVersion>
<RoslynDiagnosticsAnalyzersPackageVersion>5.6.0-2.26162.108</RoslynDiagnosticsAnalyzersPackageVersion>
<SystemCollectionsImmutablePackageVersion>10.0.1</SystemCollectionsImmutablePackageVersion>
<SystemCommandLinePackageVersion>3.0.0-preview.3.26160.112</SystemCommandLinePackageVersion>
<SystemCommandLinePackageVersion>3.0.0-preview.3.26162.108</SystemCommandLinePackageVersion>
<SystemComponentModelCompositionPackageVersion>10.0.1</SystemComponentModelCompositionPackageVersion>
<SystemCompositionPackageVersion>10.0.1</SystemCompositionPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.1</SystemConfigurationConfigurationManagerPackageVersion>
Expand Down
10 changes: 5 additions & 5 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="542fea6988c173c64859bab06c9d2d100034843c" BarId="305563" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="e9593819ed84a62923fe87c8d0958025726934c3" BarId="305927" />
<ProductDependencies>
<!-- RoslynAnalyzers reference older builds of Roslyn and this is necessary for SourceBuild. -->
<Dependency Name="Microsoft.CodeAnalysis" Version="5.6.0-2.26151.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6bdca1d6466c2f9ef46f8e5d3422fbe3568d503c</Sha>
</Dependency>
<Dependency Name="System.CommandLine" Version="3.0.0-preview.3.26160.112">
<Dependency Name="System.CommandLine" Version="3.0.0-preview.3.26162.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>542fea6988c173c64859bab06c9d2d100034843c</Sha>
<Sha>e9593819ed84a62923fe87c8d0958025726934c3</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="10.0.1">
Expand Down Expand Up @@ -153,9 +153,9 @@
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6bdca1d6466c2f9ef46f8e5d3422fbe3568d503c</Sha>
</Dependency>
<Dependency Name="Roslyn.Diagnostics.Analyzers" Version="5.6.0-2.26160.112">
<Dependency Name="Roslyn.Diagnostics.Analyzers" Version="5.6.0-2.26162.108">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>542fea6988c173c64859bab06c9d2d100034843c</Sha>
<Sha>e9593819ed84a62923fe87c8d0958025726934c3</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
4 changes: 2 additions & 2 deletions eng/targets/GeneratePkgDef.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@
(if we used Content items they would get included in the VSIX by VSSDK by default).
-->

<UsingTask TaskName="Microsoft.DotNet.Build.Tasks.VisualStudio.GetPkgDefAssemblyDependencyGuid" AssemblyFile="$(ArcadeVisualStudioBuildTasksAssembly)" />
<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GetAssemblyFullName" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" />
<UsingTask TaskName="Microsoft.DotNet.Build.Tasks.VisualStudio.GetPkgDefAssemblyDependencyGuid" AssemblyFile="$(ArcadeVisualStudioBuildTasksAssembly)" Runtime="NET" />
<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GetAssemblyFullName" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />

<Target Name="_SetGeneratePkgDefInputsOutputs">
<PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions eng/targets/Imports.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@
DestinationFolder="$(OutDir)" />
</Target>

<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.CompareVersions" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" />
<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.SingleError" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" />
<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.CompareVersions" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.SingleError" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />

<Target Name="_CheckRequiredMSBuildVersion" BeforeTargets="BeforeBuild" Condition="'$(DotNetBuildSourceOnly)' != 'true'">
<CompareVersions Left="$(MSBuildVersion)" Right="$(MinimumMSBuildVersion)">
Expand Down
2 changes: 1 addition & 1 deletion src/NuGet/VS.Tools.Roslyn.Package/VS.Tools.Roslyn.Package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<!--
Workaround for https://github.com/dotnet/roslyn/issues/17864.
-->
<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.SetCorFlags" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" />
<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.SetCorFlags" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />

<Target Name="_Generate32BitCsc"
AfterTargets="Build"
Expand Down
6 changes: 3 additions & 3 deletions src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<_NuGetRepackAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(NuGetPackageRoot)microsoft.dotnet.nugetrepack.tasks\$(MicrosoftDotnetNuGetRepackTasksVersion)\tools\netcoreapp2.1\Microsoft.DotNet.NuGetRepack.Tasks.dll</_NuGetRepackAssembly>
</PropertyGroup>

<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GetAssemblyFullName" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" />
<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GroupItemsBy" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" />
<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.Unsign" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" />
<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GetAssemblyFullName" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GroupItemsBy" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.Unsign" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" Runtime="NET" />
<UsingTask TaskName="Microsoft.NET.Build.Tasks.JoinItems" AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />
<UsingTask TaskName="Microsoft.DotNet.Tools.ReplacePackageParts" AssemblyFile="$(_NuGetRepackAssembly)" />

Expand Down
Loading