Skip to content

Commit 4c55da1

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/msbuild (#47377)
1 parent a00601c commit 4c55da1

File tree

5 files changed

+44
-11
lines changed

5 files changed

+44
-11
lines changed

‎Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<PackageVersion Include="Microsoft.VisualStudio.Sdk" Version="17.2.32505.173" />
7171
<PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.11.435" />
7272
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" />
73-
<PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.28" />
73+
<PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.52" />
7474
<PackageVersion Include="Microsoft.Web.Deployment" Version="$(WebDeploymentPackageVersion)" />
7575
<PackageVersion Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" />
7676
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,18 +101,18 @@
101101
<Sha>7619d65bf2534a42257d1d8488552e59790475f6</Sha>
102102
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
103103
</Dependency>
104-
<Dependency Name="Microsoft.Build" Version="17.14.0-preview-25155-03">
104+
<Dependency Name="Microsoft.Build" Version="17.14.0-preview-25161-12">
105105
<Uri>https://github.com/dotnet/msbuild</Uri>
106-
<Sha>428195cb74072bbb5314889119525369cb9bdeb0</Sha>
106+
<Sha>7871c1d0c68c04134d3bf525705ef03e0d23bf98</Sha>
107107
</Dependency>
108-
<Dependency Name="Microsoft.Build.Localization" Version="17.14.0-preview-25155-03">
108+
<Dependency Name="Microsoft.Build.Localization" Version="17.14.0-preview-25161-12">
109109
<Uri>https://github.com/dotnet/msbuild</Uri>
110-
<Sha>428195cb74072bbb5314889119525369cb9bdeb0</Sha>
110+
<Sha>7871c1d0c68c04134d3bf525705ef03e0d23bf98</Sha>
111111
</Dependency>
112112
<!-- Intermediate is necessary for source build. -->
113-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.0-preview-25155-03">
113+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.0-preview-25161-12">
114114
<Uri>https://github.com/dotnet/msbuild</Uri>
115-
<Sha>428195cb74072bbb5314889119525369cb9bdeb0</Sha>
115+
<Sha>7871c1d0c68c04134d3bf525705ef03e0d23bf98</Sha>
116116
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
117117
</Dependency>
118118
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.300-beta.25160.5">
@@ -500,9 +500,9 @@
500500
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
501501
</Dependency>
502502
<!-- Intermediate is necessary for source build. -->
503-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="10.0.615301">
503+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="10.0.615601">
504504
<Uri>https://github.com/dotnet/source-build-externals</Uri>
505-
<Sha>f023162b1e92e7ecf801a88733668d4021f72bdb</Sha>
505+
<Sha>148cf3e1d71c4164887e8ef7e77430baa7ad5185</Sha>
506506
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
507507
</Dependency>
508508
<!-- Intermediate is necessary for source build. -->

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@
200200
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
201201
202202
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
203-
<MicrosoftBuildVersion>17.14.0-preview-25155-03</MicrosoftBuildVersion>
204-
<MicrosoftBuildLocalizationVersion>17.14.0-preview-25155-03</MicrosoftBuildLocalizationVersion>
203+
<MicrosoftBuildVersion>17.14.0-preview-25161-12</MicrosoftBuildVersion>
204+
<MicrosoftBuildLocalizationVersion>17.14.0-preview-25161-12</MicrosoftBuildLocalizationVersion>
205205
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
206206
<MinimumVSVersion>17.13</MinimumVSVersion>
207207
</PropertyGroup>

‎src/SourceBuild/content/repo-projects/msbuild.proj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<RepositoryReference Include="roslyn" />
2020
<RepositoryReference Include="runtime" />
2121
<RepositoryReference Include="source-build-reference-packages" />
22+
<RepositoryReference Include="source-build-externals" />
2223
</ItemGroup>
2324

2425
<PropertyGroup Condition="'$(BuildOS)' == 'windows' and '$(OfficialBuildId)' != '' and '$(EnableIBCOptimization)' == 'true'">

‎src/SourceBuild/patches/nuget-client/0002-SolutionPersistance-nuget.patch

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
From 4fadb1737e9d186a834f9b395cecee12be8dbcea Mon Sep 17 00:00:00 2001
2+
From: Viktor Hofer <[email protected]>
3+
Date: Tue, 11 Mar 2025 18:13:03 +0100
4+
Subject: [PATCH] Define MicrosoftVisualStudioSolutionPersistenceVersion property
5+
6+
Backport: https://github.com/NuGet/NuGet.Client/pull/6309
7+
8+
---
9+
Directory.Packages.props | 3 ++-
10+
1 file changed, 2 insertions(+), 1 deletion(-)
11+
12+
diff --git a/Directory.Packages.props b/Directory.Packages.props
13+
index bd1066d9aae..a2bbe58f822 100644
14+
--- a/Directory.Packages.props
15+
+++ b/Directory.Packages.props
16+
@@ -35,6 +35,7 @@
17+
<SystemSecurityCryptographyProtectedDataVersion Condition="'$(SystemSecurityCryptographyProtectedDataVersion)' == ''">4.4.0</SystemSecurityCryptographyProtectedDataVersion>
18+
<!-- System.Security.Cryptography.Xml is a dependency of Microsoft.Build.Tasks.Core. This property can be probably removed when MSBuild is updated to a newer version. -->
19+
<SystemSecurityCryptographyXmlVersion Condition="'$(SystemSecurityCryptographyXmlVersion)' == ''">8.0.1</SystemSecurityCryptographyXmlVersion>
20+
+ <MicrosoftVisualStudioSolutionPersistenceVersion Condition="'$(MicrosoftVisualStudioSolutionPersistenceVersion)' == ''">1.0.52</MicrosoftVisualStudioSolutionPersistenceVersion>
21+
</PropertyGroup>
22+
23+
<ItemGroup>
24+
@@ -73,7 +74,7 @@
25+
<PackageVersion Include="Microsoft.VisualStudio.ProjectSystem.Managed" Version="17.2.0-beta1-20502-01" />
26+
<PackageVersion Include="Microsoft.VisualStudio.ProjectSystem.Managed.VS" Version="17.2.0-beta1-20502-01" />
27+
<PackageVersion Include="Microsoft.VisualStudio.ProjectSystem.VS" Version="17.4.221-pre" />
28+
- <PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.28" />
29+
+ <PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="$(MicrosoftVisualStudioSolutionPersistenceVersion)" />
30+
<!-- Microsoft.VisualStudio.SDK has vulnerable dependencies System.Text.json and Microsoft.IO.Redist. When it's upgraded, try removing the pinned packages -->
31+
<PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.11.39714" />
32+
<PackageVersion Include="Microsoft.VisualStudio.Sdk.TestFramework.Xunit" Version="17.11.8" />

0 commit comments

Comments
 (0)