Skip to content

Commit dda23d1

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
committed
Update dependencies from https://github.com/dotnet/dotnet build 289869
Updated Dependencies: System.CommandLine (Version 2.0.0-rc.1.25509.115 -> 2.0.0-rc.3.25556.111)
1 parent 68e2834 commit dda23d1

File tree

6 files changed

+29
-30
lines changed

6 files changed

+29
-30
lines changed

‎eng/Packages.props‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,23 @@
2525
</PropertyGroup>
2626

2727
<!--
28-
MSBuild - need to use older packages when targeting net7.0 since the newer versions only support net472 and net8.0.
28+
MSBuild - need to use older packages when targeting net8.0 since the newer versions only support net472 and net9.0.
2929
When tareting the latest .NET the version must also be lower or equal to one specified in
3030
https://github.com/dotnet/sdk/blob/main/src/Layout/redist/minimumMSBuildVersion#L1
3131
-->
3232

3333
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
34-
<PackageVersion Include="Microsoft.Build" Version="17.3.4" />
35-
<PackageVersion Include="Microsoft.Build.Framework" Version="17.3.4" />
36-
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.3.4" />
37-
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.3.4" />
34+
<PackageVersion Include="Microsoft.Build" Version="17.11.48" />
35+
<PackageVersion Include="Microsoft.Build.Framework" Version="17.11.48" />
36+
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.11.48" />
37+
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.11.48" />
3838
</ItemGroup>
3939

4040
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(TargetFramework)' != 'net472'">
41-
<PackageVersion Include="Microsoft.Build" Version="17.11.31" />
42-
<PackageVersion Include="Microsoft.Build.Framework" Version="17.11.31" />
43-
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.11.31" />
44-
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.11.31" />
41+
<PackageVersion Include="Microsoft.Build" Version="17.11.48" />
42+
<PackageVersion Include="Microsoft.Build.Framework" Version="17.11.48" />
43+
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.11.48" />
44+
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.11.48" />
4545
</ItemGroup>
4646

4747
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(TargetFramework)' == 'net472'">
@@ -52,7 +52,10 @@
5252
</ItemGroup>
5353

5454
<ItemGroup>
55-
<PackageVersion Include="Microsoft.Build.Locator" Version="1.8.1" />
55+
<!--
56+
BuildHost
57+
-->
58+
<PackageVersion Include="Microsoft.Build.Locator" Version="1.10.2" />
5659

5760
<!--
5861
Visual Studio

‎eng/Version.Details.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ This file should be imported by eng/Versions.props
99
<MicrosoftCodeAnalysisPackageVersion>3.11.0</MicrosoftCodeAnalysisPackageVersion>
1010
<MicrosoftNetCompilersToolsetPackageVersion>4.10.0-1.24061.4</MicrosoftNetCompilersToolsetPackageVersion>
1111
<!-- dotnet/dotnet dependencies -->
12-
<SystemCommandLinePackageVersion>2.0.0-rc.1.25509.115</SystemCommandLinePackageVersion>
12+
<SystemCommandLinePackageVersion>2.0.0-rc.3.25556.111</SystemCommandLinePackageVersion>
1313
<!-- dotnet/runtime dependencies -->
1414
<MicrosoftBclAsyncInterfacesPackageVersion>9.0.0</MicrosoftBclAsyncInterfacesPackageVersion>
1515
<MicrosoftExtensionsConfigurationPackageVersion>9.0.0</MicrosoftExtensionsConfigurationPackageVersion>

