Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mention 'main' instead of 'master' #29511

Merged
1 commit merged into from
Jan 22, 2021
Merged

Mention 'main' instead of 'master' #29511

1 commit merged into from
Jan 22, 2021

Conversation

dougbu
Copy link
Member

@dougbu dougbu commented Jan 22, 2021

nit: Remove broken links to old Travis environments (that happen to mention 'master')

- part of #29475
- primarily involves updating links to this repo

nit: Remove broken links to old Travis environments (that happen to mention 'master')
@dougbu dougbu requested review from HaoK, BrennanConroy and a team January 22, 2021 00:20
@dougbu dougbu requested a review from a team January 22, 2021 00:20
@dougbu dougbu added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Jan 22, 2021
compileJava.dependsOn generateVersionClass
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't think I set VS Code to add trailing newlines everywhere. Will this cause problems @BrennanConroy

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hope not, we'll see if the CI fails :D

@dougbu
Copy link
Member Author

dougbu commented Jan 22, 2021

Note: This will go in after I rename the branch. In a sense, it'll test out the auto-magic PR handling😁

@pranavkm
Copy link
Contributor

FYI @sebastienros

@@ -24,7 +24,7 @@ dotnet/AspNetCore code paths:
- `PS D:\github\runtime\src\libraries\System.Net.Http\tests\UnitTests> dotnet build /t:test`

## Building dotnet/AspNetCore code:
- https://github.com/dotnet/AspNetCore/blob/master/docs/BuildFromSource.md
- https://github.com/dotnet/aspnetcore/blob/main/docs/BuildFromSource.md
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file must be updated in runtime as well or the bot will overwrite this change.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Base automatically changed from master to main January 22, 2021 01:33
@ghost
Copy link

ghost commented Jan 22, 2021

Hello @dougbu!

Because this pull request has the auto-merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@ghost ghost merged commit e17569e into main Jan 22, 2021
@ghost ghost deleted the dougbu/main.master.29475 branch January 22, 2021 07:00
dougbu added a commit to dougbu/runtime that referenced this pull request Jan 22, 2021
- address difference I introduced in dotnet/aspnetcore#29511 and more
    - conflict detected in dotnet/aspnetcore#29520
- also s|aspnet/aspnetcore|dotnet/aspnetcore|
dougbu added a commit to dotnet/runtime that referenced this pull request Jan 22, 2021
- address difference I introduced in dotnet/aspnetcore#29511 and more
    - conflict detected in dotnet/aspnetcore#29520
- also s|aspnet/aspnetcore|dotnet/aspnetcore|
dougbu added a commit to dougbu/razor-compiler that referenced this pull request Nov 17, 2021
- part of dotnet/aspnetcore#29475
- primarily involves updating links to this repo

nit: Remove broken links to old Travis environments (that happen to mention 'master')

Commit migrated from dotnet/aspnetcore@e17569e18906
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants