Skip to content

Commit d724b9b

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/6.0.4xx] Update dependencies from dotnet/msbuild (#39868)
[release/6.0.4xx] Update dependencies from dotnet/msbuild - Add direct .net standard entries to pin the versions of transitive dependencies.
1 parent 9482bbd commit d724b9b

File tree

6 files changed

+16
-28
lines changed

6 files changed

+16
-28
lines changed

‎NuGet.config

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,15 @@
66
<!-- Begin: Package sources from dotnet-aspnetcore -->
77
<!-- End: Package sources from dotnet-aspnetcore -->
88
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
9+
<add key="darc-pub-DotNet-msbuild-Trusted-a400405" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-a400405b/nuget/v3/index.json" />
910
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1011
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
1112
<!-- End: Package sources from dotnet-roslyn-analyzers -->
1213
<!-- Begin: Package sources from dotnet-runtime -->
13-
<add key="darc-int-dotnet-runtime-34a1091" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-34a10914/nuget/v3/index.json" />
14-
<add key="darc-int-dotnet-runtime-34a1091-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-34a10914-2/nuget/v3/index.json" />
15-
<add key="darc-int-dotnet-runtime-34a1091-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-34a10914-1/nuget/v3/index.json" />
1614
<!-- End: Package sources from dotnet-runtime -->
1715
<!-- Begin: Package sources from dotnet-templating -->
18-
<add key="darc-int-dotnet-templating-d6969ba" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-d6969bae/nuget/v3/index.json" />
19-
<add key="darc-int-dotnet-templating-d6969ba-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-d6969bae-2/nuget/v3/index.json" />
20-
<add key="darc-int-dotnet-templating-d6969ba-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-d6969bae-1/nuget/v3/index.json" />
2116
<!-- End: Package sources from dotnet-templating -->
2217
<!-- Begin: Package sources from dotnet-windowsdesktop -->
23-
<add key="darc-int-dotnet-windowsdesktop-c4a33f2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-c4a33f22/nuget/v3/index.json" />
24-
<add key="darc-int-dotnet-windowsdesktop-c4a33f2-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-c4a33f22-2/nuget/v3/index.json" />
25-
<add key="darc-int-dotnet-windowsdesktop-c4a33f2-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-c4a33f22-1/nuget/v3/index.json" />
2618
<!-- End: Package sources from dotnet-windowsdesktop -->
2719
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2820
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -42,21 +34,12 @@
4234
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
4335
<!-- End: Package sources from DotNet-msbuild-Trusted -->
4436
<!-- Begin: Package sources from dotnet-templating -->
45-
<add key="darc-int-dotnet-templating-d6969ba-1" value="true" />
46-
<add key="darc-int-dotnet-templating-d6969ba-2" value="true" />
47-
<add key="darc-int-dotnet-templating-d6969ba" value="true" />
4837
<!-- End: Package sources from dotnet-templating -->
4938
<!-- Begin: Package sources from dotnet-aspnetcore -->
5039
<!-- End: Package sources from dotnet-aspnetcore -->
5140
<!-- Begin: Package sources from dotnet-runtime -->
52-
<add key="darc-int-dotnet-runtime-34a1091-1" value="true" />
53-
<add key="darc-int-dotnet-runtime-34a1091-2" value="true" />
54-
<add key="darc-int-dotnet-runtime-34a1091" value="true" />
5541
<!-- End: Package sources from dotnet-runtime -->
5642
<!-- Begin: Package sources from dotnet-windowsdesktop -->
57-
<add key="darc-int-dotnet-windowsdesktop-c4a33f2-1" value="true" />
58-
<add key="darc-int-dotnet-windowsdesktop-c4a33f2-2" value="true" />
59-
<add key="darc-int-dotnet-windowsdesktop-c4a33f2" value="true" />
6043
<!-- End: Package sources from dotnet-windowsdesktop -->
6144
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
6245
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@
6666
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
6767
<Sha>34a109148c7d8a2c8e6431e83e4bce5712dd8083</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.Build" Version="17.3.2">
70-
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
71-
<Sha>561848881bab01749e6d8b03be2869a18ca944f7</Sha>
69+
<Dependency Name="Microsoft.Build" Version="17.3.4">
70+
<Uri>https://github.com/dotnet/msbuild</Uri>
71+
<Sha>a400405ba8c43976eda92a70d4adf72f9d292a22</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.Build.Localization" Version="17.3.2-preview-22463-06">
74-
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
75-
<Sha>561848881bab01749e6d8b03be2869a18ca944f7</Sha>
73+
<Dependency Name="Microsoft.Build.Localization" Version="17.3.4-preview-24178-15">
74+
<Uri>https://github.com/dotnet/msbuild</Uri>
75+
<Sha>a400405ba8c43976eda92a70d4adf72f9d292a22</Sha>
7676
</Dependency>
7777
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.5-beta.22513.8">
7878
<Uri>https://github.com/dotnet/fsharp</Uri>

‎eng/Versions.props

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<MicrosoftCssParserVersion>1.0.0-20200708.1</MicrosoftCssParserVersion>
2525
<MicrosoftApplicationInsightsPackageVersion>2.20.0</MicrosoftApplicationInsightsPackageVersion>
2626
<NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</NETStandardLibraryNETFrameworkVersion>
27+
<NETStandardLibraryVersion>2.0.3</NETStandardLibraryVersion>
2728
<NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
2829
<NewtonsoftJsonVersion>$(NewtonsoftJsonPackageVersion)</NewtonsoftJsonVersion>
2930
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
@@ -40,6 +41,7 @@
4041
<SystemCommandLineVersion>2.0.0-beta4.22363.1</SystemCommandLineVersion>
4142
<MicrosoftDeploymentDotNetReleasesVersion>1.0.0-preview5.1.22263.1</MicrosoftDeploymentDotNetReleasesVersion>
4243
<MicrosoftVisualStudioSetupConfigurationInteropVersion>3.0.4496</MicrosoftVisualStudioSetupConfigurationInteropVersion>
44+
4345
</PropertyGroup>
4446
<PropertyGroup>
4547
<!-- Dependencies from https://github.com/dotnet/runtime -->
@@ -98,15 +100,15 @@
98100
</PropertyGroup>
99101
<PropertyGroup>
100102
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
101-
<MicrosoftBuildPackageVersion>17.3.2</MicrosoftBuildPackageVersion>
103+
<MicrosoftBuildPackageVersion>17.3.4</MicrosoftBuildPackageVersion>
102104
<!-- .NET Framework-targeted tasks will need to run in an MSBuild that is older than the very latest,
103105
so target one that matches the version in minimumMSBuildVersion.
104106
105107
This avoids the need to juggle references to packages that have been updated in newer MSBuild. -->
106108
<MicrosoftBuildPackageVersion Condition=" '$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))' == '.NETFramework' ">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
107109
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
108110
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
109-
<MicrosoftBuildLocalizationPackageVersion>17.3.2-preview-22463-06</MicrosoftBuildLocalizationPackageVersion>
111+
<MicrosoftBuildLocalizationPackageVersion>17.3.4-preview-24178-15</MicrosoftBuildLocalizationPackageVersion>
110112
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
111113
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
112114
<MicrosoftBuildVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildVersion>

‎src/BuiltInTools/dotnet-watch/dotnet-watch.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
Avoids picking up an old version via transitive dependency from Microsoft.Build or Microsoft.CodeAnalysis.Workspaces.MSBuild.
3030
-->
3131
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
32-
32+
<!-- Lift dependency of NETStandard.Library.NETFramework to version produced in SBRP. -->
33+
<PackageReference Include="NETStandard.Library" Version="$(NETStandardLibraryVersion)" ExcludeAssets="All" />
3334
<Compile Include="$(RepoRoot)src\Common\PathUtilities.cs" LinkBase="Common" />
3435
</ItemGroup>
3536

‎src/Cli/dotnet/dotnet.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@
9595
<PackageReference Include="Microsoft.Deployment.DotNet.Releases" Version="$(MicrosoftDeploymentDotNetReleasesVersion)" />
9696
<PackageReference Include="System.ServiceProcess.ServiceController" Version="$(SystemServiceProcessServiceControllerVersion)" />
9797
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" PrivateAssets="All" ExcludeAssets="Runtime"/>
98+
<!-- Lift dependency of NETStandard.Library.NETFramework to version produced in SBRP. -->
99+
<PackageReference Include="NETStandard.Library" Version="$(NETStandardLibraryVersion)" ExcludeAssets="All" />
98100
</ItemGroup>
99101
<ItemGroup Condition=" '$(IncludeAspNetCoreRuntime)' != 'false' ">
100102
<PackageReference Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="$(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion)" />

‎src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" ExcludeAssets="Runtime" />
4949
<PackageReference Include="NETStandard.Library.NETFramework" Version="$(NETStandardLibraryNETFrameworkVersion)" ExcludeAssets="All" NoWarn="NU1701" />
5050
<!-- Lift dependency of NETStandard.Library.NETFramework to version produced in SBRP. -->
51-
<PackageReference Include="NETStandard.Library" Version="2.0.3" ExcludeAssets="All" />
51+
<PackageReference Include="NETStandard.Library" Version="$(NETStandardLibraryVersion)" ExcludeAssets="All" />
5252
</ItemGroup>
5353

5454
<ItemGroup>

0 commit comments

Comments
 (0)