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

Commit 85be882

Browse files
DanielTheCoderDanielTheCoder
committed
Merge tag 'v1.0.2-pre'
2 parents 6aeae6d + 90820ff commit 85be882

File tree

22 files changed

+202
-242
lines changed

22 files changed

+202
-242
lines changed

‎changelog.txt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
1.0.2 -pre 2013/08/19
2+
Changes:
3+
+ PublishDisabled renamed to -> NugetPublishDisabled
4+
+ PublishToReleaseFolder renamed to -> NugetPublishToReleaseFolder
5+
+ PublishToLocalNugetFeed renamed to -> NugetPublishToLocalNugetFeed
6+
+ PublishToOfficialNugetFeed renamed to -> NugetPublishToOfficialNugetFeed
7+
8+
New Features:
9+
+ Disable all publish mechanism with: <PublishDisabled>true</PublishDisabled>
10+
+ PublishToReleaseFolder with <PublishToLocalNugetFeed>true</PublishToLocalNugetFeed>
11+
+ PublishToLocalNugetFeed with <PublishToLocalNugetFeed>true</PublishToLocalNugetFeed>
12+
+ PublishToOfficialNugetFeed with <PublishToOfficialNugetFeed>true</PublishToOfficialNugetFeed>
13+
114
1.0.1 -pre 2013/08/19
215

316
Changes:

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

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

99
</PropertyGroup>
1010

11-
<ItemGroup>
11+
<ItemGroup Label="MSBNuget">
1212
<additionalFiles Include="$(MSBuildThisFileDirectory)\..\..\MSBNuget\nuget.targets">
13-
<targetFolder>MSBNuget/content/.build</targetFolder>
13+
<targetFolder>MSBNuget/tools</targetFolder>
1414
</additionalFiles>
15+
<!--<additionalFiles Include="$(MSBuildThisFileDirectory)\..\..\MSBNuget\build.targets">
16+
<targetFolder>MSBNuget/build</targetFolder>
17+
</additionalFiles>-->
1518
</ItemGroup>
1619

20+
<ItemGroup Label="MSBNuget.Legacy">
21+
<additionalFiles Include="$(MSBuildThisFileDirectory)\..\..\MSBNuget\nuget.targets">
22+
<targetFolder>MSBNuget.Legacy/content/.build</targetFolder>
23+
</additionalFiles>
24+
</ItemGroup>
25+
1726

1827
</Project>

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0"?>
2+
<package >
3+
<metadata>
4+
<id>MSBuild.MSBBuildConvention</id>
5+
<version>1.0.0</version>
6+
<title>MSBuild project build convention target structure</title>
7+
<authors>Daniel Sack</authors>
8+
<owners>Daniel Sack</owners>
9+
<licenseUrl>https://raw.github.com/DanielTheCoder/MSBuild.MSBNuget/master/LICENSE</licenseUrl>
10+
<projectUrl>https://github.com/DanielTheCoder/MSBuild.MSBNuget</projectUrl>
11+
<iconUrl>https://raw.github.com/DanielTheCoder/MSBuild.MSBNuget/master/media/MSBuild.ico</iconUrl>
12+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
13+
<description>Convention based build pipeline for custom MSBuild projects</description>
14+
<copyright>Copyright 2013</copyright>
15+
<tags>MSBuild Package</tags>
16+
<releaseNotes>https://raw.github.com/DanielTheCoder/MSBuild.MSBNuget/master/changelog.txt</releaseNotes>
17+
</metadata>
18+
19+
</package>

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
2+
3+
<PropertyGroup>
4+
<BuildTargets>$(BuildDependsOn);</BuildTargets>
5+
<CleanTargets/>
6+
<RebuildTargets/>
7+
<PublishTargets/>
8+
</PropertyGroup>
9+
10+
<Target Name="Build">
11+
<CallTarget Targets="$(BuildTargets)" />
12+
</Target>
13+
14+
<Target Name="Clean">
15+
<CallTarget Targets="$(CleanTargets)" />
16+
</Target>
17+
18+
<Target Name="Rebuild">
19+
<CallTarget Targets="$(RebuildTargets)" />
20+
</Target>
21+
22+
<Target Name="Publish">
23+
<CallTarget Targets="$(PublishTargets)"/>
24+
</Target>
25+
26+
</Project>

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0"?>
2+
<package >
3+
<metadata>
4+
<id>MSBuild.MSBNuget.Legacy</id>
5+
<version>1.0.2-pre</version>
6+
<title>Nuget convention based MSBuild Packager (Legacy)</title>
7+
<authors>Daniel Sack</authors>
8+
<owners>Daniel Sack</owners>
9+
<licenseUrl>https://raw.github.com/DanielTheCoder/MSBuild.MSBNuget/master/LICENSE</licenseUrl>
10+
<projectUrl>https://github.com/DanielTheCoder/MSBuild.MSBNuget</projectUrl>
11+
<iconUrl>https://raw.github.com/DanielTheCoder/MSBuild.MSBNuget/master/media/MSBNuget.ico</iconUrl>
12+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
13+
<description>Convention based nuget package creator build as msbuild script</description>
14+
<copyright>Copyright 2013</copyright>
15+
<tags>NuGet MSBuild Package</tags>
16+
<releaseNotes>https://raw.github.com/DanielTheCoder/MSBuild.MSBNuget/master/changelog.txt</releaseNotes>
17+
</metadata>
18+
19+
</package>

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,19 @@
1212
<FileAlignment>512</FileAlignment>
1313
</PropertyGroup>
1414
<ItemGroup>
15-
<Compile Include=".build\build.props" />
15+
<Compile Include=".build\build.props">
16+
<SubType>Designer</SubType>
17+
</Compile>
1618
<Compile Include=".build\build.targets" />
1719
</ItemGroup>
1820
<ItemGroup>
19-
<None Include="MSBNuget.nuspec" />
21+
<Compile Include="MSBNuget\build\MSBuild.MSBNuget.targets" />
22+
<Compile Include="MSBBuildConvention\content\.build\build.targets" />
23+
<None Include="MSBBuildConvention\MSBBuildConvention.nuspec" />
24+
<None Include="MSBNuget\MSBNuget.nuspec" />
25+
<None Include="MSBNuget.Legacy\MSBNuget.Legacy.nuspec" />
2026
</ItemGroup>
27+
<ItemGroup />
2128
<Import Project="$(MSBuildProjectDirectory)\.build\build.props" />
2229
<Import Project="$(MSBuildProjectDirectory)\.build\build.targets" />
2330
</Project>

