Skip to content

Commit a905ce7

Browse files
committed
resolve conflicts
2 parents 395a072 + 8c236fc commit a905ce7

File tree

64 files changed

+157
-107
lines changed

Some content is hidden

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

64 files changed

+157
-107
lines changed

docs/extend/develop/add-chart.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ monikerRange: '>= azure-devops-2019'
1212

1313
# Add a chart
1414

15-
[!INCLUDE [ ](../../includes/version-vsts-plus-azdevserver-2019.md)]
15+
[!INCLUDE [version-vsts-plus-azdevserver-2019](../../includes/version-vsts-plus-azdevserver-2019.md)]
1616

1717
Learn how you can add charts to your extensions. Charts can be added to any Azure DevOps Services extension.
1818

docs/extend/develop/add-dashboard-widget.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ monikerRange: '>= azure-devops-2019'
1313

1414
# Add a dashboard widget
1515

16-
[!INCLUDE [ ](../../includes/version-vsts-plus-azdevserver-2019.md)]
16+
[!INCLUDE [version-vsts-plus-azdevserver-2019](../../includes/version-vsts-plus-azdevserver-2019.md)]
1717

1818
Widgets on a dashboard are implemented as [contributions](./contributions-overview.md) in the [extension framework](../overview.md).
1919
A single extension can have multiple contributions. Learn how to create an extension with multiple widgets as contributions.

docs/extend/develop/add-hub-group.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ ms.date: 08/04/2016
1414

1515
[!INCLUDE [version-tfs-2017-through-vsts](../../includes/version-tfs-2017-through-vsts.md)]
1616

17-
[!INCLUDE [extension-docs-new-sdk](../../includes/extension-docs-new-sdk.md)]
18-
1917
We'll create a hub group and add a hub to it.
2018
If you haven't already, [create the Hello hub](./add-hub.md) first, and then follow these steps to create the hub group.
2119

@@ -58,3 +56,5 @@ Here's the complete extension manifest with Hello in the samples hub group.
5856
}
5957
}
6058
```
59+
60+
[!INCLUDE [extension-docs-new-sdk](../../includes/extension-docs-new-sdk.md)]

docs/extend/develop/add-hub.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ ms.date: 12/31/2019
1414

1515
[!INCLUDE [version-azure-devops](../../includes/version-azure-devops.md)]
1616

17-
[!INCLUDE [extension-docs-new-sdk](../../includes/extension-docs-new-sdk.md)]
18-
1917
We'll create a new hub that displays in the Work hub group, after the Backlogs and Queries hubs.
2018

2119
![Location of a new hub in Azure DevOps Services](../media-procedures/hub-location.png)
@@ -33,6 +31,9 @@ We'll create a new hub that displays in the Work hub group, after the Backlogs a
3331
|--- hello-world.html // html page to be used for your hub
3432
|--- vss-extension.json // extension's manifest
3533
```
34+
35+
[!INCLUDE [extension-docs-new-sdk](../../includes/extension-docs-new-sdk.md)]
36+
3637
## Get the client SDK: `VSS.SDK.js`
3738
The core SDK script, VSS.SDK.js, enables web extensions to communicate to the host, Azure DevOps Services, frame. This script also initializes, notifies that the extension loaded, or gets context about the current page. Get the Client SDK `VSS.SDK.js` file and add it to your web app.
3839
Place it in the `home/sdk/scripts` folder.

docs/extend/develop/add-pipeline-decorator.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ description: Inject steps before and after every pipeline job
44
ms.topic: reference
55
ms.technology: devops-cicd
66
ms.assetid: 3347cdf7-07db-42af-85f0-6f1d8d371087
7+
ms.author: chcomley
8+
author: chcomley
79
ms.date: 09/16/2020
810
monikerRange: '> azure-devops-2019'
911
---
@@ -12,15 +14,15 @@ monikerRange: '> azure-devops-2019'
1214

1315
[!INCLUDE [version-cloud-plus-2020](../../includes/version-cloud-plus-2020.md)]
1416

15-
[!INCLUDE [extension-docs-new-sdk](../../includes/extension-docs-new-sdk.md)]
16-
1717
Pipeline decorators let you add steps to the beginning and end of every job.
1818
This process is different than adding steps to a single definition because it applies to all pipelines in an organization.
1919

2020
Suppose our organization requires running a virus scanner on all build outputs that could be released.
2121
Pipeline authors don't need to remember to add that step. We create a decorator that automatically injects the step.
2222
Our pipeline decorator injects a custom task that does virus scanning at the end of every pipeline job.
2323

