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

Merge pull request #5909 from dotnet/UpdateSDK

Browse source 
Update NET.Sdk to 1.1.0-alpha-20170303-2
This commit is contained in:
Eric Erhardt 2017-03-03 19:56:16 -06:00 • committed by GitHub
commit 0e0b59f910
6 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
TestAssets/TestProjects/NewtonsoftProfile/NewtonsoftFilterProfile.xml Normal file
View file

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

0
TestAssets/TestProjects/NewtonsoftFilterProfile/NewtonsoftFilterProfile.xml → TestAssets/TestProjects/NewtonsoftProfile/NewtonsoftProfile.xml
View file

2
build/DependencyVersions.props
View file

@ -4,7 +4,7 @@
<CLI_SharedFrameworkVersion>2.0.0-beta-001509-00</CLI_SharedFrameworkVersion>
<CLI_MSBuild_Version>15.2.0-preview-000047-02</CLI_MSBuild_Version>
<CLI_Roslyn_Version>2.0.0-rc4-61325-08</CLI_Roslyn_Version>
<CLI_NETSDK_Version>1.1.0-alpha-20170228-1</CLI_NETSDK_Version>
<CLI_NETSDK_Version>1.1.0-alpha-20170303-2</CLI_NETSDK_Version>
<CLI_NuGet_Version>4.3.0-beta1-2342</CLI_NuGet_Version>
<CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version>
<CLI_TestPlatform_Version>15.0.0</CLI_TestPlatform_Version>

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

@ -97,7 +97,7 @@ namespace Microsoft.DotNet.Tools.Publish
if (!string.IsNullOrEmpty(filterProjOption.Value()))
{
msbuildArgs.Add($"/p:FilterProjFile={filterProjOption.Value()}");
msbuildArgs.Add($"/p:FilterProjectFiles={filterProjOption.Value()}");
}
if (!string.IsNullOrEmpty(verbosityOption.Value()))

13
test/dotnet-cache.Tests/GivenDotnetCachesAndPublishesProjects.cs
View file

@ -17,12 +17,12 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
{
private static string _tfm = "netcoreapp2.0";
private static string _frameworkVersion = Microsoft.DotNet.TestFramework.TestAssetInstance.CurrentRuntimeFrameworkVersion;
private static string _arch = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment.RuntimeArchitecture.ToLowerInvariant();
[Fact]
public void ItPublishesARunnablePortableApp()
{
var testAppName = "NewtonSoftDependentProject";
var profileProjectName = "NewtonsoftFilterProfile";
var profileProjectName = "NewtonsoftProfile";
var testInstance = TestAssets.Get(testAppName)
.CreateInstance()
@ -55,11 +55,12 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
.Should().Pass();
var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
var profilefilter = Path.Combine(localAssemblyCache, _arch, _tfm, "artifact.xml");
new PublishCommand()
.WithFramework(_tfm)
.WithWorkingDirectory(testProjectDirectory)
.WithProFileProject(profileProject)
.WithProFileProject(profilefilter)
.Execute()
.Should().Pass();
@ -76,7 +77,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
public void AppFailsDueToMissingCache()
{
var testAppName = "NewtonSoftDependentProject";
var profileProjectName = "NewtonsoftFilterProfile";
var profileProjectName = "NewtonsoftProfile";
var testInstance = TestAssets.Get(testAppName)
.CreateInstance()
@ -88,7 +89,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
.CreateInstance()
.WithSourceFiles()
.Root.FullName;
var profileProject = Path.Combine(profileProjectPath, $"{profileProjectName}.xml");
var profileProject = Path.Combine(profileProjectPath, "NewtonsoftFilterProfile.xml");
new RestoreCommand()
.WithWorkingDirectory(testProjectDirectory)

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

@ -24,7 +24,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
[InlineData(new string[] { "-c", "<configuration>" }, "/p:Configuration=<configuration>")]
[InlineData(new string[] { "--configuration", "<configuration>" }, "/p:Configuration=<configuration>")]
[InlineData(new string[] { "--version-suffix", "<version-suffix>" }, "/p:VersionSuffix=<version-suffix>")]
[InlineData(new string[] { "--filter", "<filter>" }, "/p:FilterProjFile=<filter>")]
[InlineData(new string[] { "--filter", "<filter>" }, "/p:FilterProjectFiles=<filter>")]
[InlineData(new string[] { "-v", "<verbosity>" }, "/verbosity:<verbosity>")]
[InlineData(new string[] { "--verbosity", "<verbosity>" }, "/verbosity:<verbosity>")]
[InlineData(new string[] { "<project>" }, "<project>")]