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

Update SDK to 2.0.0-alpha-20170410-1.

Browse source
This commit is contained in:
Eric Erhardt 2017-04-10 14:24:52 -05:00
parent 99f9786ac7
commit ae78b87587
7 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
TestAssets/TestProjects/FluentProfile/FluentFilterProfile.xml
View file

@ -1,3 +1,3 @@
<CacheArtifacts> <StoreArtifacts>
<Package Id="FluentAssertions" Version ="4.12.0"/> <Package Id="FluentAssertions" Version ="4.12.0"/>
</CacheArtifacts> </StoreArtifacts>

4
TestAssets/TestProjects/NewtonsoftProfile/NewtonsoftFilterProfile.xml
View file

@ -1,3 +1,3 @@
<CacheArtifacts> <StoreArtifacts>
<Package Id="Newtonsoft.Json" Version ="9.0.1"/> <Package Id="Newtonsoft.Json" Version ="9.0.1"/>
</CacheArtifacts> </StoreArtifacts>

2
build/DependencyVersions.props
View file

@ -4,7 +4,7 @@
<CLI_SharedFrameworkVersion>2.0.0-preview1-001915-00</CLI_SharedFrameworkVersion> <CLI_SharedFrameworkVersion>2.0.0-preview1-001915-00</CLI_SharedFrameworkVersion>
<CLI_MSBuild_Version>15.2.0-preview-000093-02</CLI_MSBuild_Version> <CLI_MSBuild_Version>15.2.0-preview-000093-02</CLI_MSBuild_Version>
<CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version> <CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
<CLI_NETSDK_Version>2.0.0-alpha-20170405-2</CLI_NETSDK_Version> <CLI_NETSDK_Version>2.0.0-alpha-20170410-1</CLI_NETSDK_Version>
<CLI_NuGet_Version>4.3.0-beta1-2418</CLI_NuGet_Version> <CLI_NuGet_Version>4.3.0-beta1-2418</CLI_NuGet_Version>
<CLI_WEBSDK_Version>1.0.0-rel-20170405-433</CLI_WEBSDK_Version> <CLI_WEBSDK_Version>1.0.0-rel-20170405-433</CLI_WEBSDK_Version>
<CLI_TestPlatform_Version>15.1.0-preview-20170316-05</CLI_TestPlatform_Version> <CLI_TestPlatform_Version>15.1.0-preview-20170316-05</CLI_TestPlatform_Version>

2
src/dotnet/commands/dotnet-publish/PublishCommandParser.cs
View file

@ -30,7 +30,7 @@ namespace Microsoft.DotNet.Cli
LocalizableStrings.TargetOptionDescription, LocalizableStrings.TargetOptionDescription,
Accept.OneOrMoreArguments() Accept.OneOrMoreArguments()
.With(name: LocalizableStrings.TargetOption) .With(name: LocalizableStrings.TargetOption)
.ForwardAsSingle(o => $"/p:FilterProjectFiles={string.Join("%3B", o.Arguments)}")), .ForwardAsSingle(o => $"/p:TargetManifestFiles={string.Join("%3B", o.Arguments)}")),
Create.Option( Create.Option(
"--self-contained", "--self-contained",
LocalizableStrings.SelfContainedOptionDescription, LocalizableStrings.SelfContainedOptionDescription,

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

@ -34,7 +34,7 @@ namespace Microsoft.DotNet.Tools.Store
throw new GracefulException(LocalizableStrings.SpecifyManifests); throw new GracefulException(LocalizableStrings.SpecifyManifests);
} }
msbuildArgs.Add("/t:ComposeCache"); msbuildArgs.Add("/t:ComposeStore");
msbuildArgs.AddRange(appliedBuildOptions.OptionValuesToBeForwarded()); msbuildArgs.AddRange(appliedBuildOptions.OptionValuesToBeForwarded());

4
test/dotnet-msbuild.Tests/GivenDotnetPublishInvocation.cs
View file

