Skip to content
This repository was archived by the owner on Jun 1, 2022. It is now read-only.

Commit 080701c

Browse files
NugetFilterOnlyConventionWellKnownFolders for resharper
1 parent b2a7354 commit 080701c

File tree

4 files changed

+18
-7
lines changed

4 files changed

+18
-7
lines changed

changelog.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ Changes:
55
to: <NugetStage>$(MSBuildProjectDirectory)\obj\$(Configuration)\nugetstage\</NugetStage>
66
+ nuget minClientVersion="2.7.2"
77

8+
New Features:
9+
+ NugetFilterOnlyConventionWellKnownFolders: default is true, used to disable conventionbased folder filtering -> usage: resharper extension packages
810

911
1.0.3 -pre7 2013/11/22
1012
Changes:

src/MSBNuget.Nuget/.build/build.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
<_nugetPackagesCustomConfigurationImportPath>$(MSBuildThisFileDirectory)Configurations\$(NugetPackagesCustomConfiguration).props</_nugetPackagesCustomConfigurationImportPath>
1010
<_nugetPackagesCustomConfigurationImportPath Condition="Exists('$(_nugetPackagesCustomConfigurationImportPath)')=='false'">$(MSBuildThisFileDirectory)Configurations\default.props</_nugetPackagesCustomConfigurationImportPath>
11+
12+
<NugetFilterOnlyConventionWellKnownFolders>false</NugetFilterOnlyConventionWellKnownFolders>
1113
</PropertyGroup>
1214

1315
<!-- Conventional import of custom settings -->

src/MSBNuget.Nuget/MSBNuget.Nuget.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
<SubType>Designer</SubType>
3434
</None>
3535
</ItemGroup>
36-
<ItemGroup />
3736
<Import Project="$(MSBuildProjectDirectory)\.build\build.props" />
3837
<Import Project="$(MSBuildProjectDirectory)\.build\build.targets" />
3938
</Project>

src/MSBNuget/nuget.targets

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
<NugetIntermediatePath Condition="'$(NugetIntermediatePath)' == ''">$(OutputPath)$(Configuration)\</NugetIntermediatePath>
2525
<!-- TFS 2010/2012 support of OutDir overwrite -->
2626
<NugetIntermediatePath Condition="'$(OutDir)' != ''">$(OutDir)\NugetPackages\$(Configuration)\</NugetIntermediatePath>
27-
27+
<!-- Filter out all folders which are not known by convention -->
28+
<NugetFilterOnlyConventionWellKnownFolders Condition="'$(NugetFilterOnlyConventionWellKnownFolders)' == ''">true</NugetFilterOnlyConventionWellKnownFolders>
29+
2830
<!-- Convention based for Nuget Package Restore -->
2931
<BuildDependsOn/>
3032

@@ -118,15 +120,15 @@
118120

119121
<Target Name="NugetCreateFolderStructure">
120122
<!-- Ensure nuget Folder structure exists -->
121-
<MakeDir Directories="$(NugetStage)%(nuspec.Filename)\lib" />
122-
<MakeDir Directories="$(NugetStage)%(nuspec.Filename)\tools" />
123-
<MakeDir Directories="$(NugetStage)%(nuspec.Filename)\content" />
124-
<MakeDir Directories="$(NugetStage)%(nuspec.Filename)\build" />
123+
<MakeDir Directories="$(NugetStage)%(nuspec.Filename)\lib" Condition="'$(NugetFilterOnlyConventionWellKnownFolders)' == 'true'" />
124+
<MakeDir Directories="$(NugetStage)%(nuspec.Filename)\tools" Condition="'$(NugetFilterOnlyConventionWellKnownFolders)' == 'true'"/>
125+
<MakeDir Directories="$(NugetStage)%(nuspec.Filename)\content" Condition="'$(NugetFilterOnlyConventionWellKnownFolders)' == 'true'"/>
126+
<MakeDir Directories="$(NugetStage)%(nuspec.Filename)\build" Condition="'$(NugetFilterOnlyConventionWellKnownFolders)' == 'true'"/>
125127
</Target>
126128

127129
<Target Name="NugetCopyAdditionalFiles">
128130
<!-- nuget convention based folder structure includes -->
129-
<ItemGroup>
131+
<ItemGroup Condition="'$(NugetFilterOnlyConventionWellKnownFolders)' == 'true'">
130132
<additionalFiles Include="$(MSBuildProjectDirectory)\%(nuspec.Filename)\tools\**\*.*">
131133
<targetFolder>%(nuspec.Filename)\tools</targetFolder>
132134
</additionalFiles>
@@ -140,6 +142,12 @@
140142
<targetFolder>%(nuspec.Filename)\lib</targetFolder>
141143
</additionalFiles>
142144
</ItemGroup>
145+
146+
<ItemGroup Condition="'$(NugetFilterOnlyConventionWellKnownFolders)' == 'false'">
147+
<additionalFiles Include="$(MSBuildProjectDirectory)\%(nuspec.Filename)\**\*.*">
148+
<targetFolder>%(nuspec.Filename)</targetFolder>
149+
</additionalFiles>
150+
</ItemGroup>
143151

144152
<!-- try to evaluate 'physical path' if OutDir is present -->
145153
<ItemGroup>

0 commit comments

Comments
 (0)