Skip to content

Commit c8866b2

Browse files
committed
Merged PR 405232: Manual sync public changes to private
This PR brings in customer (and some internal) PRs that were reviewed, approved, and merged into the public repo that didn't get synced back to the private repo. See the commits list for the PRs, unfortunately there doesn't seem to be a way to get from the files in the files view to the associated commit and commit message (which is the link to the PR). All changes in this current PR have been reviewed and approved over on the public repo - this review is just a sanity check.
1 parent 9f31240 commit c8866b2

File tree

286 files changed

+960
-932
lines changed

Some content is hidden

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

286 files changed

+960
-932
lines changed

docs/_shared/help-support-shared.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44

55
We welcome your feedback.
66

7-
For product related inquiries, review our [User Voice page](https://visualstudio.uservoice.com/forums/330519-team-services) or report a problem at [Developer Community](https://developercommunity.visualstudio.com/spaces/21/index.html). Also, you can get advice on [Stack Overflow](https://stackoverflow.com/questions/tagged/vsts), or get support via our [Support](https://azure.microsoft.com/support/devops/) page.
7+
For product related inquiries, review our [User Voice page](https://visualstudio.uservoice.com/forums/330519-team-services) or report a problem at [Developer Community](https://developercommunity.visualstudio.com/spaces/21/index.html). Also, you can get advice on [Stack Overflow](https://stackoverflow.com/questions/tagged/azure-devops), or get support via our [Support](https://azure.microsoft.com/support/devops/) page.
88

99
Follow us on **[Twitter](https://twitter.com/AzureDevOps) @AzureDevOps**.

docs/_shared/qa-azure-organization-billing-support.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ A: If you're the Azure Account Administrator,
77
#### Q: What if I have other questions about Azure subscriptions and billing?
88

99
A: Check the
10-
[Azure Billing and Subscription FAQ](https://azure.microsoft.com/en-us/documentation/articles/billing-subscription-faq/),
11-
or try [Azure Support](https://azure.microsoft.com/en-us/support/options/).
10+
[Azure Billing and Subscription FAQ](https://azure.microsoft.com/documentation/articles/billing-subscription-faq/),
11+
or try [Azure Support](https://azure.microsoft.com/support/options/).
1212

1313
#### Q: Why can't I link more organizations to my Azure subscription? What does the error "The resource is blocked to receive any update" mean?
1414

docs/_shared/qa-azure-subscription-disabled-tfs.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
A: If you're the [Azure subscription Account Administrator](/azure/billing-add-change-azure-subscription-administrator),
44
check your subscription status in the [Account Center](https://account.windowsazure.com/),
5-
then try to [fix your subscription](https://azure.microsoft.com/en-us/documentation/articles/billing-subscription-become-disable/).
5+
then try to [fix your subscription](https://azure.microsoft.com/documentation/articles/billing-subscription-become-disable/).

docs/_shared/qa-azure-subscriptions-for-billing.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@
44

55
#### Q: Which Azure subscriptions can I link to my organization and use for billing?
66

7-
A: You can use an [Azure subscription](https://azure.microsoft.com/en-us/pricing/purchase-options/)
7+
A: You can use an [Azure subscription](https://azure.microsoft.com/pricing/purchase-options/)
88
that's not the following:
99

10-
* An [Azure Free Trial](https://azure.microsoft.com/en-us/offers/ms-azr-0044p/)
10+
* An [Azure Free Trial](https://azure.microsoft.com/offers/ms-azr-0044p/)
1111
* A [free Azure AD subscription](https://technet.microsoft.com/library/dn832618.aspx)
1212

1313
If you have one of these subscriptions, set up a separate
14-
[Pay-As-You-Go Azure subscription](https://azure.microsoft.com/en-us/offers/ms-azr-0003p/)
14+
[Pay-As-You-Go Azure subscription](https://azure.microsoft.com/offers/ms-azr-0003p/)
1515
instead.
1616

1717
**Important for Visual Studio subscribers and Visual Studio Dev Essentials members**:
1818

19-
* You can't use [monthly credits for Visual Studio subscriptions](https://azure.microsoft.com/en-us/pricing/member-offers/msdn-benefits-details/)
20-
or [monthly credits for Visual Studio Dev Essentials](https://azure.microsoft.com/en-us/offers/ms-azr-0022p/) to pay for Azure DevOps purchases.
19+
* You can't use [monthly credits for Visual Studio subscriptions](https://azure.microsoft.com/pricing/member-offers/msdn-benefits-details/)
20+
or [monthly credits for Visual Studio Dev Essentials](https://azure.microsoft.com/offers/ms-azr-0022p/) to pay for Azure DevOps purchases.
2121
You can still use these types of Azure subscriptions for billing,
2222
but the monthly credits won't apply, so your credit card will be billed for charges instead.
2323

24-
* Before you use these Azure subscriptions for billing, you must remove their [default spending limit indefinitely](https://azure.microsoft.com/en-us/pricing/spending-limits/).
24+
* Before you use these Azure subscriptions for billing, you must remove their [default spending limit indefinitely](https://azure.microsoft.com/pricing/spending-limits/).
2525

2626
This prevents disabling your Azure subscription
2727
when your monthly charges are billed the next month.

docs/_shared/qa-browser-problems-azure.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
A: This might happen if you're using an unsupported browser.
44
For the best experience, please make sure that you're using a
5-
[supported browser](https://azure.microsoft.com/en-us/documentation/articles/azure-preview-portal-supported-browsers-devices/).
5+
[supported browser](https://azure.microsoft.com/documentation/articles/azure-preview-portal-supported-browsers-devices/).

docs/_shared/qa-get-vsts-support.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ A: You have several options for support:
77
* Provide a suggestion on [Developer Community](https://developercommunity.visualstudio.com/content/idea/post.html?space=21).
88
* Get advice on [Stack Overflow](https://stackoverflow.com/questions/tagged/vs-team-services).
99
* Get support on [Azure DevOps Support](https://azure.microsoft.com/support/devops).
10-
* View the archives of the [Azure DevOps forum](https://social.msdn.microsoft.com/Forums/en-us/home?forum=TFService) on MSDN.
10+
* View the archives of the [Azure DevOps forum](https://social.msdn.microsoft.com/Forums/home?forum=TFService) on MSDN.

docs/_shared/qa-vs-legacy-connect.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#### Q: Can I use earlier versions of Visual Studio to connect to Azure DevOps?
22

33
A: Yes, you can use Visual Studio 2013 or 2012. You can also use Visual Studio 2010,
4-
but you'll need to install [Service Pack 1](https://www.microsoft.com/en-us/download/details.aspx?id=34677)
4+
but you'll need to install [Service Pack 1](https://www.microsoft.com/download/details.aspx?id=34677)
55
and [KB2662296](http://support.microsoft.com/kb/2662296) first. Or, you can use Visual
66
Studio 2008 SP1, with [this GDR update](http://support.microsoft.com/kb/2673642).
77
Launch Visual Studio, then connect to Azure DevOps

docs/articles/build-deployment-best-practices.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -197,15 +197,15 @@ and Fortify Integration
197197
## References
198198

199199
[1] Visual Studio team,
200-
[Automate deployments with Release Management](https://msdn.microsoft.com/en-us/Library/vs/alm/Release/overview),
200+
[Automate deployments with Release Management](https://msdn.microsoft.com/Library/vs/alm/Release/overview),
201201
MSDN Article
202202

203203
[2] Visual Studio team,
204-
[Build and Deploy Continuously](https://msdn.microsoft.com/en-us/library/ee308011%28v=vs.100%29.aspx),
204+
[Build and Deploy Continuously](https://msdn.microsoft.com/library/ee308011%28v=vs.100%29.aspx),
205205
MSDN Article
206206

207207
[3] Visual Studio team,
208-
[Building a Release Pipeline with Team Foundation Server 2012](https://msdn.microsoft.com/en-us/library/dn449957.aspx),
208+
[Building a Release Pipeline with Team Foundation Server 2012](https://msdn.microsoft.com/library/dn449957.aspx),
209209
MSDN Article
210210

211211
*(c) 2015 Microsoft Corporation. All rights reserved. This document is

docs/articles/credential-storage.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Azure DevOps Services - Stored Credentials
3-
description: Learn how Microsoft stores your your credentials for Azure DevOps
3+
description: Learn how Microsoft stores your credentials for Azure DevOps
44
ms.prod: devops
55
ms.topic: article
66
ms.technology: devops-whitepapers

docs/articles/migrate-to-vsts-from-tfs.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ is the right strategy.
8080

8181
## Related notes
8282
- [About Azure DevOps Services and Team Foundation Server](../user-guide/about-azure-devops-services-tfs.md)
83-
- [Pricing, Azure DevOps Services](https://azure.microsoft.com/en-us/pricing/details/devops/azure-devops-services/)
83+
- [Pricing, Azure DevOps Services](https://azure.microsoft.com/pricing/details/devops/azure-devops-services/)
8484
- [Pricing, TFS](https://visualstudio.microsoft.com/team-services/tfs-pricing/)
8585

8686
<!---

docs/articles/migration-import.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ Granting exceptions for the necessary IPs is handled at the Azure networking lay
454454

455455
![Add inbound port rule](_img/migration-import/inbound.png)
456456

457-
Select advanced to configure an inbound port rul for a specific IP.
457+
Select advanced to configure an inbound port rule for a specific IP.
458458

459459
![Advanced inbound port rule configuration](_img/migration-import/advanced.png)
460460

docs/articles/migration-post-import.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ An Azure DevOps organization is ready for use once an import has completed succe
2222
## Immediately After Import
2323
Immediately after the organization becomes available you will want to take a small team and perform spot checks on the organization. It's recommended that this team consists of the project collection administrators. This shouldn't be an in-depth check, but rather making sure that major pieces from your collection were brought over. Did your source code get imported? Are you seeing your build history? Are all of our area paths still present? It's best to confirm these artifacts are present before opening the organization to the entirety of your user base.
2424

25-
After spot checking the organization you will want to consider if you want to rename it. [Renaming an Azure DevOps organization](../organizations/accounts/rename-organization.md) is a simple operation, but it has [large impacts](https://support.microsoft.com/en-us/kb/2793597) on users currently using the organization. Some examples being Team Explore connections breaking or bookmarks no longer working. Getting a rename out of the way while it's just a small group of users using the organization allows the rest of the users to come in and configure their connections once.
25+
After spot checking the organization you will want to consider if you want to rename it. [Renaming an Azure DevOps organization](../organizations/accounts/rename-organization.md) is a simple operation, but it has [large impacts](https://support.microsoft.com/kb/2793597) on users currently using the organization. Some examples being Team Explore connections breaking or bookmarks no longer working. Getting a rename out of the way while it's just a small group of users using the organization allows the rest of the users to come in and configure their connections once.
2626

2727
## Set up Billing
2828

@@ -39,7 +39,7 @@ This means that you shouldn't have to take any other import steps if your identi
3939
Dry run imports do not have their licenses reset on the 1st of the month. Unlike production imports, their grace period extends for the life of the organization. So you don't need to worry about purchasing licenses while testing out an import.
4040

4141
## Builds
42-
Next, you will want to configure your build agents. As part of the migration, all of your build pipelines have been brought over, but agents and pools need to be reconfigured against the new Azure DevOps organization. Azure DevOps Services offers the ability to use a Microsoft-hosted pool of build agents that you can use, or you can connect your self-hosted build agent(s). It's important to note that only one self-hosted build agent is included for free. After that there is a [fee](https://visualstudio.microsoft.com/en-us/products/visual-studio-team-services-pricing-vs.aspx) for having additional self-hosted build agents. To pay for Microsoft-hosted and self-hosted build agents you will need to link a subscription to your Azure DevOps organization. See the following resources for details on performing this task:
42+
Next, you will want to configure your build agents. As part of the migration, all of your build pipelines have been brought over, but agents and pools need to be reconfigured against the new Azure DevOps organization. Azure DevOps Services offers the ability to use a Microsoft-hosted pool of build agents that you can use, or you can connect your self-hosted build agent(s). It's important to note that only one self-hosted build agent is included for free. After that there is a [fee](https://visualstudio.microsoft.com/products/visual-studio-team-services-pricing-vs.aspx) for having additional self-hosted build agents. To pay for Microsoft-hosted and self-hosted build agents you will need to link a subscription to your Azure DevOps organization. See the following resources for details on performing this task:
4343

4444
* [Build Agents](../pipelines/agents/agents.md)
4545

docs/articles/migration-processtemplates.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ To fix this you will need to run the witadmin changefield command. Syntax for th
133133
witadmin changefield /collection:http://AdventureWorksServer:8080/tfs/DefaultCollection /n:fieldname /syncnamechanges:true
134134
```
135135

136-
For more information on the changfield command see https://msdn.microsoft.com/en-us/library/dd236909.aspx
136+
For more information on the changfield command see https://msdn.microsoft.com/library/dd236909.aspx
137137

138138
#### TF402556: For field System.IterationId to be well defined, you must name it Iteration ID and set its type to Integer.
139139

docs/articles/migration-troubleshooting.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ The largest table size is currently {Table size}GBs. This is above the recommend
3636
Similar to the previous warning, this warning means you will have to use the SQL Azure VM method to complete the import. Follow the instructions linked from the warning message to setup the VM and complete your import. This warning does **NOT** mean that your collection is too big to be imported.
3737

3838
```cmdline
39-
The database metadata size is currently {Metadata Size}GBs. This is above the recommended size of {Warning Size}GBs. It's recommended that you consider cleaning up older data as described in [Cleaning up old data] (/tfs/server/upgrade/clean-up-data).
39+
The database metadata size is currently {Metadata Size}GBs. This is above the recommended size of {Warning Size}GBs. It's recommended that you consider cleaning up older data as described in [Cleaning up old data](/tfs/server/upgrade/clean-up-data).
4040
```
4141

4242
This warning means that your database is approaching the limit for total metadata size. Metadata size refers to the size of your database without including files, code, and other binary data. The warning does **NOT** mean that your collection is too big for import, rather its metadata size is larger than the vast majority of other databases. It's strongly recommended that you [reduce the size](/tfs/server/upgrade/clean-up-data) of your database before import. Reducing the size provides the additional benefit of speeding up your import.
@@ -118,13 +118,13 @@ ISVError:100014 Missing permission for group:Microsoft.TeamFoundation.Identity;S
118118
The final command will look like:
119119

120120
```cmdline
121-
TFSSecurity.exe /a+ Identity "0c7c2216-fa4b-4107-a203-82b324a147ef\\" Read sid:S-1-9-XXXXXXXXXX-XXXXXXXXXX-XXXXXXXXXX-XXXXXXXXXX-0-0-0-0-1 ALLOW /collectionhttps://localhost:8080/tfs/defaultcollection
121+
TFSSecurity.exe /a+ Identity "0c7c2216-fa4b-4107-a203-82b324a147ef\\" Read sid:S-1-9-XXXXXXXXXX-XXXXXXXXXX-XXXXXXXXXX-XXXXXXXXXX-0-0-0-0-1 ALLOW /collection:https://localhost:8080/tfs/defaultcollection
122122
123-
TFSSecurity.exe /a+ Identity "0c7c2216-fa4b-4107-a203-82b324a147ef\\" Write sid:S-1-9-XXXXXXXXXX-XXXXXXXXXX-XXXXXXXXXX-XXXXXXXXXX-0-0-0-0-1 ALLOW /collectionhttps://localhost:8080/tfs/defaultcollection
123+
TFSSecurity.exe /a+ Identity "0c7c2216-fa4b-4107-a203-82b324a147ef\\" Write sid:S-1-9-XXXXXXXXXX-XXXXXXXXXX-XXXXXXXXXX-XXXXXXXXXX-0-0-0-0-1 ALLOW /collection:https://localhost:8080/tfs/defaultcollection
124124
125-
TFSSecurity.exe /a+ Identity "0c7c2216-fa4b-4107-a203-82b324a147ef\\" Delete sid:S-1-9-XXXXXXXXXX-XXXXXXXXXX-XXXXXXXXXX-XXXXXXXXXX-0-0-0-0-1 ALLOW /collectionhttps://localhost:8080/tfs/defaultcollection
125+
TFSSecurity.exe /a+ Identity "0c7c2216-fa4b-4107-a203-82b324a147ef\\" Delete sid:S-1-9-XXXXXXXXXX-XXXXXXXXXX-XXXXXXXXXX-XXXXXXXXXX-0-0-0-0-1 ALLOW /collection:https://localhost:8080/tfs/defaultcollection
126126
127-
TFSSecurity.exe /a+ Identity "0c7c2216-fa4b-4107-a203-82b324a147ef\\" ManageMembership sid:S-1-9-XXXXXXXXXX-XXXXXXXXXX-XXXXXXXXXX-XXXXXXXXXX-0-0-0-0-1 ALLOW /collectionhttps://localhost:8080/tfs/defaultcollection
127+
TFSSecurity.exe /a+ Identity "0c7c2216-fa4b-4107-a203-82b324a147ef\\" ManageMembership sid:S-1-9-XXXXXXXXXX-XXXXXXXXXX-XXXXXXXXXX-XXXXXXXXXX-0-0-0-0-1 ALLOW /collection:https://localhost:8080/tfs/defaultcollection
128128
```
129129
If you have multiple errors that need to be corrected, it's recommended that you put all of the commands into a batch file to execute them against TFSSecurity in an automated fashion. Once the commands have been executed you will need to run TfsMigrator validate again to ensure that the error(s) has\have been corrected. If the error(s) still persists, please contact [Azure DevOps Services customer support](https://aka.ms/AzureDevOpsImportSupport).
130130

docs/articles/phase-rollout-with-rings.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ monikerRange: '>= tfs-2013'
1616

1717
In today's fast-paced, feature-driven markets, it's important to continuously deliver value and receive feedback on features quickly and continuously. Partnering with end users to get early versions of features vetted out is valuable.
1818

19-
Are you planning to build and deploy Azure DevOps extensionsto production? You probably have a few questions, such as:
19+
Are you planning to build and deploy Azure DevOps extensions to production? You probably have a few questions, such as:
2020
* How do you embrace DevOps to deliver changes and value faster?
2121
* How do you mitigate the risk of deploying to production?
2222
* How do you automate the build and deployment?
@@ -58,7 +58,7 @@ Next you need to map the topology of your application to the ringed deployment m
5858
> The ringed deployment model is not a silver bullet!
5959
> Start small, prototype, and continuously compare impact, value, and cost.
6060
61-
At the application level, the composition of Azure DevOps extensionsis innocuous, easy to digest, scale, and deploy independently. Each extension:
61+
At the application level, the composition of Azure DevOps extensions is innocuous, easy to digest, scale, and deploy independently. Each extension:
6262
* Has one of more web and script files
6363
* Interfaces with Core client
6464
* Interfaces with REST client and REST APIs
@@ -83,7 +83,7 @@ The extension topology is perfectly suited for the ring deployment model and to
8383

8484
Let's observe how a change triggers and moves through the ring-based deployment process, using the [Azure DevOps Developer Tools Build Tasks](https://marketplace.visualstudio.com/items?itemName=ms-devlabs.vsts-developer-tools-build-tasks) extension.
8585

86-
**Azure DevOps Developer Tools Build Tasks** extension is the secret sauce, used to package and publish Azure DevOps extensionsto the Visual Studio Marketplace.
86+
**Azure DevOps Developer Tools Build Tasks** extension is the secret sauce, used to package and publish Azure DevOps extensions to the Visual Studio Marketplace.
8787

8888
![Extension rings](./_img/phase-rollout-with-rings/phase-rollout-with-rings-pipeline.png)
8989

@@ -171,7 +171,7 @@ Refer to [Default and custom release variables](/azure/devops/pipelines/release/
171171

172172
### How can you manage secrets used by the pipeline?
173173

174-
Refer to [Azure Key Vault](https://azure.microsoft.com/en-us/services/key-vault/) to safeguard cryptographic keys and other secrets used by your pipelines.
174+
Refer to [Azure Key Vault](https://azure.microsoft.com/services/key-vault/) to safeguard cryptographic keys and other secrets used by your pipelines.
175175

176176
##Reference information
177177
* [CI/CD pipeline examples](https://blogs.msdn.microsoft.com/visualstudioalmrangers/tag/cicd-pipeline/)

0 commit comments

Comments
 (0)