From ad04ccc893d0fa3702dd10b5951ca0d971c5e60f Mon Sep 17 00:00:00 2001 From: aborziak-ms <83784664+aborziak-ms@users.noreply.github.com> Date: Mon, 31 Jan 2022 13:15:01 -0800 Subject: [PATCH] Sync some files to the new branch name (#486) --- README.md | 2 +- samples/LottieSamples/Scenarios/AsyncPage.xaml | 2 +- samples/LottieSamples/Scenarios/CodegenPage.xaml | 2 +- samples/LottieSamples/Scenarios/FallbackPage.xaml | 2 +- samples/LottieSamples/Scenarios/JsonPage.xaml | 2 +- samples/LottieSamples/Scenarios/ModifyPage.xaml | 8 ++++---- samples/LottieSamples/Scenarios/PlaybackPage.xaml | 4 ++-- samples/LottieSamples/Scenarios/ProgressPage.xaml | 4 ++-- samples/LottieSamples/Scenarios/SegmentPage.xaml | 2 +- source/Lottie/Issue.cs | 2 +- version.json | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index e3ac44e..7a65e65 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ This repo also contains source code for **[samples](/LottieViewer)**. ## Build Status | Target | Branch | Status | Recommended NuGet package | | ------ | ------ | ------ | ------ | -| 6.1.0 release | master | [![Build Status](https://dev.azure.com/dotnet/WindowsCommunityToolkit/_apis/build/status/Microsoft.Toolkit.Uwp.UI.Lottie?branchName=master)](https://dev.azure.com/dotnet/WindowsCommunityToolkit/_build/latest?definitionId=61&branchName=master) | [![NuGet](https://img.shields.io/nuget/v/Microsoft.Toolkit.Uwp.UI.Lottie.svg)](https://www.nuget.org/packages/Microsoft.Toolkit.Uwp.UI.Lottie/) | +| 7.1.0 release | main | [![Build Status](https://dev.azure.com/dotnet/WindowsCommunityToolkit/_apis/build/status/Microsoft.Toolkit.Uwp.UI.Lottie?branchName=main)](https://dev.azure.com/dotnet/WindowsCommunityToolkit/_build/latest?definitionId=61&branchName=main) | [![NuGet](https://img.shields.io/nuget/v/Microsoft.Toolkit.Uwp.UI.Lottie.svg)](https://www.nuget.org/packages/Microsoft.Toolkit.Uwp.UI.Lottie/) | ## Feedback and Requests Please use [GitHub Issues](https://github.com/windows-toolkit/Lottie-Windows/issues) for bug reports and feature requests. diff --git a/samples/LottieSamples/Scenarios/AsyncPage.xaml b/samples/LottieSamples/Scenarios/AsyncPage.xaml index db1766e..49a3eab 100644 --- a/samples/LottieSamples/Scenarios/AsyncPage.xaml +++ b/samples/LottieSamples/Scenarios/AsyncPage.xaml @@ -111,7 +111,7 @@ To learn more about the PlayAsync method, check out the - + code-behind and read diff --git a/samples/LottieSamples/Scenarios/CodegenPage.xaml b/samples/LottieSamples/Scenarios/CodegenPage.xaml index b62dd0d..c5b31cf 100644 --- a/samples/LottieSamples/Scenarios/CodegenPage.xaml +++ b/samples/LottieSamples/Scenarios/CodegenPage.xaml @@ -62,7 +62,7 @@ To learn more, check out the - + XAML and read diff --git a/samples/LottieSamples/Scenarios/FallbackPage.xaml b/samples/LottieSamples/Scenarios/FallbackPage.xaml index c69521c..883c1bf 100644 --- a/samples/LottieSamples/Scenarios/FallbackPage.xaml +++ b/samples/LottieSamples/Scenarios/FallbackPage.xaml @@ -55,7 +55,7 @@ To learn more, check out the - + XAML and read diff --git a/samples/LottieSamples/Scenarios/JsonPage.xaml b/samples/LottieSamples/Scenarios/JsonPage.xaml index 4cfeafc..64b7071 100644 --- a/samples/LottieSamples/Scenarios/JsonPage.xaml +++ b/samples/LottieSamples/Scenarios/JsonPage.xaml @@ -55,7 +55,7 @@ To learn more, check out the - + XAML and read diff --git a/samples/LottieSamples/Scenarios/ModifyPage.xaml b/samples/LottieSamples/Scenarios/ModifyPage.xaml index 19b7cbc..990798f 100644 --- a/samples/LottieSamples/Scenarios/ModifyPage.xaml +++ b/samples/LottieSamples/Scenarios/ModifyPage.xaml @@ -49,19 +49,19 @@ Check out the - + modified Lottie file + - + codegen'd class + - + XAML + - + code-behind to get a sense of how property annotations may be used to dynamically update Lottie animations. diff --git a/samples/LottieSamples/Scenarios/PlaybackPage.xaml b/samples/LottieSamples/Scenarios/PlaybackPage.xaml index c195af4..bfdad1c 100644 --- a/samples/LottieSamples/Scenarios/PlaybackPage.xaml +++ b/samples/LottieSamples/Scenarios/PlaybackPage.xaml @@ -87,11 +87,11 @@ To learn more, check out the - + XAML + - + code-behind , diff --git a/samples/LottieSamples/Scenarios/ProgressPage.xaml b/samples/LottieSamples/Scenarios/ProgressPage.xaml index 40339ac..5724679 100644 --- a/samples/LottieSamples/Scenarios/ProgressPage.xaml +++ b/samples/LottieSamples/Scenarios/ProgressPage.xaml @@ -73,11 +73,11 @@ To learn more, check out the - + XAML + - + code-behind . diff --git a/samples/LottieSamples/Scenarios/SegmentPage.xaml b/samples/LottieSamples/Scenarios/SegmentPage.xaml index d67fc32..31facaf 100644 --- a/samples/LottieSamples/Scenarios/SegmentPage.xaml +++ b/samples/LottieSamples/Scenarios/SegmentPage.xaml @@ -68,7 +68,7 @@ To learn more, check out the - + code-behind and read diff --git a/source/Lottie/Issue.cs b/source/Lottie/Issue.cs index ba20d0c..2b17fca 100644 --- a/source/Lottie/Issue.cs +++ b/source/Lottie/Issue.cs @@ -30,7 +30,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Lottie /// /// Gets a URL that may give more information about the issue. /// - public string Url => $"https://github.com/windows-toolkit/Lottie-Windows/blob/master/source/Issues/{Code}.md"; + public string Url => $"https://github.com/windows-toolkit/Lottie-Windows/blob/main/source/Issues/{Code}.md"; /// /// Returns a string representation of the issue. diff --git a/version.json b/version.json index f1cebaf..b566443 100644 --- a/version.json +++ b/version.json @@ -1,7 +1,7 @@ { "version": "7.1.0-build.{height}", "publicReleaseRefSpec": [ - "^refs/heads/master$", // we release out of master + "^refs/heads/main$", // we release out of main "^refs/heads/dev$", // we release out of dev "^refs/heads/rel/\\d+\\.\\d+\\.\\d+" // we also release branches starting with rel/N.N.N ],