Skip to content

Do not use apphost when resolving assets for dotnet store #3448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 24, 2019
Merged

Do not use apphost when resolving assets for dotnet store #3448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ComposeStore.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<!-- Resolve phase-->
<MSBuild Projects="@(PackageReferencesToStore)"
Targets="StoreResolver"
Properties="SelfContained=false;MSBuildProjectExtensionsPath=$(ComposeWorkingDir)\%(PackageReferencesToStore.PackageName)_$([System.String]::Copy('%(PackageReferencesToStore.PackageVersion)').Replace('*','-'))\;"
Properties="SelfContained=false;UseAppHost=false;MSBuildProjectExtensionsPath=$(ComposeWorkingDir)\%(PackageReferencesToStore.PackageName)_$([System.String]::Copy('%(PackageReferencesToStore.PackageVersion)').Replace('*','-'))\;"
BuildInParallel="$(BuildInParallel)">
<Output ItemName="ResolvedPackagesFromMapper" TaskParameter="TargetOutputs" />
</MSBuild>
Expand Down
13 changes: 8 additions & 5 deletions src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

using NuGet.Packaging.Core;
using NuGet.Versioning;

using Xunit;
using Xunit.Abstractions;

namespace Microsoft.NET.Publish.Tests
Expand Down Expand Up @@ -300,21 +300,24 @@ public void It_creates_profiling_symbols()
}
}

[CoreMSBuildOnlyFact]
public void It_stores_when_targeting_netcoreapp3()
[CoreMSBuildOnlyTheory]
[InlineData(true)]
[InlineData(false)]
public void It_stores_when_targeting_netcoreapp3(bool isExe)
{
const string TFM = "netcoreapp3.0";

var testProject = new TestProject()
{
Name = "Test",
IsSdkProject = true,
TargetFrameworks = TFM
TargetFrameworks = TFM,
IsExe = isExe,
};

testProject.PackageReferences.Add(new TestPackageReference("Newtonsoft.Json", "12.0.1"));

var testProjectInstance = _testAssetsManager.CreateTestProject(testProject);
var testProjectInstance = _testAssetsManager.CreateTestProject(testProject, identifier: isExe.ToString());

var outputFolder = Path.Combine(testProjectInstance.TestRoot, "o");
var workingDir = Path.Combine(testProjectInstance.TestRoot, "w");
Expand Down