rename master branch to main (#3654)

Already done in nav-docker and nav-arm-templates --------- Co-authored-by: freddydk <freddydk@users.noreply.github.com>
microsoft · Sep 5, 2024 · c7bbcf4 · c7bbcf4
1 parent fefa87f
commit c7bbcf4
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 55 deletions.
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -6,7 +6,7 @@ on:
     paths-ignore:
       - '**.md'
       - '.github/**'
-    branches: [ master ]
+    branches: [ main ]
 
 permissions:
   contents: read
@@ -226,7 +226,7 @@ jobs:
                                   -AliasesToExport $aliasesToExport `
                                   -CompanyName "Microsoft" `
                                   -ReleaseNotes $versionReleaseNotes `
-                                  -LicenseUri 'https://github.com/microsoft/navcontainerhelper/blob/master/LICENSE' `
+                                  -LicenseUri 'https://github.com/microsoft/navcontainerhelper/blob/main/LICENSE' `
                                   -ProjectUri 'https://github.com/microsoft/navcontainerhelper'
 
             $certFileName = Join-Path ([System.IO.Path]::GetTempPath()) "$([GUID]::NewGuid().ToString()).pfx"

diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml
@@ -83,7 +83,7 @@ jobs:
                                   -AliasesToExport $aliasesToExport `
                                   -CompanyName "Microsoft" `
                                   -ReleaseNotes $versionReleaseNotes `
-                                  -LicenseUri 'https://github.com/microsoft/navcontainerhelper/blob/master/LICENSE' `
+                                  -LicenseUri 'https://github.com/microsoft/navcontainerhelper/blob/main/LICENSE' `
                                   -ProjectUri 'https://github.com/microsoft/navcontainerhelper'
 
             $certFileName = Join-Path ([System.IO.Path]::GetTempPath()) "$([GUID]::NewGuid().ToString()).pfx"

diff --git a/BcContainerHelper.psd1 b/BcContainerHelper.psd1
@@ -259,7 +259,7 @@ PrivateData = @{
         # Tags = @()
 
         # A URL to the license for this module.
-        LicenseUri = 'https://github.com/microsoft/navcontainerhelper/blob/master/LICENSE'
+        LicenseUri = 'https://github.com/microsoft/navcontainerhelper/blob/main/LICENSE'
 
         # A URL to the main website for this project.
         ProjectUri = 'https://github.com/microsoft/navcontainerhelper'

diff --git a/ContainerHandling/New-NavImage.ps1 b/ContainerHandling/New-NavImage.ps1
@@ -472,9 +472,9 @@ try {
                 $InstallDotNet = ""
                 if ($genericTag -le [Version]"1.0.2.13" -and [Version]$appManifest.Version -ge [Version]"22.0.0.0") {
                     Write-Host "Patching SetupConfiguration.ps1 due to issue #2874"
-                    $myscripts += @( "https://raw.githubusercontent.com/microsoft/nav-docker/master/generic/Run/210-new/SetupConfiguration.ps1" )
+                    $myscripts += @( "https://raw.githubusercontent.com/microsoft/nav-docker/main/generic/Run/210-new/SetupConfiguration.ps1" )
                     Write-Host "Patching prompt.ps1 due to issue #2891"
-                    $myScripts += @( "https://raw.githubusercontent.com/microsoft/nav-docker/master/generic/Run/Prompt.ps1" )
+                    $myScripts += @( "https://raw.githubusercontent.com/microsoft/nav-docker/main/generic/Run/Prompt.ps1" )
                     $myScripts += @( "https://download.visualstudio.microsoft.com/download/pr/04389c24-12a9-4e0e-8498-31989f30bb22/141aef28265938153eefad0f2398a73b/dotnet-hosting-6.0.27-win.exe" )
                     Write-Host "Base image is generic image 1.0.2.13 or below, installing dotnet 6.0.27"
                     $InstallDotNet = 'RUN start-process -Wait -FilePath "c:\run\dotnet-hosting-6.0.27-win.exe" -ArgumentList /quiet'

diff --git a/NavContainerHelper.md b/NavContainerHelper.md
diff --git a/README.md b/README.md
@@ -87,7 +87,7 @@ Your computer will restart.
 
 Run PowerShell as an administrator:
 ```PowerShell
-Invoke-WebRequest -UseBasicParsing -Uri 'https://raw.githubusercontent.com/microsoft/nav-arm-templates/master/InstallOrUpdateDockerEngine.ps1' -OutFile (Join-Path $ENV:TEMP 'installOrUpdateDocker.ps1')
+Invoke-WebRequest -UseBasicParsing -Uri 'https://raw.githubusercontent.com/microsoft/nav-arm-templates/main/InstallOrUpdateDockerEngine.ps1' -OutFile (Join-Path $ENV:TEMP 'installOrUpdateDocker.ps1')
 . (Join-Path $ENV:TEMP 'installOrUpdateDocker.ps1')
 ```
 
@@ -135,7 +135,7 @@ Your computer will restart.
 
 Run PowerShell as an administrator:
 ```PowerShell
-Invoke-WebRequest -UseBasicParsing -Uri 'https://raw.githubusercontent.com/microsoft/nav-arm-templates/master/InstallOrUpdateDockerEngine.ps1' -OutFile (Join-Path $ENV:TEMP 'installOrUpdateDocker.ps1')
+Invoke-WebRequest -UseBasicParsing -Uri 'https://raw.githubusercontent.com/microsoft/nav-arm-templates/main/InstallOrUpdateDockerEngine.ps1' -OutFile (Join-Path $ENV:TEMP 'installOrUpdateDocker.ps1')
 . (Join-Path $ENV:TEMP 'installOrUpdateDocker.ps1')
 ```
 
@@ -174,9 +174,9 @@ These images will also be tagged with the `osversion`, but BcContainerHelper's `
 - Windows Server 2022 can run process isolation with the latest image
 # Branches
 
-**NavContainerHelper** is the main repo for the NavContainerHelper PowerShell module on PowerShell Gallery. **NavContainerHelper** will as of August 1st 2020 only receive bug fixes.
+**NavContainerHelper** is the main branch for the NavContainerHelper PowerShell module on PowerShell Gallery. **NavContainerHelper** is no longer supported.
 
-**master** is the main repo for the BcContainerHelper PowerShell module on PowerShell Gallery. **BcContainerHelper** will from August 1st 2020 ship as release and pre-release.
+**main** is the main branch for the BcContainerHelper PowerShell module on PowerShell Gallery. **BcContainerHelper** will from August 1st 2020 ship as release and pre-release.
 
 Please report issues in the issues list.
 

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
@@ -1,4 +1,5 @@
 6.0.21
+Main branch is now main instead of master
 Issue 3613 aka.ms/getbc fallback to NAVUserPassword because token expired when setting up SSO
 Issue #3617 Regression File Newtonsoft.Json.dll not found when copying item for New-BcCompilerFolder
 Remove functions for supporting Alpaca and Cloud Containers - integration between alpaca and cloud containers with AL-Go for GitHub will NOT be done through BcContainerHelper