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

Commit c02cd97

Browse files
DanielTheCoderDanielTheCoder
committed
Renamed from Nugkg to NugetPublishReleaseFolder and NugetPublishLocalNugetFeedFolder
1 parent 82e55cc commit c02cd97

File tree

9 files changed

+34
-31
lines changed

9 files changed

+34
-31
lines changed

‎README.md‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ It uses the method described here: http://docs.nuget.org/docs/creating-packages/
88
HOW TO USE
99
------------
1010

11-
- Add a new project to your solution by using the MSBuild project template (http://visualstudiogallery.msdn.microsoft.com/4b75d0cc-b693-4c1c-8105-fbaeb0714b03)
11+
- Add a new project to your solution by using the [MSBuild-project-template](http://visualstudiogallery.msdn.microsoft.com/4b75d0cc-b693-4c1c-8105-fbaeb0714b03)
1212
- Install nuget package [MSBuild.MSBNuget](sdfsf)
1313
- Open build.props and configure common settings, eg:
1414

@@ -17,8 +17,8 @@ HOW TO USE
1717
<NugetPublishToReleaseFolder Condition="'$(NugetPublishToReleaseFolder)'==''">false</NugetPublishToReleaseFolder>
1818
<NugetPublishToLocalNugetFeed Condition="'$(NugetPublishToLocalNugetFeed)'==''">false</NugetPublishToLocalNugetFeed>
1919

20-
<NugkgPublishLocalNugetFeedFolder Condition="'$(NugkgPublishLocalNugetFeedFolder)'==''">$(MSBuildProjectDirectory)\..\..\Publish\</NugkgPublishLocalNugetFeedFolder>
21-
<NugkgPublishReleaseFolder Condition="'$(NugkgPublishReleaseFolder)'==''">$(MSBuildProjectDirectory)\..\..\Releases\</NugkgPublishReleaseFolder>
20+
<NugetPublishLocalNugetFeedFolder Condition="'$(NugetPublishLocalNugetFeedFolder)'==''">$(MSBuildProjectDirectory)\..\..\Publish\</NugetPublishLocalNugetFeedFolder
21+
<NugetPublishReleaseFolder Condition="'$(NugetPublishReleaseFolder)'==''">$(MSBuildProjectDirectory)\..\..\Releases\</NugetPublishReleaseFolder>
2222
</PropertyGroup>
2323
```
2424

@@ -37,22 +37,21 @@ HOW TO USE
3737
```
3838
project
3939
|-'folder: nuspecname'
40-
|--build
41-
|--content
42-
|--libs
43-
|--tools
44-
|-'file: nuspec'
40+
|-|-build
41+
|-|-content
42+
|-|-libs
43+
|-|-tools
44+
|-|-'file: nuspec'
4545
```
4646

47-
- build.targets will be replaced during install with nuget package 'MSBuild.MSBBuildConvention'
47+
- build.targets will be replaced during install with nuget package [MSBuild.MSBBuildConvention](https://www.nuget.org/packages/MSBuild.MSBBuildConvention)
4848

4949
Contributing
5050
------------
51-
5251
If you are interested in contributing,
5352

5453
1. Get a Github account
5554
1. Fork the project
5655
1. Make your feature addition or bugfix. Please also update the [changelog](https://github.com/DanielTheCoder/MSBuild.MSBNuget/blob/master/changelog.txt).
5756
1. Send me a pull request via GitHub
58-
57+

‎changelog.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ Changes:
44
from: <NugetStage>$(MSBuildProjectDirectory)\objnugetstage\</NugetStage>
55
to: <NugetStage>$(MSBuildProjectDirectory)\obj\$(Configuration)\nugetstage\</NugetStage>
66
+ nuget minClientVersion="2.7.2"
7+
+ NugkgPublishLocalNugetFeedFolder renamed to -> NugetPublishLocalNugetFeedFolder
8+
+ NugkgPublishReleaseFolder renamed to -> NugetPublishReleaseFolder
79

810
New Features:
911
+ NugetFilterOnlyConventionWellKnownFolders: default is true, used to disable conventionbased folder filtering -> usage: resharper extension packages
@@ -40,7 +42,6 @@ Changes:
4042

4143

4244
1.0.1 -pre 2013/08/19
43-
4445
Changes:
4546
+ NugkgReleaseFolder renamed to -> NugkgPublishReleaseFolder
4647
+ NugkgPublishFolder renamed to -> NugkgPublishLocalNugetFeedFolder

‎src/MSBNuget.Nuget/.build/Configurations/TTV-DS06.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<NugetPublishToReleaseFolder Condition="'$(NugetPublishToReleaseFolder)'==''">true</NugetPublishToReleaseFolder>
66
<NugetPublishToLocalNugetFeed Condition="'$(NugetPublishToLocalNugetFeed)'==''">true</NugetPublishToLocalNugetFeed>
77

8-
<NugkgPublishLocalNugetFeedFolder Condition="'$(NugkgPublishLocalNugetFeedFolder)'==''">D:\Documents\SkyDrive\Development\_Galleries\nuget\MSBuild\</NugkgPublishLocalNugetFeedFolder>
9-
<NugkgPublishReleaseFolder Condition="'$(NugkgPublishReleaseFolder)'==''">$(MSBuildProjectDirectory)\..\..\Releases\</NugkgPublishReleaseFolder>
8+
<NugetPublishLocalNugetFeedFolder Condition="'$(NugetPublishLocalNugetFeedFolder)'==''">D:\Documents\SkyDrive\Development\_Galleries\nuget\MSBuild\</NugetPublishLocalNugetFeedFolder>
9+
<NugetPublishReleaseFolder Condition="'$(NugetPublishReleaseFolder)'==''">$(MSBuildProjectDirectory)\..\..\Releases\</NugetPublishReleaseFolder>
1010
</PropertyGroup>
1111

1212
</Project>

‎src/MSBNuget.Nuget/.build/Configurations/TTV-DS07.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<NugetPublishToReleaseFolder Condition="'$(NugetPublishToReleaseFolder)'==''">true</NugetPublishToReleaseFolder>
66
<NugetPublishToLocalNugetFeed Condition="'$(NugetPublishToLocalNugetFeed)'==''">true</NugetPublishToLocalNugetFeed>
77

8-
<NugkgPublishLocalNugetFeedFolder Condition="'$(NugkgPublishLocalNugetFeedFolder)'==''">D:\Documents\SkyDrive\Development\_Galleries\nuget\MSBuild\</NugkgPublishLocalNugetFeedFolder>
9-
<NugkgPublishReleaseFolder Condition="'$(NugkgPublishReleaseFolder)'==''">$(MSBuildProjectDirectory)\..\..\Releases\</NugkgPublishReleaseFolder>
8+
<NugetPublishLocalNugetFeedFolder Condition="'$(NugetPublishLocalNugetFeedFolder)'==''">D:\Documents\SkyDrive\Development\_Galleries\nuget\MSBuild\</NugetPublishLocalNugetFeedFolder>
9+
<NugetPublishReleaseFolder Condition="'$(NugetPublishReleaseFolder)'==''">$(MSBuildProjectDirectory)\..\..\Releases\</NugetPublishReleaseFolder>
1010
</PropertyGroup>
1111

1212
</Project>

‎src/MSBNuget.Nuget/.build/Configurations/default.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<NugetPublishToReleaseFolder Condition="'$(NugetPublishToReleaseFolder)'==''">false</NugetPublishToReleaseFolder>
66
<NugetPublishToLocalNugetFeed Condition="'$(NugetPublishToLocalNugetFeed)'==''">false</NugetPublishToLocalNugetFeed>
77

8-
<NugkgPublishLocalNugetFeedFolder Condition="'$(NugkgPublishLocalNugetFeedFolder)'==''">$(MSBuildProjectDirectory)\..\..\Publish\</NugkgPublishLocalNugetFeedFolder>
9-
<NugkgPublishReleaseFolder Condition="'$(NugkgPublishReleaseFolder)'==''">$(MSBuildProjectDirectory)\..\..\Releases\</NugkgPublishReleaseFolder>
8+
<NugetPublishLocalNugetFeedFolder Condition="'$(NugetPublishLocalNugetFeedFolder)'==''">$(MSBuildProjectDirectory)\..\..\Publish\</NugetPublishLocalNugetFeedFolder>
9+
<NugetPublishReleaseFolder Condition="'$(NugetPublishReleaseFolder)'==''">$(MSBuildProjectDirectory)\..\..\Releases\</NugetPublishReleaseFolder>
1010
</PropertyGroup>
1111

1212
</Project>

‎src/MSBNuget.Nuget/.build/build.targets‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
22

3-
<Import Project="$(MSBuildThisFileDirectory)\..\..\MSBNuget\nuget.targets" />
4-
5-
<Target Name="Build">
3+
<Import Project="$(MSBuildThisFileDirectory)..\..\MSBNuget\nuget.targets" />
4+
<Import Project="$(MSBuildThisFileDirectory)..\MSBNuget\build\Legacy.100.targets" />
5+
6+
<Target Name="Build">
7+
<CallTarget Targets="$(BuildTargets)" />
68
<CallTarget Targets="NugetBuild" />
79
</Target>
810

‎src/MSBNuget.Nuget/MSBNuget.Legacy/MSBNuget.Legacy.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22
<package >
3-
<metadata>
3+
<metadata minClientVersion="2.7.2">
44
<id>MSBuild.MSBNuget.Legacy</id>
5-
<version>1.0.3-pre6</version>
5+
<version>1.0.3-pre8</version>
66
<title>Nuget convention based MSBuild Packager (Legacy)</title>
77
<authors>Daniel Sack</authors>
88
<owners>Daniel Sack</owners>

‎src/MSBNuget.Nuget/MSBNuget.Nuget.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<None Include=".build\Configurations\default.props" />
2323
<None Include=".build\Configurations\TTV-DS06.props" />
2424
<None Include=".build\Configurations\TTV-DS07.props" />
25+
<None Include="MSBNuget\build\Legacy.100.targets" />
2526
<None Include="MSBNuget\MSBNuget.nuspec.props">
2627
<SubType>Designer</SubType>
2728
</None>

‎src/MSBNuget/nuget.targets‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
<NugetPublishToLocalNugetFeed Condition="'$(NugetPublishToLocalNugetFeed)'==''">true</NugetPublishToLocalNugetFeed>
5151
<NugetPublishToOfficialNugetFeed Condition="'$(NugetPublishToOfficialNugetFeed)' == ''">false</NugetPublishToOfficialNugetFeed>
5252

53-
<NugkgPublishReleaseFolder Condition="'$(NugkgPublishReleaseFolder)'==''">$(NugetIntermediatePath)Release\</NugkgPublishReleaseFolder>
54-
<NugkgPublishLocalNugetFeedFolder Condition="'$(NugkgPublishLocalNugetFeedFolder)'==''">$(NugetIntermediatePath)Publish\</NugkgPublishLocalNugetFeedFolder>
53+
<NugetPublishReleaseFolder Condition="'$(NugetPublishReleaseFolder)'==''">$(NugetIntermediatePath)Release\</NugetPublishReleaseFolder>
54+
<NugetPublishLocalNugetFeedFolder Condition="'$(NugetPublishLocalNugetFeedFolder)'==''">$(NugetIntermediatePath)Publish\</NugetPublishLocalNugetFeedFolder>
5555

5656
<!-- Global overrides for nuget package creation -->
5757
<NugetVersion Condition="'$(NugetVersion)' == ''"></NugetVersion>
@@ -228,27 +228,27 @@
228228
<nupkg Include="$(NugetIntermediatePath)**\*.nupkg"/>
229229
</ItemGroup>
230230

231-
<MakeDir Directories="$(NugkgPublishReleaseFolder)" />
231+
<MakeDir Directories="$(NugetPublishReleaseFolder)" />
232232

233233
<Copy SourceFiles="@(nupkg)"
234-
DestinationFolder="$(NugkgPublishReleaseFolder)%(nupkg.RecursiveDir)"
234+
DestinationFolder="$(NugetPublishReleaseFolder)%(nupkg.RecursiveDir)"
235235
OverwriteReadOnlyFiles="true" ContinueOnError="true"/>
236236

237-
<Message Text="PublishedTo: $(NugkgPublishReleaseFolder)" Importance="high" />
237+
<Message Text="PublishedTo: $(NugetPublishReleaseFolder)" Importance="high" />
238238
</Target>
239239

240240
<Target Name="NugetPublishToLocalFeed">
241241
<ItemGroup>
242242
<nupkg Include="$(NugetIntermediatePath)**\*.nupkg"/>
243243
</ItemGroup>
244244

245-
<MakeDir Directories="$(NugkgPublishLocalNugetFeedFolder)" />
245+
<MakeDir Directories="$(NugetPublishLocalNugetFeedFolder)" />
246246

247247
<Copy SourceFiles="@(nupkg)"
248-
DestinationFolder="$(NugkgPublishLocalNugetFeedFolder)%(nupkg.RecursiveDir)"
248+
DestinationFolder="$(NugetPublishLocalNugetFeedFolder)%(nupkg.RecursiveDir)"
249249
OverwriteReadOnlyFiles="true" ContinueOnError="true"/>
250250

251-
<Message Text="PublishedTo: $(NugkgPublishLocalNugetFeedFolder)" Importance="high" />
251+
<Message Text="PublishedTo: $(NugetPublishLocalNugetFeedFolder)" Importance="high" />
252252
</Target>
253253

254254
<Target Name="NugetPublishToOfficialNugetFeed">

0 commit comments

Comments
 (0)