src/MSBNuget.Nuget/MSBNuget.nuspec renamed to src/MSBNuget.Nuget/MSBNuget/MSBNuget.nuspec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>MSBuild.MSBNuget</id>
5-
<version>1.0.1</version>
5+
<version>1.0.2-pre</version>
66
<title>Nuget convention based MSBuild Packager</title>
77
<authors>Daniel Sack</authors>
88
<owners>Daniel Sack</owners>
@@ -14,6 +14,9 @@
1414
<copyright>Copyright 2013</copyright>
1515
<tags>NuGet MSBuild Package</tags>
1616
<releaseNotes>https://raw.github.com/DanielTheCoder/MSBuild.MSBNuget/master/changelog.txt</releaseNotes>
17+
<dependencies>
18+
<dependency id="MSBuild.MSBBuildConvention" />
19+
</dependencies>
1720
</metadata>
1821

1922
</package>

‎src/MSBNuget.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2525
..\changelog.txt = ..\changelog.txt
2626
..\LICENSE = ..\LICENSE
2727
MSBNuget.sln.DotSettings = MSBNuget.sln.DotSettings
28+
publish.nuget_org.bat = publish.nuget_org.bat
2829
..\README.md = ..\README.md
2930
EndProjectSection
3031
EndProject

‎src/MSBNuget/nuget.targets‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,24 @@
2121
<NugetStage>$(MSBuildProjectDirectory)\obj\nugetstage\</NugetStage>
2222
<NugetIntermediatePath Condition="'$(NugetIntermediatePath)' == ''">$(MSBuildProjectDirectory)\bin\$(Configuration)\</NugetIntermediatePath>
2323

24-
<PublishDisabled Condition="'$(PublishDisabled)' == ''">false</PublishDisabled>
25-
26-
<PublishToReleaseFolder Condition="'$(PublishToReleaseFolder)'==''">true</PublishToReleaseFolder>
27-
<PublishToLocalNugetFeed Condition="'$(PublishToLocalNugetFeed)'==''">true</PublishToLocalNugetFeed>
28-
<PublishToOfficialNugetFeed Condition="'$(PublishToOfficialNugetFeed)' == ''">false</PublishToOfficialNugetFeed>
24+
<NugetPublishDisabled Condition="'$(NugetPublishDisabled)' == ''">false</NugetPublishDisabled>
25+
<NugetPublishToReleaseFolder Condition="'$(NugetPublishToReleaseFolder)'==''">true</NugetPublishToReleaseFolder>
26+
<NugetPublishToLocalNugetFeed Condition="'$(NugetPublishToLocalNugetFeed)'==''">true</NugetPublishToLocalNugetFeed>
27+
<NugetPublishToOfficialNugetFeed Condition="'$(NugetPublishToOfficialNugetFeed)' == ''">false</NugetPublishToOfficialNugetFeed>
2928

3029
<NugkgPublishReleaseFolder Condition="'$(NugkgPublishReleaseFolder)'==''">$(MSBuildProjectDirectory)\bin\$(Configuration)\Release\</NugkgPublishReleaseFolder>
3130
<NugkgPublishLocalNugetFeedFolder Condition="'$(NugkgPublishLocalNugetFeedFolder)'==''">$(MSBuildProjectDirectory)\bin\$(Configuration)\Publish\</NugkgPublishLocalNugetFeedFolder>
3231