24+
[!INCLUDE [extension-docs-new-sdk](../../includes/extension-docs-new-sdk.md)]
25+
2426
## Author a pipeline decorator
2527

2628
This example assumes you're familiar with the [contribution models](contributions-overview.md).

docs/extend/develop/add-query-result-tabs.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ ms.date: 05/15/2018
1414

1515
[!INCLUDE [version-tfs-2017-through-vsts](../../includes/version-tfs-2017-through-vsts.md)]
1616

17-
[!INCLUDE [extension-docs-new-sdk](../../includes/extension-docs-new-sdk.md)]
18-
1917
If you have a web page that can be hosted in an iframe, it can be hosted in Azure DevOps as a tab on the query result pages.
2018
In this example, we'll add a simple Hello World tab on query results.
2119

2220
![Tab location on the Azure DevOps Query Results.](media/query-results-pivot-tab.png)
2321

22+
[!INCLUDE [extension-docs-new-sdk](../../includes/extension-docs-new-sdk.md)]
23+
2424
## Create your web page
2525

2626
[!INCLUDE [Web_page](../includes/procedures/create-web-page.md)]

docs/extend/develop/add-service-hook.md

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ ms.date: 10/27/2021
1414
# Create a consumer service for service hooks
1515

1616
[!INCLUDE [version-tfs-2017-through-vsts](../../includes/version-tfs-2017-through-vsts.md)]
17+
1718
With service hooks, you can do tasks on other services when events happen in your project. For example, create a card in Trello when a work item gets created or send a push notification to your team's mobile devices when a build fails. Service hooks can also be used in custom apps and services, as a more efficient way to drive activities when events happen in your projects.
1819

1920
[!INCLUDE [extension-docs-new-sdk](../../includes/extension-docs-new-sdk.md)]

docs/extend/develop/auth.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ ms.date: 08/29/2016
1414

1515
[!INCLUDE [version-tfs-2017-through-vsts](../../includes/version-tfs-2017-through-vsts.md)]
1616

17-
> [!NOTE]
18-
> This page pertains only to _web extensions_, and not Pipelines task extensions or service endpoint extensions. For those tasks, you can use the [Publish to Azure Service Bus Task](../../pipelines/tasks/utility/publish-to-azure-service-bus.md).
17+
This article pertains only to _web extensions_, and not Pipelines task extensions or service endpoint extensions. For those tasks, you can use the [Publish to Azure Service Bus Task](../../pipelines/tasks/utility/publish-to-azure-service-bus.md).
1918

2019
[!INCLUDE [extension-docs-new-sdk](../../includes/extension-docs-new-sdk.md)]
2120

docs/extend/develop/configure-workitemform-extensions.md

+33-31
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,38 @@ title: Configure work item form extensions | Extensions for Azure DevOps
33
description: Describes how to add and configure work item form extensions in Azure DevOps.
44
ms.contentid: DEC28077-2F52-490D-B87C-48D4785CD597
55
ms.technology: devops-ecosystem
6+
ms.custom: freshness-fy22q3
67
ms.topic: conceptual
78
monikerRange: '>= tfs-2017'
89
ms.author: chcomley
910
author: chcomley
10-
ms.date: 10/10/2017
11+
ms.date: 02/03/2022
1112
---
1213

1314
# Add extensions in work item form via work item type definition xml
1415

16+
[!INCLUDE [version-tfs-2017-through-vsts](../../includes/version-tfs-2017-through-vsts.md)]
17+
18+
You can export a work item type as xml using the `witadmin` tool, which includes the layout of the work item form. As part of this example, we add the page, group, and control contributions to the layout. We also add the control to the Agile "User Story" work item type. For more information, see [WebLayout xml](../../reference/xml/weblayout-xml-elements.md).
19+
1520
> [!NOTE]
1621
> Work item form customization via xml is supported only on Azure DevOps Server, not Azure DevOps Services.
1722
18-
[!INCLUDE [version-tfs-2017-through-vsts](../../includes/version-tfs-2017-through-vsts.md)]
19-
20-
A work item type can be exported as XML using `witadmin` tool, that includes the layout of the work item form. As part of the walkthrough, you add the page, group, and control contributions to the layout. [Read more information on WebLayout XML](../../reference/xml/weblayout-xml-elements.md). In this example, we add the control to the Agile "User Story" work item type.
23+
## Add extension in work item form
2124

22-
[!INCLUDE [extension-docs-new-sdk](../../includes/extension-docs-new-sdk.md)]
25+
1. Install work item form extensions in Azure DevOps Server.
2326