@ -33,7 +33,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
[InlineData(new string[] { "-c", "<config>" }, "/p:Configuration=<config>")] [InlineData(new string[] { "-c", "<config>" }, "/p:Configuration=<config>")]
[InlineData(new string[] { "--configuration", "<config>" }, "/p:Configuration=<config>")] [InlineData(new string[] { "--configuration", "<config>" }, "/p:Configuration=<config>")]
[InlineData(new string[] { "--version-suffix", "<versionsuffix>" }, "/p:VersionSuffix=<versionsuffix>")] [InlineData(new string[] { "--version-suffix", "<versionsuffix>" }, "/p:VersionSuffix=<versionsuffix>")]
[InlineData(new string[] { "--target", "<targetfiles>" }, "/p:FilterProjectFiles=<targetfiles>")] [InlineData(new string[] { "--target", "<targetfiles>" }, "/p:TargetManifestFiles=<targetfiles>")]
[InlineData(new string[] { "-v", "minimal" }, "/verbosity:minimal")] [InlineData(new string[] { "-v", "minimal" }, "/verbosity:minimal")]
[InlineData(new string[] { "--verbosity", "minimal" }, "/verbosity:minimal")] [InlineData(new string[] { "--verbosity", "minimal" }, "/verbosity:minimal")]
[InlineData(new string[] { "<project>" }, "<project>")] [InlineData(new string[] { "<project>" }, "<project>")]
@ -60,7 +60,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
[InlineData(new string[] { "-c", "<config>" }, "/p:Configuration=<config>")] [InlineData(new string[] { "-c", "<config>" }, "/p:Configuration=<config>")]
[InlineData(new string[] { "--configuration", "<config>" }, "/p:Configuration=<config>")] [InlineData(new string[] { "--configuration", "<config>" }, "/p:Configuration=<config>")]
[InlineData(new string[] { "--version-suffix", "<versionsuffix>" }, "/p:VersionSuffix=<versionsuffix>")] [InlineData(new string[] { "--version-suffix", "<versionsuffix>" }, "/p:VersionSuffix=<versionsuffix>")]
[InlineData(new string[] { "--target", "<targetfiles>" }, "/p:FilterProjectFiles=<targetfiles>")] [InlineData(new string[] { "--target", "<targetfiles>" }, "/p:TargetManifestFiles=<targetfiles>")]
[InlineData(new string[] { "-v", "minimal" }, "/verbosity:minimal")] [InlineData(new string[] { "-v", "minimal" }, "/verbosity:minimal")]
[InlineData(new string[] { "--verbosity", "minimal" }, "/verbosity:minimal")] [InlineData(new string[] { "--verbosity", "minimal" }, "/verbosity:minimal")]
public void OptionForwardingIsCorrect(string[] args, string expectedAdditionalArgs) public void OptionForwardingIsCorrect(string[] args, string expectedAdditionalArgs)

9
test/dotnet-msbuild.Tests/GivenDotnetStoreInvocation.cs
View file

@ -1,18 +1,17 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. // Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information. // Licensed under the MIT license. See LICENSE file in the project root for full license information.
using Microsoft.DotNet.Tools.Store;
using FluentAssertions; using FluentAssertions;
using Xunit; using Microsoft.DotNet.Tools.Store;
using System;
using System.Linq;
using System.IO; using System.IO;
using System.Linq;
using Xunit;
namespace Microsoft.DotNet.Cli.MSBuild.Tests namespace Microsoft.DotNet.Cli.MSBuild.Tests
{ {
public class GivenDotnetStoreInvocation public class GivenDotnetStoreInvocation
{ {
const string ExpectedPrefix = "exec <msbuildpath> /m /v:m /t:ComposeCache <project>"; const string ExpectedPrefix = "exec <msbuildpath> /m /v:m /t:ComposeStore <project>";
static readonly string[] ArgsPrefix = { "-m", "<project>" }; static readonly string[] ArgsPrefix = { "-m", "<project>" };
[Theory] [Theory]