Sync up with changes to the internal code that got ported to Open

dotnet · Jul 4, 2016 · 5919bc4 · 5919bc4
1 parent 3a298c1
commit 5919bc4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Setup/DevDivPackages/Dependencies.proj b/src/Setup/DevDivPackages/Dependencies.proj
@@ -17,7 +17,7 @@
       and/or move the source for the packages to separate repos.
      -->		
     <NuSpec Include="Microsoft.VisualStudio.InteractiveWindow">
-      <Version>$(MicrosoftVisualStudioInteractiveWindowVersion)</Version>
+      <Version>$(MicrosoftVisualStudioInteractiveWindowVersion)-beta-$(BuildNumberPart1.Trim())-$(BuildNumberPart2.Trim())</Version>
       <External>false</External>
     </NuSpec>
     <NuSpec Include="Microsoft.DiaSymReader.PortablePdb">

diff --git a/src/Setup/DevDivPackages/Roslyn.proj b/src/Setup/DevDivPackages/Roslyn.proj
@@ -11,7 +11,7 @@
     <NuSpec Include="$(InsertionFilesDir)\VS.ExternalAPIs.Roslyn.nuspec" >
       <Version>$(NuGetPerBuildPreReleaseVersion)</Version>
       <!-- TFS build number isn't set on CI server -->
-      <Version Condition="'$(NuGetPerBuildPreReleaseVersion)' == ''">$(RoslynSemanticVersion)-cibuild</Version>
+      <Version Condition="'$(NuGetPerBuildPreReleaseVersion)' == ''">$(NuGetReleaseVersion)-cibuild</Version>
     </NuSpec>
   </ItemGroup>
   <Target Name="Build" Inputs="@(NuSpec)" Outputs="@(NuSpec->$(PackagesOutDir)\%(Filename)%(Extension).%(Version).nupkg">

diff --git a/src/Tools/MicroBuild/PostTest.ps1 b/src/Tools/MicroBuild/PostTest.ps1
@@ -33,7 +33,7 @@ try
     Stop-Process -Name "vbcscompiler" -Force -ErrorAction SilentlyContinue
 
     # Load in the NuGet.exe information
-    . "$PSScriptRoot\..\..\..\builds\scripts\LoadNuGetInfo.ps1"
+    . "$PSScriptRoot\..\..\..\build\scripts\LoadNuGetInfo.ps1"
     write-host "NuGet.exe path is $nugetexe"
 
     $exitCode = 0