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

Commit f095247

Browse files
Merge branch 'master' into Github/master
2 parents 62cf87f + 8517244 commit f095247

File tree

16 files changed

+200
-48
lines changed

16 files changed

+200
-48
lines changed

changelog.txt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
1-
1.0.3 -pre 2013/08/22
1+
1.0.3 -pre4 2013/10/23
22
Fixed issues:
33
+ pack: invalid arguments. -> Escaped command
44

5+
Changes:
6+
+ Use OutputPath instead hardcoded path bin/$(Configuration)
7+
+ internal - strucutring of property groups and documentation
8+
+ internal - convention based for nuget package creation (MSBNuget.Nuget/.build/Configuration)
9+
10+
New Features:
11+
+ Global override of nuget pack arguments for all nuspec files (NugetVersion, NugetMinClientVersion, NugetCommandPackArguments)
12+
+ Logging publishing paths after publish
13+
+ Nuget.exe not needed anymore in path var, dependency of package
14+
515
1.0.2 -pre 2013/08/19
616
Changes:
717
+ PublishDisabled renamed to -> NugetPublishDisabled

src/.nuget/packages.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="NuGet.CommandLine" version="2.7.1" />
4+
</packages>
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
2+
3+
<!-- MSBuild.MSBNuget MSBuild properties with 'noe.Core.NugetPackages' default values -->
4+
<PropertyGroup Label="Package Creation Configuration Settings">
5+
<NugetPublishToReleaseFolder Condition="'$(NugetPublishToReleaseFolder)'==''">true</NugetPublishToReleaseFolder>
6+
<NugetPublishToLocalNugetFeed Condition="'$(NugetPublishToLocalNugetFeed)'==''">true</NugetPublishToLocalNugetFeed>
7+
8+
<NugkgPublishLocalNugetFeedFolder Condition="'$(NugkgPublishLocalNugetFeedFolder)'==''">D:\Documents\SkyDrive\Development\_Galleries\nuget\MSBuild\</NugkgPublishLocalNugetFeedFolder>
9+
<NugkgPublishReleaseFolder Condition="'$(NugkgPublishReleaseFolder)'==''">$(MSBuildProjectDirectory)\..\..\Releases\</NugkgPublishReleaseFolder>
10+
</PropertyGroup>
11+
12+
</Project>
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
2+
3+
<!-- MSBuild.MSBNuget MSBuild properties with 'noe.Core.NugetPackages' default values -->
4+
<PropertyGroup Label="Package Creation Configuration Settings">
5+
<NugetPublishToReleaseFolder Condition="'$(NugetPublishToReleaseFolder)'==''">true</NugetPublishToReleaseFolder>
6+
<NugetPublishToLocalNugetFeed Condition="'$(NugetPublishToLocalNugetFeed)'==''">true</NugetPublishToLocalNugetFeed>
7+
8+
<NugkgPublishLocalNugetFeedFolder Condition="'$(NugkgPublishLocalNugetFeedFolder)'==''">D:\Documents\SkyDrive\Development\_Galleries\nuget\MSBuild\</NugkgPublishLocalNugetFeedFolder>
9+
<NugkgPublishReleaseFolder Condition="'$(NugkgPublishReleaseFolder)'==''">$(MSBuildProjectDirectory)\..\..\Releases\</NugkgPublishReleaseFolder>
10+
</PropertyGroup>
11+
12+
</Project>
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
2+
3+
<!-- MSBuild.MSBNuget MSBuild properties with 'noe.Core.NugetPackages' default values -->
4+
<PropertyGroup Label="MSBuild.MSBNuget Default values">
5+
<NugetPublishToReleaseFolder Condition="'$(NugetPublishToReleaseFolder)'==''">false</NugetPublishToReleaseFolder>
6+
<NugetPublishToLocalNugetFeed Condition="'$(NugetPublishToLocalNugetFeed)'==''">false</NugetPublishToLocalNugetFeed>
7+
8+
<NugkgPublishLocalNugetFeedFolder Condition="'$(NugkgPublishLocalNugetFeedFolder)'==''">$(MSBuildProjectDirectory)\..\..\Publish\</NugkgPublishLocalNugetFeedFolder>
9+
<NugkgPublishReleaseFolder Condition="'$(NugkgPublishReleaseFolder)'==''">$(MSBuildProjectDirectory)\..\..\Releases\</NugkgPublishReleaseFolder>
10+
</PropertyGroup>
11+
12+
</Project>
Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,17 @@
11
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
22

33
<PropertyGroup>
4-
<PublishToLocalNugetFeed Condition="'(PublishToLocalNugetFeed)'==''">true</PublishToLocalNugetFeed>
5-
6-
<NugkgPublishReleaseFolder Condition="'$(NugkgPublishReleaseFolder)'==''">$(MSBuildProjectDirectory)\..\..\Releases\</NugkgPublishReleaseFolder>
7-
<NugkgPublishLocalNugetFeedFolder Condition="'$(NugkgPublishLocalNugetFeedFolder)'==''">C:\Dev\_galleries\nuget\</NugkgPublishLocalNugetFeedFolder>
4+
<!-- overwrite nuget.exe path because we are not acting in scope of packages folder -->
5+
<NuGetToolsPath>$(MSBuildProjectDirectory)\..\packages\NuGet.CommandLine.*\tools\</NuGetToolsPath>
86

