Skip to content

Commit f99f04a

Browse files
committed
ensure format & help xmls get into the cmdlet package
1 parent 9a16de0 commit f99f04a

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

tools/CLU/BuildPackage.ps1

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,23 @@
22

33
if (!(Test-Path $cmdletsDir))
44
{
5-
throw "cmdletsDir: '$cmdletsDir' must be an existing directory containing cmdlet code"
5+
throw "cmdletsDir: '$cmdletsDir' must be an existing directory containing cmdlet code"
66
}
77
if (!(Test-Path $outputDir))
88
{
9-
throw "outputDir: '$outputDir' must be an existing directory"
9+
throw "outputDir: '$outputDir' must be an existing directory"
1010
}
1111

1212
if ([string]::IsNullOrWhiteSpace($env:WORKSPACE) -or !(Test-Path $env:WORKSPACE))
1313
{
14-
throw "env:WORKSPACE: '$env:WORKSPACE' must be an existing directory"
14+
throw "env:WORKSPACE: '$env:WORKSPACE' must be an existing directory"
1515
}
1616

1717
$packageSource = $packageSource.TrimEnd('\\')
1818
Write-Host "using package id: $packageId, package source: $packageSource, packageVersion: $packageVersion"
1919
dotnet publish $cmdletsDir -f dnxcore50 -r win7-x64 -o $packageSource
2020
Copy-Item -Path $cmdletsDir\content -Destination $packageSource\content -Recurse -Force
21+
Copy-Item -Path $cmdletsDir\*xml -Destination $packageSource\content -Force
2122

2223
$nuSpecTemplate = (Get-ChildItem ([System.IO.Path]::Combine($cmdletsDir, ($packageId + ".nuspec.template"))))
2324
$nuSpecOutput = [System.IO.Path]::Combine($packageSource, ($packageId + ".nuspec"))
@@ -34,19 +35,20 @@ $contentFileText = ""
3435
$contentFiles | %{ $contentFileText += (" <file src=""" + $_.Name + """ target=""content""/>`r`n")}
3536
if ($packageId -ne "Microsoft.CLU.Commands")
3637
{
37-
$contentFileText += " <file src=""content\*.lx"" target=""content""/>`r`n"
38+
$contentFileText += " <file src=""content\*.lx"" target=""content""/>`r`n"
39+
$contentFileText += " <file src=""content\*xml"" target=""content""/>`r`n"
3840
}
3941
if ($renameFileExists)
4042
{
41-
$contentFileText += " <file src=""content\rename.cfg"" target=""content""/>`r`n"
43+
$contentFileText += " <file src=""content\rename.cfg"" target=""content""/>`r`n"
4244
}
4345
$contentFileText += " <file src=""content\package.cfg"" target=""content""/>`r`n"
4446
$sourceFileText = ""
4547
$refFiles | %{$sourceFileText += (" <file src=""" + $_.Name + """ target=""lib\dnxcore50""/>`r`n")}
4648
$outputContent = $fileContent -replace "%PackageVersion%", $packageVersion
4749
$outputContent = $outputContent -replace "%ReferenceFiles%", $refFileText
48-
$outputContent = $outputContent -replace "%SourceFiles%", $sourceFileText
49-
$outputContent = $outputContent -replace "%ContentFiles%", $contentFileText
50+
$outputContent = $outputContent -replace "%SourceFiles%", $sourceFileText
51+
$outputContent = $outputContent -replace "%ContentFiles%", $contentFileText
5052
Set-Content -Value $outputContent -Path $nuspecOutput
5153

5254
Write-Host "Creating nuget package..."

0 commit comments

Comments
 (0)