Skip to content

Commit 7a119c4

Browse files
authored
Do not use apphost when resolving assets for dotnet store (#3448)
Some changes in the way apphost is handled broke the case where you use an exe project as the dotnet store "manifest" project. The fix is to set UseAppHost=false when doing the store resolution.
1 parent 7ee4c2a commit 7a119c4

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ComposeStore.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Copyright (c) .NET Foundation. All rights reserved.
101101
<!-- Resolve phase-->
102102
<MSBuild Projects="@(PackageReferencesToStore)"
103103
Targets="StoreResolver"
104-
Properties="SelfContained=false;MSBuildProjectExtensionsPath=$(ComposeWorkingDir)\%(PackageReferencesToStore.PackageName)_$([System.String]::Copy('%(PackageReferencesToStore.PackageVersion)').Replace('*','-'))\;"
104+
Properties="SelfContained=false;UseAppHost=false;MSBuildProjectExtensionsPath=$(ComposeWorkingDir)\%(PackageReferencesToStore.PackageName)_$([System.String]::Copy('%(PackageReferencesToStore.PackageVersion)').Replace('*','-'))\;"
105105
BuildInParallel="$(BuildInParallel)">
106106
<Output ItemName="ResolvedPackagesFromMapper" TaskParameter="TargetOutputs" />
107107
</MSBuild>

src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
using NuGet.Packaging.Core;
1919
using NuGet.Versioning;
20-
20+
using Xunit;
2121
using Xunit.Abstractions;
2222

2323
namespace Microsoft.NET.Publish.Tests
@@ -300,21 +300,24 @@ public void It_creates_profiling_symbols()
300300
}
301301
}
302302

303-
[CoreMSBuildOnlyFact]
304-
public void It_stores_when_targeting_netcoreapp3()
303+
[CoreMSBuildOnlyTheory]
304+
[InlineData(true)]
305+
[InlineData(false)]
306+
public void It_stores_when_targeting_netcoreapp3(bool isExe)
305307
{
306308
const string TFM = "netcoreapp3.0";
307309

308310
var testProject = new TestProject()
309311
{
310312
Name = "Test",
311313
IsSdkProject = true,
312-
TargetFrameworks = TFM
314+
TargetFrameworks = TFM,
315+
IsExe = isExe,
313316
};
314317

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

317-
var testProjectInstance = _testAssetsManager.CreateTestProject(testProject);
320+
var testProjectInstance = _testAssetsManager.CreateTestProject(testProject, identifier: isExe.ToString());
318321

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

0 commit comments

Comments
 (0)