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

Merge pull request #3480 from livarcocc/fix_swr_generation

Browse source 
Updating GenerateMSBuildExtensionsSWR to match what we actually insert into VS.
This commit is contained in:
Livar 2019-07-26 13:19:53 -07:00 • committed by GitHub
commit a2e323d5ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,7 @@ namespace Microsoft.DotNet.Cli.Build
AddFolder(sb,
@"MSBuildSdkResolver",
@"MSBuild\15.0\Bin\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver");
@"MSBuild\Current\Bin\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver");
AddFolder(sb,
@"msbuildExtensions",
@ -32,7 +32,7 @@ namespace Microsoft.DotNet.Cli.Build
AddFolder(sb,
@"msbuildExtensions-ver",
@"MSBuild\15.0");
@"MSBuild\Current");
File.WriteAllText(OutputFile, sb.ToString());
@ -45,7 +45,7 @@ namespace Microsoft.DotNet.Cli.Build
var files = Directory.GetFiles(sourceFolder)
.Where(f => !Path.GetExtension(f).Equals(".pdb", StringComparison.OrdinalIgnoreCase))
.ToList();
if (files.Any())
if (files.Any(f => !Path.GetFileName(f).Equals("_._")))
{
sb.Append(@"folder ""InstallDir:\");
sb.Append(swrInstallDir);
@ -74,8 +74,7 @@ namespace Microsoft.DotNet.Cli.Build
readonly string SWR_HEADER = @"use vs
package name=Microsoft.Net.Core.SDK.MSBuildExtensions
version=$(Version)
vs.package.branch=$(VsSingletonPackageBranch)
version=$(ProductsBuildVersion)
vs.package.internalRevision=$(PackageInternalRevision)
";