Skip to content

Commit 0a41c5f

Browse files
github-actions[bot]dotnet-botJaynieBaiViktorHoferakoeplinger
authored
[automated] Merge branch 'vs17.14' => 'main' (dotnet#11572)
* Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 11081403 * Update Versions.props VersionPrefix * Update Versions.props VersionPrefix * [vs17.14] Remove deprecated 4.3.* System package references & fix entries in Version.Details.xml (dotnet#11571) * Remove deprecated 4.3.* package references Both "System.Runtime" and "System.Private.Uri" are inbox in .NETCoreApp since ~2017 and don't need to be referenced explicitly anymore. They were referenced here as external dependencies brought vulnerable netstandard1.x dependencies in which were then flagged by CG. That isn't the case anymore. xunit, shouldly and other packages with their corresponding versions used in this repo don't bring netstandard1.x in anymore. Don't reference "System.Net.Http" for the same reason. It is inbox on .NET Framework, .NETCoreApp and .NET Standard. On .NET Framework a "<Reference Include="System.Net.Http" />" item is needed as it isn't part of the default referenced assemblies. Note that this change will help when starting to consume a .NET 10 SDK as those would get flagged by NuGet Prune Package Reference and NuGet Audit. * Avoid netstandard1.x dependencies * fix build * Fix entries in Version.Details.xml and make version overriding clearer (dotnet#11561) Follow-up to dotnet#11145. We were missing the entry for System.Text.Encoding.CodePages in Version.Details.xml which caused a prebuild in dotnet/sdk#47377. Also simplified the way we reference the different package versions a bit to make it clearer. Remove Microsoft.VisualStudio.SolutionPersistence from SourceBuildPrebuiltBaseline.xml, since we now properly reference it from source-build-externals --------- Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com> Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com> * Don't ngen StringTools.net35 (dotnet#11544) This assembly shouldn't ever be loaded in the net4x context so don't spend the install time ngening it. * Make SolutionParser package reference private (dotnet#11603) Context The VS insertion is currently failing due to the SolutionParser version being upgraded beyond the version used by VS. Made the change so this reference is not exposed and so the insertions do not fail. --------- Co-authored-by: dotnet bot <dotnet-bot@dotnetfoundation.org> Co-authored-by: Jenny Bai <v-jennybai@microsoft.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com> Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com> Co-authored-by: Rainer Sigwald <raines@microsoft.com> Co-authored-by: Mariana Dematte <magarces@microsoft.com>
1 parent bd9741e commit 0a41c5f

6 files changed

Lines changed: 27 additions & 25 deletions

File tree

src/Build.OM.UnitTests/Microsoft.Build.Engine.OM.UnitTests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
<ProjectReference Include="..\Tasks\Microsoft.Build.Tasks.csproj" />
6666
<ProjectReference Include="..\Xunit.NetCore.Extensions\Xunit.NetCore.Extensions.csproj" />
6767
<ProjectReference Include="..\UnitTests.Shared\Microsoft.Build.UnitTests.Shared.csproj" />
68+
<PackageReference Include="Microsoft.VisualStudio.SolutionPersistence" PrivateAssets="all"/>
6869
</ItemGroup>
6970

7071
<ItemGroup>

src/Build.UnitTests/Microsoft.Build.Engine.UnitTests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<PackageReference Include="FakeItEasy" />
2525
<PackageReference Include="Microsoft.CodeAnalysis.Build.Tasks" />
2626
<PackageReference Include="Verify.Xunit" />
27+
<PackageReference Include="Microsoft.VisualStudio.SolutionPersistence" />
2728
<PackageReference Include="NuGet.Frameworks">
2829
<PrivateAssets>all</PrivateAssets>
2930
</PackageReference>

src/Build/Microsoft.Build.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<ItemGroup>
3232
<ProjectReference Include="..\Framework\Microsoft.Build.Framework.csproj" />
3333
<ProjectReference Include="..\StringTools\StringTools.csproj" />
34-
<PackageReference Include="Microsoft.VisualStudio.SolutionPersistence" />
34+
<PackageReference Include="Microsoft.VisualStudio.SolutionPersistence" PrivateAssets="all"/>
3535
<PackageReference Include="System.Configuration.ConfigurationManager" />
3636

3737
<PackageReference Include="System.Reflection.MetadataLoadContext" />

src/MSBuild/Resources/xlf/Strings.zh-Hans.xlf

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/MSBuild/Resources/xlf/Strings.zh-Hant.xlf

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Package/MSBuild.VSSetup/files.swr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ folder InstallDir:\MSBuild\Current\Bin
6161
file source=$(X86BinPath)System.Collections.Immutable.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=1
6262
file source=$(X86BinPath)Microsoft.Bcl.HashCode.dll
6363
file source=$(X86BinPath)Microsoft.NET.StringTools.dll vs.file.ngenArchitecture=all
64-
file source=$(TaskHostBinPath)Microsoft.NET.StringTools.net35.dll vs.file.ngenArchitecture=all
64+
file source=$(TaskHostBinPath)Microsoft.NET.StringTools.net35.dll
6565
file source=$(X86BinPath)Microsoft.Common.CurrentVersion.targets
6666
file source=$(X86BinPath)Microsoft.Common.CrossTargeting.targets
6767
file source=$(X86BinPath)Microsoft.Common.overridetasks
@@ -230,7 +230,7 @@ folder InstallDir:\MSBuild\Current\Bin\amd64
230230
file source=$(X86BinPath)System.Collections.Immutable.dll vs.file.ngenArchitecture=all
231231
file source=$(X86BinPath)Microsoft.Bcl.HashCode.dll
232232
file source=$(X86BinPath)Microsoft.NET.StringTools.dll vs.file.ngenArchitecture=all
233-
file source=$(TaskHostBinPath)Microsoft.NET.StringTools.net35.dll vs.file.ngenArchitecture=all
233+
file source=$(TaskHostBinPath)Microsoft.NET.StringTools.net35.dll
234234
file source=$(X86BinPath)Microsoft.Common.CurrentVersion.targets
235235
file source=$(X86BinPath)Microsoft.Common.CrossTargeting.targets
236236
file source=$(X86BinPath)Microsoft.Common.overridetasks

0 commit comments

Comments
 (0)