Merge branch 'release/0.14.0'

Author: matkoch

CHANGELOG.md

@@ -6,8 +6,30 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [vNext]
 
+## [0.14.0] / 2018-12-31
+- Removed named target dependencies
+- Removed choice of target framework in setup
+- Changed setup to write solution file reference to configuration file again
+- Added extended solution parsing with integration for `Microsoft.Build`
+- Added `Configuration` type
+- Added `continue` parameter
+- Added checking for active build project configurations in solution files
+- Added highlighting for default target in HTML graph
+- Added `SonarScannerTasks`
+- Added `EnvironmentInfo.SwitchWorkingDirectory`
+- Added `SymbolPackageFormat` property for `DotNetTasks`, `MSBuildTasks`, and `NuGetTasks`
+- Fixed bootstrapping scripts not to leave DotNet processes behind
+- Fixed bootstrapping scripts to correctly quote arguments
+- Fixed overload of tool path for .NET Core executables
+- Fixed default value not to be hidden by cursor
+- Fixed `ToolSettingsExtensions.When` to have generic constraint on `ToolSettings`
+- Fixed `InspectCodeTasks` to use deterministic hashing
+- Fixed `ChangelogTasks` to correctly parse empty sections at end of file
+- Fixed `InjectionAttributeBase` to express implicit assignment only
+- Fixed `ExternalFilesTask` to be executed before `Restore` target
+
 ## [0.13.0] / 2018-12-10
-- Change verification of PATH environment variable to be executed only with `Trace` log level
+- Changed verification of PATH environment variable to be executed only with `Trace` log level
 - Added `ToolSettings.When` for conditional fluent modifications
 - Added `.editorconfig` file in setup to avoid formatting issues
 - Added `DotMemoryUnitTasks`
@@ -226,7 +248,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Added CLT tasks for Git
 - Fixed background color in console output
 
-[vNext]: https://github.com/nuke-build/nuke/compare/0.13.0...HEAD
+[vNext]: https://github.com/nuke-build/nuke/compare/0.14.0...HEAD
+[0.14.0]: https://github.com/nuke-build/nuke/compare/0.13.0...0.14.0
 [0.13.0]: https://github.com/nuke-build/nuke/compare/0.12.4...0.13.0
 [0.12.4]: https://github.com/nuke-build/nuke/compare/0.12.3...0.12.4
 [0.12.3]: https://github.com/nuke-build/nuke/compare/0.12.2...0.12.3

CONTRIBUTING.md

@@ -1,9 +1,15 @@
-# Contribution Guidelines
+# Contributing
 
