Skip to content
This repository was archived by the owner on Jul 2, 2023. It is now read-only.

Commit e6fa2c6

Browse files
pvanderveldepvandervelde
committed
Updating to the latest version of nBuildKit
1 parent 3e1f207 commit e6fa2c6

4 files changed

+79
-4
lines changed

‎build.settings.props

+42-2
Original file line numberDiff line numberDiff line change
@@ -351,11 +351,13 @@
351351
<!--
352352
<BuildFilesToGenerate Include="$(DirBuildTemp)\MyFile.txt">
353353
<Template>$(DirTemplates)\MyTemplatefile.txt</Template>
354+
<Encoding>UTF-8</Encoding>
354355
</BuildFilesToGenerate>
355356
<BuildFilesToGenerate Include="$(DirBuildTemp)\MyOtherFile.txt">
356357
<Template>$(DirTemplates)\MyOtherTemplatefile.txt</Template>
357358
<Token>MyAdditionalTemplateParameter</Token>
358359
<ReplacementValue>MyAdditionalTemplateValue</ReplacementValue>
360+
<Encoding>UTF-8</Encoding>
359361
</BuildFilesToGenerate>
360362
-->
361363
</ItemGroup>
@@ -464,6 +466,37 @@
464466
-->
465467
<ShouldGenerateAssemblyBuildInfo>true</ShouldGenerateAssemblyBuildInfo>
466468
</PropertyGroup>
469+
<!--
470+
The ItemGroup defining the information for the generation of the InternalsVisibleAttribute.
471+
Three different ways of referencing the test projects public key are available. Test assemblies
472+
can be referenced by:
473+
- Providing the snk key that was / is used to sign the test assembly. This is mainly of use
474+
for test assemblies which are compiled at the same time as the target assemblies, i.e. test
475+
assemblies that are part of the same Visual Studio solution.
476+
- Providing the signed test assembly. This is mainly of use for test assemblies that have been
477+
compiled prior to compiling the target assemblies, e.g. third party test assemblies.
478+
- Providing the full public key for the assembly. This is mainly of use for assemblies that
479+
do not exists on disk, e.g. assemblies that are dynamically generated.
480+
Multiple projects can be referenced in the 'projects' section by separating them with a semi-colon (;). Whitespace
481+
can be added if required but it has no influence on the project list.
482+
If the assemblies are not signed it is possible to leave out the signing information, e.g. the 'KeyFile'
483+
property, the 'AssemblyFromPackage' property and the 'PublicKey' property.
484+
-->
485+
<PropertyGroup>
486+
<!--
487+
Defines the compiler constants for which the InternalsVisibleTo attributes should
488+
be generated.
489+
Separate multiple compiler constants with semi-colons.
490+
-->
491+
<!-- <InternalsVisibletoCompilerConstants>$(TestConfiguration.ToUpper())</InternalsVisibletoCompilerConstants> -->
492+
</PropertyGroup>
493+
<ItemGroup>
494+
<InternalsVisibleTo Include="Test.Unit.Storage">
495+
<Projects>
496+
Metamorphic.Storage;
497+
</Projects>
498+
</InternalsVisibleTo>
499+
</ItemGroup>
467500

468501
<!-- Build configuration -->
469502
<PropertyGroup>
@@ -514,7 +547,7 @@
514547
The ItemGroup items that define which files contain the unit test cases. Paths can include build templates,
515548
e.g. $(DirBuildBinPlatformConfig)\${VersionMajor}.0\**\test*.dll
516549
-->
517-
<!-- <UnitTestAssemblies Include="$(DirSrc)\**\bin\**\$(UnitTestAssemblyNamePrefix)*.dll" /> -->
550+
<!-- <UnitTestAssemblies Include="$(DirSrc)\**\bin\$(Configuration)\**\$(UnitTestAssemblyNamePrefix)*.dll" /> -->
518551
</ItemGroup>
519552
<ItemGroup>
520553
<!--
@@ -767,7 +800,14 @@
767800
<!--
768801
The full path to the sn.exe command line executable.
769802
-->
770-
<!-- <ToolsExternalSnPath Condition=" '$(ToolsExternalSnPath)' == '' ">UNDEFINED</ToolsExternalSnPath>-->
803+
<!--
804+
<ToolsExternalSnPath Condition=" '$(ToolsExternalSnPath)' == '' AND Exists('C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\x64\sn.exe')">C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\x64\sn.exe</ToolsExternalSnPath>
805+
<ToolsExternalSnPath Condition=" '$(ToolsExternalSnPath)' == '' AND Exists('C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\x64\sn.exe')">C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\x64\sn.exe</ToolsExternalSnPath>
806+
<ToolsExternalSnPath Condition=" '$(ToolsExternalSnPath)' == '' AND Exists('C:\Program Files (x86)\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools\x64\sn.exe')">C:\Program Files (x86)\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools\x64\sn.exe</ToolsExternalSnPath>
807+
<ToolsExternalSnPath Condition=" '$(ToolsExternalSnPath)' == '' AND Exists('C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0A\bin\NETFX 4.0 Tools\x64\sn.exe')">C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0A\bin\NETFX 4.0 Tools\x64\sn.exe</ToolsExternalSnPath>
808+
<ToolsExternalSnPath Condition=" '$(ToolsExternalSnPath)' == '' AND Exists('C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\x64\sn.exe')">C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\x64\sn.exe</ToolsExternalSnPath>
809+
<ToolsExternalSnPath Condition=" '$(ToolsExternalSnPath)' == '' ">UNDEFINED</ToolsExternalSnPath>
810+
-->
771811

