Skip to content
This repository was archived by the owner on Jan 12, 2024. It is now read-only.

Commit 4c70eef

Browse files
kzuadalon
authored andcommitted
Restore capability to infer project configurations from usage
Until we switch to the new Configurations/Platforms approach in the SDK, we still need to provide the default property groups so that the project system can infer them for Restore.
1 parent fd11964 commit 4c70eef

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/VisualStudio/NuGet.Packaging.VisualStudio.15/ProjectSystem/NuProjCapabilities.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ namespace NuGet.Packaging.VisualStudio
55
internal static class NuProjCapabilities
66
{
77
public const string NuProj = "PackagingProject";
8-
9-
public const string HandlesOwnReload = ProjectCapabilities.HandlesOwnReload;
108
public const string OpenProjectFile = nameof(OpenProjectFile);
119

12-
public const string DefaultCapabilities = HandlesOwnReload + "; " +
13-
OpenProjectFile;
10+
public const string DefaultCapabilities =
11+
ProjectCapabilities.HandlesOwnReload + "; " +
12+
OpenProjectFile + ";" +
13+
ProjectCapabilities.ProjectConfigurationsInferredFromUsage;
1414
}
1515
}

src/VisualStudio/NuGet.Packaging.VisualStudio.15/Templates/Projects/Nuget/Package/Package.nuproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
<TargetFramework>netstandard1.0</TargetFramework>
2222
<PackageTargetFallback>net11;net20;net35;net40;net403;net45;net451;net452;net46;net461;net462;net47;netcore;netcore45;netcore451;netcore50;win8;win81;win10;sl4;sl5;wp;wp7;wp75;wp8;wp81;wpa81;uap;uap10;netstandard1.0;netstandard1.1;netstandard1.2;netstandard1.3;netstandard1.4;netstandard1.5;netstandard1.6;netstandard2.0;netcoreapp1.0;netcoreapp2.0;monoandroid;monotouch;monomac;xamarinios;xamarinmac;xamarinpsthree;xamarinpsfour;xamarinpsvita;xamarinwatchos;xamarintvos;xamarinxboxthreesixty;xamarinxboxone</PackageTargetFallback>
2323

24-
<Configurations>Debug;Release</Configurations>
25-
<Platforms>AnyCPU</Platforms>
26-
2724
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
2825
<OutputPath>bin\$(Configuration)\</OutputPath>
2926
</PropertyGroup>

src/VisualStudio/NuGet.Packaging.VisualStudio.15/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"MSBuilder.Introspect": "0.1.5",
1818
"MSBuilder.ThisAssembly.Project": "0.3.3",
1919
"MSBuilder.VsixDependency": "0.2.11",
20-
"MSBuilder.VsixInstaller": "0.2.13",
20+
"MSBuilder.VsixInstaller": "0.2.15",
2121
"VSLangProj150": "1.0.0",
2222
"VSSDK.ComponentModelHost.11": "11.0.4"
2323
},

src/VisualStudio/NuGet.Packaging.VisualStudio/Targets/NuGet.Packaging.Authoring.targets

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ Copyright (c) .NET Foundation. All rights reserved.
7070
<ItemGroup>
7171
<ProjectCapability Include="PackagingProject" />
7272

73+
<!-- Allows configurations inferred from Condition="CONFIG|PLATFORM" usage -->
74+
<ProjectCapability Include="ProjectConfigurationsInferredFromUsage" />
75+
7376
<!-- DependenciesTree capability lights up a Dependencies tree node and it's sub node providers-->
7477
<ProjectCapability Include="DependenciesTree" />
7578

0 commit comments

Comments
 (0)