Minor fixes

iSazonov · iSazonov · commit 39e04f1972cf · 2017-08-29T11:05:53.000+03:00
diff --git a/PowerShell.Common.props b/PowerShell.Common.props
@@ -17,7 +17,7 @@
   >
 
     <Exec Command='git describe --abbrev=60 --long'
-          WorkingDirectory=$(MSBuildProjectDirectory)
+          WorkingDirectory="$(MSBuildProjectDirectory)"
           ConsoleToMSBuild="true"
           StandardOutputImportance="Low">
       <Output TaskParameter="ConsoleOutput" PropertyName="PowerShellVersion" />
@@ -51,9 +51,6 @@
       <Version>$(PSCoreBuildVersion)</Version>
       <InformationalVersion>$(PSCoreFormattedVersion)</InformationalVersion>
 
-      <!--VersionPrefix>$(PSCorePrefixVersion)</VersionPrefix-->
-      <!--VersionSuffix>$(PSCoreLabelVersion)</VersionSuffix-->
-
       <!--
             We have explicitly assign 'PackageVersion'
             because there is a bug: 'PackageVersion' is correctly assigned as 'Version' in 'NuGet.targets'
diff --git a/build.psm1 b/build.psm1
@@ -1358,7 +1358,7 @@ function Publish-NuGetFeed
 'Microsoft.PowerShell.SDK'
         ) | ForEach-Object {
             if ($ReleaseTag) {
-                dotnet pack "src/$_" --output $OutputPath "/property:ReleaseTag=$ReleaseTag1" /p:IncludeSymbols=true
+                dotnet pack "src/$_" --output $OutputPath "/property:IncludeSymbols=true;ReleaseTag=$ReleaseTag1"
             } else {
                 dotnet pack "src/$_" --output $OutputPath
             }
diff --git a/tools/appveyor.psm1 b/tools/appveyor.psm1
@@ -470,7 +470,7 @@ function Invoke-AppveyorFinish
         # only publish to nuget feed if it is a daily build and tests passed
         if((Test-DailyBuild) -and $env:TestPassed -eq 'True')
         {
-            Publish-NuGetFeed -OutputPath .\nuget-artifacts -ReleaseTag "/property:ReleaseTag=$preReleaseVersion"
+            Publish-NuGetFeed -OutputPath .\nuget-artifacts -ReleaseTag $preReleaseVersion
         }
 
         $nugetArtifacts = Get-ChildItem .\nuget-artifacts -ErrorAction SilentlyContinue | ForEach-Object { $_.FullName }

Original file line number	Diff line number	Diff line change
`@@ -1358,7 +1358,7 @@ function Publish-NuGetFeed`
`1358`	`1358`	`'Microsoft.PowerShell.SDK'`
`1359`	`1359`	`) \| ForEach-Object {`
`1360`	`1360`	`if ($ReleaseTag) {`
`1361`		`- dotnet pack "src/$_" --output $OutputPath "/property:ReleaseTag=$ReleaseTag1" /p:IncludeSymbols=true`
	`1361`	`+ dotnet pack "src/$_" --output $OutputPath "/property:IncludeSymbols=true;ReleaseTag=$ReleaseTag1"`
`1362`	`1362`	`} else {`
`1363`	`1363`	`dotnet pack "src/$_" --output $OutputPath`
`1364`	`1364`	`}`
Original file line number	Diff line number	Diff line change
`@@ -470,7 +470,7 @@ function Invoke-AppveyorFinish`
`470`	`470`	`# only publish to nuget feed if it is a daily build and tests passed`
`471`	`471`	`if((Test-DailyBuild) -and $env:TestPassed -eq 'True')`
`472`	`472`	`{`
`473`		`- Publish-NuGetFeed -OutputPath .\nuget-artifacts -ReleaseTag "/property:ReleaseTag=$preReleaseVersion"`
	`473`	`+ Publish-NuGetFeed -OutputPath .\nuget-artifacts -ReleaseTag $preReleaseVersion`
`474`	`474`	`}`
`475`	`475`
`476`	`476`	`$nugetArtifacts = Get-ChildItem .\nuget-artifacts -ErrorAction SilentlyContinue \| ForEach-Object { $_.FullName }`