[release/2.1] Remove some dangling 'master' mentions (#1020)

- ignoring the `dotnet-install` scripts for now
- remove an old `dev` mention too
  - branch no longer exists
- nit: address a few Markdown lint complaints
This commit is contained in:
Doug Bunting 2023-02-17 10:30:17 -08:00 коммит произвёл GitHub
Родитель b51f7e81e2
Коммит 9f99846734
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
11 изменённых файлов: 20 добавлений и 24 удалений

Просмотреть файл

@ -2,7 +2,7 @@
trigger:
branches:
include:
- master
- main
- release/*
# Trigger builds for PRs to any branch

Просмотреть файл

@ -69,7 +69,7 @@ jobs:
maxParallel: 8
matrix: ${{ parameters.matrix }}
# Map friendly OS names to the right queue
# See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md and
# See https://github.com/dotnet/arcade/blob/main/Documentation/ChoosingAMachinePool.md and
# https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#use-a-microsoft-hosted-agent
pool:
${{ if ne(parameters.poolName, '') }}:

Просмотреть файл

@ -1,4 +1,4 @@
Contributing
======
Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/AspNetCore/blob/master/CONTRIBUTING.md) in the AspNetCore repo.
Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/AspNetCore/blob/main/CONTRIBUTING.md) in the AspNetCore repo.

Просмотреть файл

@ -1,5 +1,4 @@
Build Tools
===========
# Build Tools
Utilities used in the build system for projects that are used with ASP.NET Core and Entity Framework Core.
@ -13,19 +12,17 @@ See [docs/README.md](./docs/README.md).
Channel | Latest Build
---------------|:---------------
master | ![badge][master-badge]
main | ![badge][main-badge]
release/2.1 | ![badge][rel-2.1-badge]
release/2.0 | ![badge][rel-2.0-badge]
[master-badge]: https://aspnetcore.blob.core.windows.net/buildtools/korebuild/channels/master/badge.svg
[main-badge]: https://aspnetcore.blob.core.windows.net/buildtools/korebuild/channels/main/badge.svg
[rel-2.1-badge]: https://aspnetcore.blob.core.windows.net/buildtools/korebuild/channels/release/2.1/badge.svg
[rel-2.0-badge]: https://aspnetcore.blob.core.windows.net/buildtools/korebuild/channels/release/2.0/badge.svg
This tool contains build scripts, console tools, MSBuild targets, and other settings required to build ASP.NET Core.
## Local testing
To test changes to this project locally we recomend you do:
To test changes to this project locally we recommend you do:
```ps1
./test.ps1 -Command $CommandToTest -RepoPath C:\repo\to\test\against\

Просмотреть файл

@ -41,10 +41,10 @@ Example:
{
// add this for editor auto-completion :)
"$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
"$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/main/tools/korebuild.schema.json",
// specifies the channel used to update KoreBuild to new versions when you attempt to upgrade KoreBuild
"channel": "dev",
"channel": "main",
"toolsets": {
// All toolsets listed in this section are treated as required toolsets

Просмотреть файл

@ -1,5 +1,4 @@
Signing
=======
# Signing
KoreBuild supports code signing files and using MSBuild to configure the list of files which are code-signed.
@ -137,4 +136,4 @@ For example,
content/*.js;Microsoft.DotNet.Web.Spa.ProjectTemplates.*.nupkg; Exclude JavaScript files from codesigning in project templates
```
See https://github.com/dotnet/arcade/tree/master/src/SignCheck for more details on SignCheck.
See https://github.com/dotnet/arcade/tree/main/src/SignCheck for more details on SignCheck.

Просмотреть файл

@ -30,7 +30,7 @@ namespace KoreBuild.Tasks
private CancellationTokenSource _cts = new CancellationTokenSource();
/// <summary>
/// The lineup package ID of the nupkg that contains the master dependencies.props files that will be used to upgrade versions
/// The lineup package ID of the nupkg that contains the main dependencies.props files that will be used to upgrade versions
/// </summary>
[Required]
public string LineupPackageId { get; set; }

Просмотреть файл

@ -72,7 +72,7 @@
Specifies a required .NET Core SDK.
Examples:
<DotNetCoreSdk Include="coherent" Channel="master" InstallDir="$(RepositoryRoot)\.siteextension\" />
<DotNetCoreSdk Include="coherent" Channel="LTS" InstallDir="$(RepositoryRoot)\.siteextension\" />
-->
<DotNetCoreSdk>
<Arch>$(DefaultDotNetAssetArch)</Arch>

Просмотреть файл

@ -52,8 +52,8 @@ in the file are overridden by command line parameters.
Example config file:
```json
{
"$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
"channel": "master",
"$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/main/tools/korebuild.schema.json",
"channel": "main",
"toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools"
}
```
@ -193,7 +193,7 @@ if (!$DotNetHome) {
else { Join-Path $PSScriptRoot '.dotnet'}
}
if (!$Channel) { $Channel = 'master' }
if (!$Channel) { $Channel = 'main' }
if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' }
# Execute

Просмотреть файл

@ -251,7 +251,7 @@ if [ -f "$config_file" ]; then
fi
[ -z "${DOTNET_HOME:-}" ] && DOTNET_HOME="$HOME/.dotnet"
[ -z "$channel" ] && channel='master'
[ -z "$channel" ] && channel='main'
[ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'
get_korebuild

Просмотреть файл

@ -109,9 +109,9 @@
"channel": {
"description": "The channel of KoreBuild used to select a version when korebuild-lock.txt is not present.",
"type": "string",
"default": "master",
"default": "main",
"enum": [
"master",
"main",
"release/2.2",
"release/2.1",
"release/2.0"