CommunityToolkit
/
Lottie-Windows
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Sync some files to the new branch name (#486)

This commit is contained in:
aborziak-ms 2022-01-31 13:15:01 -08:00 коммит произвёл GitHub
Родитель 29f4dd8d7c
Коммит ad04ccc893
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
11 изменённых файлов: 16 добавлений и 16 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
README.md
Просмотреть файл

@ -24,7 +24,7 @@ This repo also contains source code for **[samples](/LottieViewer)**.
## Build Status ## Build Status
| Target | Branch | Status | Recommended NuGet package | | 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 ## Feedback and Requests
Please use [GitHub Issues](https://github.com/windows-toolkit/Lottie-Windows/issues) for bug reports and feature requests. Please use [GitHub Issues](https://github.com/windows-toolkit/Lottie-Windows/issues) for bug reports and feature requests.

2
samples/LottieSamples/Scenarios/AsyncPage.xaml
Просмотреть файл

@ -111,7 +111,7 @@
<RichTextBlock Style="{StaticResource OutroTextBlock}"> <RichTextBlock Style="{StaticResource OutroTextBlock}">
<Paragraph> <Paragraph>
To learn more about the PlayAsync method, check out the To learn more about the PlayAsync method, check out the
<Hyperlink NavigateUri="https://github.com/windows-toolkit/Lottie-Windows/blob/master/samples/LottieSamples/Scenarios/AsyncPage.xaml.cs"> <Hyperlink NavigateUri="https://github.com/windows-toolkit/Lottie-Windows/blob/main/samples/LottieSamples/Scenarios/AsyncPage.xaml.cs">
code-behind code-behind
</Hyperlink> </Hyperlink>
and read and read

2
samples/LottieSamples/Scenarios/CodegenPage.xaml
Просмотреть файл

@ -62,7 +62,7 @@
<RichTextBlock Style="{StaticResource OutroTextBlock}"> <RichTextBlock Style="{StaticResource OutroTextBlock}">
<Paragraph> <Paragraph>
To learn more, check out the To learn more, check out the
<Hyperlink NavigateUri="https://github.com/windows-toolkit/Lottie-Windows/blob/master/samples/LottieSamples/Scenarios/CodegenPage.xaml"> <Hyperlink NavigateUri="https://github.com/windows-toolkit/Lottie-Windows/blob/main/samples/LottieSamples/Scenarios/CodegenPage.xaml">
XAML XAML
</Hyperlink> </Hyperlink>
and read and read

2
samples/LottieSamples/Scenarios/FallbackPage.xaml
Просмотреть файл

@ -55,7 +55,7 @@
<RichTextBlock Style="{StaticResource OutroTextBlock}"> <RichTextBlock Style="{StaticResource OutroTextBlock}">
<Paragraph> <Paragraph>
To learn more, check out the To learn more, check out the
<Hyperlink NavigateUri="https://github.com/windows-toolkit/Lottie-Windows/blob/master/samples/LottieSamples/Scenarios/FallbackPage.xaml"> <Hyperlink NavigateUri="https://github.com/windows-toolkit/Lottie-Windows/blob/main/samples/LottieSamples/Scenarios/FallbackPage.xaml">
XAML XAML
</Hyperlink> </Hyperlink>
and read and read

2
samples/LottieSamples/Scenarios/JsonPage.xaml
Просмотреть файл

@ -55,7 +55,7 @@
<RichTextBlock Style="{StaticResource OutroTextBlock}"> <RichTextBlock Style="{StaticResource OutroTextBlock}">
<Paragraph> <Paragraph>
To learn more, check out the To learn more, check out the
<Hyperlink NavigateUri="https://github.com/windows-toolkit/Lottie-Windows/blob/master/samples/LottieSamples/Scenarios/JsonPage.xaml"> <Hyperlink NavigateUri="https://github.com/windows-toolkit/Lottie-Windows/blob/main/samples/LottieSamples/Scenarios/JsonPage.xaml">
XAML XAML
</Hyperlink> </Hyperlink>
and read and read

8
samples/LottieSamples/Scenarios/ModifyPage.xaml
Просмотреть файл

@ -49,19 +49,19 @@
<RichTextBlock Style="{StaticResource OutroTextBlock}"> <RichTextBlock Style="{StaticResource OutroTextBlock}">
<Paragraph> <Paragraph>
Check out the Check out the
<Hyperlink NavigateUri="https://github.com/windows-toolkit/Lottie-Windows/blob/master/samples/LottieSamples/Assets/LottieLogo1_Modified.json"> <Hyperlink NavigateUri="https://github.com/windows-toolkit/Lottie-Windows/blob/main/samples/LottieSamples/Assets/LottieLogo1_Modified.json">
modified Lottie file modified Lottie file
</Hyperlink> </Hyperlink>
+ +
<Hyperlink NavigateUri="https://github.com/windows-toolkit/Lottie-Windows/blob/master/samples/LottieSamples/AnimatedVisuals/LottieLogo1_Modified.cs"> <Hyperlink NavigateUri="https://github.com/windows-toolkit/Lottie-Windows/blob/main/samples/LottieSamples/AnimatedVisuals/LottieLogo1_Modified.cs">
codegen'd class codegen'd class
</Hyperlink> </Hyperlink>
+ +
<Hyperlink NavigateUri="https://github.com/windows-toolkit/Lottie-Windows/blob/master/samples/LottieSamples/Scenarios/ModifyPage.xaml"> <Hyperlink NavigateUri="https://github.com/windows-toolkit/Lottie-Windows/blob/main/samples/LottieSamples/Scenarios/ModifyPage.xaml">
XAML XAML
</Hyperlink> </Hyperlink>
+ +
<Hyperlink NavigateUri="https://github.com/windows-toolkit/Lottie-Windows/blob/master/samples/LottieSamples/Scenarios/ModifyPage.xaml.cs"> <Hyperlink NavigateUri="https://github.com/windows-toolkit/Lottie-Windows/blob/main/samples/LottieSamples/Scenarios/ModifyPage.xaml.cs">
code-behind code-behind
</Hyperlink> </Hyperlink>
to get a sense of how property annotations may be used to dynamically update Lottie animations. to get a sense of how property annotations may be used to dynamically update Lottie animations.

4
samples/LottieSamples/Scenarios/PlaybackPage.xaml
Просмотреть файл

@ -87,11 +87,11 @@
<RichTextBlock Style="{StaticResource OutroTextBlock}"> <RichTextBlock Style="{StaticResource OutroTextBlock}">
<Paragraph> <Paragraph>
To learn more, check out the To learn more, check out the
<Hyperlink NavigateUri="https://github.com/windows-toolkit/Lottie-Windows/blob/master/samples/LottieSamples/Scenarios/PlaybackPage.xaml"> <Hyperlink NavigateUri="https://github.com/windows-toolkit/Lottie-Windows/blob/main/samples/LottieSamples/Scenarios/PlaybackPage.xaml">
XAML XAML
</Hyperlink> </Hyperlink>
+ +
<Hyperlink NavigateUri="https://github.com/windows-toolkit/Lottie-Windows/blob/master/samples/LottieSamples/Scenarios/PlaybackPage.xaml.cs"> <Hyperlink NavigateUri="https://github.com/windows-toolkit/Lottie-Windows/blob/main/samples/LottieSamples/Scenarios/PlaybackPage.xaml.cs">
code-behind code-behind
</Hyperlink> </Hyperlink>
, ,

4
samples/LottieSamples/Scenarios/ProgressPage.xaml
Просмотреть файл

@ -73,11 +73,11 @@
<RichTextBlock Style="{StaticResource OutroTextBlock}"> <RichTextBlock Style="{StaticResource OutroTextBlock}">
<Paragraph> <Paragraph>
To learn more, check out the To learn more, check out the
<Hyperlink NavigateUri="https://github.com/windows-toolkit/Lottie-Windows/blob/master/samples/LottieSamples/Scenarios/ProgressPage.xaml"> <Hyperlink NavigateUri="https://github.com/windows-toolkit/Lottie-Windows/blob/main/samples/LottieSamples/Scenarios/ProgressPage.xaml">
XAML XAML
</Hyperlink> </Hyperlink>
+ +
<Hyperlink NavigateUri="https://github.com/windows-toolkit/Lottie-Windows/blob/master/samples/LottieSamples/Scenarios/ProgressPage.xaml.cs"> <Hyperlink NavigateUri="https://github.com/windows-toolkit/Lottie-Windows/blob/main/samples/LottieSamples/Scenarios/ProgressPage.xaml.cs">
code-behind code-behind
</Hyperlink>. </Hyperlink>.
<LineBreak /> <LineBreak />

2
samples/LottieSamples/Scenarios/SegmentPage.xaml
Просмотреть файл

@ -68,7 +68,7 @@
<RichTextBlock Style="{StaticResource OutroTextBlock}"> <RichTextBlock Style="{StaticResource OutroTextBlock}">
<Paragraph> <Paragraph>
To learn more, check out the To learn more, check out the
<Hyperlink NavigateUri="https://github.com/windows-toolkit/Lottie-Windows/blob/master/samples/LottieSamples/Scenarios/SegmentPage.xaml.cs"> <Hyperlink NavigateUri="https://github.com/windows-toolkit/Lottie-Windows/blob/main/samples/LottieSamples/Scenarios/SegmentPage.xaml.cs">
code-behind code-behind
</Hyperlink> </Hyperlink>
and read and read

2
source/Lottie/Issue.cs
Просмотреть файл

@ -30,7 +30,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Lottie
/// <summary> /// <summary>
/// Gets a URL that may give more information about the issue. /// Gets a URL that may give more information about the issue.
/// </summary> /// </summary>
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";
/// <summary> /// <summary>
/// Returns a string representation of the issue. /// Returns a string representation of the issue.

2
version.json
Просмотреть файл

@ -1,7 +1,7 @@
{ {
"version": "7.1.0-build.{height}", "version": "7.1.0-build.{height}",
"publicReleaseRefSpec": [ "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/dev$", // we release out of dev
"^refs/heads/rel/\\d+\\.\\d+\\.\\d+" // we also release branches starting with rel/N.N.N "^refs/heads/rel/\\d+\\.\\d+\\.\\d+" // we also release branches starting with rel/N.N.N
], ],