Merge branch 'release/2.1.3xx' into release/2.1.3xx-MSRC

* release/2.1.3xx:
  Updating the CLI stage0 to 2.1.300 and fixing some build failures.
  Update Microsoft.NETCore.App Package Version
  Formatting...
  Drop the LZMA archive for every build.
This commit is contained in:
Peter Huene 2018-06-12 10:31:56 -07:00
commit c0eff4fa56
No known key found for this signature in database
GPG key ID: E1D265D820213D6A
8 changed files with 11 additions and 10 deletions

View file

@ -30,8 +30,7 @@
TemplateFillInPackageName=%(BundledDotnetTools.Identity);
TemplateFillInPackageVersion=%(BundledDotnetTools.Version);
PreviousStageDirectory=$(PreviousStageDirectory);
DotnetToolsLayoutDirectory=$(testAssetSourceRoot);
DotnetToolsRestoreProjectStyle=DotnetToolReference
DotnetToolsLayoutDirectory=$(testAssetSourceRoot)
</Properties>
</TestDotnetTools>
</ItemGroup>

View file

@ -54,8 +54,7 @@
TemplateFillInPackageName=dotnet-watch;
TemplateFillInPackageVersion=$(DotnetWatchPackageVersion);
PreviousStageDirectory=$(PreviousStageDirectory);
DotnetToolsLayoutDirectory=$(testAssetSourceRoot);
DotnetToolsRestoreProjectStyle=DotnetToolReference
DotnetToolsLayoutDirectory=$(testAssetSourceRoot)
</Properties>
</TestDotnetTools>
</ItemGroup>