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

Commit aa1833d

Browse files
DanielTheCoderDanielTheCoder
committed
Merge branch 'master' into Github/master
2 parents f095247 + f6025e8 commit aa1833d

File tree

26 files changed

+150
-360
lines changed

26 files changed

+150
-360
lines changed

‎README.md‎

Lines changed: 18 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,26 @@ 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)
12-
- Install nuget package MSBuild.MSBNuget
11+
- Add a new project to your solution by using the [MSBuild-project-template](http://visualstudiogallery.msdn.microsoft.com/4b75d0cc-b693-4c1c-8105-fbaeb0714b03)
12+
- Install nuget package [MSBuild.MSBNuget](sdfsf)
1313
- Open build.props and configure common settings, eg:
1414

1515
```XML
1616
<PropertyGroup>
17-
<PublishToLocalNugetFeed>true</PublishToLocalNugetFeed>
18-
<NugkgPublishFolder>C:\Dev\_galleries\nuget\</NugkgPublishFolder>
19-
<NugkgPublishFolder Condition="'$(NugkgPublishFolder)'==''">$(MSBuildProjectDirectory)\..\..\Publish\</NugkgPublishFolder>
20-
<NugkgReleaseFolder Condition="'$(NugkgReleaseFolder)'==''">$(MSBuildProjectDirectory)\..\..\Releases\</NugkgReleaseFolder>
17+
<NugetPublishToReleaseFolder Condition="'$(NugetPublishToReleaseFolder)'==''">false</NugetPublishToReleaseFolder>
18+
<NugetPublishToLocalNugetFeed Condition="'$(NugetPublishToLocalNugetFeed)'==''">false</NugetPublishToLocalNugetFeed>
19+
20+
<NugetPublishLocalNugetFeedFolder Condition="'$(NugetPublishLocalNugetFeedFolder)'==''">$(MSBuildProjectDirectory)\..\..\Publish\</NugetPublishLocalNugetFeedFolder
21+
<NugetPublishReleaseFolder Condition="'$(NugetPublishReleaseFolder)'==''">$(MSBuildProjectDirectory)\..\..\Releases\</NugetPublishReleaseFolder>
2122
</PropertyGroup>
2223
```
2324

24-
- Use item groups to add additional files, eg:
25+
- Use item groups to add additional files, eg: add file 'my.dll' to convention based folder
2526

2627
```XML
2728
<ItemGroup>
28-
<additionalFiles Include="$(MSBuildThisFileDirectory)\..\..\MSBNuget\nuget.targets">
29-
<targetFolder>MSBNuget/content/.build</targetFolder>
29+
<additionalFiles Include="$(MSBuildThisFileDirectory)\..\..\MSBNuget\my.dll">
30+
<targetFolder>MSBNuget/content/libs/net45</targetFolder>
3031
</additionalFiles>
3132
</ItemGroup>
3233
```
@@ -36,43 +37,21 @@ HOW TO USE
3637
```
3738
project
3839
|-'folder: nuspecname'
39-
|--build
40-
|--content
41-
|--libs
42-
|--tools
43-
|-'file: nuspec'
40+
|-|-build
41+
|-|-content
42+
|-|-libs
43+
|-|-tools
44+
|-|-'file: nuspec'
4445
```
4546

46-
- Open build.targets and add/replace with the following
47-
48-
```XML
49-
<Import Project="nuget.targets" />
50-
51-
<Target Name="Build">
52-
<CallTarget Targets="NugetBuild" />
53-
</Target>
54-
55-
<Target Name="Clean">
56-
<CallTarget Targets="NugetClean" />
57-
</Target>
58-
59-
<Target Name="Rebuild">
60-
<CallTarget Targets="NugetRebuild" />
61-
</Target>
62-
63-
<Target Name="Publish">
64-
<CallTarget Targets="NugetPublish"/>
65-
</Target>
66-
```
67-
47+
- build.targets will be replaced during install with nuget package [MSBuild.MSBBuildConvention](https://www.nuget.org/packages/MSBuild.MSBBuildConvention)
6848

6949
Contributing
7050
------------
71-
7251
If you are interested in contributing,
7352

7453
1. Get a Github account
7554
1. Fork the project
76-
1. Make your feature addition or bugfix. Please also update the [changelog](https://github.com/DanielTheCoder/MSBuild.MSBNuget/edit/master/changelog.txt).
55+
1. Make your feature addition or bugfix. Please also update the [changelog](https://github.com/DanielTheCoder/MSBuild.MSBNuget/blob/master/changelog.txt).
7756
1. Send me a pull request via GitHub
78-
57+

‎changelog.txt‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,25 @@
1-
1.0.3 -pre4 2013/10/23
1+
1.0.3 -pre8 2013/11/22
2+
Changes:
3+
+ NugetStage default changed honoring $(Configuration)
4+
from: <NugetStage>$(MSBuildProjectDirectory)\objnugetstage\</NugetStage>
5+
to: <NugetStage>$(MSBuildProjectDirectory)\obj\$(Configuration)\nugetstage\</NugetStage>
6+
+ nuget minClientVersion="2.7.2"
7+
+ NugkgPublishLocalNugetFeedFolder renamed to -> NugetPublishLocalNugetFeedFolder
8+
+ NugkgPublishReleaseFolder renamed to -> NugetPublishReleaseFolder
9+
10+
New Features:
11+
+ NugetFilterOnlyConventionWellKnownFolders: default is true, used to disable conventionbased folder filtering -> usage: resharper extension packages
12+
13+
1.0.3 -pre7 2013/11/22
14+
Changes:
15+
+ *.targets no longer placed in tools folder -> .gitignore compatibility
16+
17+
18+
1.0.3 -pre6 2013/10/23
219
Fixed issues:
320
+ pack: invalid arguments. -> Escaped command
21+
+ pack: invalid path -> nuget.exe from dependency package
22+
+ push: invalid path -> nuget.exe from dependency package
423

524
Changes:
625
+ Use OutputPath instead hardcoded path bin/$(Configuration)
@@ -11,23 +30,18 @@ New Features:
1130
+ Global override of nuget pack arguments for all nuspec files (NugetVersion, NugetMinClientVersion, NugetCommandPackArguments)
1231
+ Logging publishing paths after publish
1332
+ Nuget.exe not needed anymore in path var, dependency of package
33+
+ OutDir Support, should work with Team Foundation Server 2010/2012/2013
34+
1435

1536
1.0.2 -pre 2013/08/19
1637
Changes:
1738
+ PublishDisabled renamed to -> NugetPublishDisabled
1839
+ PublishToReleaseFolder renamed to -> NugetPublishToReleaseFolder
1940
+ PublishToLocalNugetFeed renamed to -> NugetPublishToLocalNugetFeed
2041
+ PublishToOfficialNugetFeed renamed to -> NugetPublishToOfficialNugetFeed
21-
22-
New Features:
23-
+ Disable all publish mechanism with: <PublishDisabled>true</PublishDisabled>
24-
+ PublishToReleaseFolder with <PublishToLocalNugetFeed>true</PublishToLocalNugetFeed>
25-
+ PublishToLocalNugetFeed with <PublishToLocalNugetFeed>true</PublishToLocalNugetFeed>
26-
+ PublishToOfficialNugetFeed with <PublishToOfficialNugetFeed>true</PublishToOfficialNugetFeed>
2742

2843

2944
1.0.1 -pre 2013/08/19
30-
3145
Changes:
3246
+ NugkgReleaseFolder renamed to -> NugkgPublishReleaseFolder
3347
+ NugkgPublishFolder renamed to -> NugkgPublishLocalNugetFeedFolder

‎src/.nuget/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="NuGet.CommandLine" version="2.7.1" />
3+
<package id="NuGet.CommandLine" version="2.7.3" />
44
</packages>

‎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.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/.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/MSBBuildConvention/MSBBuildConvention.nuspec‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎src/MSBNuget.Nuget/MSBBuildConvention/MSBBuildConvention.nuspec.props‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)