24-
**Step 1:** Install work item form extensions in Azure DevOps Server.
27+
2. Open the `Developer Command Prompt`. Export the xml file to your desktop with the following command.
2528

26-
**Step 2:** Open the `Developer Command Prompt`. Export the XML file to your desktop with command shown below.
29+
```
30+
witadmin exportwitd /collection:CollectionURL /p:Project /n:TypeName /f:FileName
31+
```
2732

28-
```
29-
witadmin exportwitd /collection:CollectionURL /p:Project /n:TypeName /f:FileName
30-
```
33+
A file gets created in the directory that you specified.
3134

32-
<br>
33-
<strong>Step 3:</strong> This creates a file in the directory that you specified. Inside this file, navigate to the section called &quot;WebLayout&quot;. Inside the <code>Weblayout</code> Section a comment blob is present that specifies what extensions targeting work item form are installed in your collection. For each extension, all its form contributions are listed with their IDs and inputs (if it&#39;s a Control contribution). In the example below, the comment shows that the &quot;color-control-dev&quot; extension has been installed on the collection which has one control contribution that takes 2 inputs -
35+
3. Inside this file, go to the **WebLayout** section. Inside the WebLayout section, a comment blob specifies which installed extensions target work item forms for your collection. For each extension, all its form contributions are listed with their IDs and inputs (if it's a Control contribution). In the following example, the comment shows the *color-control-dev* extension installed on the collection. The extension has one control contribution that takes two inputs.
3436

35-
```xml
37+
```xml
3638
<!--**********************************Work Item Extensions***************************
3739
3840
Extension:
@@ -52,24 +54,22 @@ A work item type can be exported as XML using `witadmin` tool, that includes the
5254
Descriptions: The colors that match the values in the control.
5355
Type: String
5456
IsRequired: false
55-
```
57+
```
5658
57-
<br>
58-
<strong>Step 4:</strong> Find your extension ID in the &quot;Work Item Extensions&quot; section:
59+
4. Find your extension ID in the **Work Item Extensions** section:
5960
60-
```xml
61+
```xml
6162
<!--**********************************Work Item Extensions***************************
6263
6364
Extension:
6465
Name: color-control-dev
6566
Id: example.color-control-dev
6667
...
67-
```
68+
```
6869
69-
<br>
70-
<strong>Step 5:</strong> Add an extension tag below the &quot;Work Item Extensions&quot; section as shown below to make your extension available to the work item form. To place a contribution inside the form, its extension must be specified in the Extensions section.
70+
5. Add an extension tag below the **Work Item Extensions** section, shown as follows, to make your extension available to the work item form. To place a contribution inside the form, its extension must be specified in the `Extensions` section.
7171
72-
```xml
72+
```xml
7373
<!--**********************************Work Item Extensions***************************
7474
...
7575
@@ -80,19 +80,20 @@ A work item type can be exported as XML using `witadmin` tool, that includes the
8080
<Extensions>
8181
<Extension Id="example.color-control-dev" />
8282
</Extensions>
83-
```
83+
```
8484

85-
<br>
86-
<strong>Step 6:</strong> Specifying the extensions in the xml automatically places both the <strong>page</strong> and <strong>group</strong> contributions defined in the extensions inside the form. You can move the contributions following the examples below:
85+
6. Specifying the extensions in the xml automatically places both the **page** and **group** contributions defined in the extensions inside the form. You can move the contributions in the following examples.
8786

8887
#### Add page contribution
88+
8989
```xml
9090
<Page Id="Details">
9191
<PageContribution Id="<page contribution id>" />
9292
...
9393
```
9494

9595
#### Add group contribution
96+
9697
```xml
9798
<Page Id="Details">
9899
...
@@ -102,13 +103,14 @@ A work item type can be exported as XML using `witadmin` tool, that includes the
102103
...
103104
```
104105

105-
> Note that a page contribution and a group contribution can not take any other layout elements inside them.
106+
A page contribution and a group contribution can't take any other layout elements.
106107

107108
#### Add control contribution
108-
Unlike **page** and **group** contributions, specifying the extensions in the xml doesn't automatically place **control** contributions.
109-
To add these contributions in the form, you have to add them with a contribution tag inside the form. The example below adds the "ControlContribution" to the "Planning" group.
110109

111-
Note that if a control contribution has any required input defined, users must give a value for that input. For any non-required input, users can opt to either set or not set a value to the input. In the example below, the values of "FieldName" and "Colors" inputs are set:
110+
Unlike *page* and *group* contributions, specifying the extensions in the xml doesn't automatically place *control* contributions.
111+
To add these contributions in the form, add them with a contribution tag inside the form. The following example adds the *ControlContribution* to the *Planning* group.
112+
113+
If a control contribution has any required input defined, users must give a value for that input. For any non-required input, users can decide whether to set a value to the input. In the following example, the `FieldName` and `Colors` inputs get set.
112114

113115
```xml
114116
<Page Id="Details">
@@ -127,8 +129,8 @@ Note that if a control contribution has any required input defined, users must g
127129
<Control Label="Risk" Type="FieldControl" FieldName="Microsoft.Azure DevOps Services.Common.Risk" />
128130
```
129131

132+
7. Import this xml file, using `witadmin`.
130133

134+
`witadmin importwitd /collection:CollectionURL /p:Project /f:FileName`
131135

132-
<br>
133-
<strong>Step 7:</strong> Finally, import this <em>.xml</em> file, using <code>witadmin</code>.
134-
<code>witadmin importwitd /collection:CollectionURL /p:Project /f:FileName</code>
136+
Your extension is configured via the work item form!

docs/extend/develop/pipeline-decorator-context.md

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ description: Contextual data available to pipeline decorators
44
ms.topic: reference
55
ms.technology: devops-cicd
66
ms.assetid: fe3e1e94-0415-400a-9b2d-7eeadb6101fc
7+
ms.author: chcomley
8+
author: chcomley
79
ms.date: 07/20/2021
810
monikerRange: 'azure-devops'
911
---

docs/extend/develop/public-project.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ ms.technology: devops-ecosystem
66
ms.assetid: 3fa22433-150b-428c-8e10-3ffb4d832c20
77
ms.topic: conceptual
88
monikerRange: 'azure-devops'
9-
ms.author: apawast
10-
author: apawast
9+
ms.author: chcomley
10+
author: chcomley
1111
ms.date: 06/02/2020
1212
---
1313

docs/extend/develop/styles-from-widget-sdk.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ ms.date: 08/04/2016
1414

1515
[!INCLUDE [version-tfs-2017-through-vsts](../../includes/version-tfs-2017-through-vsts.md)]
1616

17-
[!INCLUDE [extension-docs-new-sdk](../../includes/extension-docs-new-sdk.md)]
18-
1917
We recommend you use the basic styles provided via the Widget SDK. Using these styles helps you quickly and easily create a widget that's consistent with the rest of the widgets on the dashboard.
2018
To use these styles, add the below line inside the `VSS.require` block in the JavaScript code for your widget.
2119

20+
[!INCLUDE [extension-docs-new-sdk](../../includes/extension-docs-new-sdk.md)]
21+
2222
```javascript
2323
WidgetHelpers.IncludeWidgetStyles();
2424
```

docs/extend/develop/using-host-dialog.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ ms.date: 09/19/2019
1414

1515
[!INCLUDE [version-tfs-2017-through-vsts](../../includes/version-tfs-2017-through-vsts.md)]
1616

17-
[!INCLUDE [extension-docs-new-sdk](../../includes/extension-docs-new-sdk.md)]
18-
1917
The HostDialogService enables you to present a modal dialog to the user and prevent interaction with all parts of web access until the dialog is dismissed.
2018

19+
[!INCLUDE [extension-docs-new-sdk](../../includes/extension-docs-new-sdk.md)]
20+
2121
<div class="alert alert-info">
2222
In contrast to the standard dialog control, a modal dialog presented via the HostDialogService prevents interaction by the user on the entire page, not just within the extension.
2323
</div>

docs/extend/develop/web-navigation.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ description: Guidance for developing extensions to be used with vertical web nav
55
ms.assetid: 3fa22433-150b-428c-8e10-3ffb4d832c20
66
ms.topic: conceptual
77
monikerRange: 'azure-devops'
8-
ms.author: apawast
9-
author: apawast
8+
ms.author: chcomley
9+
author: chcomley
1010
ms.date: 06/08/2021
1111
---
1212

docs/extend/develop/work-with-urls.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ description: Learn about best practices for working with URLs in Azure DevOps ex
55
ms.assetid: 1f27f05e-2c55-4873-ab4a-8c9c0947a7fe
66
ms.topic: conceptual
77
monikerRange: 'azure-devops'
8-
ms.author: apawast
9-
author: apawast
8+
ms.author: chcomley
9+
author: chcomley
1010
ms.date: 06/02/2020
1111
---
1212

docs/includes/version-header-tfs-only.md

-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ ms.topic: include
33
---
44

55
**Azure DevOps Server 2020 | Azure DevOps Server 2019 | TFS 2018 - TFS 2013**
6-
*Azure DevOps Server was previously named Visual Studio Team Foundation Server.*

docs/index.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ highlightedContent:
3030
# Card
3131
- title: What's new in Azure DevOps?
3232
itemType: whats-new
33-
url: /azure/devops/release-notes/index
33+
url: https://aka.ms/azuredevops/releasenotes
3434
# Card
3535
- title: What's new in Azure DevOps documentation?
3636
itemType: whats-new

docs/integrate/concepts/cross-origin-resource-sharing.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.date: 08/04/2016
1212

1313
# Cross-origin resource sharing (CORS)
1414

15-
[!INCLUDE [version-all](../../includes/version-vsts-only.md)]
15+
[!INCLUDE [version-vsts-only](../../includes/version-vsts-only.md)]
1616

1717
Azure DevOps supports cross-origin resource sharing (CORS). CORS enables JavaScript code served from a domain other than `dev.azure.com/*` to make Ajax requests to Azure DevOps Services REST APIs. For this to work, each request must provide credentials (personal access tokens and OAuth access tokens are both supported options). Example:
1818

docs/integrate/concepts/dotnet-client-libraries.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ description: Easily integrate with Azure DevOps from apps and services on Window
44
ms.assetid: 474cdb4f-9a5e-49fb-84b2-9c540ebcf98b
55
ms.technology: devops-ecosystem
66
ms.topic: conceptual
7-
monikerRange: '<= azure-devops'
7+
monikerRange: 'azure-devops'
88
ms.author: chcomley
99
author: chcomley
1010
ms.date: 11/08/2021
1111
---
1212

1313
# .NET client libraries
1414

15-
[!INCLUDE [version-all](../../includes/version-all.md)]
15+
[!INCLUDE [version-vsts-only](../../includes/version-all.md)]
1616

1717
Client libraries are available for .NET developers who build Windows apps and services that integrate with Azure DevOps. Client libraries integrate with work item tracking, version control, build, and other services. These packages replace the traditional TFS Client OM installer and make it easy to acquire and redistribute the libraries needed by your app or service.
1818

docs/integrate/concepts/integration-bestpractices.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ titleSuffix: Azure DevOps Services
44
description: Best practices when integrating with the REST APIs for Azure DevOps Services
55
ms.technology: devops-ecosystem
66
ms.assetid: 9E1F3FD7-E1C1-44D9-B265-5368B3BD621E
7+
monikerRange: 'azure-devops'
78
ms.author: chcomley
89
author: chcomley
910
ms.date: 07/15/2020

docs/integrate/concepts/wit-client-om-deprecation.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ ms.assetid: 2C636EA8-6A10-48C1-9620-F792915EBB65
77
ms.author: liho
88
author: KathrynEE
99
ms.topic: reference
10-
monikerRange: "azure-devops"
10+
monikerRange: 'azure-devops'
1111
ms.date: 08/29/2018
1212
---
1313

1414
# Deprecation of the Work Item Tracking (WIT) and Test Client OM
1515

16-
[!INCLUDE [version](../../includes/version-vsts-only.md)]
16+
[!INCLUDE [version-vsts-only](../../includes/version-vsts-only.md)]
1717

1818
WIT and Test Client OM are part of the broader TFS SDK. They are a set of SOAP-based APIs that can be used to create tools to run operations against the Azure DevOps. These SOAP-based APIs have been replaced by the set of modern REST-based endpoints. Therefore we are in the process of deprecating the SOAP-based APIs (Client OM) for WIT and Test.
1919

docs/integrate/get-started/authentication/oauth.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.date: 10/22/2021
1212

1313
# Authorize access to REST APIs with OAuth 2.0
1414

15-
[!INCLUDE [version-azure-devops](../../../includes/version-vsts-only.md)]
15+
[!INCLUDE [version-vsts-only](../../../includes/version-vsts-only.md)]
1616

1717
> [!NOTE]
1818
> The following guidance is intended for Azure DevOps Services users since OAuth 2.0 is not supported on Azure DevOps Server. [Client Libraries](../../concepts/dotnet-client-libraries.md) are a series of packages built specifically for extending Azure DevOps Server functionality. For on-premises users, we recommend using [Client Libraries](../../concepts/dotnet-client-libraries.md), Windows Auth, or [Personal Access Tokens (PATs)](../../../organizations/accounts/use-personal-access-tokens-to-authenticate.md) to authenticate on behalf of a user.

0 commit comments

Comments
 (0)