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 <nick@builttoroam.com>
This commit is contained in:
Stephane Delcroix
GitHub
Родитель
0576ea1a87
Коммит
289874f0ec
|
|
@ -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).
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<!-- WAIT! Before you submit this PR, make sure you're building on and targeting the right branch!
|
||||
- If this is an enhancement or contains API changes or breaking changes, target master.
|
||||
- If this is an enhancement or contains API changes or breaking changes, target main.
|
||||
- If the issue you're working on has a milestone, target the corresponding branch.
|
||||
- If this is a bug fix, target the branch of the latest stable version (unless the bug is only in a prerelease or master, of course!).
|
||||
See [Contributing](https://github.com/xamarin/Xamarin.Forms/blob/master/.github/CONTRIBUTING.md) for more tips!
|
||||
- If this is a bug fix, target the branch of the latest stable version (unless the bug is only in a prerelease or main, of course!).
|
||||
See [Contributing](https://github.com/xamarin/Xamarin.Forms/blob/main/.github/CONTRIBUTING.md) for more tips!
|
||||
|
||||
PLEASE DELETE THE ALL THESE COMMENTS BEFORE SUBMITTING! THANKS!!!
|
||||
-->
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ Read more about the platform at https://www.xamarin.com/forms.
|
|||
|
||||
## Build Status ##
|
||||
|
||||
|
||||
|
||||
|
||||
## 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` | [](https://www.nuget.org/packages/Xamarin.Forms/) | [](https://www.nuget.org/packages/Xamarin.Forms/) |
|
||||
AppLinks | `Xamarin.Forms.AppLinks` | [](https://www.nuget.org/packages/Xamarin.Forms.AppLinks/) | [](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 ###
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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) }
|
||||
|
|
|
|||
|
|
@ -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" },
|
||||
|
|
|
|||
|
|
@ -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++)
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ namespace Xamarin.Forms.Controls
|
|||
InitializeElement(isLoadingContainer.View);
|
||||
InitializeElement(isOpaqueContainer.View);
|
||||
|
||||
var sourceContainer = new ViewContainer<ImageButton>(Test.ImageButton.Source, new ImageButton { Source = "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Xamarin.Forms.Controls/coffee.png" });
|
||||
var sourceContainer = new ViewContainer<ImageButton>(Test.ImageButton.Source, new ImageButton { Source = "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/main/Xamarin.Forms.Controls/coffee.png" });
|
||||
|
||||
var gifContainer = new ViewContainer<ImageButton>(Test.ImageButton.Source, new ImageButton { Source = "GifTwo.gif" });
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ namespace Xamarin.Forms.Controls
|
|||
InitializeElement (isLoadingContainer.View);
|
||||
InitializeElement (isOpaqueContainer.View);
|
||||
|
||||
var sourceContainer = new ViewContainer<Image> (Test.Image.Source, new Image { Source = "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/master/Xamarin.Forms.Controls/coffee.png" });
|
||||
var sourceContainer = new ViewContainer<Image> (Test.Image.Source, new Image { Source = "https://raw.githubusercontent.com/xamarin/Xamarin.Forms/main/Xamarin.Forms.Controls/coffee.png" });
|
||||
|
||||
Add (aspectFillContainer);
|
||||
Add (aspectFitContainer);
|
||||
|
|
|
|||
|
|
@ -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" };
|
||||
|
|
|
|||
|
|
@ -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
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -221,4 +221,4 @@ namespace Xamarin.Forms.Internals
|
|||
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
From original drawable https://github.com/aosp-mirror/platform_frameworks_base/blob/master/core/res/res/drawable/progress_horizontal_material.xml
|
||||
From original drawable https://github.com/aosp-mirror/platform_frameworks_base/blob/main/core/res/res/drawable/progress_horizontal_material.xml
|
||||
with removed rounded corners. And, following some of the drawable/color links.
|
||||
-->
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче