Update references to the default branch (#6148)

This change updates references to this repo's default branch ("master" to "main") in YAML pipelines, markdown documents, scripts, and code comments in this repo. It also updates references to other repos where the default branch has been renamed.

.gitignore

@@ -88,7 +88,7 @@ From: [email protected]
 [Ss][Yy][Ss][Pp][Rr][Ee][Pp].[Ii][Nn][Ff]
 
 ###
-From: https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+From: https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
 Commit: 5130d9a5060fcaed8f7458a8717b5573f5562774
 ###
 

README.md

@@ -1,6 +1,6 @@
 # IoT Edge
 
-[![Build Status](https://msazure.visualstudio.com/One/_apis/build/status/Custom/Azure/IoT/Edge/Core/Azure-IoT-Edge-Core%20CI?branchName=master)](https://msazure.visualstudio.com/One/_build/latest?definitionId=45137&branchName=master)
+[![Build Status](https://dev.azure.com/msazure/One/_apis/build/status/Custom/Azure/IoT/Edge/Core/Azure-IoT-Edge-Core%20CI?branchName=main)](https://dev.azure.com/msazure/One/_build/latest?definitionId=45137&branchName=main)
 
 Welcome to the home of IoT Edge.
 

builds/checkin/dotnet.yaml

@@ -2,7 +2,7 @@ trigger: none
 pr:
   branches:
     include:
-      - master
+      - main
       - release/*
       - iiot
 jobs:

builds/checkin/e2e-checkin.yaml

@@ -7,7 +7,7 @@ trigger: none
 pr:
   branches:
     include:
-      - master
+      - main
       - release/*
 
 resources:

builds/checkin/edgelet.yaml

@@ -2,7 +2,7 @@ trigger: none
 pr:
   branches:
     include:
-      - master
+      - main
       - release/*
       - iiot
 jobs:

builds/checkin/libiothsm.yaml

@@ -2,7 +2,7 @@ trigger: none
 pr:
   branches:
     include:
-      - master
+      - main
       - release/*
       - iiot
 jobs:

builds/ci/dotnet.yaml

@@ -2,7 +2,7 @@ trigger:
   batch: true
   branches:
     include:
-      - master
+      - main
       - release/*
       - iiot
 pr: none

builds/ci/edgelet.yaml

@@ -2,7 +2,7 @@ trigger:
   batch: true
   branches:
     include:
-      - master
+      - main
       - release/*
       - iiot
 pr: none

builds/ci/libiothsm.yaml

@@ -2,7 +2,7 @@ trigger:
   batch: true
   branches:
     include:
-      - master
+      - main
       - release/*
       - iiot
 pr: none

builds/e2e/proxy-deployment-template.json

@@ -79,13 +79,13 @@
 		}
 	},
 	"variables": {
-		"agent_prep1_script_uri": "https://raw.githubusercontent.com/Azure/iotedge/master/builds/e2e/agent.sh",
-		"agent_prep2_script_uri": "https://raw.githubusercontent.com/Azure/iotedge/master/builds/e2e/agent_final.sh",
-		"create_linux_vm_template_uri": "https://raw.githubusercontent.com/Azure/iotedge/master/builds/e2e/create-linux-vm-template.json",
-		"create_windows_vm_template_uri": "https://raw.githubusercontent.com/Azure/iotedge/master/builds/e2e/create-windows-vm-template.json",
-		"finalize_agent_template_uri": "https://raw.githubusercontent.com/Azure/iotedge/master/builds/e2e/finalize-agent-template.json",
-		"runner1_prep_script_uri": "https://raw.githubusercontent.com/Azure/iotedge/master/builds/e2e/runner.sh",
-		"runner2_prep_script_uri": "https://raw.githubusercontent.com/Azure/iotedge/master/builds/e2e/Runner.ps1"
+		"agent_prep1_script_uri": "https://raw.githubusercontent.com/Azure/iotedge/main/builds/e2e/agent.sh",
+		"agent_prep2_script_uri": "https://raw.githubusercontent.com/Azure/iotedge/main/builds/e2e/agent_final.sh",
+		"create_linux_vm_template_uri": "https://raw.githubusercontent.com/Azure/iotedge/main/builds/e2e/create-linux-vm-template.json",
+		"create_windows_vm_template_uri": "https://raw.githubusercontent.com/Azure/iotedge/main/builds/e2e/create-windows-vm-template.json",
+		"finalize_agent_template_uri": "https://raw.githubusercontent.com/Azure/iotedge/main/builds/e2e/finalize-agent-template.json",
+		"runner1_prep_script_uri": "https://raw.githubusercontent.com/Azure/iotedge/main/builds/e2e/runner.sh",
+		"runner2_prep_script_uri": "https://raw.githubusercontent.com/Azure/iotedge/main/builds/e2e/Runner.ps1"
 	},
 	"resources": [{
 		"type": "Microsoft.KeyVault/vaults",

builds/misc/images.yaml

@@ -2,7 +2,7 @@ trigger:
   batch: true
   branches:
     include:
-      - master
+      - main
       - release/*
 pr: none
 

builds/misc/packages.slow.yaml

@@ -5,7 +5,7 @@ trigger:
   batch: true
   branches:
     include:
-      - master
+      - main
       - release/*
 pr: none
 variables:

builds/misc/packages.yaml

@@ -2,7 +2,7 @@ trigger:
   batch: true
   branches:
     include:
-      - master
+      - main
       - release/*
 pr: none
 

builds/misc/templates/build-rocksdb.yaml

@@ -26,7 +26,7 @@ stages:
             postfix: arm64
       steps:
       - bash: |
-          build_image=rocksdb-build:master-$(postfix)-$(Build.BuildNumber) && \
+          build_image=rocksdb-build:main-$(postfix)-$(Build.BuildNumber) && \
           mkdir -p $(Build.ArtifactStagingDirectory)/librocksdb && \
           cd $(System.DefaultWorkingDirectory)/edge-util/docker/linux/$(arch) && \
           docker build --tag ${build_image} . && \

builds/service/service-deployment.yaml

@@ -7,7 +7,7 @@ schedules:
   displayName: Nightly build
   branches:
     include:
-    - master
+    - main
   always: true
 
 pool:

doc/StyleGuide.md

@@ -8,7 +8,7 @@ C# is a very broad, multi-paradigm language. It's done a good job over the years
 
 ### Baseline
 
-Our baseline C# Coding Style is defined [here](https://github.com/Azure/DotNetty/wiki/C#-Coding-Style). These guidelines are used by the broader IoT Hub team.  In order to enforce coding style, StyleCop (NuGet version) is used.  StyleCop will be run automatically during build except Debug configuration.  Some StyleCop rules are not applicable to IoT Edge, you can find out from [here](https://github.com/Azure/iotedge/blob/master/stylecop.ruleset). 
+Our baseline C# Coding Style is defined [here](https://github.com/Azure/DotNetty/wiki/C#-Coding-Style). These guidelines are used by the broader IoT Hub team.  In order to enforce coding style, StyleCop (NuGet version) is used.  StyleCop will be run automatically during build except Debug configuration.  Some StyleCop rules are not applicable to IoT Edge, you can find out from [here](https://github.com/Azure/iotedge/blob/main/stylecop.ruleset). 
 
 ### Resharper
 

doc/build-test.md

@@ -4,23 +4,19 @@ IoT Edge Build and Test Infrastructure
 Build
 -----
 
-We use Azure DevOps to build and release.
-
-More information about Azure DevOps is available [here](https://docs.microsoft.com/en-us/azure/devops/pipelines/overview).
+We use [Azure DevOps](https://docs.microsoft.com/en-us/azure/devops/pipelines/overview) to build and release.
 
 Our builds fall into these categories:
 
-| Type                                      | Goal                                                                                                          | Trigger                                        | Target                      |
-|-------------------------------------------|---------------------------------------------------------------------------------------------------------------|------------------------------------------------|-----------------------------|
-| Checkin                                   | Ensures that the master branch builds clean and passes basic tests.                                           | When commits are pushed to a Pull Request (PR) | Linux - x64                 |
-| Security Development Lifecycle (SDL)      | Scans and analyzes the code to detect security issues.                                                        | When commits are pushed to a PR                | Windows - x64               |
-| Continuous Integration (CI)               | Runs end-to-end tests, builds Docker images & publishes to ACR, builds iotedgectl pypi archive.               | After a PR is merged to master                 | Linux - x64, Windows - x64  |
-| Continuous Deployment (CD)                | Consumes artifacts from CI, deploys IoT Edge to a Linux VM and a Raspberry Pi and tests basic functionality.  | After a successful CI build                    | Linux - x64                 |
-| Images                                    | Builds Docker images & publishes to ACR.                                                                      | Manual                                         | Linux - x64, Windows - x64  |
-| Service Deployment Verification           | Runs smoke tests. Used to validate IoT Edge scenarios before the service deploys updates.                     | Manual                                         | Linux - x64                 |
-| Release Build                             | Under the Release/ folder. Builds IoT Edge core runtime (C#) and iotedgectl tool (Python).                    | Manual                                         | Linux - x64, Windows - x64  |
-| Release Publish                           | Under the Release/ folder. Builds Docker images from signed IoT Edge runtime binaries.                        | Manual                                         | Linux - x64, Windows - x64  |
-
+| Type                                      | Goal                                                                                                          | Trigger                                        | Target                                            |
+|-------------------------------------------|---------------------------------------------------------------------------------------------------------------|------------------------------------------------|---------------------------------------------------|
+| Checkin                                   | Ensures that a branch builds clean and passes basic tests.                                                    | When commits are pushed to a Pull Request (PR) | Linux (amd64), Windows (amd64)                    |
+| Security Development Lifecycle (SDL)      | Scans and analyzes the code to detect security issues.                                                        | When commits are pushed to a PR                | Windows (amd64)                                   |
+| Continuous Integration (CI)               | Ensures that a branch builds clean and passes integration tests, builds host packages and Docker images.      | After a PR is merged                           | Linux (amd64, aarch64, arm32v7), Windows (amd64)  |
+| Continuous Deployment (CD)                | Consumes artifacts from CI, deploys IoT Edge to supported devices and tests basic functionality.              | After a successful CI build                    | Linux (amd64, aarch64, arm32v7), Windows (amd64)  |
+| Service Deployment Verification           | Runs smoke tests. Used to validate IoT Edge scenarios before IoT Hub deploys updates.                         | Manual                                         | Linux (amd64)                                     |
+| Build Release                             | Builds IoT Edge packages and Docker images for final release                                                  | Manual                                         | Linux (amd64, aarch64, arm32v7), Windows (amd64)  |
+| Publish Release                           | Publishes IoT Edge packages and Docker images to public release locations.                                    | Manual                                         | Linux (amd64, aarch64, arm32v7), Windows (amd64)  |
 
 Test
 ----

doc/built-in-logs-pull.md

@@ -21,7 +21,7 @@ For best compatibility with this feature, the recommended logging format is:
 
 `{LogLevel}` should follow the [Syslog severity level format](https://wikipedia.org/wiki/Syslog#Severity_lnevel) and `{Timestamp}` should be formatted as `yyyy-mm-dd hh:mm:ss.fff zzz`.
 
-The [Logger class in IoT Edge](https://github.com/Azure/iotedge/blob/master/edge-util/src/Microsoft.Azure.Devices.Edge.Util/Logger.cs) serves as a canonical implementation.
+The [Logger class in IoT Edge](https://github.com/Azure/iotedge/blob/main/edge-util/src/Microsoft.Azure.Devices.Edge.Util/Logger.cs) serves as a canonical implementation.
 
 
 ## UploadModuleLogs

doc/rc/how-to-auto-provision-x509-certificates.md

@@ -126,7 +126,7 @@ The Azure IoT Edge git repository contains scripts that you can use to generate
 
 1. Open a PowerShell window in administrator mode.
 
-1. Clone the git repo that contains scripts to generate non-production certificates. These scripts help you create the necessary certificates to use X.509 attestation when creating a DPS enrollment. Use the `git clone` command or [download the ZIP](https://github.com/Azure/iotedge/archive/master.zip).
+1. Clone the git repo that contains scripts to generate non-production certificates. These scripts help you create the necessary certificates to use X.509 attestation when creating a DPS enrollment. Use the `git clone` command or [download the ZIP](https://github.com/Azure/iotedge/archive/main.zip).
 
    ```powershell
    git clone https://github.com/Azure/iotedge.git
@@ -141,7 +141,7 @@ The Azure IoT Edge git repository contains scripts that you can use to generate
    copy <path>\iotedge\tools\CACertificates\ca-certs.ps1 .
    ```
 
-   If you downloaded the repo as a ZIP, then the folder name is `iotedge-master` and the rest of the path is the same.
+   If you downloaded the repo as a ZIP, then the folder name is `iotedge-main` and the rest of the path is the same.
 
 1. Enable PowerShell to run the scripts.
 

edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.Docker/DockerUtil.cs

@@ -34,7 +34,7 @@ public static class DockerUtil
         ///
         /// tl;dr if there is more than one path-component, and the first component contains a '.' or ':' then
         /// it is a registry address.
-        /// For more information: https://github.com/docker/distribution/blob/master/reference/reference.go
+        /// For more information: https://github.com/docker/distribution/blob/main/reference/reference.go
         /// </summary>
         /// <param name="image">docker image tag</param>
         /// <param name="domain">docker domain</param>

edge-modules/azure-monitor/src/PrometheusMetricsParser.cs

@@ -17,7 +17,7 @@ public static class PrometheusMetricsParser
         //
         // - https://prometheus.io/docs/concepts/data_model/
         // - https://prometheus.io/docs/instrumenting/exposition_formats/
-        // - https://github.com/prometheus/common/blob/master/expfmt/text_parse.go
+        // - https://github.com/prometheus/common/blob/main/expfmt/text_parse.go
         //
         // Example:
         //

edge-util/src/Microsoft.Azure.Devices.Edge.Storage.RocksDb/RocksDbOptionsProvider.cs

@@ -8,9 +8,9 @@ namespace Microsoft.Azure.Devices.Edge.Storage.RocksDb
     public class RocksDbOptionsProvider : IRocksDbOptionsProvider
     {
         // Some explanations from
-        // https://github.com/facebook/rocksdb/blob/master/include/rocksdb/options.h
+        // https://github.com/facebook/rocksdb/blob/main/include/rocksdb/options.h
         // and
-        // https://github.com/facebook/rocksdb/blob/master/include/rocksdb/advanced_options.h
+        // https://github.com/facebook/rocksdb/blob/main/include/rocksdb/advanced_options.h
         // These defaults were taken from ColumnFamilyOptions::OptimizeForSmallDb()
 
         // write_buffer_size = 2M (bytes) per column family

edge-util/src/Microsoft.Azure.Devices.Edge.Storage/StorageLogLevel.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 namespace Microsoft.Azure.Devices.Edge.Storage
 {
-    // Ref: https://github.com/facebook/rocksdb/blob/master/java/src/main/java/org/rocksdb/InfoLogLevel.java
+    // Ref: https://github.com/facebook/rocksdb/blob/main/java/src/main/java/org/rocksdb/InfoLogLevel.java
     public enum StorageLogLevel
     {
         DEBUG = 0,

edgelet/build/linux/package-mariner.sh

@@ -39,17 +39,17 @@ replace-with = "vendored-sources"
 
 [source."https://github.com/Azure/hyperlocal-windows"]
 git = "https://github.com/Azure/hyperlocal-windows"
-branch = "master"
+branch = "main"
 replace-with = "vendored-sources"
 
 [source."https://github.com/Azure/mio-uds-windows.git"]
 git = "https://github.com/Azure/mio-uds-windows.git"
-branch = "master"
+branch = "main"
 replace-with = "vendored-sources"
 
 [source."https://github.com/Azure/tokio-uds-windows.git"]
 git = "https://github.com/Azure/tokio-uds-windows.git"
-branch = "master"
+branch = "main"
 replace-with = "vendored-sources"
 
 [source.vendored-sources]