Skip to content

Commit d9d83fb

Browse files
pvanderveldepvandervelde
committed
Merge branch 'release/0.10.0'
2 parents b65bb9d + 5626fd2 commit d9d83fb

82 files changed

Lines changed: 8072 additions & 762 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ for a project.
3030
[docs-intro]: http://nbuildkit.github.io/nBuildKit.MsBuild/
3131
[docs-usage]: http://nbuildkit.github.io/nBuildKit.MsBuild/usage
3232
[github-release-badge]: https://img.shields.io/github/release/nbuildkit/nbuildkit.msbuild.svg
33-
[github-release]: https://github.com/GitTools/GitVersion/releases/latest
33+
[github-release]: https://github.com/nbuildkit/nBuildKit.MsBuild/releases/latest
3434
[gitter-badge]: https://badges.gitter.im/Join+Chat.svg
3535
[gitter]: https://gitter.im/nbuildkit/nbuildkit.msbuild
3636
[nuget-actions-badge]: https://img.shields.io/nuget/v/nBuildKit.MsBuild.Actions.svg

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ max_jobs: 1
4040
#---------------------------------#
4141

4242
# Build worker image (VM template)
43-
image: Visual Studio 2015
43+
image: Visual Studio 2017
4444

4545
# scripts that are called at very beginning, before repo cloning
4646
init:

‎build.settings.props‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,15 @@
6363
<!--
6464
<HttpFilesToCopy Include="">
6565
<Destination></Destination>
66+
<GpgKey></GpgKey>
67+
<Hash></Hash>
68+
<HashAlgorithm></HashAlgorithm>
69+
<HashFile></HashFile>
70+
<Name></Name>
71+
<Password></Password>
72+
<SignatureFile></SignatureFile>
73+
<UseDefaultCredentials></UseDefaultCredentials>
74+
<UserName></UserName>
6675
<Unzip></Unzip>
6776
</HttpFilesToCopy>
6877
-->
@@ -78,6 +87,11 @@
7887
<!--
7988
<ArchiveFilesToCopy Include="">
8089
<Destination></Destination>
90+
<GpgKey></GpgKey>
91+
<Hash></Hash>
92+
<HashAlgorithm></HashAlgorithm>
93+
<HashFile></HashFile>
94+
<SignatureFile></SignatureFile>
8195
</ArchiveFilesToCopy>
8296
-->
8397
</ItemGroup>

‎deploy.settings.props‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@
1818
<!--
1919
<HttpFilesToCopy Include="">
2020
<Destination></Destination>
21+
<GpgKey></GpgKey>
22+
<Hash></Hash>
23+
<HashAlgorithm></HashAlgorithm>
24+
<HashFile></HashFile>
25+
<Name></Name>
26+
<Password></Password>
27+
<SignatureFile></SignatureFile>
28+
<UseDefaultCredentials></UseDefaultCredentials>
29+
<UserName></UserName>
2130
<Unzip></Unzip>
2231
</HttpFilesToCopy>
2332
-->
@@ -33,6 +42,11 @@
3342
<!--
3443
<ArchiveFilesToCopy Include="">
3544
<Destination></Destination>
45+
<GpgKey></GpgKey>
46+
<Hash></Hash>
47+
<HashAlgorithm></HashAlgorithm>
48+
<HashFile></HashFile>
49+
<SignatureFile></SignatureFile>
3650
</ArchiveFilesToCopy>
3751
-->
3852
</ItemGroup>