-It is important to understand [our philosophy](https://nuke.build/docs/getting-started/philosophy.html). Of course we're grateful for any type of contribution or feedback. NUKE is a free open-source project, with the goal that many developers will benefit from it. Nevertheless, we do have several expectations on participation:
+NUKE is a free open-source project, with the goal that as many individuals as possible gain a benefit. We expect everyone to follow our [code of conduct](CODE_OF_CONDUCT.md), and it is important to understand [our philosophy](https://nuke.build/docs/getting-started/philosophy.html).
 
-- [Code of conduct](CODE_OF_CONDUCT.md) must be followed at any time
-- Issue authors are required to become a [stargazer](https://github.com/nuke-build/nuke/stargazers)
-- Bug reports must include information about the _actual behavior_, _expected behavior_ and _used versions_
-- Issues related to [unsupported tools](https://nuke.build/docs/authoring-builds/cli-tools.html#unsupported-tools) or [missing arguments](https://nuke.build/docs/authoring-builds/cli-tools.html#note-1) are not accepted anymore; given the declarative code-generation approach, we expect pull-requests instead
-- Pull-requests don't imply any requirements yet, but we do recommend getting in touch first
+We appreciate any kind of contribution that helps to grow the project. Following next, we would like to outline a few possibilities, expectations and thoughts.
+
+- [Become a stargazer](https://github.com/nuke-build/nuke/stargazers), especially when requesting features
+- Follow us on [Twitter](https://twitter.com/nukebuildnet), join our [Slack workspace](https://slofile.com/slack/nukebuildnet) or [Gitter room](https://gitter.im/nuke-build/nuke)
+- [Tweets](https://twitter.com/intent/tweet?text=NUKE%20is%20awesome!%20https%3A%2F%2Fnuke.build), blog posts and other [testimonials](https://dotnet.libhunt.com/project/nuke/recommend) are very motivating
+- Well-formed feedback is what shapes the technical future of the project
+- [Issues are triaged](https://github.com/nuke-build/nuke/issues?utf8=%E2%9C%93&q=label%3A%22bug+%3Abeetle%3A%22+) carefully; make sure to include all important information, like _expected_ vs. _actual_ behavior, version numbers etc.
+- Issues related to [unsupported tools](https://nuke.build/docs/authoring-builds/cli-tools.html#unsupported-tools) or [missing arguments](https://nuke.build/docs/authoring-builds/cli-tools.html#note-1) are not accepted; given the declarative code-generation approach, we expect pull-requests instead
+- Pull-requests are much appreciated, but for trivial changes it's recommended to get in touch with the maintainers first
+- Pull-requests must be started off from `develop` and should only use `git rebase`, i.e. not `git merge`
+- If this project increases your productivity/income, consider becoming a [backer](https://opencollective.com/nuke/order/7399) (individuals) or [sponsor](https://opencollective.com/nuke/order/7400) (companies)

appveyor.yml

@@ -1,4 +1,7 @@
 image: Visual Studio 2017
 
+init:
+  - git config --global core.autocrlf true
+
 build_script:
   - ps: .\build.ps1 test+pack

build.ps1

@@ -1,6 +1,5 @@
 [CmdletBinding()]
 Param(
-    [switch]$RefExt,
     [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)]
     [string[]]$BuildArguments
 )
@@ -66,5 +65,5 @@ else {
 
 Write-Output "Microsoft (R) .NET Core SDK version $(& $env:DOTNET_EXE --version)"
 
-ExecSafe { & $env:DOTNET_EXE build $BuildProjectFile /p:ReferenceExternal=$RefExt }
-ExecSafe { & $env:DOTNET_EXE run --project $BuildProjectFile -- $BuildArguments }
+ExecSafe { & $env:DOTNET_EXE build $BuildProjectFile /nodeReuse:false }
+ExecSafe { & $env:DOTNET_EXE run --project $BuildProjectFile --no-build -- $BuildArguments }

build.sh

@@ -2,16 +2,6 @@
 
 echo $(bash --version 2>&1 | head -n 1)
 
-REFEXT="False"
-BUILD_ARGUMENTS=()
-for i in "$@"; do
-    case $(echo $1 | awk '{print tolower($0)}') in
-        -refext) REFEXT="True";;
-        *) BUILD_ARGUMENTS+=("$1") ;;
-    esac
-    shift
-done
-
 set -eo pipefail
 SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
 
@@ -71,5 +61,5 @@ fi
 
 echo "Microsoft (R) .NET Core SDK version $("$DOTNET_EXE" --version)"
 
-"$DOTNET_EXE" build "$BUILD_PROJECT_FILE" /p:"ReferenceExternal=$REFEXT"
-"$DOTNET_EXE" run --project "$BUILD_PROJECT_FILE" -- ${BUILD_ARGUMENTS[@]}
+"$DOTNET_EXE" build "$BUILD_PROJECT_FILE" /nodeReuse:false
+"$DOTNET_EXE" run --project "$BUILD_PROJECT_FILE" --no-build -- "$@"

build/Build.cs

@@ -40,16 +40,16 @@ partial class Build : NukeBuild
     public static int Main() => Execute<Build>(x => x.Pack);
 
     [Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")]
-    readonly string Configuration = IsLocalBuild ? "Debug" : "Release";
+    readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release;
 
     [Parameter("ApiKey for the specified source.")] readonly string ApiKey;
-    [Parameter] string Source = "https://api.nuget.org/v3/index.json";
-    [Parameter] string SymbolSource = "https://nuget.smbsrc.net/";
+    [Parameter] readonly string Source = "https://api.nuget.org/v3/index.json";
+    [Parameter] readonly string SymbolSource = "https://nuget.smbsrc.net/";
 
     [Parameter("Gitter authtoken.")] readonly string GitterAuthToken;
     [Parameter("Slack webhook.")] readonly string SlackWebhook;
 
-    [Solution("nuke-common.sln")] readonly Solution Solution;
+    [Solution] readonly Solution Solution;
     [GitRepository] readonly GitRepository GitRepository;
     [GitVersion] readonly GitVersion GitVersion;
 
@@ -131,6 +131,7 @@ partial class Build : NukeBuild
                 .EnableNoBuild()
                 .SetConfiguration(Configuration)
                 .EnableIncludeSymbols()
+                .SetSymbolPackageFormat(DotNetSymbolPackageFormat.snupkg)
                 .SetOutputDirectory(OutputDirectory)
                 .SetVersion(GitVersion.NuGetVersionV2)
                 .SetPackageReleaseNotes(GetNuGetReleaseNotes(ChangelogFile, GitRepository)));
@@ -148,33 +149,13 @@ partial class Build : NukeBuild
         .DependsOn(Compile)
         .Executes(() =>
         {
-            var framework = "net461";
-            var xunitSettings = new Xunit2Settings()
-                .SetFramework(framework)
-                .AddTargetAssemblies(GlobFiles(SourceDirectory, $"*/bin/{Configuration}/{framework}/Nuke.*.Tests.dll").NotEmpty())
-                .AddResultReport(Xunit2ResultFormat.Xml, OutputDirectory / "tests.xml");
-
-            if (IsWin)
-            {
-                OpenCover(s => s
-                    .SetTargetSettings(xunitSettings)
-                    .SetOutput(OutputDirectory / "coverage.xml")
-                    .SetSearchDirectories(xunitSettings.TargetAssemblyWithConfigs.Select(x => Path.GetDirectoryName(x.Key)))
-                    .SetRegistration(RegistrationType.User)
-                    .SetTargetExitCodeOffset(targetExitCodeOffset: 0)
-                    .SetFilters(
-                        "+[*]*",
-                        "-[xunit.*]*",
-                        "-[FluentAssertions.*]*")
-                    .SetExcludeByAttributes("System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute"));
-
-                ReportGenerator(s => s
-                    .AddReports(OutputDirectory / "coverage.xml")
-                    .AddReportTypes(ReportTypes.Html)
-                    .SetTargetDirectory(OutputDirectory / "coverage"));
-            }
-            else
-                Xunit2(s => xunitSettings);
+            Solution.GetProjects("*.Tests")
+                .ForEach(x => DotNetTest(s => s
+                    .SetProjectFile(x)
+                    .SetConfiguration(Configuration)
+                    .EnableNoBuild()
+                    .SetLogger("trx")
+                    .SetResultsDirectory(OutputDirectory)));
         });
 
     Target Analysis => _ => _
@@ -196,7 +177,7 @@ partial class Build : NukeBuild
         .DependsOn(Test, Pack)
         .Requires(() => ApiKey, () => SlackWebhook, () => GitterAuthToken)
         .Requires(() => GitHasCleanWorkingCopy())
-        .Requires(() => Configuration.EqualsOrdinalIgnoreCase("release"))
+        .Requires(() => Configuration.Equals(Configuration.Release))
         .Requires(() => GitRepository.Branch.EqualsOrdinalIgnoreCase(MasterBranch) ||
                         GitRepository.Branch.EqualsOrdinalIgnoreCase(DevelopBranch) ||
                         GitRepository.Branch.StartsWithOrdinalIgnoreCase(ReleaseBranchPrefix) ||
@@ -208,7 +189,7 @@ partial class Build : NukeBuild
                 .ForEach(x => DotNetNuGetPush(s => s
                     .SetTargetPath(x)
                     .SetSource(Source)
-                    // .SetSymbolSource(SymbolSource)
+                    .SetSymbolSource(SymbolSource)
                     .SetApiKey(ApiKey)));
 
             if (GitRepository.Branch.EqualsOrdinalIgnoreCase(MasterBranch))

build/_build.csproj

@@ -5,7 +5,6 @@
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <RootNamespace></RootNamespace>
-    <ReferenceExternal>False</ReferenceExternal>
     <IsPackable>false</IsPackable>
     <NoWarn>CS0649;CS0169</NoWarn>
   </PropertyGroup>
@@ -17,18 +16,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitVersion.CommandLine" Version="4.0.0-beta0012" />
+    <PackageReference Include="GitVersion.CommandLine.DotNetCore" Version="4.0.1-beta1-53" />
     <PackageReference Include="JetBrains.ReSharper.CommandLineTools" Version="2017.1.20170613.162720" />
     <PackageReference Include="OpenCover" Version="4.6.519" />
     <PackageReference Include="ReportGenerator" Version="2.5.6" />
     <PackageReference Include="xunit.runner.console" Version="2.4.0" />
   </ItemGroup>
-
-  <ItemGroup Condition="'$(ReferenceExternal)'=='True'">
-    <PackageReference Include="Nuke.CodeGeneration" Version="*" />
-  </ItemGroup>
 
-  <ItemGroup Condition="'$(ReferenceExternal)'!='True'">
+  <ItemGroup>
     <ProjectReference Include="..\source\Nuke.Common\Nuke.Common.csproj" />
     <ProjectReference Include="..\source\Nuke.CodeGeneration\Nuke.CodeGeneration.csproj" />
   </ItemGroup>

build/specifications/DotNet.json

@@ -649,6 +649,11 @@
         {
           "name": "RepositoryType",
           "type": "string"
+        },
+        {
+          "name": "SymbolPackageFormat",
+          "type": "DotNetSymbolPackageFormat",
+          "help": "Format for packaging symbols."
         }
       ]
     }
@@ -741,6 +746,13 @@
         "Detailed",
         "Diagnostic"
       ]
+    },
+    {
+      "name": "DotNetSymbolPackageFormat",
+      "values": [
+        "symbols.nupkg",
+        "snupkg"
+      ]
     }
   ]
 }

build/specifications/MSBuild.json

@@ -220,6 +220,11 @@
                 "name": "RestoreOutputPath",
                 "type": "string",
                 "help": "Output folder, defaulting to the obj folder."
+              },
+              {
+                "name": "SymbolPackageFormat",
+                "type": "MSBuildSymbolPackageFormat",
+                "help": "Format for packaging symbols."
               }
             ]
           },
@@ -307,6 +312,13 @@
         "arm",
         "Win32"
       ]
+    },
+    {
+      "name": "MSBuildSymbolPackageFormat",
+      "values": [
+        "symbols.nupkg",
+        "snupkg"
+      ]
     }
   ]
 }

build/specifications/NuGet.json

@@ -225,6 +225,12 @@
             "format": "-Version {value}",
             "createOverload": true,
             "help": "Overrides the version number from the <c>.nuspec</c> file."
+          },
+          {
+            "name": "SymbolPackageFormat",
+            "type": "NuGetSymbolPackageFormat",
+            "format": "-SymbolPackageFormat {value}",
+            "help": "Format for packaging symbols."
           }
         ]
       }
@@ -379,6 +385,13 @@
         "12",
         "14"
       ]
+    },
+    {
+      "name": "NuGetSymbolPackageFormat",
+      "values": [
+        "symbols.nupkg",
+        "snupkg"
+      ]
     }
   ]
 }