mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[automated] Merge branch 'release/8.0.3xx' => 'main' (#19208)

Browse source
This commit is contained in:
Forgind 2024-03-28 10:20:06 -07:00 committed by GitHub
commit 0c1a017349
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs
View file

@ -24,8 +24,7 @@ namespace Microsoft.DotNet.Cli.Build
AddFolder(sb, AddFolder(sb,
@"MSBuildSdkResolver", @"MSBuildSdkResolver",
@"MSBuild\Current\Bin\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver", @"MSBuild\Current\Bin\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver");
ngenAssemblies: true);
AddFolder(sb, AddFolder(sb,
@"msbuildExtensions", @"msbuildExtensions",
@ -40,7 +39,7 @@ namespace Microsoft.DotNet.Cli.Build
return true; return true;
} }
private void AddFolder(StringBuilder sb, string relativeSourcePath, string swrInstallDir, bool ngenAssemblies = false) private void AddFolder(StringBuilder sb, string relativeSourcePath, string swrInstallDir)
{ {
string sourceFolder = Path.Combine(MSBuildExtensionsLayoutDirectory, relativeSourcePath); string sourceFolder = Path.Combine(MSBuildExtensionsLayoutDirectory, relativeSourcePath);
var files = Directory.GetFiles(sourceFolder) var files = Directory.GetFiles(sourceFolder)
@ -56,16 +55,7 @@ namespace Microsoft.DotNet.Cli.Build
{ {
sb.Append(@" file source=""$(PkgVS_Redist_Common_Net_Core_SDK_MSBuildExtensions)\"); sb.Append(@" file source=""$(PkgVS_Redist_Common_Net_Core_SDK_MSBuildExtensions)\");
sb.Append(Path.Combine(relativeSourcePath, Path.GetFileName(file))); sb.Append(Path.Combine(relativeSourcePath, Path.GetFileName(file)));
sb.Append('"'); sb.AppendLine("\"");
if (ngenAssemblies && file.EndsWith(".dll", StringComparison.OrdinalIgnoreCase))
{
sb.Append(@" vs.file.ngenApplications=""[installDir]\Common7\IDE\vsn.exe""");
sb.Append(@" vs.file.ngenApplications=""[installDir]\MSBuild\Current\Bin\MSBuild.exe""");
sb.Append(" vs.file.ngenArchitecture=all");
}
sb.AppendLine();
} }
sb.AppendLine(); sb.AppendLine();
@ -77,7 +67,6 @@ namespace Microsoft.DotNet.Cli.Build
string newRelativeSourcePath = Path.Combine(relativeSourcePath, subfolderName); string newRelativeSourcePath = Path.Combine(relativeSourcePath, subfolderName);
string newSwrInstallDir = Path.Combine(swrInstallDir, subfolderName); string newSwrInstallDir = Path.Combine(swrInstallDir, subfolderName);
// Don't propagate ngenAssemblies to subdirectories.
AddFolder(sb, newRelativeSourcePath, newSwrInstallDir); AddFolder(sb, newRelativeSourcePath, newSwrInstallDir);
} }
} }