‎entrypoint.msbuild‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@
222222
<MSBuild
223223
BuildInParallel="False"
224224
Projects="$(DirNBuildKitMsBuildActions)\shared.bootstrap.build.tasks.msbuild"
225-
Properties="DirWorkspace=$(DirWorkspace);$(Locations);$(Files);$(BootstrapSettings);$(BootstrapIncludes)"
225+
Properties="DirWorkspace=$(DirWorkspace);$(Locations);$(Files);$(BootstrapSettings);$(BootstrapIncludes);DirUserConfiguration=$(DirUserSettings)"
226226
RebaseOutputs="False"
227227
RemoveProperties=""
228228
RunEachTargetSeparately="True"
@@ -238,7 +238,7 @@
238238
<MSBuild
239239
BuildInParallel="False"
240240
Projects="$(DirNBuildKitMsBuildActions)\shared.bootstrap.generate.targetsfile.msbuild"
241-
Properties="DirWorkspace=$(DirWorkspace);$(Locations);$(Files);$(BootstrapSettings);$(BootstrapIncludes)"
241+
Properties="DirWorkspace=$(DirWorkspace);$(Locations);$(Files);$(BootstrapSettings);$(BootstrapIncludes);DirUserConfiguration=$(DirUserSettings)"
242242
RebaseOutputs="False"
243243
RemoveProperties=""
244244
RunEachTargetSeparately="True"

‎settings.props‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -320,15 +320,9 @@
320320
<!--<DirBuildTemp>$(DirBuild)\temp</DirBuildTemp>-->
321321

322322
<!-- The directory that will contain all the test files generated during the test process -->
323-
<!-- <DirBuildTest>$(DirBuild)\tests</DirBuildTest> -->
323+
<!-- <DirBuildTests>$(DirBuild)\tests</DirBuildTests> -->
324324

325-
<DirBuildTestLatest>$(DirBuildTest)\latest</DirBuildTestLatest>
326-
<DirBuildTestLatestCSharp>$(DirBuildTestLatest)\csharp</DirBuildTestLatestCSharp>
327-
<DirBuildTestLatestVbNet>$(DirBuildTestLatest)\vbnet</DirBuildTestLatestVbNet>
328-
329-
<DirBuildTestOldest>$(DirBuildTest)\oldest</DirBuildTestOldest>
330-
<DirBuildTestOldestCSharp>$(DirBuildTestOldest)\csharp</DirBuildTestOldestCSharp>
331-
<DirBuildTestOldestVbNet>$(DirBuildTestOldest)\vbnet</DirBuildTestOldestVbNet>
325+
<DirBuildTestIntegration>$(DirBuildTests)\integration</DirBuildTestIntegration>
332326

333327
<!-- The directory that contains all the NuGet packages for the project -->
334328
<!-- <DirPackages>$(DirWorkspace)\packages</DirPackages> -->
@@ -365,6 +359,16 @@
365359
<IsGitFlow>true</IsGitFlow>
366360
</PropertyGroup>
367361

362+
<!--
363+
Security
364+
-->
365+
<PropertyGroup>
366+
<!--
367+
The GPG key server that will be used to pull GPG keys from.
368+
-->
369+
<!-- <GpgKeyServer>pgp.mit.edu</GpgKeyServer> -->
370+
</PropertyGroup>
371+
368372

369373
<!--
370374
**** PREPARE - NUGET RESTORE ****

‎src/nbuildkit/actions/build/build.shared.postuser.props‎

Lines changed: 45 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,12 @@
8383
<!--
8484
<HttpFilesToCopy Include="">
8585
<Destination></Destination>
86+
<GpgKey></GpgKey>
87+
<Hash></Hash>
88+
<HashAlgorithm></HashAlgorithm>
89+
<HashFile></HashFile>
8690
<Password></Password>
91+
<SignatureFile></SignatureFile>
8792
<UseDefaultCredentials></UseDefaultCredentials>
8893
<UserName></UserName>
8994
<Unzip></Unzip>
@@ -101,11 +106,41 @@
101106
<!--
102107
<ArchiveFilesToCopy Include="">
103108
<Destination></Destination>
109+
<GpgKey></GpgKey>
110+
<Hash></Hash>
111+
<HashAlgorithm></HashAlgorithm>
112+
<HashFile></HashFile>
113+
<SignatureFile></SignatureFile>
104114
</ArchiveFilesToCopy>
105115
-->
106116
</ItemGroup>
107117

