Skip to content

Commit c7bbcf4

Browse files
authored
rename master branch to main (#3654)
Already done in nav-docker and nav-arm-templates --------- Co-authored-by: freddydk <[email protected]>
1 parent fefa87f commit c7bbcf4

File tree

7 files changed

+56
-55
lines changed

7 files changed

+56
-55
lines changed

.github/workflows/CI.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
paths-ignore:
77
- '**.md'
88
- '.github/**'
9-
branches: [ master ]
9+
branches: [ main ]
1010

1111
permissions:
1212
contents: read
@@ -226,7 +226,7 @@ jobs:
226226
-AliasesToExport $aliasesToExport `
227227
-CompanyName "Microsoft" `
228228
-ReleaseNotes $versionReleaseNotes `
229-
-LicenseUri 'https://github.com/microsoft/navcontainerhelper/blob/master/LICENSE' `
229+
-LicenseUri 'https://github.com/microsoft/navcontainerhelper/blob/main/LICENSE' `
230230
-ProjectUri 'https://github.com/microsoft/navcontainerhelper'
231231
232232
$certFileName = Join-Path ([System.IO.Path]::GetTempPath()) "$([GUID]::NewGuid().ToString()).pfx"

.github/workflows/Release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
-AliasesToExport $aliasesToExport `
8484
-CompanyName "Microsoft" `
8585
-ReleaseNotes $versionReleaseNotes `
86-
-LicenseUri 'https://github.com/microsoft/navcontainerhelper/blob/master/LICENSE' `
86+
-LicenseUri 'https://github.com/microsoft/navcontainerhelper/blob/main/LICENSE' `
8787
-ProjectUri 'https://github.com/microsoft/navcontainerhelper'
8888
8989
$certFileName = Join-Path ([System.IO.Path]::GetTempPath()) "$([GUID]::NewGuid().ToString()).pfx"

BcContainerHelper.psd1

+1-1
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ PrivateData = @{
259259
# Tags = @()
260260

261261
# A URL to the license for this module.
262-
LicenseUri = 'https://github.com/microsoft/navcontainerhelper/blob/master/LICENSE'
262+
LicenseUri = 'https://github.com/microsoft/navcontainerhelper/blob/main/LICENSE'
263263

264264
# A URL to the main website for this project.
265265
ProjectUri = 'https://github.com/microsoft/navcontainerhelper'

ContainerHandling/New-NavImage.ps1

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

NavContainerHelper.md

+45-45
Large diffs are not rendered by default.

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Your computer will restart.
8787

8888
Run PowerShell as an administrator:
8989
```PowerShell
90-
Invoke-WebRequest -UseBasicParsing -Uri 'https://raw.githubusercontent.com/microsoft/nav-arm-templates/master/InstallOrUpdateDockerEngine.ps1' -OutFile (Join-Path $ENV:TEMP 'installOrUpdateDocker.ps1')
90+
Invoke-WebRequest -UseBasicParsing -Uri 'https://raw.githubusercontent.com/microsoft/nav-arm-templates/main/InstallOrUpdateDockerEngine.ps1' -OutFile (Join-Path $ENV:TEMP 'installOrUpdateDocker.ps1')
9191
. (Join-Path $ENV:TEMP 'installOrUpdateDocker.ps1')
9292
```
9393

@@ -135,7 +135,7 @@ Your computer will restart.
135135

136136
Run PowerShell as an administrator:
137137
```PowerShell
138-
Invoke-WebRequest -UseBasicParsing -Uri 'https://raw.githubusercontent.com/microsoft/nav-arm-templates/master/InstallOrUpdateDockerEngine.ps1' -OutFile (Join-Path $ENV:TEMP 'installOrUpdateDocker.ps1')
138+
Invoke-WebRequest -UseBasicParsing -Uri 'https://raw.githubusercontent.com/microsoft/nav-arm-templates/main/InstallOrUpdateDockerEngine.ps1' -OutFile (Join-Path $ENV:TEMP 'installOrUpdateDocker.ps1')
139139
. (Join-Path $ENV:TEMP 'installOrUpdateDocker.ps1')
140140
```
141141

@@ -174,9 +174,9 @@ These images will also be tagged with the `osversion`, but BcContainerHelper's `
174174
- Windows Server 2022 can run process isolation with the latest image
175175
# Branches
176176

177-
**NavContainerHelper** is the main repo for the NavContainerHelper PowerShell module on PowerShell Gallery. **NavContainerHelper** will as of August 1st 2020 only receive bug fixes.
177+
**NavContainerHelper** is the main branch for the NavContainerHelper PowerShell module on PowerShell Gallery. **NavContainerHelper** is no longer supported.
178178

179-
**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.
179+
**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.
180180

181181
Please report issues in the issues list.
182182

ReleaseNotes.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
6.0.21
2+
Main branch is now main instead of master
23
Issue 3613 aka.ms/getbc fallback to NAVUserPassword because token expired when setting up SSO
34
Issue #3617 Regression File Newtonsoft.Json.dll not found when copying item for New-BcCompilerFolder
45
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

0 commit comments

Comments
 (0)