3332
<!-- Convention based for Nuget Package Restore -->
3433
<BuildDependsOn/>
3534

36-
<BuildTargets>
37-
$(BuildDependsOn);
35+
<NugetBuildTargets>
3836
NugetCleanupFolderStructure;
3937
NugetCreateFolderStructure;
4038
NugetCopyAdditionalFiles;
4139
NugetCopyNuspec;
4240
NugetCreatePackage;
43-
</BuildTargets>
41+
</NugetBuildTargets>
4442
</PropertyGroup>
4543

4644
<ItemGroup>
@@ -64,22 +62,22 @@
6462

6563
<Target Name="NugetPublish">
6664
<CallTarget Targets="Build"/>
67-
<CallTarget Condition="'$(PublishDisabled)'=='false'" Targets="NugetPublishToFeeds"/>
65+
<CallTarget Condition="'$(NugetPublishDisabled)'=='false'" Targets="NugetPublishToFeeds"/>
6866
</Target>
6967

7068

7169

7270

7371
<Target Name="NugetCreatePackages">
74-
<CallTarget Targets="$(BuildTargets)" />
72+
<CallTarget Targets="$(NugetBuildTargets)" />
7573
</Target>
7674

7775
<Target Name="NugetCreateFolderStructure">
7876
<!-- Ensure nuget Folder structure exists -->
79-
<MakeDir Directories="$(NugetStage)\%(nuspec.Filename)\lib" />
80-
<MakeDir Directories="$(NugetStage)\%(nuspec.Filename)\tools" />
81-
<MakeDir Directories="$(NugetStage)\%(nuspec.Filename)\content" />
82-
<MakeDir Directories="$(NugetStage)\%(nuspec.Filename)\build" />
77+
<MakeDir Directories="$(NugetStage)%(nuspec.Filename)\lib" />
78+
<MakeDir Directories="$(NugetStage)%(nuspec.Filename)\tools" />
79+
<MakeDir Directories="$(NugetStage)%(nuspec.Filename)\content" />
80+
<MakeDir Directories="$(NugetStage)%(nuspec.Filename)\build" />
8381
</Target>
8482

8583
<Target Name="NugetCopyAdditionalFiles">
@@ -100,7 +98,7 @@
10098

10199
<!-- additional includes -->
102100
<Copy SourceFiles="@(additionalFiles)"
103-
DestinationFolder="$(NugetStage)\%(additionalFiles.targetFolder)\%(additionalFiles.RecursiveDir)"
101+
DestinationFolder="$(NugetStage)%(additionalFiles.targetFolder)\%(additionalFiles.RecursiveDir)"
104102
OverwriteReadOnlyFiles="true" ContinueOnError="true"/>
105103
</Target>
106104

@@ -128,13 +126,13 @@
128126

129127
<Target Name="NugetCopyNuspec">
130128
<Copy SourceFiles="@(nuspec)"
131-
DestinationFolder="$(NugetStage)\%(nuspec.Filename)"
129+
DestinationFolder="$(NugetStage)%(nuspec.Filename)"
132130
OverwriteReadOnlyFiles="true" ContinueOnError="true"/>
133131
</Target>
134132

135133
<Target Name="NugetCreatePackage" >
136134
<ItemGroup>
137-
<nuspecStaged Include="$(NugetStage)\%(nuspec.Filename)\*.nuspec"/>
135+
<nuspecStaged Include="$(NugetStage)%(nuspec.Filename)\*.nuspec"/>
138136
</ItemGroup>
139137

140138
<MakeDir Directories="$(NugetIntermediatePath)" />
@@ -146,9 +144,9 @@
146144
</Target>
147145

148146
<Target Name="NugetPublishToFeeds">
149-
<CallTarget Condition="'$(PublishToReleaseFolder)' == 'true'" Targets="NugetPublishToReleaseFolder" />
150-
<CallTarget Condition="'$(PublishToLocalNugetFeed)' == 'true'" Targets="NugetPublishToLocalFeed" />
151-
<CallTarget Condition="'$(PublishToOfficialNugetFeed)' == 'true'" Targets="NugetPublishToOfficialNugetFeed" />
147+
<CallTarget Condition="'$(NugetPublishToReleaseFolder)' == 'true'" Targets="NugetPublishToReleaseFolder" />
148+
<CallTarget Condition="'$(NugetPublishToLocalNugetFeed)' == 'true'" Targets="NugetPublishToLocalFeed" />
149+
<CallTarget Condition="'$(NugetPublishToOfficialNugetFeed)' == 'true'" Targets="NugetPublishToOfficialNugetFeed" />
152150
</Target>
153151

154152
<Target Name="NugetPublishToReleaseFolder">

‎src/Tests/MSBNuget.Test/.build/build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
22

33
<PropertyGroup>
4-
<PublishDisabled>true</PublishDisabled>
4+
<NugetPublishDisabled>true</NugetPublishDisabled>
55
</PropertyGroup>
66

77
<ItemGroup>

0 commit comments

Comments
 (0)