Stabilize CLI. (#565)

* Stabilize CLI.
* Use stable MSBuild.
* Fix MSBuild version to match prodcon build.
* Modify CLI build file to always ignore NU5104

Author: crummel

repos/cli.proj

@@ -94,6 +94,10 @@
       Unable to find package dotnet-watch.
     -->
     <EnvironmentVariables Include="CLIBUILD_SKIP_BUNDLEDDOTNETTOOLS=true" />
+
+    <!-- Produce stable versions for RTM only.  When https://github.com/dotnet/source-build/issues/550
+         is fixed we will be able to determine this automatically.  -->
+    <EnvironmentVariables Include="DropSuffix=true" />
   </ItemGroup>
 
   <Target Name="AddProdConFeed" BeforeTargets="Build">
@@ -113,6 +117,28 @@
                       Overwrite="true" />
   </Target>
 
+  <!--
+    Ignore this error in the CLI build, which doesn't seem to happen in ProdCon:
+
+      error NU5104: A stable release of a package should not have a prerelease dependency. Either
+      modify the version spec of dependency "NuGet.Frameworks [4.7.0-rtm.5156, )" or update the
+      version field in the nuspec.
+  -->
+  <Target Name="AddNoWarnNU5104ByDefault" BeforeTargets="Build">
+    <PropertyGroup>
+      <BuildDefaultsFile>$(ProjectDirectory)build\BuildDefaults.props</BuildDefaultsFile>
+      <ReplacementEndMark>&lt;/NoWarn&gt;</ReplacementEndMark>
+      <InsertItemLine>;NU5104$(ReplacementEndMark)</InsertItemLine>
+
+      <BuildDefaultsPropsContents>$([System.IO.File]::ReadAllText('$(BuildDefaultsFile)'))</BuildDefaultsPropsContents>
+    </PropertyGroup>
+
+    <WriteLinesToFile File="$(BuildDefaultsFile)"
+                      Lines="$(BuildDefaultsPropsContents.Replace('$(ReplacementEndMark)', '$(InsertItemLine)'))"
+                      Condition="! $(BuildDefaultsPropsContents.Contains('$(InsertItemLine)'))"
+                      Overwrite="true" />
+  </Target>
+
   <Target Name="CopyTarBall" AfterTargets="CopyPackage">
     <ItemGroup>
       <CliTarBalls Include="$(TarBallOutput)*$(TarBallExtension)" />

repos/msbuild.proj

@@ -6,7 +6,7 @@
     <!-- Override value from commit to match expected build. -->
     <OfficialBuildId>20180426.1</OfficialBuildId>
     <PackagesOutput>$(ProjectDirectory)/artifacts/$(Configuration)/packages</PackagesOutput>
-    <OutputVersionArgs>/p:VersionPrefix=15.6.82 /p:DisableNerdbankVersioning=true /p:PreReleaseVersionLabel="rc" /p:BUILD_BUILDNUMBER=$(OfficialBuildId)</OutputVersionArgs>
+    <OutputVersionArgs>/p:VersionPrefix=15.7.179 /p:DisableNerdbankVersioning=true /p:PreReleaseVersionLabel="" /p:BUILD_BUILDNUMBER=$(OfficialBuildId)</OutputVersionArgs>
     <BuildCommand>$(ProjectDirectory)build/build$(ShellExtension) build -DotNetBuildFromSource -DotNetCoreSdkDir $(DotNetCliToolDir) -bootstraponly -skiptests -pack -configuration $(Configuration) /p:GitHeadSha=$(GitCommitHash) $(OutputVersionArgs)</BuildCommand>
     <SourceOverrideRepoApiImplemented>true</SourceOverrideRepoApiImplemented>
     <RepoApiImplemented>false</RepoApiImplemented>