diff --git a/.gitignore b/.gitignore index 07b5e37..0ddcf11 100644 --- a/.gitignore +++ b/.gitignore @@ -166,3 +166,4 @@ AssemblyInfo.Company.cs src/.vs/config/applicationhost.config doc/_site/ _site/ +src/.vs/ diff --git a/artefacts.settings.props b/artefacts.settings.props new file mode 100644 index 0000000..1d51fc4 --- /dev/null +++ b/artefacts.settings.props @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + 1.1 + + diff --git a/build.settings.props b/build.settings.props index 1085183..085f56e 100644 --- a/build.settings.props +++ b/build.settings.props @@ -1,341 +1,97 @@ - + - + - Release + Release - Deploy + Release - + - - - - - - Prepare; - - - - - - - Prepare; - - - - - - - Prepare; - - - - - - - Prepare; - - - - - - - Prepare; - - - - - - - Prepare; - - - + + - - - - - Prepare; - - - - + + + - - - - - Compile; - - - - - + + - - - Configuration=$(TestConfiguration); - Platform=$(Platform) - - - Analyze; - - - + + - - - - Configuration=$(ProductionConfiguration); - Platform=$(Platform) - - - Package; - - - - - Configuration=$(ProductionConfiguration); - Platform=$(Platform) - - - Package; - - - - - + - - - - + @@ -347,62 +103,30 @@ The list of all files that should be generated and their template files. The template file may contain zero or more template parameters as indicated at the top of this - file. Template parameters must be enclosed in '${}'. + file. By default template parameters must be enclosed in '${}'. By providing a value for + 'Expression' it is possible to use a custom regular expression to search for elements to replace, + e.g. $TOKEN$. Note that elements in the regular expession might need to be converted in a suitable + format because XML doesn't like < and > and MsBuild doesn't like $ (%24), * (%2A), ? (%3F). + + Only the 'Template' value is required. Additional parameters can be provided through the 'TemplateTokens' ItemGroup below. --> - + - - - - - - - - - - - - - - - - - - - - @@ -410,7 +134,7 @@ The item group defining the location of the Vistual Studio solutions that should be build. The solution path allows build templates, e.g. '$(DirSrc)\${CompanyName}\${ProductName}\MySolution.sln' --> - + $(TestConfiguration) @@ -471,6 +195,59 @@ true + + + + + + + + + - + - + - + - + - + + + + - + - + - + - + - - - - - + @@ -570,44 +356,37 @@ - - + - - - - $(DirSrc)\default.ruleset - + - - + - - + - true + - + + - + - + - - - - - - @@ -656,136 +423,713 @@ Patch - The version range of the dependency is from the current version up to, but not including, the next patch version, e.g [1.2.3, 1.2.4) --> - + - - - - true - - - - - - - + + + + + + + + + + + + + + + - + + + + + + + + + + + clean; + prepare; + prepare.clean; + + BuildStepsPrepareWorkspace + + + + + + + + + + + + + + + prepare; + prepare.restore; + prepare.restore.nuget; + + BuildStepsPrepareRestoreNuGet + + + + + + + - - - + + + + + prepare; + prepare.buildserver; + prepare.buildserver.vcssetbranch; + prepare.vcs; + prepare.vcs.vcssetbranch; + + BuildStepsPrepareVcsBranch + + + + + + + + + + + + prepare; + prepare.get; + prepare.get.vcsinfo; + + BuildStepsPrepareVcsInfo + + + + + + + + + + + + prepare; + prepare.get; + prepare.get.issueids; + + BuildStepsPrepareGetIssueIds + + + + + + + - + + + + + prepare; + prepare.buildserver; + prepare.buildserver.merge; + prepare.vcs; + prepare.vcs.merge; + + BuildStepsPrepareVcsMerge + + + + + + + - + + + + + prepare; + prepare.get; + prepare.get.version; + + BuildStepsPrepareGetVersion + + + + + + + + + + + + prepare; + prepare.buildserver; + prepare.buildserver.tag; + prepare.vcs; + prepare.vcs.tag; + + BuildStepsPrepareTagVcs + + + + + + + + + + + + + prepare; + prepare.get; + prepare.get.releasenotes; + + BuildStepsPrepareReleaseNotes + + + + + + + - + + + + + prepare; + prepare.copy; + prepare.copy.nuget; + + BuildStepsPrepareCopyNuGet + + + + + + + + + + + + prepare; + prepare.copy; + prepare.copy.url; + + BuildStepsPrepareCopyHttp + + + + + + + + + + + + prepare; + prepare.copy; + prepare.copy.files; + + BuildStepsPrepareCopyFiles + + + + + + + + + + + + prepare; + prepare.copy; + prepare.copy.archive; + + BuildStepsPrepareCopyArchive + + + + + + + + + + + + + prepare; + prepare.generate; + prepare.generate.assemblyinfo; + + build.help + + + + + + + - + + + + + prepare; + prepare.generate; + prepare.generate.files; + + BuildStepsPrepareGenerateFiles + + + + + + + + + + + + build; + build.visualstudio; + + BuildStepsBuildVisualStudioSolution + + + + + + + + + + + + + test; + test.unittest; + test.unittest.nunit; + + BuildStepsUnitTestNUnit + + + + + + Configuration=$(TestConfiguration); + Platform=$(Platform) + + - - - - - + + + + + package; + package.nuget; + + BuildStepsPackNuGet + + + + + + Configuration=$(ProductionConfiguration); + Platform=$(Platform) + + + + + + + package; + package.zip; + + BuildStepsPackZip + + + + + + Configuration=$(ProductionConfiguration); + Platform=$(Platform) + + + + + + - + + + - + + + + + + + + + + @@ -803,5 +1147,8 @@ true + + + 1.1 diff --git a/deploy.settings.props b/deploy.settings.props index b4ecc05..7791327 100644 --- a/deploy.settings.props +++ b/deploy.settings.props @@ -2,6 +2,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Nuclei + ${ReleaseNotes} + + + + + + + + + + + $(GitRemoteRepository) + gh-pages + true + Documentation update for version ${VersionSemantic} + + + + + + - + + + + + + + + prepare; + prepare.restore; + prepare.restore.nuget; + + DeployStepsRestoreNuGet + + + + + + + + + + + + + prepare; + prepare.buildserver; + prepare.buildserver.vcssetbranch; + + DeployStepsPrepareVcsBranch + + + + + + + + - Prepare; + prepare; + prepare.get; + prepare.get.vcsinfo; + DeployStepsPrepareVcsInfo + + + + + + + + + + prepare; + prepare.get; + prepare.get.issueids; + + DeployStepsPrepareGetIssueIds + + + + + + + + + + - Prepare; + prepare; + prepare.get; + prepare.get.version; + DeployStepsPrepareGetVersion + + + + + + - - + + + + + prepare; + prepare.copy; + prepare.copy.files; + + DeployStepsPrepareCopyFiles + + + + + + + + + + + + prepare; + prepare.copy; + prepare.copy.archive; + + DeployStepsPrepareCopyArchive + + + + + + + + + + + + + deploy; + deploy.vcs.tags; + + DeployStepsPushToTags + + + + Configuration=$(ProductionConfiguration); Platform=$(Platform); - - NuGet; - Push; + + + + + + deploy; + deploy.package.nuget; + DeployStepsPushToNuget + + + + + + Configuration=$(ProductionConfiguration); + Platform=$(Platform); + - - + DeployStepsPushToHttp + + + + Configuration=$(ProductionConfiguration); Platform=$(Platform); + + + + - Push; - SymbolServer; + deploy; + deploy.package.symbols; + DeployStepsPushToSymbolServer + + + + + + Configuration=$(ProductionConfiguration); + Platform=$(Platform); + - - + DeployStepsPushToGitBranch + + + + Configuration=$(ProductionConfiguration); Platform=$(Platform); + + + + - Git; - Push; + deploy; + deploy.vcs.git.repository; + DeployStepsPushToGitRepository + + + + + + Configuration=$(ProductionConfiguration); + Platform=$(Platform); + @@ -122,18 +489,9 @@ for that step, e.g. adding a deploy step that points to the 'c:\stuff\MyCoolScript.msbuild' will execute that script. - Each script has the following properties passed to it: - $(SharedPropertyFile) - The full path to the settings.props file (i.e. this file). - $(ShouldDisplayDebugLog) - A flag indicating whether or not to display debug log information, usually at the start of the script execution. - $(NBuildKitVersion) - The full version of the nBuildKit library that is executing the build. - $(DirNBuildKitMsBuild) - The full path to the directory that contains the nBuildKit scripts. - $(DirNBuildKitMsBuildShared) - The full path to the directory that contains the shared nBuildkit scripts. - $(DirNBuildKitMsBuildExtensions) - The full path to the directory that contains the nBuildKit extension scripts. - $(DirNBuildKitMsBuildTemplates) - The full path to the directory that contains the nBuildKit templates. - - Additionally any properties defined by the 'Properties' section are also pushed up. + Any properties defined by the 'Properties' section are pushed up. --> - + - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - Nuclei - ${ReleaseNotes} - - - - - - - - - - - $(GitRemoteRepository) - gh-pages - true - Documentation update for version ${VersionSemantic} - @@ -259,10 +532,6 @@ - - @@ -281,5 +550,8 @@ true + + + 1.1 diff --git a/doc/Nuclei.Build.Documentation/Nuclei.Build.Documentation.csproj b/doc/Nuclei.Build.Documentation/Nuclei.Build.Documentation.csproj index 4e9f5e5..0038078 100644 --- a/doc/Nuclei.Build.Documentation/Nuclei.Build.Documentation.csproj +++ b/doc/Nuclei.Build.Documentation/Nuclei.Build.Documentation.csproj @@ -1,5 +1,10 @@  + + + + + Debug @@ -13,7 +18,7 @@ Properties Nuclei.Build.Documentation Nuclei.Build.Documentation - v4.5.2 + v4.6.2 true @@ -22,18 +27,12 @@ + + ..\..\build\logs\docfx.txt - - pdbonly - true - bin\ - TRACE - prompt - 4 - @@ -69,6 +68,16 @@ Nuclei.Build + + + + + + + + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -98,9 +107,14 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + + + + + + - + @@ -79,10 +81,18 @@ NBUILDKIT_MACHINE_ENVIRONMENT_FILE, if it exists * Workspace - Load the environment information from the file in the workspace, if it exists --> - - - - + + + + - + @@ -188,7 +200,9 @@ script and passing the path to the 'settings.props' file and the version of nBuildKit that is going to be used to execute the tests. --> - + @@ -202,7 +216,9 @@ script and passing the path to the 'settings.props' file and the version of nBuildKit that is going to be used to execute the deploy. --> - + @@ -211,68 +227,139 @@ - - - - + + + + - + - + - - + + - + - - + + - - + + - - + + - - + + - + - - + + - - + + - - - - + + + + @@ -283,29 +370,50 @@ --> - - + + - - + + - - + + - - + + - + - + - + - - - - + + + + - - - + + + - + - - - - + + + + - + - + - - - - - + + + + + - + - 1.0 + 1.1 diff --git a/settings.props b/settings.props index 7d8a34a..ed61545 100644 --- a/settings.props +++ b/settings.props @@ -1,7 +1,8 @@ - + - - - - + + + + + + + @@ -90,8 +109,6 @@ nuclei.build @@ -188,7 +205,7 @@ Note that custom version number templates may not reference other custom version number templates. --> - + - + - + - + - + - + - + - - - - + - + - - - - $(DirWorkspace)\doc + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + - - - - + - + - UNDEFINED + @@ -394,20 +519,14 @@ **** PREPARE - RELEASE NOTES **** --> - - - - - - - + - + - UNDEFINED + - + - - - - - - - - + @@ -503,22 +613,24 @@ Each script should have a task with the same name as the file. --> - + - - - $(DirDoc) + + - + @@ -537,7 +649,7 @@ The tag 'all' is a special tag that will lead to the invocation of all steps that are registered for the selected stage. --> - + @@ -554,67 +666,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -632,6 +683,9 @@ true + + + 1.1 - 1.0.0 - 2.0.0 + 1.1.0 + 2.0.0 diff --git a/src/base.props b/src/base.props index 627015f..43ce2e3 100644 --- a/src/base.props +++ b/src/base.props @@ -1,7 +1,6 @@ - + true - - v4.0 - DEBUG;CODE_ANALYSIS;$(DefineConstants) + DEBUG;$(DefineConstants) true full true true false bin\Debug\ - false - true + bin\ - CODE_ANALYSIS;$(DefineConstants) + $(DefineConstants) false pdbonly false true true bin\Release\ - false - true - - - - - false - pdbonly - false - true - true - bin\Deploy\ - false - true + bin\ - - false - true - - $(OutputPath)\$(AssemblyName).XML + $(OutputPath)\$(AssemblyName).XML diff --git a/src/nuclei.build.sln b/src/nuclei.build.sln index 9fb08b2..34fb825 100644 --- a/src/nuclei.build.sln +++ b/src/nuclei.build.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28803.202 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0245F9D1-9F8D-43AA-8C61-69370002790D}" ProjectSection(SolutionItems) = preProject @@ -17,7 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{FE08C5 .nuget\packages.config = .nuget\packages.config EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nuclei.Build", "nuclei.build\Nuclei.Build.csproj", "{AEA39FA0-9B45-4FDF-B94C-543E410F480C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nuclei.Build", "nuclei.build\Nuclei.Build.csproj", "{AEA39FA0-9B45-4FDF-B94C-543E410F480C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{525FF8D6-BF44-4BEB-BEF4-DD767DC0E722}" ProjectSection(SolutionItems) = preProject @@ -40,22 +40,22 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Deploy|Any CPU = Deploy|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {AEA39FA0-9B45-4FDF-B94C-543E410F480C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AEA39FA0-9B45-4FDF-B94C-543E410F480C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AEA39FA0-9B45-4FDF-B94C-543E410F480C}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU - {AEA39FA0-9B45-4FDF-B94C-543E410F480C}.Deploy|Any CPU.Build.0 = Deploy|Any CPU {AEA39FA0-9B45-4FDF-B94C-543E410F480C}.Release|Any CPU.ActiveCfg = Release|Any CPU {AEA39FA0-9B45-4FDF-B94C-543E410F480C}.Release|Any CPU.Build.0 = Release|Any CPU - {F6E6D7BB-5943-414B-9971-9706862A178A}.Debug|Any CPU.ActiveCfg = Deploy|Any CPU - {F6E6D7BB-5943-414B-9971-9706862A178A}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU - {F6E6D7BB-5943-414B-9971-9706862A178A}.Deploy|Any CPU.Build.0 = Deploy|Any CPU + {F6E6D7BB-5943-414B-9971-9706862A178A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F6E6D7BB-5943-414B-9971-9706862A178A}.Debug|Any CPU.Build.0 = Debug|Any CPU {F6E6D7BB-5943-414B-9971-9706862A178A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F6E6D7BB-5943-414B-9971-9706862A178A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F5F2264C-C4C5-4ABE-BBD9-D2B4B42589D2} + EndGlobalSection EndGlobal diff --git a/src/nuclei.build/AssemblyBuildInformationAttribute.cs b/src/nuclei.build/AssemblyBuildInformationAttribute.cs index 3aac1d8..fba6eb2 100644 --- a/src/nuclei.build/AssemblyBuildInformationAttribute.cs +++ b/src/nuclei.build/AssemblyBuildInformationAttribute.cs @@ -7,6 +7,7 @@ using System; using System.Diagnostics.CodeAnalysis; +using Nuclei.Build.Properties; namespace Nuclei.Build { @@ -34,12 +35,14 @@ public AssemblyBuildInformationAttribute(int buildNumber, string versionControlI { if (versionControlInformation == null) { - throw new ArgumentNullException("versionControlInformation", "The version control information string should not be null"); + throw new ArgumentNullException(nameof(versionControlInformation)); } if (string.IsNullOrWhiteSpace(versionControlInformation)) { - throw new ArgumentException("The version control information string should not be an empty string.", "versionControlInformation"); + throw new ArgumentException( + Resources.Exceptions_Messages_ParameterShouldNotBeAnEmptyString, + nameof(versionControlInformation)); } BuildNumber = buildNumber; diff --git a/src/nuclei.build/AssemblyBuildTimeAttribute.cs b/src/nuclei.build/AssemblyBuildTimeAttribute.cs index eb1ecb0..ff08d34 100644 --- a/src/nuclei.build/AssemblyBuildTimeAttribute.cs +++ b/src/nuclei.build/AssemblyBuildTimeAttribute.cs @@ -8,6 +8,7 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Globalization; +using Nuclei.Build.Properties; namespace Nuclei.Build { @@ -38,12 +39,14 @@ public AssemblyBuildTimeAttribute(string buildTime) { if (buildTime == null) { - throw new ArgumentNullException("buildTime", "The build time string should not be null"); + throw new ArgumentNullException(nameof(buildTime)); } if (string.IsNullOrWhiteSpace(buildTime)) { - throw new ArgumentException("The build time string should not be an empty string.", "buildTime"); + throw new ArgumentException( + Resources.Exceptions_Messages_ParameterShouldNotBeAnEmptyString, + nameof(buildTime)); } BuildTime = DateTimeOffset.ParseExact(buildTime, "o", CultureInfo.InvariantCulture); diff --git a/src/nuclei.build/Nuclei.Build.csproj b/src/nuclei.build/Nuclei.Build.csproj index 1102dca..94c4eff 100644 --- a/src/nuclei.build/Nuclei.Build.csproj +++ b/src/nuclei.build/Nuclei.Build.csproj @@ -1,86 +1,57 @@ - - + - $(MSBuildProjectDirectory)\.. - - - $(MSBuildProjectDirectory)\.. - {AEA39FA0-9B45-4FDF-B94C-543E410F480C} - Library - Nuclei.Build - Nuclei.Build - - 9.0.30729 - 2.0 - - Debug - AnyCPU - v4.0 - 512 - - Properties - $(SolutionDir)\..\build\bin\$(Platform)\$(Configuration)\ - $(SolutionDir)\..\build\temp\bin\obj\$(AssemblyName)\$(Platform)\$(Configuration)\ - - prompt - 4 - true + netstandard1.3 + 1.0.0.0 + 1.0.0.0 + 1.0.0 true - ..\default.ruleset - - - true - full - false - TRACE;DEBUG;CODE_ANALYSIS - - pdbonly - true - TRACE;CODE_ANALYSIS + + + true + 1.0.0 + true + true + symbols.nupkg + $(MSBuildThisFileDirectory)/../../build/deploy - - pdbonly - true - TRACE + + P. van der Velde + Company + Nuclei.Build + Provides attributes that can be applied to assemblies to provide build related information. + Mine + Apache-2.0 + https://github.com/thenucleus/nuclei.build + https://github.com/thenucleus/nuclei.build - - - - - - - - - - - + Properties\App.snk - - - - Designer - - - - + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + + + True + True + Resources.resx + - - - + + ResXFileCodeGenerator + Resources.Designer.cs + - - \ No newline at end of file diff --git a/src/nuclei.build/Properties/AssemblyInfo.cs b/src/nuclei.build/Properties/AssemblyInfo.cs index 8d2bc50..9fd297d 100644 --- a/src/nuclei.build/Properties/AssemblyInfo.cs +++ b/src/nuclei.build/Properties/AssemblyInfo.cs @@ -12,20 +12,10 @@ using System.Runtime.InteropServices; using Nuclei.Build; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Nuclei.Build")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyProduct("Nuclei.Build")] - -[assembly: AssemblyCompany("")] -[assembly: AssemblyCopyright("Copyright © 2013")] - [assembly: AssemblyCulture("")] // Resources -[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.MainAssembly)] +[assembly: NeutralResourcesLanguage("en-US")] // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information @@ -39,29 +29,3 @@ // Indicate that the assembly is CLS compliant. [assembly: CLSCompliant(true)] - -[assembly: AssemblyConfiguration("Release")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.0.0.0")] - -// The time the assembly was build -[assembly: AssemblyBuildTime(buildTime: "1900-01-01T00:00:00.0000000+00:00")] - -// The version from which the assembly was build -[module: SuppressMessage( - "Microsoft.Usage", - "CA2243:AttributeStringLiteralsShouldParseCorrectly", - Justification = "It's a VCS revision, not a version")] -[assembly: AssemblyBuildInformation(buildNumber: 0, versionControlInformation: "1234567890123456789012345678901234567890")] diff --git a/src/nuclei.build/Properties/Resources.Designer.cs b/src/nuclei.build/Properties/Resources.Designer.cs new file mode 100644 index 0000000..3aa4c7c --- /dev/null +++ b/src/nuclei.build/Properties/Resources.Designer.cs @@ -0,0 +1,73 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Nuclei.Build.Properties { + using System; + using System.Reflection; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Nuclei.Build.Properties.Resources", typeof(Resources).GetTypeInfo().Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to The parameter should not be an empty string.. + /// + internal static string Exceptions_Messages_ParameterShouldNotBeAnEmptyString { + get { + return ResourceManager.GetString("Exceptions_Messages_ParameterShouldNotBeAnEmptyString", resourceCulture); + } + } + } +} diff --git a/src/nuclei.build/Properties/Resources.resx b/src/nuclei.build/Properties/Resources.resx new file mode 100644 index 0000000..0740405 --- /dev/null +++ b/src/nuclei.build/Properties/Resources.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + The parameter should not be an empty string. + + \ No newline at end of file diff --git a/src/nuclei.build/nbuildkit.csharp.readme.txt b/src/nuclei.build/nbuildkit.csharp.readme.txt deleted file mode 100644 index bf9a26d..0000000 --- a/src/nuclei.build/nbuildkit.csharp.readme.txt +++ /dev/null @@ -1 +0,0 @@ -This file was installed by nBuildKit.MsBuild.Projects.CSharp [version: 0.5.1]. \ No newline at end of file diff --git a/src/nuclei.build/nbuildkit.readme.txt b/src/nuclei.build/nbuildkit.readme.txt deleted file mode 100644 index 86302e4..0000000 --- a/src/nuclei.build/nbuildkit.readme.txt +++ /dev/null @@ -1 +0,0 @@ -This file was installed by nBuildKit.MsBuild [version: 0.5.1]. \ No newline at end of file diff --git a/src/nuclei.build/nuclei.build.nuspec b/src/nuclei.build/nuclei.build.nuspec deleted file mode 100644 index 9b8d2a5..0000000 --- a/src/nuclei.build/nuclei.build.nuspec +++ /dev/null @@ -1,27 +0,0 @@ - - - - Nuclei.Build - $VersionSemantic$ - P. van der Velde - $CompanyName$ - http://www.apache.org/licenses/LICENSE-2.0 - $CompanyUrl$ - false - - Provides attributes that can be applied to assemblies to provide build related information. - - - $ReleaseNotes$ - - - $Dependencies$ - - - - - - - - - \ No newline at end of file diff --git a/src/nuclei.build/packages.config b/src/nuclei.build/packages.config deleted file mode 100644 index ca94d10..0000000 --- a/src/nuclei.build/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/test.settings.props b/test.settings.props index 87e29fe..5b237b2 100644 --- a/test.settings.props +++ b/test.settings.props @@ -1,106 +1,491 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + clean; + prepare; + prepare.clean; + + TestStepsPrepareWorkspace + + + + + + + + + + + - Prepare; + prepare; + prepare.restore; + prepare.restore.nuget; + TestStepsPrepareRestoreNuGet + + + + + + + + + + + + + + prepare; + prepare.buildserver; + prepare.buildserver.vcssetbranch; + + TestStepsPrepareVcsBranch + + + + + + + + + + + + prepare; + prepare.get; + prepare.get.vcsinfo; + + TestStepsPrepareVcsInfo + + + + + + - + + + + + prepare; + prepare.get; + prepare.get.issueids; + + TestStepsPrepareGetIssueIds + + + + + + + + + + + + + prepare; + prepare.get; + prepare.get.version; + + TestStepsPrepareGetVersion + + + + + + + + - Prepare; + prepare; + prepare.get; + prepare.get.releasenotes; + TestStepsPrepareReleaseNotes + + + + + + - + + + + + + prepare; + prepare.copy; + prepare.copy.nuget; + + TestStepsPrepareCopyNuGet + + + + + + + + - Prepare; + prepare; + prepare.copy; + prepare.copy.url; + TestStepsPrepareCopyHttp + + + + + + - + + + + + prepare; + prepare.copy; + prepare.copy.files; + + TestStepsPrepareCopyFiles + + + + + + + + - Prepare; + prepare; + prepare.copy; + prepare.copy.archive; + TestStepsPrepareCopyArchive + + + + + + - + + + + + + prepare; + prepare.generate; + prepare.generate.files; + + TestStepsPrepareGenerateFiles + + + + + + + + + - Generate; - Prepare; + test; + test.pester; + test.pester.integration; + TestStepsIntegrationPester + + + + + + @@ -111,18 +496,9 @@ for that step, e.g. adding a test step that points to the 'c:\stuff\MyCoolScript.msbuild' will execute that script. - Each script has the following properties passed to it: - $(SharedPropertyFile) - The full path to the settings.props file (i.e. this file). - $(ShouldDisplayDebugLog) - A flag indicating whether or not to display debug log information, usually at the start of the script execution. - $(NBuildKitVersion) - The full version of the nBuildKit library that is executing the build. - $(DirNBuildKitMsBuild) - The full path to the directory that contains the nBuildKit scripts. - $(DirNBuildKitMsBuildShared) - The full path to the directory that contains the shared nBuildkit scripts. - $(DirNBuildKitMsBuildExtensions) - The full path to the directory that contains the nBuildKit extension scripts. - $(DirNBuildKitMsBuildTemplates) - The full path to the directory that contains the nBuildKit templates. - - Additionally any properties defined by the 'Properties' section are also pushed up. + Any properties defined by the 'Properties' section are pushed up. --> - + - - - - - - - - - - + + @@ -198,5 +557,8 @@ true + + + 1.1