7+
<NugetPackagesCustomConfiguration Condition="'$(NugetPackagesCustomConfiguration)'==''">$(COMPUTERNAME)</NugetPackagesCustomConfiguration>
8+
9+
<_nugetPackagesCustomConfigurationImportPath>$(MSBuildThisFileDirectory)Configurations\$(NugetPackagesCustomConfiguration).props</_nugetPackagesCustomConfigurationImportPath>
10+
<_nugetPackagesCustomConfigurationImportPath Condition="Exists('$(_nugetPackagesCustomConfigurationImportPath)')=='false'">$(MSBuildThisFileDirectory)Configurations\default.props</_nugetPackagesCustomConfigurationImportPath>
911
</PropertyGroup>
1012

11-
<ItemGroup Label="MSBNuget">
12-
<additionalFiles Include="$(MSBuildThisFileDirectory)\..\..\MSBNuget\nuget.targets">
13-
<targetFolder>MSBNuget/tools</targetFolder>
14-
</additionalFiles>
15-
<!--<additionalFiles Include="$(MSBuildThisFileDirectory)\..\..\MSBNuget\build.targets">
16-
<targetFolder>MSBNuget/build</targetFolder>
17-
</additionalFiles>-->
18-
</ItemGroup>
19-
20-
<ItemGroup Label="MSBNuget.Legacy">
21-
<additionalFiles Include="$(MSBuildThisFileDirectory)\..\..\MSBNuget\nuget.targets">
22-
<targetFolder>MSBNuget.Legacy/content/.build</targetFolder>
23-
</additionalFiles>
24-
</ItemGroup>
25-
13+
<!-- Conventional import of custom settings -->
14+
<Import Project="$(_nugetPackagesCustomConfigurationImportPath)" Condition="Exists('$(_nugetPackagesCustomConfigurationImportPath)')=='true'"/>
15+
<Import Project="$(MSBuildProjectDirectory)\*\*.nuspec.props"/>
2616

2717
</Project>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
2+
3+
</Project>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
2+
3+
<ItemGroup Label="MSBNuget.Legacy">
4+
<additionalFiles Include="$(MSBuildThisFileDirectory)\..\..\MSBNuget\nuget.targets">
5+
<targetFolder>MSBNuget.Legacy/content/.build</targetFolder>
6+
</additionalFiles>
7+
</ItemGroup>
8+
9+
</Project>

src/MSBNuget.Nuget/MSBNuget.Nuget.csproj

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,18 @@
2020
<ItemGroup>
2121
<Compile Include="MSBNuget\build\MSBuild.MSBNuget.targets" />
2222
<Compile Include="MSBBuildConvention\content\.build\build.targets" />
23+
<None Include=".build\Configuration\TTV-DS07.props" />
24+
<None Include=".build\Configuration\default.props" />
25+
<None Include="MSBBuildConvention\MSBBuildConvention.nuspec.props">
26+
<SubType>Designer</SubType>
27+
</None>
2328
<None Include="MSBBuildConvention\MSBBuildConvention.nuspec" />
29+
<None Include="MSBNuget\MSBNuget.nuspec.props">
30+
<SubType>Designer</SubType>
31+
</None>
32+
<None Include="MSBNuget.Legacy\MSBNuget.Legacy.nuspec.props">
33+
<SubType>Designer</SubType>
34+
</None>
2435
<None Include="MSBNuget\MSBNuget.nuspec" />
2536
<None Include="MSBNuget.Legacy\MSBNuget.Legacy.nuspec" />
2637
</ItemGroup>

src/MSBNuget.Nuget/MSBNuget/MSBNuget.nuspec

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0"?>
22
<package >
3+
34
<metadata>
45
<id>MSBuild.MSBNuget</id>
5-
<version>1.0.3-pre</version>
6+
<version>1.0.3-pre4</version>
67
<title>Nuget convention based MSBuild Packager</title>
78
<authors>Daniel Sack</authors>
89
<owners>Daniel Sack</owners>
@@ -14,9 +15,14 @@
1415
<copyright>Copyright 2013</copyright>
1516
<tags>NuGet MSBuild Package</tags>
1617
<releaseNotes>https://raw.github.com/DanielTheCoder/MSBuild.MSBNuget/master/changelog.txt</releaseNotes>
18+
1719
<dependencies>
1820
<dependency id="MSBuild.MSBBuildConvention" />
21+
<dependency id="NuGet.CommandLine" version="2.7.1" />
1922
</dependencies>
23+
2024
</metadata>
2125

26+
27+
2228
</package>

0 commit comments

Comments
 (0)