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

Merge branch 'rel/1.0.0' into slntest

Browse source
This commit is contained in:
Piotr Puszkiewicz 2017-01-11 17:37:46 -08:00 • committed by GitHub
commit c0b73e4b5f
11 changed files with 52 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
View file

@ -1,4 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<VersionPrefix>1.0.0-rc</VersionPrefix>
<TargetFramework>netcoreapp1.0</TargetFramework>
@ -24,7 +26,7 @@
<Version>1.0.3</Version>
</PackageReference>
<PackageReference Include="NuGet.Frameworks">
<Version>4.0.0-rc3</Version>
<Version>$(CLI_NuGet_Version)</Version>
</PackageReference>
<PackageReference Include="Microsoft.DotNet.Cli.Utils">
<Version>$(SdkNugetVersion)</Version>

2
build/Microsoft.DotNet.Cli.BundledSdks.props
View file

@ -2,7 +2,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<BundledSdk Include="NuGet.Build.Tasks.Pack" Version="4.0.0-rc3" />
<BundledSdk Include="NuGet.Build.Tasks.Pack" Version="$(CLI_NuGet_Version)" />
<BundledSdk Include="Microsoft.NET.Sdk" Version="$(CLI_NETSDK_Version)" />
<BundledSdk Include="Microsoft.NET.Sdk.Web" Version="$(CLI_WEBSDK_Version)" />
<BundledSdk Include="Microsoft.NET.Sdk.Publish" Version="$(CLI_WEBSDK_Version)" />

23
build/Microsoft.DotNet.Cli.DependencyVersions.props
View file

@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<CLI_MSBuild_Version>15.1.0-preview-000509-03</CLI_MSBuild_Version>
<CLI_Roslyn_Version>2.0.0-rc3-61212-03</CLI_Roslyn_Version>
<CLI_NETSDK_Version>1.0.0-alpha-20170105-5</CLI_NETSDK_Version>
<CLI_WEBSDK_Version>1.0.0-alpha-20170106-1-203</CLI_WEBSDK_Version>
<CLI_TestPlatform_Version>15.0.0-preview-20170106-08</CLI_TestPlatform_Version>
<TemplateEngineVersion>1.0.0-beta1-20170106-79</TemplateEngineVersion>
</PropertyGroup>
</Project>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<CLI_MSBuild_Version>15.1.0-preview-000509-03</CLI_MSBuild_Version>
<CLI_Roslyn_Version>2.0.0-rc3-61212-03</CLI_Roslyn_Version>
<CLI_NETSDK_Version>1.0.0-alpha-20170105-5</CLI_NETSDK_Version>
<CLI_NuGet_Version>4.0.0-rc3</CLI_NuGet_Version>
<CLI_WEBSDK_Version>1.0.0-alpha-20170106-1-203</CLI_WEBSDK_Version>
<CLI_TestPlatform_Version>15.0.0-preview-20170106-08</CLI_TestPlatform_Version>
<TemplateEngineVersion>1.0.0-beta1-20170106-79</TemplateEngineVersion>
</PropertyGroup>
</Project>

2
build_projects/dotnet-cli-build/dotnet-cli-build.csproj
View file

@ -41,7 +41,7 @@
<Version>7.2.1</Version>
</PackageReference>
<PackageReference Include="NuGet.CommandLine.XPlat">
<Version>4.0.0-rc3</Version>
<Version>$(CLI_NuGet_Version)</Version>
</PackageReference>
<PackageReference Include="Microsoft.Build.Utilities.Core">
<Version>$(CLI_MSBuild_Version)</Version>

8
src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
View file

@ -18,16 +18,16 @@
<Version>1.0.1-beta-000933</Version>
</PackageReference>
<PackageReference Include="NuGet.Versioning">
<Version>4.0.0-rc3</Version>
<Version>$(CLI_NuGet_Version)</Version>
</PackageReference>
<PackageReference Include="NuGet.Packaging">
<Version>4.0.0-rc3</Version>
<Version>$(CLI_NuGet_Version)</Version>
</PackageReference>
<PackageReference Include="NuGet.Frameworks">
<Version>4.0.0-rc3</Version>
<Version>$(CLI_NuGet_Version)</Version>
</PackageReference>
<PackageReference Include="NuGet.ProjectModel">
<Version>4.0.0-rc3</Version>
<Version>$(CLI_NuGet_Version)</Version>
</PackageReference>
<PackageReference Include="Microsoft.Build">
<Version>$(CLI_MSBuild_Version)</Version>