772812
<!--
773813
The full path to the SourceMonitor command line executable. If not defined the packages directory is searched.

‎deploy.settings.props

+29
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,18 @@
9797
Push;
9898
</Groups>
9999
</DeployStepsToExecute>
100+
<!--
101+
<DeployStepsToExecute Include="$(DeployStepsPushToGitBranch)">
102+
<Properties>
103+
Configuration=$(ProductionConfiguration);
104+
Platform=$(Platform);
105+
</Properties>
106+
<Groups>
107+
Git;
108+
Push;
109+
</Groups>
110+
</DeployStepsToExecute>
111+
-->
100112
</ItemGroup>
101113

102114
<!--
@@ -216,6 +228,23 @@
216228
</ItemGroup>
217229

218230

231+
<!--
232+
**** PUSHTO - GIT BRANCH ****
233+
-->
234+
<!--
235+
The ItemGroup defining the files that should be pushed to a GIT branch. All properties
236+
allow the use of build templates, e.g. $(DirBuildDeploy)\myarchive-${VersionSemantic}.zip
237+
-->
238+
<ItemGroup>
239+
<!--
240+
<PushToGitBranchSpecs Include="$(DirBuildDeploy)\myarchive-${VersionSemantic}.zip">
241+
<Repository>$(GitRemoteRepository)</Repository>
242+
<Branch>master</Branch>
243+
<ExtractZipFiles>true</ExtractZipFiles>
244+
<CommitMessage>New changes</CommitMessage>
245+
</PushToGitBranchSpecs>
246+
-->
247+
</ItemGroup>
219248

220249

221250

‎settings.props

+6-2
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,10 @@
473473
ISSUE_LABELS - The labels / type for the issue.
474474
-->
475475
<!-- <ScriptWriteReleaseNotes Condition=" '$(ScriptWriteReleaseNotes)' == '' ">UNDEFINED</ScriptWriteReleaseNotes> -->
476+
<!--
477+
A flag that indicates whether or not the build should fail if there is a failure to gather the release notes.
478+
-->
479+
<!-- <ContinueBuildIfReleaseNoteGatheringFails Condition=" '$(ContinueBuildIfReleaseNoteGatheringFails)' == '' ">true</ContinueBuildIfReleaseNoteGatheringFails> -->
476480
</PropertyGroup>
477481

478482

@@ -633,7 +637,7 @@
633637
NuGet if no package is specified in the packages.config file.
634638
-->
635639
<PropertyGroup>
636-
<NBuildKitMinimumVersion>0.8.0</NBuildKitMinimumVersion>
637-
<NBuildKitMaximumVersion>1.0.0</NBuildKitMaximumVersion>
640+
<NBuildKitMinimumVersion Condition=" '$(NBuildKitMinimumVersion)' == '' ">0.8.0</NBuildKitMinimumVersion>
641+
<NBuildKitMaximumVersion Condition=" '$(NBuildKitMaximumVersion)' == '' ">1.0.0</NBuildKitMaximumVersion>
638642
</PropertyGroup>
639643
</Project>

‎test.settings.props

+2
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,13 @@
156156
<ItemGroup>
157157
<!--<TestFilesToGenerate Include="$(DirBuildTemp)\MyFile.txt">
158158
<Template>$(DirTemplates)\MyTemplatefile.txt</Template>
159+
<Encoding>UTF-8</Encoding>
159160
</TestFilesToGenerate>
160161
<TestFilesToGenerate Include="$(DirBuildTemp)\MyOtherFile.txt">
161162
<Template>$(DirTemplates)\MyOtherTemplatefile.txt</Template>
162163
<Token>MyAdditionalTemplateParameter</Token>
163164
<ReplacementValue>MyAdditionalTemplateValue</ReplacementValue>
165+
<Encoding>UTF-8</Encoding>
164166
</TestFilesToGenerate>-->
165167
</ItemGroup>
166168

0 commit comments

Comments
 (0)