Merge branch 'master' into branch_regex_fix

asbjornu · web-flow · commit 39fabd7cc0d1 · 2019-02-19T12:03:37.000+01:00
diff --git a/build.cake b/build.cake
@@ -173,7 +173,8 @@ Task("Test")
             settings.Filter = "TestCategory!=NoMono";
         }
 
-        DotNetCoreTest(project.FullPath, settings, coverletSettings);
+        // DotNetCoreTest(project.FullPath, settings, coverletSettings);
+        DotNetCoreTest(project.FullPath, settings);
     }
 
     // run using NUnit
diff --git a/docs/build-server-support/build-server/azure-devops b/docs/build-server-support/build-server/azure-devops
@@ -1,6 +1,6 @@
-# Team Foundation Build (vNext) Setup
+# TFS Build or Azure DevOps Pipeline Setup
 ## Basic Usage
-In Team Foundation Build (the web based build system) you can call GitVersion either using the Command Line build step or install an extension / custom build step. The custom build step requires a one-time setup to import the GitVersion task into your TFS or VSTS instance.
+In Azure DevOps Pipeline (the web based build system) you can call GitVersion either using the Command Line build step or install an extension / custom build step. The custom build step requires a one-time setup to import the GitVersion task into your TFS or Azure DevOps Pipeline instance.
 
 ## Executing GitVersion
 ### Using GitVersion with the MSBuild Task NuGet Package
@@ -14,7 +14,7 @@ See [MSBuild Task](/usage/msbuild-task) for further instructions how to use the
 3. Set the Tool parameter to `<pathToGitVersion>\GitVersion.exe`.
 4. Set the Arguments parameter to `/output buildserver /nofetch`.
 5. If you want the GitVersionTask to update AssemblyInfo files add `updateAssemblyInfo true` to the Arguments parameter.