108118

119+
<!--
120+
**** PREPARE - CALCULATE HASHES ****
121+
-->
122+
<!--
123+
The collection of files for which the hashes need to be calculated. The available hash algorithms
124+
are:
125+
126+
- MD5
127+
- SHA1
128+
- SHA256
129+
- SHA384
130+
- SHA512
131+
132+
Hash values are stored in a file in the temp directory and can be retrieved with the
133+
'ReadHashFromFile' task
134+
-->
135+
<ItemGroup Condition=" '$(ShouldLoadFilesToHash)' == 'true' AND '@(FilesToHash)' == '' ">
136+
<!-->
137+
<FilesToHash Include="">
138+
<Algorithm></Algorithm>
139+
</FilesToHash>
140+
-->
141+
</ItemGroup>
142+
143+
109144
<!--
110145
**** PREPARE - UPDATE ASSEMBLY INFO FILES ****
111146
-->
@@ -346,19 +381,22 @@
346381

347382
<ItemGroup Condition=" '$(ShouldLoadBuildStepsToExecute)' == 'true' AND '@(BuildStepsToExecute)' == '' ">
348383
<BuildStepsToExecute Include="$(BuildStepsShowHelp)">
384+
<ExecuteAfter></ExecuteAfter>
385+
<ExecuteBefore></ExecuteBefore>
386+
<Groups>
387+
Help;
388+
</Groups>
389+
<Id>build.help</Id>
390+
<PostSteps>
391+
</PostSteps>
392+
<PreSteps>
393+
</PreSteps>
349394
<Properties>
350395
HelpFilePathSharedSettings=$(DirNBuildKitMsBuildActions)\shared.importbuildsharedsettings.props;
351396
HelpFileSettings=build.settings.props;
352397
HelpProcess=build;
353398
HelpStepGroup=BuildStepsToExecute;
354399
</Properties>
355-
<Groups>
356-
Help;
357-
</Groups>
358-
<PreSteps>
359-
</PreSteps>
360-
<PostSteps>
361-
</PostSteps>
362400
</BuildStepsToExecute>
363401
</ItemGroup>
364402

‎src/nbuildkit/actions/build/shared.buildsteps.msbuild‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<BuildStepsPrepareCopyHttp>$(MSBuildThisFileDirectory)..\shared.prepare.copy.http.msbuild</BuildStepsPrepareCopyHttp>
3030
<BuildStepsPrepareCopyFiles>$(MSBuildThisFileDirectory)..\shared.prepare.copy.file.msbuild</BuildStepsPrepareCopyFiles>
3131
<BuildStepsPrepareCopyArchive>$(MSBuildThisFileDirectory)..\shared.prepare.copy.archive.msbuild</BuildStepsPrepareCopyArchive>
32+
<BuildStepsPrepareFileHashes>$(MSBuildThisFileDirectory)..\shared.prepare.getfilehashes.msbuild</BuildStepsPrepareFileHashes>
3233

3334
<BuildStepsPrepareAssemblyInfo>$(MSBuildThisFileDirectory)build.prepare.updateassemblyinfo.msbuild</BuildStepsPrepareAssemblyInfo>
3435
<BuildStepsPrepareGenerateLicenses>$(MSBuildThisFileDirectory)build.prepare.generatelicenses.msbuild</BuildStepsPrepareGenerateLicenses>
@@ -173,6 +174,14 @@
173174
<Name>Build - copy archive</Name>
174175
<Path>$(BuildStepsPrepareCopyArchive)</Path>
175176
</AvailableStepMetadata>
177+
<AvailableStepMetadata Include="$([System.IO.Path]::GetFileName('$(BuildStepsPrepareFileHashes)'))">
178+
<Description>
179+
Calculate the hash of one or more files.
180+
</Description>
181+
<Id>BuildStepsPrepareFileHashes</Id>
182+
<Name>Build - Calculate file hashes</Name>
183+
<Path>$(BuildStepsPrepareFileHashes)</Path>
184+
</AvailableStepMetadata>
176185
<AvailableStepMetadata Include="$([System.IO.Path]::GetFileName('$(BuildStepsPrepareAssemblyInfo)'))">
177186
<Description>
178187
Updates all existing AssemblyInfo.cs and AssemblyInfo.vb files with the version numbers, company information, copyright information and optionally build time and build information.

