Skip to content

Commit 71fd04d

Browse files
John Simonsshlomii
John Simons
authored and
shlomii
committed
Nuget install.ps1 fails to modify project file to include start program, fixes #491
Conflicts: default.ps1
1 parent 3231ac9 commit 71fd04d

File tree

1 file changed

+8
-17
lines changed

1 file changed

+8
-17
lines changed

default.ps1

+8-17
Original file line numberDiff line numberDiff line change
@@ -621,6 +621,8 @@ task CreatePackages -depends PrepareRelease -description "After preparing for R
621621
"
622622
$installPs1Content = "param(`$installPath, `$toolsPath, `$package, `$project)
623623
624+
`$project.Save()
625+
624626
`$directoryName = [system.io.Path]::GetDirectoryName(`$project.FullName)
625627
`$appConfigFile = `$directoryName + `"\App.config`"
626628
if((Test-Path -Path `$appConfigFile) -eq `$true){
@@ -643,46 +645,35 @@ task CreatePackages -depends PrepareRelease -description "After preparing for R
643645
}
644646
}
645647
646-
if(`$Host.Version.Major -gt 1)
647-
{
648648
[xml] `$prjXml = Get-Content `$project.FullName
649649
`$proceed = `$true
650650
foreach(`$PropertyGroup in `$prjXml.project.ChildNodes)
651651
{
652-
653652
if(`$PropertyGroup.StartAction -ne `$null)
654653
{
655654
`$proceed = `$false
656655
}
657-
658656
}
659657
660658
if (`$proceed -eq `$true){
661-
`$propertyGroupElement = `$prjXml.CreateElement(`"PropertyGroup`");
662-
`$propertyGroupElement.SetAttribute(`"Condition`", `"'```$(Configuration)|```$(Platform)' == 'Release|AnyCPU'`")
663-
`$propertyGroupElement.RemoveAttribute(`"xmlns`")
664-
`$startActionElement = `$prjXml.CreateElement(`"StartAction`");
659+
`$propertyGroupElement = `$prjXml.CreateElement(`"PropertyGroup`", `$prjXml.Project.GetAttribute(`"xmlns`"));
660+
`$startActionElement = `$prjXml.CreateElement(`"StartAction`", `$prjXml.Project.GetAttribute(`"xmlns`"));
665661
`$propertyGroupElement.AppendChild(`$startActionElement)
666662
`$propertyGroupElement.StartAction = `"Program`"
667-
`$startProgramElement = `$prjXml.CreateElement(`"StartProgram`");
663+
`$startProgramElement = `$prjXml.CreateElement(`"StartProgram`", `$prjXml.Project.GetAttribute(`"xmlns`"));
668664
`$propertyGroupElement.AppendChild(`$startProgramElement)
669665
`$propertyGroupElement.StartProgram = `"```$(ProjectDir)```$(OutputPath)NServiceBus.Host.exe`"
670666
`$prjXml.project.AppendChild(`$propertyGroupElement);
671667
`$writerSettings = new-object System.Xml.XmlWriterSettings
672-
`$writerSettings.OmitXmlDeclaration = `$true
673-
`$writerSettings.NewLineOnAttributes = `$true
668+
`$writerSettings.OmitXmlDeclaration = `$false
669+
`$writerSettings.NewLineOnAttributes = `$false
674670
`$writerSettings.Indent = `$true
675671
`$projectFilePath = Resolve-Path -Path `$project.FullName
676672
`$writer = [System.Xml.XmlWriter]::Create(`$projectFilePath, `$writerSettings)
677-
678673
`$prjXml.WriteTo(`$writer)
679674
`$writer.Flush()
680675
`$writer.Close()
681-
}
682-
}
683-
else{
684-
echo `"Please use PowerShell V2 for better configuration for the project`"
685-
}
676+
}
686677
"
687678
$appConfigTranformFile = "$releaseRoot\content\app.config.transform"
688679
$installPs1File = "$releaseRoot\tools\install.ps1"

0 commit comments

Comments
 (0)