From 289874f0ec873d0e6675624fa365ef0d4f3ccc8f Mon Sep 17 00:00:00 2001 From: Stephane Delcroix Date: Wed, 1 Jul 2020 11:58:04 +0200 Subject: [PATCH] Fix some links with main branch rename (#11240) * Replacing master with main * revert some changes pointing to different repositories * Update Xamarin.Forms.Core/Crc64.cs Co-authored-by: Nick Randolph --- .github/CONTRIBUTING.md | 4 ++-- .github/PULL_REQUEST_TEMPLATE.md | 6 +++--- README.md | 6 +++--- .../Bugzilla32691.cs | 2 +- .../Bugzilla35733.cs | 2 +- .../Bugzilla37625.cs | 2 +- .../Bugzilla39378.xaml.cs | 2 +- .../Xamarin.Forms.Controls.Issues.Shared/Issue1613.cs | 2 +- .../Xamarin.Forms.Controls.Issues.Shared/Issue1700.cs | 4 ++-- .../Xamarin.Forms.Controls.Issues.Shared/Issue1724.cs | 2 +- .../Xamarin.Forms.Controls.Issues.Shared/Issue7128.cs | 10 +++++----- .../CoreGalleryPages/ImageButtonCoreGalleryPage.cs | 2 +- .../CoreGalleryPages/ImageCoreGalleryPage.cs | 2 +- .../GalleryPages/CellsGalleries/ViewCellGallery.cs | 2 +- .../GalleryPages/ImageLoadingGallery.cs | 2 +- Xamarin.Forms.Core/Crc64.cs | 2 +- .../Resources/drawable/MaterialProgressBar.xml | 2 +- 17 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 38c792dc07..6333602828 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -72,6 +72,6 @@ Once a pull request has two approvals, it will receive an "approved" label. As l Bug fixes should be targeted at the earliest appropriate branch. - The _current stable branch_ corresponds to the latest stable version available on NuGet.org. This branch will now only accept regressions or fixes that meet a very high bar and low risk. - The _current prerelease branch_ corresponds to the latest prerelease version available on NuGet.org. This branch will only accept bug fixes without API changes or breaking changes, with the exception of any API that is under an experimental flag. -- _Master_ corresponds to a version that is not yet tagged. This is also the "nightly" branch. This is where anything that doesn't fit into the stable or prerelease branches should be targeted. +- _Main_ corresponds to a version that is not yet tagged. This is also the "nightly" branch. This is where anything that doesn't fit into the stable or prerelease branches should be targeted. -Commits will be merged up from stable to prerelease to master branches on a regular basis (typically every Monday and whenever a new release is tagged). +Commits will be merged up from stable to prerelease to main branches on a regular basis (typically every Monday and whenever a new release is tagged). diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 9e5e02a2d9..c5d0a933a9 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,8 +1,8 @@ diff --git a/README.md b/README.md index 1a783ca6b2..1d000fc33d 100644 --- a/README.md +++ b/README.md @@ -9,11 +9,11 @@ Read more about the platform at https://www.xamarin.com/forms. ## Build Status ## -![Azure DevOps](https://devdiv.visualstudio.com/DevDiv/_apis/build/status/Xamarin/XamarinForms/Xamarin%20Forms?branchName=master "Azure Pipelines") +![Azure DevOps](https://devdiv.visualstudio.com/DevDiv/_apis/build/status/Xamarin/XamarinForms/Xamarin%20Forms?branchName=main "Azure Pipelines") ## Packages ## -Platform/Feature | Package name | Stable | Prerelease | Nightly Feed [Azure](https://aka.ms/xf-ci/index.json) (master branch) +Platform/Feature | Package name | Stable | Prerelease | Nightly Feed [Azure](https://aka.ms/xf-ci/index.json) (main branch) -----------------------|-------------------------------------------|-----------------------------|------------------------- |-------------------------| Core | `Xamarin.Forms` | [![NuGet](https://img.shields.io/nuget/v/Xamarin.Forms.svg?style=flat-square&label=nuget)](https://www.nuget.org/packages/Xamarin.Forms/) | [![NuGet](https://img.shields.io/nuget/vpre/Xamarin.Forms.svg?style=flat-square&label=nuget)](https://www.nuget.org/packages/Xamarin.Forms/) | AppLinks | `Xamarin.Forms.AppLinks` | [![NuGet](https://img.shields.io/nuget/v/Xamarin.Forms.AppLinks.svg?style=flat-square&label=nuget)](https://www.nuget.org/packages/Xamarin.Forms.AppLinks/) | [![NuGet](https://img.shields.io/nuget/vpre/Xamarin.Forms.AppLinks.svg?style=flat-square&label=nuget)](https://www.nuget.org/packages/Xamarin.Forms.AppLinks/) | @@ -151,7 +151,7 @@ We follow the style used by the [.NET Foundation](https://github.com/dotnet/runt ## Contributing ## -- [How to Contribute](https://github.com/xamarin/Xamarin.Forms/blob/master/.github/CONTRIBUTING.md) +- [How to Contribute](https://github.com/xamarin/Xamarin.Forms/blob/main/.github/CONTRIBUTING.md) ### Reporting Bugs ### diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32691.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32691.cs index 9eb7405dd4..fc6acc0684 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32691.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32691.cs @@ -40,7 +40,7 @@ namespace Xamarin.Forms.Controls.Issues { ClearImageCache(); image.Source = - "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/banner.png"; + "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/main/banner.png"; btnSetOrClear.Text = KClearImageSource; } else diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35733.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35733.cs index 6ef9af53a6..daa25a7aa8 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35733.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35733.cs @@ -42,7 +42,7 @@ namespace Xamarin.Forms.Controls.Issues async Task ShowLocation(string locationString) { - var stringUri = $"https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/README.md?l=en&px_location={Uri.EscapeDataString(locationString)}"; + var stringUri = $"https://raw.githubusercontent.com/xamarin/Xamarin.Forms/main/README.md?l=en&px_location={Uri.EscapeDataString(locationString)}"; var uri = new Uri(stringUri); var webPage = new ContentPage diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37625.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37625.cs index 8f7d80d4cf..eed403afa1 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37625.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37625.cs @@ -22,7 +22,7 @@ namespace Xamarin.Forms.Controls.Issues { int retry = 5; while (retry-- >= 0) { - var imageUri = new Uri ("https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Xamarin.Forms.ControlGallery.Android/Assets/WebImages/XamarinLogo.png"); + var imageUri = new Uri ("https://raw.githubusercontent.com/xamarin/Xamarin.Forms/main/Xamarin.Forms.ControlGallery.Android/Assets/WebImages/XamarinLogo.png"); Content = new Image () { Source = new UriImageSource () { Uri = imageUri }, BackgroundColor = Color.Black, AutomationId = "success" }; await Task.Delay (50); diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39378.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39378.xaml.cs index d75e319ebd..e4d7880522 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39378.xaml.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39378.xaml.cs @@ -28,7 +28,7 @@ namespace Xamarin.Forms.Controls.Issues public ImageController39378() { - HomeImage = "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/banner.png"; + HomeImage = "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/main/banner.png"; BackgroundColor = "#f5f5dc"; } diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1613.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1613.cs index 646d031f37..6a5a23db30 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1613.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1613.cs @@ -26,7 +26,7 @@ namespace Xamarin.Forms.Controls.Issues { var image = new Image { - Source = "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/banner.png", + Source = "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/main/banner.png", Aspect = Aspect.AspectFill, Opacity = 0.5, }; diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1700.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1700.cs index 56fd12386a..c68ab8b5b1 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1700.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1700.cs @@ -23,8 +23,8 @@ namespace Xamarin.Forms.Controls.Issues protected override void Init() { var stack = new StackLayout(); - var url = "https://github.com/xamarin/Xamarin.Forms/raw/master/Xamarin.Forms.ControlGallery.Android/Resources/drawable/Legumes.jpg?a=bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"; - var url2 = "https://github.com/xamarin/Xamarin.Forms/raw/master/Xamarin.Forms.ControlGallery.Android/Resources/drawable/Vegetables.jpg?a=bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbasdasdasdasdasasdasdasdasdasd"; + var url = "https://github.com/xamarin/Xamarin.Forms/raw/main/Xamarin.Forms.ControlGallery.Android/Resources/drawable/Legumes.jpg?a=bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"; + var url2 = "https://github.com/xamarin/Xamarin.Forms/raw/main/Xamarin.Forms.ControlGallery.Android/Resources/drawable/Vegetables.jpg?a=bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbasdasdasdasdasasdasdasdasdasd"; var img = new Image { Source = new UriImageSource { Uri = new Uri(url) } diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1724.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1724.cs index 410c0c7393..4b7861274a 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1724.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1724.cs @@ -98,7 +98,7 @@ namespace Xamarin.Forms.Controls.Issues new Label(){ Text = "Do you see image from a Uri?" }, new ImageButton() { - Source = "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Xamarin.Forms.Controls/coffee.png", + Source = "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/main/Xamarin.Forms.Controls/coffee.png", BackgroundColor = Color.ForestGreen }, new Label(){ Text = "Invalid Image Uri just to test it doesn't crash" }, diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7128.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7128.cs index 7faef9cb74..640c490f14 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7128.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7128.cs @@ -121,11 +121,11 @@ namespace Xamarin.Forms.Controls.Issues var source = new ObservableCollection<_7128Model>(); var images = new string[] { - "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Xamarin.Forms.ControlGallery.iOS/oasis.jpg", - "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Xamarin.Forms.ControlGallery.iOS/photo.jpg", - "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Xamarin.Forms.ControlGallery.iOS/xamarinstore.jpg", - "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Xamarin.Forms.ControlGallery.iOS/crimson.jpg", - "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Xamarin.Forms.ControlGallery.WindowsUniversal/cover1.jpg" + "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/main/Xamarin.Forms.ControlGallery.iOS/oasis.jpg", + "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/main/Xamarin.Forms.ControlGallery.iOS/photo.jpg", + "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/main/Xamarin.Forms.ControlGallery.iOS/xamarinstore.jpg", + "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/main/Xamarin.Forms.ControlGallery.iOS/crimson.jpg", + "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/main/Xamarin.Forms.ControlGallery.WindowsUniversal/cover1.jpg" }; for (int n = 0; n < 35; n++) diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/ImageButtonCoreGalleryPage.cs b/Xamarin.Forms.Controls/CoreGalleryPages/ImageButtonCoreGalleryPage.cs index b03c378f5d..366008034d 100644 --- a/Xamarin.Forms.Controls/CoreGalleryPages/ImageButtonCoreGalleryPage.cs +++ b/Xamarin.Forms.Controls/CoreGalleryPages/ImageButtonCoreGalleryPage.cs @@ -110,7 +110,7 @@ namespace Xamarin.Forms.Controls InitializeElement(isLoadingContainer.View); InitializeElement(isOpaqueContainer.View); - var sourceContainer = new ViewContainer(Test.ImageButton.Source, new ImageButton { Source = "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Xamarin.Forms.Controls/coffee.png" }); + var sourceContainer = new ViewContainer(Test.ImageButton.Source, new ImageButton { Source = "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/main/Xamarin.Forms.Controls/coffee.png" }); var gifContainer = new ViewContainer(Test.ImageButton.Source, new ImageButton { Source = "GifTwo.gif" }); diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/ImageCoreGalleryPage.cs b/Xamarin.Forms.Controls/CoreGalleryPages/ImageCoreGalleryPage.cs index eb5a9433a7..611086ae14 100644 --- a/Xamarin.Forms.Controls/CoreGalleryPages/ImageCoreGalleryPage.cs +++ b/Xamarin.Forms.Controls/CoreGalleryPages/ImageCoreGalleryPage.cs @@ -29,7 +29,7 @@ namespace Xamarin.Forms.Controls InitializeElement (isLoadingContainer.View); InitializeElement (isOpaqueContainer.View); - var sourceContainer = new ViewContainer (Test.Image.Source, new Image { Source = "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Xamarin.Forms.Controls/coffee.png" }); + var sourceContainer = new ViewContainer (Test.Image.Source, new Image { Source = "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/main/Xamarin.Forms.Controls/coffee.png" }); Add (aspectFillContainer); Add (aspectFitContainer); diff --git a/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/ViewCellGallery.cs b/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/ViewCellGallery.cs index e377e204c5..e0083876e8 100644 --- a/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/ViewCellGallery.cs +++ b/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/ViewCellGallery.cs @@ -68,7 +68,7 @@ namespace Xamarin.Forms.Controls { albums[n] = string.Format( - "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Xamarin.Forms.Controls/coffee.png?ticks={0}", n); + "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/main/Xamarin.Forms.Controls/coffee.png?ticks={0}", n); } var label = new Label { Text = "I have not been selected" }; diff --git a/Xamarin.Forms.Controls/GalleryPages/ImageLoadingGallery.cs b/Xamarin.Forms.Controls/GalleryPages/ImageLoadingGallery.cs index 9488a333e2..6c06e87f72 100644 --- a/Xamarin.Forms.Controls/GalleryPages/ImageLoadingGallery.cs +++ b/Xamarin.Forms.Controls/GalleryPages/ImageLoadingGallery.cs @@ -11,7 +11,7 @@ namespace Xamarin.Forms.Controls Padding = new Thickness (20); var source = new UriImageSource { - Uri = new Uri ("https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/banner.png"), + Uri = new Uri ("https://raw.githubusercontent.com/xamarin/Xamarin.Forms/main/banner.png"), CachingEnabled = false }; diff --git a/Xamarin.Forms.Core/Crc64.cs b/Xamarin.Forms.Core/Crc64.cs index 8273222181..db56f5f6e7 100644 --- a/Xamarin.Forms.Core/Crc64.cs +++ b/Xamarin.Forms.Core/Crc64.cs @@ -221,4 +221,4 @@ namespace Xamarin.Forms.Internals } } -#endif \ No newline at end of file +#endif diff --git a/Xamarin.Forms.Material.Android/Resources/drawable/MaterialProgressBar.xml b/Xamarin.Forms.Material.Android/Resources/drawable/MaterialProgressBar.xml index 2a875ad5a0..3cbde77109 100644 --- a/Xamarin.Forms.Material.Android/Resources/drawable/MaterialProgressBar.xml +++ b/Xamarin.Forms.Material.Android/Resources/drawable/MaterialProgressBar.xml @@ -1,6 +1,6 @@