2
src/dotnet/commands/dotnet-build/Program.cs
View file

@ -89,6 +89,8 @@ namespace Microsoft.DotNet.Tools.Build
msbuildArgs.Add($"/verbosity:{verbosityOption.Value()}");
}
msbuildArgs.Add($"/clp:Summary");
msbuildArgs.AddRange(app.RemainingArguments);
return new MSBuildForwardingApp(msbuildArgs).Execute();

2
src/redist/redist.csproj
View file

@ -15,7 +15,7 @@
<Version>$(CLI_MSBuild_Version)</Version>
</PackageReference>
<PackageReference Include="NuGet.Build.Tasks">
<Version>4.0.0-rc3</Version>
<Version>$(CLI_NuGet_Version)</Version>
</PackageReference>
<PackageReference Include="Microsoft.TestPlatform.CLI">
<Version>$(CLI_TestPlatform_Version)</Version>

2
src/tool_nuget/tool_nuget.csproj
View file

@ -10,7 +10,7 @@
<Version>1.0.3</Version>
</PackageReference>
<PackageReference Include="NuGet.CommandLine.XPlat">
<Version>4.0.0-rc3</Version>
<Version>$(CLI_NuGet_Version)</Version>
</PackageReference>
</ItemGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

8
test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj
View file

@ -57,16 +57,16 @@
<Version>4.1.1</Version>
</PackageReference>
<PackageReference Include="NuGet.Versioning">
<Version>4.0.0-rc3</Version>
<Version>$(CLI_NuGet_Version)</Version>
</PackageReference>
<PackageReference Include="NuGet.Packaging">
<Version>4.0.0-rc3</Version>
<Version>$(CLI_NuGet_Version)</Version>
</PackageReference>
<PackageReference Include="NuGet.Frameworks">
<Version>4.0.0-rc3</Version>
<Version>$(CLI_NuGet_Version)</Version>
</PackageReference>
<PackageReference Include="NuGet.ProjectModel">
<Version>4.0.0-rc3</Version>
<Version>$(CLI_NuGet_Version)</Version>
</PackageReference>
<PackageReference Include="moq.netcore">
<Version>4.4.0-beta8</Version>

20
test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
View file

@ -72,5 +72,25 @@ namespace Microsoft.DotNet.Cli.Build.Tests
.Should().Pass()
.And.HaveStdOutContaining("Hello World");
}
[Fact]
public void ItPrintsBuildSummary()
{
var testAppName = "MSBuildTestApp";
var testInstance = TestAssets.Get(testAppName)
.CreateInstance(testAppName)
.WithSourceFiles()
.WithRestoreFiles();
string expectedBuildSummary = @"Build succeeded.
0 Warning(s)
0 Error(s)";
var cmd = new BuildCommand()
.WithWorkingDirectory(testInstance.Root)
.ExecuteWithCapturedOutput();
cmd.Should().Pass();
cmd.StdOut.Should().ContainVisuallySameFragment(expectedBuildSummary);
}
}
}

5
test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs
View file

@ -7,6 +7,7 @@ using Microsoft.DotNet.TestFramework;
using Microsoft.DotNet.Tools.Test.Utilities;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using Xunit;
namespace Microsoft.DotNet.Migration.Tests
@ -37,11 +38,11 @@ namespace Microsoft.DotNet.Migration.Tests
"PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj");
}
private void MigrateAndBuild(string groupName, string projectName)
private void MigrateAndBuild(string groupName, string projectName, [CallerMemberName] string callingMethod = "", string identifier = "")
{
var projectDirectory = TestAssets
.Get(groupName, projectName)
.CreateInstance()
.CreateInstance(callingMethod: callingMethod, identifier: identifier)
.WithSourceFiles()
.Root;