diff --git a/TestAssets/TestProjects/NewtonsoftProfile/NewtonsoftFilterProfile.xml b/TestAssets/TestProjects/NewtonsoftProfile/NewtonsoftFilterProfile.xml new file mode 100644 index 000000000..af9538879 --- /dev/null +++ b/TestAssets/TestProjects/NewtonsoftProfile/NewtonsoftFilterProfile.xml @@ -0,0 +1,3 @@ + + + diff --git a/TestAssets/TestProjects/NewtonsoftFilterProfile/NewtonsoftFilterProfile.xml b/TestAssets/TestProjects/NewtonsoftProfile/NewtonsoftProfile.xml similarity index 100% rename from TestAssets/TestProjects/NewtonsoftFilterProfile/NewtonsoftFilterProfile.xml rename to TestAssets/TestProjects/NewtonsoftProfile/NewtonsoftProfile.xml diff --git a/src/dotnet/commands/dotnet-publish/Program.cs b/src/dotnet/commands/dotnet-publish/Program.cs index c74db0d40..96214a26d 100644 --- a/src/dotnet/commands/dotnet-publish/Program.cs +++ b/src/dotnet/commands/dotnet-publish/Program.cs @@ -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())) diff --git a/test/dotnet-cache.Tests/GivenDotnetCachesAndPublishesProjects.cs b/test/dotnet-cache.Tests/GivenDotnetCachesAndPublishesProjects.cs index e379d5493..b8451bb8f 100644 --- a/test/dotnet-cache.Tests/GivenDotnetCachesAndPublishesProjects.cs +++ b/test/dotnet-cache.Tests/GivenDotnetCachesAndPublishesProjects.cs @@ -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) diff --git a/test/dotnet-msbuild.Tests/GivenDotnetPublishInvocation.cs b/test/dotnet-msbuild.Tests/GivenDotnetPublishInvocation.cs index 8eb025f72..7e0599526 100644 --- a/test/dotnet-msbuild.Tests/GivenDotnetPublishInvocation.cs +++ b/test/dotnet-msbuild.Tests/GivenDotnetPublishInvocation.cs @@ -24,7 +24,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests [InlineData(new string[] { "-c", "" }, "/p:Configuration=")] [InlineData(new string[] { "--configuration", "" }, "/p:Configuration=")] [InlineData(new string[] { "--version-suffix", "" }, "/p:VersionSuffix=")] - [InlineData(new string[] { "--filter", "" }, "/p:FilterProjFile=")] + [InlineData(new string[] { "--filter", "" }, "/p:FilterProjectFiles=")] [InlineData(new string[] { "-v", "" }, "/verbosity:")] [InlineData(new string[] { "--verbosity", "" }, "/verbosity:")] [InlineData(new string[] { "" }, "")]