-6. If you want to update the build number you need to send a [logging command](https://github.com/Microsoft/vso-agent-tasks/blob/master/docs/authoring/commands.md) to TFS.
+6. If you want to update the build number you need to send a [logging command](https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md) to TFS.
 
 ### Using the custom GitVersion build step
 #### Installing
@@ -36,7 +36,7 @@ From a TFS build definition, select "Add a Step" and then in the Build category,
 
 If you want the GitVersionTask to update AssemblyInfo files, check the box in the task configuration. For advanced usage, you can pass additional options to the GitVersion exe in the Additional arguments section.
 
-The VSO build step can update your build number with GitVersion variables. See below for details.
+The Azure DevOps Pipeline build step can update your build number with GitVersion variables. See below for details.
 
 
 ## Running inside TFS
@@ -68,6 +68,6 @@ Just checking the `Clean Repository` check box in the build definition settings
 You can force deletion of the whole folder and a re-clone containing all tags by settings the variable `Build.Clean` to `all`.
 This will take more time during build but makes sure that all tags are fetched.
 In the future it is planned to allow using `git.exe` instead of current `libgit2sharp` for syncing the repos which might allow other possibilities to solve this issue.
-For details see this [GitHub issue](https://github.com/Microsoft/vso-agent-tasks/issues/1218).
+For details see this [GitHub issue](https://github.com/Microsoft/azure-pipelines-tasks/issues/1218).
 * If running a build for a certain commit (through passing the commit SHA while queueing the build) all tags from the repository will be fetched, even the ones newer than the commit.
 This can lead to different version numbers while re-running historical builds.
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -23,7 +23,7 @@ pages:
       - Octopus Deploy: build-server-support/build-server/octopus-deploy.md
       - TeamCity: build-server-support/build-server/teamcity.md
       - Team Build (TFS): build-server-support/build-server/teambuild.md
-      - TFS Build vNext: build-server-support/build-server/tfs-build-vnext.md
+      - TFS Build vNext: build-server-support/build-server/azure-devops.md
 - Examples: examples.md
 - FAQ: faq.md
 - Why?: why.md
diff --git a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="NUnit" Version="3.11.0"></PackageReference>
     <packagereference Include="NUnit3TestAdapter" Version="3.12.0"></packagereference>
     <PackageReference Include="Shouldly" Version="3.0.2"></PackageReference>
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.7.179" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.9.20" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Approved\**\*.txt" />
diff --git a/src/GitVersionTask/GitVersionTask.csproj b/src/GitVersionTask/GitVersionTask.csproj
@@ -38,7 +38,7 @@
         <PrivateAssets>All</PrivateAssets>
     </PackageReference>
     <!--See https://github.com/Microsoft/msbuild/issues/3671 for reason for the ExcludeAssets against msbuild packagerefernces -->
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.7.179" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.9.20" ExcludeAssets="runtime" />
     <PackageReference Include="UtilPack.NuGet.MSBuild" Version="$(PackageVersion_UtilPackNuGetMSBuild)">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
diff --git a/src/GitVersionTfsTask/GitVersionTask/task.json b/src/GitVersionTfsTask/GitVersionTask/task.json
@@ -1,76 +1,73 @@
 {
-  "id": "e5983830-3f75-11e5-82ed-81492570a08e",
-  "name": "GitVersion",
-  "friendlyName": "GitVersion Task",
-  "description": "Easy Semantic Versioning (http://semver.org) for projects using Git",
-  "author": "GitVersion Contributors",
-  "helpMarkDown": "See the [documentation](http://gitversion.readthedocs.org/en/latest/) for help",
-  "category": "Build",
-  "demands": [],
-  "version": {
-    "Major": "4",
-    "Minor": "0",
-    "Patch": "0"
-  },
-  "minimumAgentVersion": "1.83.0",
-  "groups": [
-    {
-      "name": "additional",
-      "displayName": "Additional Options",
-      "isExpanded": false
-    }
-  ],
-  "instanceNameFormat": "GitVersion",
-  "inputs": [
-    {
-      "name": "updateAssemblyInfo",
-      "type": "boolean",
-      "label": "Update AssemblyInfo files",
-      "defaultValue": "false",
-      "required": false,
-      "helpMarkDown": "Whether to update versions in the AssemblyInfo files"
-    },
-    {
-      "name": "updateAssemblyInfoFilename",
-      "type": "string",
-      "label": "Update Assembly File",
-      "defaultValue": "",
-      "required": false,
-      "helpMarkDown": "Update versions in specified file",
-      "groupName": "additional"
-    },
-    {
-      "name": "additionalArguments",
-      "type": "string",
-      "label": "Additional GitVersion.exe arguments",
-      "defaultValue": "",
-      "required": false,
-      "helpMarkDown": "Additional arguments to send to GitVersion.exe",
-      "groupName": "additional"
+    "id": "e5983830-3f75-11e5-82ed-81492570a08e",
+    "name": "GitVersion",
+    "friendlyName": "GitVersion Task",
+    "description": "Easy Semantic Versioning (http://semver.org) for projects using Git",
+    "author": "GitVersion Contributors",
+    "helpMarkDown": "See the [documentation](http://gitversion.readthedocs.org/en/latest/) for help",
+    "category": "Build",
+    "demands": [],
+    "version": {
+        "Major": "4",
+        "Minor": "0",
+        "Patch": "0"
     },
-    {
-      "name": "gitVersionPath",
-      "type": "string",
-      "label": "Path to GitVersion.exe",
-      "defaultValue": "",
-      "required": false,
-      "helpMarkDown": "Optionally supply the path to GitVersion.exe",
-      "groupName": "additional"
-    },
-    {
-      "name": "preferBundledVersion",
-      "type": "boolean",
-      "label": "Prefer bundled GiVersion.exe",
-      "required": false,
-      "helpMarkDown": "If checked it will prefer the bundled version over a version found in path",
-      "groupName": "additional"
-    }
-  ],
-  "execution": {
-    "Node": {
-      "target": "GitVersion.js",
-      "argumentFormat": "",
-      "workingDirectory": "."
+    "minimumAgentVersion": "1.83.0",
+    "groups": [{
+        "name": "additional",
+        "displayName": "Additional Options",
+        "isExpanded": false
+    }],
+    "instanceNameFormat": "GitVersion",
+    "inputs": [{
+            "name": "updateAssemblyInfo",
+            "type": "boolean",
+            "label": "Update AssemblyInfo files",
+            "defaultValue": "false",
+            "required": false,
+            "helpMarkDown": "Whether to update versions in the AssemblyInfo files"
+        },
+        {
+            "name": "updateAssemblyInfoFilename",
+            "type": "string",
+            "label": "Update Assembly File",
+            "defaultValue": "",
+            "required": false,
+            "helpMarkDown": "Update versions in specified file",
+            "groupName": "additional"
+        },
+        {
+            "name": "additionalArguments",
+            "type": "string",
+            "label": "Additional GitVersion.exe arguments",
+            "defaultValue": "",
+            "required": false,
+            "helpMarkDown": "Additional arguments to send to GitVersion.exe",
+            "groupName": "additional"
+        },
+        {
+            "name": "gitVersionPath",
+            "type": "string",
+            "label": "Path to GitVersion.exe",
+            "defaultValue": "",
+            "required": false,
+            "helpMarkDown": "Optionally supply the path to GitVersion.exe",
+            "groupName": "additional"
+        },
+        {
+            "name": "preferBundledVersion",
+            "type": "boolean",
+            "label": "Prefer bundled GitVersion.exe",
+            "required": false,
+            "helpMarkDown": "If checked it will prefer the bundled version over a version found in path",
+            "groupName": "additional"
+        }
+    ],
+    "execution": {
+        "Node": {
+            "target": "GitVersion.js",
+            "argumentFormat": "",
+            "workingDirectory": "."
+        }
     }
-  }
 }

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,8 @@ Task("Test")`
`173`	`173`	`settings.Filter = "TestCategory!=NoMono";`
`174`	`174`	`}`
`175`	`175`
`176`		`- DotNetCoreTest(project.FullPath, settings, coverletSettings);`
	`176`	`+ // DotNetCoreTest(project.FullPath, settings, coverletSettings);`
	`177`	`+ DotNetCoreTest(project.FullPath, settings);`
`177`	`178`	`}`
`178`	`179`
`179`	`180`	`// run using NUnit`