Skip to content

Commit 9cec912

Browse files
aborziak-msaborziak-ms
authored
Namespace migration and WinUI3 package MicrosoftToolkit.WinUI.Lottie (#500)
1 parent 63b9ad0 commit 9cec912

File tree

379 files changed

+956
-782
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

379 files changed

+956
-782
lines changed

‎Lottie-Windows-WinUI3/Lottie-Windows-WinUI3.csproj

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Library</OutputType>
5+
<RootNamespace>CommunityToolkit.WinUI.Lottie</RootNamespace>
6+
<AssemblyName>CommunityToolkit.WinUI.Lottie</AssemblyName>
7+
<PackageId>CommunityToolkit.WinUI.Lottie</PackageId>
8+
<TargetFramework>net5.0-windows10.0.18362.0</TargetFramework>
9+
<Nullable>enable</Nullable>
10+
<CsWinRTIncludes>Microsoft</CsWinRTIncludes>
11+
<Platforms>x64;x86</Platforms>
12+
<DefineConstants>WINAPPSDK</DefineConstants>
13+
<SignAssembly>False</SignAssembly>
14+
</PropertyGroup>
15+
16+
<ItemGroup>
17+
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.3.1" />
18+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.3" />
19+
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.194" />
20+
<PackageReference Include="System.Runtime.InteropServices.WindowsRuntime" Version="4.3.0" />
21+
</ItemGroup>
22+
23+
<Import Project="..\source\Animatables\Animatables.projitems" Label="Shared" />
24+
<Import Project="..\source\DotLottie\DotLottie.projitems" Label="Shared" />
25+
<Import Project="..\source\CompMetadata\CompMetadata.projitems" Label="Shared" />
26+
<Import Project="..\source\GenericData\GenericData.projitems" Label="Shared" />
27+
<Import Project="..\source\Lottie\Lottie.projitems" Label="Shared" />
28+
<Import Project="..\source\LottieData\LottieData.projitems" Label="Shared" />
29+
<Import Project="..\source\LottieMetadata\LottieMetadata.projitems" Label="Shared" />
30+
<Import Project="..\source\LottieReader\LottieReader.projitems" Label="Shared" />
31+
<Import Project="..\source\LottieToWinComp\LottieToWinComp.projitems" Label="Shared" />
32+
<Import Project="..\source\NullablesAttributes\NullablesAttributes.projitems" Label="Shared" />
33+
<Import Project="..\source\UIData\UIData.projitems" Label="Shared" />
34+
<Import Project="..\source\WinCompData\WinCompData.projitems" Label="Shared" />
35+
<Import Project="..\source\WinStorageStreamsData\WinStorageStreamsData.projitems" Label="Shared" />
36+
<Import Project="..\source\WinUIXamlMediaData\WinUIXamlMediaData.projitems" Label="Shared" />
37+
<Import Project="..\source\YamlData\YamlData.projitems" Label="Shared" />
38+
39+
</Project>

‎Lottie-Windows.sln

Lines changed: 146 additions & 99 deletions
Large diffs are not rendered by default.

‎Lottie-Windows/Lottie-Windows.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,22 @@
99
<Description>This library provides the LottieVisualSource which is consumed by the Microsoft.UI.Xaml.Controls.AnimatedVisualPlayer to render Lottie JSON files.</Description>
1010
<PackageTags>UWP Toolkit Windows Animations Lottie XAML</PackageTags>
1111

12-
<RootNamespace>Microsoft.Toolkit.Uwp.UI.Lottie</RootNamespace>
13-
<AssemblyName>Microsoft.Toolkit.Uwp.UI.Lottie</AssemblyName>
12+
<RootNamespace>CommunityToolkit.WinUI.Lottie</RootNamespace>
13+
<AssemblyName>CommunityToolkit.WinUI.Lottie</AssemblyName>
14+
<PackageId>CommunityToolkit.Uwp.Lottie</PackageId>
1415

1516

1617
<!-- Enable the latest C# language features -->
1718
<LangVersion>latest</LangVersion>
1819

1920
<!--
2021
Turn off debugging information for now. It is causing errors with winmd generation because
21-
the build system is creating Microsoft.Toolkit.Uwp.UI.Lottie.compile.pdb but the winmdexp
22+
the build system is creating CommunityToolkit.WinUI.Lottie.compile.pdb but the winmdexp
2223
task expects the name without the "compile." in it.
2324
-->
2425
<DebugType>none</DebugType>
2526

26-
<DocumentationFile>bin\AnyCPU\Release\Microsoft.Toolkit.Uwp.UI.Lottie.xml</DocumentationFile>
27+
<DocumentationFile>bin\AnyCPU\Release\CommunityToolkit.WinUI.Lottie.xml</DocumentationFile>
2728

2829
</PropertyGroup>
2930

‎Lottie-Windows/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Lottie-Windows
2-
Lottie-Windows provides the [`LottieVisualSource`](https://docs.microsoft.com/dotnet/api/microsoft.toolkit.uwp.ui.lottie.lottievisualsource) which is consumed by the [`Microsoft.UI.Xaml.Controls.AnimatedVisualPlayer`](https://docs.microsoft.com/uwp/api/microsoft.ui.xaml.controls.animatedvisualplayer) to render Lottie JSON files.
2+
Lottie-Windows provides the [`LottieVisualSource`](https://docs.microsoft.com/dotnet/api/CommunityToolkit.WinUI.lottie.lottievisualsource) which is consumed by the [`Microsoft.UI.Xaml.Controls.AnimatedVisualPlayer`](https://docs.microsoft.com/uwp/api/microsoft.ui.xaml.controls.animatedvisualplayer) to render Lottie JSON files.
33

44
The Lottie-Windows project generates a NuGet package for use by Windows apps.
55

66
## Package locations
7-
* The [latest release and pre-release versions are on NuGet](https://www.nuget.org/packages/Microsoft.Toolkit.Uwp.UI.Lottie).
8-
* The NuGets for the latest CI builds are published to Azure DevOps. Links here for the [main branch](https://dev.azure.com/dotnet/WindowsCommunityToolkit/_packaging?_a=package&feed=WindowsCommunityToolkit-MainLatest&protocolType=NuGet&package=Microsoft.Toolkit.Uwp.UI.Lottie) and for [PRs](https://dev.azure.com/dotnet/WindowsCommunityToolkit/_packaging?_a=package&feed=WindowsCommunityToolkit-PullRequests&protocolType=NuGet&package=Microsoft.Toolkit.Uwp.UI.Lottie).
7+
* The [latest release and pre-release versions are on NuGet](https://www.nuget.org/packages/CommunityToolkit.WinUI.Lottie).
8+
* The NuGets for the latest CI builds are published to Azure DevOps. Links here for the [main branch](https://dev.azure.com/dotnet/WindowsCommunityToolkit/_packaging?_a=package&feed=WindowsCommunityToolkit-MainLatest&protocolType=NuGet&package=CommunityToolkit.WinUI.Lottie) and for [PRs](https://dev.azure.com/dotnet/WindowsCommunityToolkit/_packaging?_a=package&feed=WindowsCommunityToolkit-PullRequests&protocolType=NuGet&package=CommunityToolkit.WinUI.Lottie).
99
See the [Windows Community Toolkit wiki](https://github.com/windows-toolkit/WindowsCommunityToolkit/wiki/Preview-Packages) for details.
1010
* The latest local build is output to the bin\nupkg directory in your repo directory.
1111

‎LottieGen/DotnetTool/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
static class Program
66
{
77
static int Main(string[] args)
8-
=> Microsoft.Toolkit.Uwp.UI.Lottie.LottieGenExe.Main.Run(args);
8+
=> CommunityToolkit.WinUI.Lottie.LottieGenExe.Main.Run(args);
99
}

‎LottieGen/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ CI builds can be installed from Azure DevOps. From the [main branch](https://dev
3434

3535
dotnet tool install -g LottieGen --add-source https://pkgs.dev.azure.com/dotnet/WindowsCommunityToolkit/_packaging/WindowsCommunityToolkit-MainLatest/nuget/v3/index.json --version 7.0.0-build.2
3636

37-
From [PRs](https://dev.azure.com/dotnet/WindowsCommunityToolkit/_packaging?_a=package&feed=WindowsCommunityToolkit-PullRequests&protocolType=NuGet&package=Microsoft.Toolkit.Uwp.UI.LottieGen):
37+
From [PRs](https://dev.azure.com/dotnet/WindowsCommunityToolkit/_packaging?_a=package&feed=WindowsCommunityToolkit-PullRequests&protocolType=NuGet&package=CommunityToolkit.WinUI.LottieGen):
3838

3939
dotnet tool install -g LottieGen --add-source https://pkgs.dev.azure.com/dotnet/WindowsCommunityToolkit/_packaging/WindowsCommunityToolkit-PullRequests/nuget/v3/index.json --version 7.0.0-build.2
4040

‎LottieGen/win-x64/LottieGen.win-x64.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
<PropertyGroup>
3232
<_SourceDir>..\..\source\</_SourceDir>
33-
<StartupObject>Microsoft.Toolkit.Uwp.UI.Lottie.LottieGenExe.Program</StartupObject>
33+
<StartupObject>CommunityToolkit.WinUI.Lottie.LottieGenExe.Program</StartupObject>
3434
</PropertyGroup>
3535

3636
<Import Project="..\Common.proj" />

‎LottieGen/win-x64/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
static class Program
66
{
77
static int Main(string[] args)
8-
=> Microsoft.Toolkit.Uwp.UI.Lottie.LottieGenExe.Main.Run(args);
8+
=> CommunityToolkit.WinUI.Lottie.LottieGenExe.Main.Run(args);
99
}

‎LottieViewer/LottieViewer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@
229229
<Version>5.0.1</Version>
230230
</PackageReference>
231231
<PackageReference Include="Win2D.uwp">
232-
<Version>1.25.0</Version>
232+
<Version>1.26.0</Version>
233233
</PackageReference>
234234
</ItemGroup>
235235
<Import Project="..\source\CompMetadata\CompMetadata.projitems" Label="Shared" />

‎LottieViewer/MainPage.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
55
xmlns:local="using:LottieViewer"
6-
xmlns:lottie="using:Microsoft.Toolkit.Uwp.UI.Lottie"
6+
xmlns:lottie="using:CommunityToolkit.WinUI.Lottie"
77
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:viewmodel="using:LottieViewer.ViewModel"
88
Visibility="Visible"
99
mc:Ignorable="d"

0 commit comments

Comments
 (0)