diff --git a/Nodejs/Setup/SetupProjectBefore.settings b/Nodejs/Setup/SetupProjectBefore.settings index 577a470f3..d3a433d9d 100644 --- a/Nodejs/Setup/SetupProjectBefore.settings +++ b/Nodejs/Setup/SetupProjectBefore.settings @@ -1,4 +1,23 @@ + + + $([System.DateTime]::Now.Year) + $([MSBuild]::Subtract($(Year), 4)) + $(YearMinus4.ToString()) + $(YearMinus4String.Substring(3,1)) + $([System.DateTime]::Now.ToString("MMdd")) + + + 1 + 2 + $(LastDigitOfYear)$(Date) + $(Time) + $(Build).$(Revision) + + $(MajorVersion).$(MinorVersion).$(BuildNumber) + $(MajorVersion).$(MinorVersion).$(Build).$(Revision) + + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root)) Setup diff --git a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.InteractiveWindow.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.InteractiveWindow.swixproj index d3f8f0af7..49c4ad9dc 100644 --- a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.InteractiveWindow.swixproj +++ b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.InteractiveWindow.swixproj @@ -9,7 +9,7 @@ - $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber) + $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(BuildVersion) diff --git a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.NodejsTools.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.NodejsTools.swixproj index c6286e60b..cf797b163 100644 --- a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.NodejsTools.swixproj +++ b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.NodejsTools.swixproj @@ -9,7 +9,7 @@ - $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber) + $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(BuildVersion) diff --git a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Profiling.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Profiling.swixproj index 9954379aa..e8f588b58 100644 --- a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Profiling.swixproj +++ b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Profiling.swixproj @@ -9,7 +9,7 @@ - $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber) + $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(BuildVersion) diff --git a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj index 7ce198f44..ab84713a8 100644 --- a/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj +++ b/Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj @@ -11,7 +11,7 @@ $(BuildOutputRoot)Setup\Microsoft.VisualStudio.NodejsTools.Targets.vsix $(SignedBinariesPath)\Microsoft.NodejsTools.WebRole.dll $(BuildOutputRoot)\Binaries\WebRole\Microsoft.NodejsTools.WebRole.dll - $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(Build.BuildNumber);WebRoleDll=$(WebRoleDll) + $(PackagePreprocessorDefinitions);BuildOutputRoot=$(BuildOutputRoot);BuildVersion=$(BuildVersion);WebRoleDll=$(WebRoleDll) $(WebRoleDll)