‎src/nbuildkit/actions/deploy/deploy.pushto.gitbranch.msbuild‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -113,18 +113,20 @@
113113
Importance="low"
114114
Text="Cloning repository from: $(RepositoryToPushTo)" />
115115

116-
<CreateProperty Value="$(RepositoryToPushTo.Substring($(RepositoryToPushTo.LastIndexOf('/'))).TrimStart('/'))">
117-
<Output
118-
PropertyName="RepositoryName"
119-
TaskParameter="Value" />
120-
</CreateProperty>
121-
<CreateProperty Value="$(DirBuildTemp)\git\$(RepositoryName)">
116+
<CreateProperty Value="$(DirBuildTemp)\$([System.Guid]::NewGuid().ToString('N'))">
122117
<Output
123118
PropertyName="DirRepositoryWorkspace"
124119
TaskParameter="Value" />
125120
</CreateProperty>
121+
122+
<!-- Delete the workspace directory before trying to use it so that we know it's empty -->
123+
<Delete
124+
Condition="Exists('$(DirRepositoryWorkspace)')"
125+
Files="$(DirRepositoryWorkspace)\**\*" />
126+
<RemoveDir
127+
Condition="Exists('$(DirRepositoryWorkspace)')"
128+
Directories="$(DirRepositoryWorkspace)" />
126129
<MakeDir
127-
Condition="!Exists('$(DirRepositoryWorkspace)') "
128130
Directories="$(DirRepositoryWorkspace)" />
129131

130132
<!-- Clone the repository in the temporary directory -->
@@ -137,7 +139,7 @@
137139
Repository="$(RepositoryToPushTo)"
138140
Workspace="$(DirRepositoryWorkspace)" />
139141

140-
<!-- Verify that we're on the branch!' -->
142+
<!-- Verify that we're on the branch! -->
141143
<GitCurrentBranch
142144
ErrorInformation="@(ErrorInformation)"
143145
GitExecutablePath="$(ToolsExternalGitPath)"
@@ -183,8 +185,14 @@
183185
<PropertyGroup>
184186
<DirBuildTempCopy>$(DirBuildTemp)\copy</DirBuildTempCopy>
185187
</PropertyGroup>
188+
189+
<!-- Make sure the directory is empty -->
190+
<Delete
191+
Files="$(DirBuildTempCopy)\**\*" />
192+
<RemoveDir
193+
Condition="Exists('$(DirBuildTempCopy)')"
194+
Directories="$(DirBuildTempCopy)" />
186195
<MakeDir
187-
Condition="!Exists('$(DirBuildTempCopy)') "
188196
Directories="$(DirBuildTempCopy)" />
189197

190198
<Copy

‎src/nbuildkit/actions/deploy/deploy.pushto.gitrepository.msbuild‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,13 @@
9393
<PropertyGroup>
9494
<DirBuildTempCopy>$(DirBuildTemp)\copy</DirBuildTempCopy>
9595
</PropertyGroup>
96+
<!-- Make sure the directory is empty -->
97+
<Delete
98+
Files="$(DirBuildTempCopy)\**\*" />
99+
<RemoveDir
100+
Condition="Exists('$(DirBuildTempCopy)')"
101+
Directories="$(DirBuildTempCopy)" />
96102
<MakeDir
97-
Condition="!Exists('$(DirBuildTempCopy)') "
98103
Directories="$(DirBuildTempCopy)" />
99104

100105
<Copy

0 commit comments

Comments
 (0)