‎eng/Version.Details.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="2a4d010d133eb0c2c2a985d4da28f637de833957" BarId="286462" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="77ee357638bcd8fa66a1c16fa588dcd5818068d2" BarId="289869" />
44
<ProductDependencies>
55
<!-- RoslynAnalyzers reference older builds of Roslyn and this is necessary for SourceBuild. -->
66
<Dependency Name="Microsoft.CodeAnalysis" Version="3.11.0">
77
<Uri>https://github.com/dotnet/roslyn</Uri>
88
<Sha>ae1fff344d46976624e68ae17164e0607ab68b10</Sha>
99
</Dependency>
10-
<Dependency Name="System.CommandLine" Version="2.0.0-rc.1.25509.115">
10+
<Dependency Name="System.CommandLine" Version="2.0.0-rc.3.25556.111">
1111
<Uri>https://github.com/dotnet/dotnet</Uri>
12-
<Sha>2a4d010d133eb0c2c2a985d4da28f637de833957</Sha>
12+
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
1313
</Dependency>
1414
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
1515
<Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0">

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
Analyzer, it needs to directly reference patched versions of some transitive dependencies.
109109
-->
110110
<PropertyGroup>
111-
<MicrosoftBuildTasksCoreVersionForMetrics>17.10.29</MicrosoftBuildTasksCoreVersionForMetrics>
111+
<MicrosoftBuildTasksCoreVersionForMetrics>17.10.46</MicrosoftBuildTasksCoreVersionForMetrics>
112112
<SystemTextJsonVersionForMetrics>8.0.5</SystemTextJsonVersionForMetrics>
113113
</PropertyGroup>
114114
<PropertyGroup>

‎eng/targets/TargetFrameworks.props‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33

4-
<!--
4+
<!--
55
This props file manages the target framework properties for Roslyn. The strategy for these properties
66
is covered in "docs/contributing/target-framework-strategy.md". Please see that for documentation
77
on what these values mean.
88
9-
Requirements:
9+
Requirements:
1010
- NetVSShared must include both NetVS and NetVSCode
1111
- NetRoslynSourceBuild must include NetRoslyn
1212
- NetRoslynAll must include all .NET Core TFMS in any property below
@@ -17,7 +17,7 @@
1717
<NetVS>net8.0</NetVS>
1818
<NetVSCode>net9.0</NetVSCode>
1919
<NetVSShared>net8.0</NetVSShared>
20-
<NetRoslynBuildHostNetCoreVersion>net6.0</NetRoslynBuildHostNetCoreVersion>
20+
<NetRoslynBuildHostNetCoreVersion>net8.0</NetRoslynBuildHostNetCoreVersion>
2121
<NetRoslynNext>net9.0</NetRoslynNext>
2222
</PropertyGroup>
2323

@@ -26,13 +26,13 @@
2626
we calculate them
2727
-->
2828
<Choose>
29-
<!--
30-
1. CI source build leg: this needs to build the current and previous source build TFM. Both are
31-
necessary as the output of this leg is used in other CI source build legs. Those could be
32-
targeting NetCurrent or NetPrevious hence we must produce both.
29+
<!--
30+
1. CI source build leg: this needs to build the current and previous source build TFM. Both are
31+
necessary as the output of this leg is used in other CI source build legs. Those could be
32+
targeting NetCurrent or NetPrevious hence we must produce both.
3333
34-
However the toolset package we produce must target NetPrevious. This package gets used as the
35-
bootstrap toolset in other repos doing (1). Those can be using a NetPrevious runtime hence
34+
However the toolset package we produce must target NetPrevious. This package gets used as the
35+
bootstrap toolset in other repos doing (1). Those can be using a NetPrevious runtime hence
3636
the toolset must support that.
3737
-->
3838
<When Condition="'$(DotNetBuildSourceOnly)' == 'true' AND '$(DotNetBuildFromVMR)' != 'true'">

‎src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,12 @@
2222
<PlatformTarget>AnyCPU</PlatformTarget>
2323
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
2424

25-
<!-- We suppress NETSDK1138 because we intentionally build against net6.0 to support a wider range of .NET SDKs -->
26-
<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
2725

2826
<!--
29-
We specifically reference Microsoft.Build 17.3.4, since it's the oldest version still compatible $(NetRoslynBuildHostNetCoreVersion).
27+
We specifically reference Microsoft.Build 17.11.48, since it's the oldest version still compatible $(NetRoslynBuildHostNetCoreVersion).
3028
The version targeted is only used for build time, since we use MSBuildLocator to discover the proper version at runtime.
3129
-->
32-
<_MsbuildVersion>17.3.4</_MsbuildVersion>
33-
<!-- S.C.I 9.0 no longer supports .NET 6 -->
34-
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
30+
<_MsbuildVersion>17.11.48</_MsbuildVersion>
3531
</PropertyGroup>
3632
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
3733
<PackageReference Include="Microsoft.Build" VersionOverride="$(_MsbuildVersion)" ExcludeAssets="Runtime" PrivateAssets="All" />

0 commit comments

Comments
 (0)