Skip to content

removing the dependency on IO.Redist from MSBuild GetPathToBuildToolsFile #11270

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

Merged
merged 4 commits into from
Jan 14, 2025
Merged

removing the dependency on IO.Redist from MSBuild GetPathToBuildToolsFile #11270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
04484ba
removing the dependency on IO.Redist that is clashing with the one lo…
SimaTian Jan 13, 2025
3805da1
Add rollback comments and link the issue.
SimaTian Jan 13, 2025
200ee8c
version bump
SimaTian Jan 13, 2025
c1b9c91
Merge branch 'AZDO-assembly-collision-vs17.13-backport' of https://gi…
SimaTian Jan 13, 2025
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
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>
<PropertyGroup>
<VersionPrefix>17.13.5</VersionPrefix>
<VersionPrefix>17.13.6</VersionPrefix>
<DotNetFinalVersionKind>release</DotNetFinalVersionKind>
<PackageValidationBaselineVersion>17.12.6</PackageValidationBaselineVersion>
<AssemblyVersion>15.1.0.0</AssemblyVersion>
Expand Down
7 changes: 4 additions & 3 deletions src/Shared/FrameworkLocationHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
Expand Down Expand Up @@ -1390,10 +1390,11 @@ public virtual string GetPathToDotNetFramework(DotNetFrameworkArchitecture archi
// Assume if either MSBuild.exe or Microsoft.Build.dll are shipped, there is a valid install.
// Note: net481 did not ship an ARM64 MSBuild.exe, so checking its dll's is the fallback for a valid install.
// Context: https://github.com/dotnet/msbuild/pull/7689
// Rollback see https://developercommunity.visualstudio.com/t/Unable-to-locate-MSBuild-path-with-Lates/10824132
if (this._hasMsBuild &&
generatedPathToDotNetFramework != null &&
(!FileSystems.Default.FileExists(Path.Combine(generatedPathToDotNetFramework, NativeMethodsShared.IsWindows ? "MSBuild.exe" : "mcs.exe")) &&
!FileSystems.Default.FileExists(Path.Combine(generatedPathToDotNetFramework, "Microsoft.Build.dll"))))
(!File.Exists(Path.Combine(generatedPathToDotNetFramework, NativeMethodsShared.IsWindows ? "MSBuild.exe" : "mcs.exe")) &&
!File.Exists(Path.Combine(generatedPathToDotNetFramework, "Microsoft.Build.dll"))))
{
return null;
}
Expand Down
3 changes: 2 additions & 1 deletion src/Utilities/ToolLocationHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3584,7 +3584,8 @@ public static string GetPathToBuildToolsFile(string fileName, string toolsVersio
{
toolPath = Path.Combine(toolPath, fileName);

if (!FileSystems.Default.FileExists(toolPath))
// Rollback see https://developercommunity.visualstudio.com/t/Unable-to-locate-MSBuild-path-with-Lates/10824132
if (!File.Exists(toolPath))
{
toolPath = null;
}
Expand Down
Loading