14
votes
Accepted
How to resolve merge conflicts in Azure DevOps current UI
Try this solution: Pull Request Merge Conflict Extension. It helps to resolve conflicts inside the pull request page.
10
votes
Accepted
Single Build with Multiple Artifacts
Here is my YAML for multiple artifacts from a single build.
pool:
name: Hosted Windows 2019 with VS2019
demands:
- msbuild
- visualstudio
- vstest
- npm
steps:
- task: NuGetToolInstaller@...
- 351
10
votes
Accepted
Multi-language Monorepo
Monorepos have been getting a lot of attention in recent years since google popularized them. If you aren't on a similar scale as google it might not work out as well for you. I've been in a startup ...
- 1,838
7
votes
How to resolve merge conflicts in Azure DevOps current UI
I had this problem too, coming from github where you can usually resolve text file changes in browser.
On your local repo, you want to get the latest then reverse-merge, so in your case
// Precursor ...
- 171
7
votes
Accepted
Is it possible to view all changes made on a Git feature branch in Azure Devops?
You're looking for the branch compare functionality. In the list of branches, click the overflow ellipses on your feature branch and select compare branches.
Azure DevOps will diff your branch with ...
- 321
6
votes
How to keep original and new repositories in sync during a migration? (including the commit history)
Simply keep pushing stuff between the repositories. Git pushes are designed for exactly that.
So, if origin is the old repository, and newis the new one, and you want to move new stuff in the master ...
- 4,866
6
votes
Single Build with Multiple Artifacts
I managed to get Erik's approach working which is great.
I then wondered if I could simplify it so instead of deleting the content how about put each artifact in a sub folder of the $(Build....
- 161
6
votes
Rename build pipeline .yml files in Azure DevOps
As suggested by @030, I have prepared two screenshots that show how to connect the .yml files with the build pipeline.
Rename the .yml file in the repository
Open the pipeline editor
Select the ...
- 315
6
votes
Rename build pipeline .yml files in Azure DevOps
This has been fixed in recent version of Azure DevOps. Currently you can easily rename or move the pipeline in the list of pipelines while clicking on 3 dots and select Rename/move
and change your ...
- 161
6
votes
Project pipeline not able to access NuGet package from Artifact Feed in different Project
Very few people were viewing this thread, so afterwards I posted a duplicate question on Stack Overflow, and now contains the answer. Below is a copy of it ...
Finally, I found the problem. I wonder ...
- 456
5
votes
Reading two Repos in Azure Build pipeline
I also use the classic editor, and I have implemented this for our builds. My use case was that I have a set of common set of build/release scripts stored in their own repository, and I want the ...
- 179
5
votes
Multi-language Monorepo
You can put two or more projects into the same repository without opting in to a "monorepo" where every project goes into the same repository by default.
If you have multiple products that ...
- 151
5
votes
Accepted
Rename build pipeline .yml files in Azure DevOps
According to this Azure Q&A it should be possible to change the name of the yaml file by clicking on "Edit in the visual designer".
- 13.1k
5
votes
Accepted
Given a blank slate, tool recommendations?
This question runs two risks:
of being marked as "primarily opinion-based", and
its answers might age poorly.
However, I think it's useful to express an opinion, if only for posterity; if and when ...
- 3,570
4
votes
Accepted
How to setup artifact filters to differentiate for deployment
Azure DevOps supports artifact filters for each environment. Below is screenshot of how to enable the feature.
- 156
4
votes
Accepted
Installing Ansible Controllers to build agents which best practice to use?
Infrastructure as code means that the infrastructure configuration is stored in a version control system (VCS). If changes will be applied, it is traceable who changed the code and when.
Although it ...
- 13.1k
4
votes
How to resolve merge conflicts in Azure DevOps current UI
I am not sure this tab appears 100% of the time, you still have to merge some cases locally, but you can merge some PRs without any extensions in latest UI update.
- 141
4
votes
Accepted
Azure DevOps service connection: lifetime of service principal
I will try to elaborate a lite about those topics.
When secret expires and you got error, you have to refresh connection. Go to Edit dialog for connection and save without any changes. Described here:...
- 221
4
votes
How do fail a Packer pipeline upon powershell provisioner pester test failure?
After resolving some syntax issues, I found the true cause of failing to throw the error.
In my prior usage I was doing this through Inspec provisioner, which handled the exit codes.
If you are ...
- 261
4
votes
Using Azure Devops with Git Workflow
Most answers to these questions are going be subjective and influenced by your particular organization's workflows and culture. Little of this response if more than just my own opinion and experience ...
- 221
4
votes
Accepted
How to skip reviewer for project administrator pull request?
As a workaround, you can add "bypass policies" for project admins.
The documentation: Security groups - Git repository (object-level)
4
votes
How to get information about resources in an Azure Pipelines run?
You can do:
variables:
templates.ref: $[ resources.repositories['templates'].ref ]
See Repository Details docs.
- 161
3
votes
How to report Code Coverage metrics across git repositories?
If you use python and GitLab like I do, you can include a test coverage report in your CI/CD pipeline. You pip install coverage and then just run coverage in your pipeline. The following is an excerpt ...
3
votes
Accepted
Azure Devops: Filter Test Projects in Nuget Build Pipeline
I noticed that the description for the filepath properties of the pack command is different than the descriptions in the test and publish commands:
Pattern to search for csproj or nuspec files to ...
- 179
3
votes
How to deploy a desktop application using Azure DevOps?
You have multiple storage solutions in Azure (i.e. blob, file system). All of these integrate with Pipelines and are good target locations for your build artifacts. Now that you have the build you ...
- 2,707
3
votes
Pushing code changes from Pipeline back to repo/branch, using Git!
Found the issue...
The documentation states that the "contribute" permission needs to be added to "Project Collection Build Service Accounts".
There is also an USER called ""Project Collection Build ...
- 151
3
votes
Single Build with Multiple Artifacts
Can I suggest building and publishing the artefacts in separate jobs? That would mean that each job is simpler (no need to specify an artefact subfolder), and might give you some speed-up by running ...
- 250
3
votes
PowerShell command to automate Azure Linux VM
Apologies for not directly answering your question, but by the sounds of your question, you are trying to build an update management system to mitigate the threats of vulnerable operating system ...
- 11.6k
3
votes
Accepted
Azure DevOps Artifact.zip folder structure for .NET Core 3.0 application
I'm looking this fact:
I have an ASP.NET Core 3.0 application for which I have a full CI/CD setup in Azure DevOps. The Application is hosted on a Ubuntu 18.04 server machine.
Therefore I can ...
3
votes
Trunk Based Development - release branch testing
There are different strategies and, depending on your specific problem domain, you need to decide what makes sense for you.
For server side applications, especially micro services, you typically don'...
- 1,675
Only top scored, non community-wiki answers of a minimum length are eligible