mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

use Sdks attribute in dotnet new templates (#4916)

Browse source 
* Move dotnet-new templates to Sdk attribute

* Update to MSBuild 15.1.0-preview-000454-01

To pick up a fix for Microsoft/msbuild#1431.

* Fix template newlines

* Fix casing on Microsoft.Net.Sdk

* Move migration test csproj's to Sdk attribute

* Disable parallel sdk restore

Each SDK restore operation will try to manipulate the same assets.json file since the dependency name&version are injected into a common csproj file. This can cause runtime failures when two NuGets try to restore the project at once.

* Make casing of SDK 'NET' and not 'Net'

* Remove redundatn imports

* Fix test string

* Additional race

* Replacing the SDK with the Web.Sdk when it is a Web project.

* Fixing the test by writting the csproj before running the migration rule.
This commit is contained in:
Piotr Puszkiewicz 2016-12-04 22:31:58 -08:00 • committed by GitHub
parent dc3d88c587
commit d6cab4af58
30 changed files with 179 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

22
test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs
View file

@ -180,7 +180,16 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
if (tasksToAwait.Any())
{
Task.WaitAll(tasksToAwait.ToArray());
try
{
Task.WaitAll(tasksToAwait.ToArray());
}
catch (System.ObjectDisposedException e)
{
taskErr = null;
taskOut = null;
}
}
var result = new CommandResult(
@ -244,7 +253,16 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
if (tasksToAwait.Any())
{
Task.WaitAll(tasksToAwait.ToArray());
try
{
Task.WaitAll(tasksToAwait.ToArray());
}
catch (System.ObjectDisposedException e)
{
taskErr = null;
taskOut = null;
}
}
var result = new CommandResult(