diff --git a/build/Publish.targets b/build/Publish.targets
index 88c6ae41c0..7d97b9b81d 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -199,7 +199,6 @@
     <Run FileName="npm"
          Arguments="publish;--registry;$(PublishMyGetNpmRegistryUrl);%(NpmPackageToPublish.Identity)"
          MaxRetries="5"
-         UseShellExecute="true"
          ContinueOnError="true">
       <Output TaskParameter="ExitCode" ItemName="_NpmExitCodes" />
     </Run>
diff --git a/build/repo.targets b/build/repo.targets
index 2f1ecdeaa5..f81f495946 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -77,10 +77,10 @@
 
   <Target Name="GetLineupPackageInfo">
     <ItemGroup>
-      <ArtifactInfo Include="$(BuildDir)Internal.AspNetCore.Universe.Lineup.$(Version).nupkg">
+      <ArtifactInfo Include="$(BuildDir)Internal.AspNetCore.Universe.Lineup.$(PackageVersion).nupkg">
         <ArtifactType>NuGetPackage</ArtifactType>
         <PackageId>Internal.AspNetCore.Universe.Lineup</PackageId>
-        <Version>$(Version)</Version>
+        <Version>$(PackageVersion)</Version>
         <Category>noship</Category>
         <IsLineup>true</IsLineup>
       </ArtifactInfo>
@@ -110,7 +110,7 @@
     <PackNuSpec NuSpecPath="$(MSBuildThisFileDirectory)lineups\Internal.AspNetCore.Universe.Lineup.nuspec"
                 DestinationFolder="$(BuildDir)"
                 Overwrite="true"
-                Properties="version=$(Version);dependenciesPropsFile=$(GeneratedPackageVersionPropsPath)">
+                Properties="version=$(PackageVersion);dependenciesPropsFile=$(GeneratedPackageVersionPropsPath)">
       <Output TaskParameter="Packages" ItemName="LineupPackage" />
     </PackNuSpec>
   </Target>