Skip to content

Commit 76f4768

Browse files
aborziak-msaborziak-ms
authored
Csproj Refactoring (#504)
1 parent bb76fdf commit 76f4768

File tree

86 files changed

+177
-203
lines changed

Some content is hidden

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

86 files changed

+177
-203
lines changed

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

-40
This file was deleted.

‎Lottie-Windows.sln

+49-47
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LottieViewer", "LottieViewe
2323
{6AB50ED0-6273-4919-9ADE-50195664EF15} = {6AB50ED0-6273-4919-9ADE-50195664EF15}
2424
EndProjectSection
2525
EndProject
26-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lottie-Windows", "Lottie-Windows\Lottie-Windows.csproj", "{E392BAD0-F936-4B64-A445-552597795CC7}"
26+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lottie-Windows-Uwp", "Lottie-Windows\Lottie-Windows-Uwp\Lottie-Windows-Uwp.csproj", "{E392BAD0-F936-4B64-A445-552597795CC7}"
2727
EndProject
2828
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dlls", "dlls", "{C75BD686-21A6-4EB3-8D4B-D5A01C019C52}"
2929
ProjectSection(SolutionItems) = preProject
@@ -44,18 +44,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
4444
README.md = README.md
4545
EndProjectSection
4646
EndProject
47-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{0AD530DC-793B-417E-B6E4-9B88746D483E}"
48-
ProjectSection(SolutionItems) = preProject
49-
samples\README.md = samples\README.md
50-
EndProjectSection
51-
EndProject
52-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LottieSamples", "samples\LottieSamples\LottieSamples.csproj", "{6AB50ED0-6273-4919-9ADE-50195664EF15}"
53-
ProjectSection(ProjectDependencies) = postProject
54-
{E392BAD0-F936-4B64-A445-552597795CC7} = {E392BAD0-F936-4B64-A445-552597795CC7}
55-
EndProjectSection
56-
EndProject
57-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LottieSamples", "LottieSamples", "{D61BA044-4DAC-44AC-93FE-853BDE0475D7}"
58-
EndProject
5947
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "UIData", "source\UIData\UIData.shproj", "{74601E6C-2DFE-4842-B170-047941ABFF2C}"
6048
EndProject
6149
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UIData.dll", "dlls\UIData\UIData.dll.csproj", "{9A99E690-71D2-4E26-9000-0E0920394DFE}"
@@ -179,7 +167,9 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "LottieGenExe", "source\Lott
179167
EndProject
180168
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LottieGen.MsBuild", "LottieGen\MSBuildTask\LottieGen.MsBuild.csproj", "{192FBD28-8531-4607-A17C-44A1A51A1565}"
181169
EndProject
182-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lottie-Windows-WinUI3", "Lottie-Windows-WinUI3\Lottie-Windows-WinUI3.csproj", "{C505CD2D-5D26-42EE-8FAA-41BB784821EF}"
170+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lottie-Windows-WinUI3", "Lottie-Windows\Lottie-Windows-WinUI3\Lottie-Windows-WinUI3.csproj", "{C505CD2D-5D26-42EE-8FAA-41BB784821EF}"
171+
EndProject
172+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LottieSamples", "LottieSamples\LottieSamples.csproj", "{6AB50ED0-6273-4919-9ADE-50195664EF15}"
183173
EndProject
184174
Global
185175
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -324,37 +314,6 @@ Global
324314
{BCEDF904-F986-42EC-A22D-E0662777B7F9}.Release|ARM64.ActiveCfg = Release|Any CPU
325315
{BCEDF904-F986-42EC-A22D-E0662777B7F9}.Release|x64.ActiveCfg = Release|Any CPU
326316
{BCEDF904-F986-42EC-A22D-E0662777B7F9}.Release|x86.ActiveCfg = Release|Any CPU
327-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.BETA|Any CPU.ActiveCfg = Debug|x86
328-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.BETA|ARM.ActiveCfg = Debug|ARM
329-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.BETA|ARM64.ActiveCfg = Debug|ARM64
330-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.BETA|x64.ActiveCfg = Debug|x64
331-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.BETA|x86.ActiveCfg = Debug|x86
332-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|Any CPU.ActiveCfg = Debug|x86
333-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|ARM.ActiveCfg = Debug|ARM
334-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|ARM.Build.0 = Debug|ARM
335-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|ARM.Deploy.0 = Debug|ARM
336-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|ARM64.ActiveCfg = Debug|ARM64
337-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|ARM64.Build.0 = Debug|ARM64
338-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|ARM64.Deploy.0 = Debug|ARM64
339-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|x64.ActiveCfg = Debug|x64
340-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|x64.Build.0 = Debug|x64
341-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|x64.Deploy.0 = Debug|x64
342-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|x86.ActiveCfg = Debug|x86
343-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|x86.Build.0 = Debug|x86
344-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|x86.Deploy.0 = Debug|x86
345-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|Any CPU.ActiveCfg = Release|x86
346-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|ARM.ActiveCfg = Release|ARM
347-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|ARM.Build.0 = Release|ARM
348-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|ARM.Deploy.0 = Release|ARM
349-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|ARM64.ActiveCfg = Release|ARM64
350-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|ARM64.Build.0 = Release|ARM64
351-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|ARM64.Deploy.0 = Release|ARM64
352-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|x64.ActiveCfg = Release|x64
353-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|x64.Build.0 = Release|x64
354-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|x64.Deploy.0 = Release|x64
355-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|x86.ActiveCfg = Release|x86
356-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|x86.Build.0 = Release|x86
357-
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|x86.Deploy.0 = Release|x86
358317
{9A99E690-71D2-4E26-9000-0E0920394DFE}.BETA|Any CPU.ActiveCfg = Release|Any CPU
359318
{9A99E690-71D2-4E26-9000-0E0920394DFE}.BETA|ARM.ActiveCfg = Release|Any CPU
360319
{9A99E690-71D2-4E26-9000-0E0920394DFE}.BETA|ARM64.ActiveCfg = Release|Any CPU
@@ -609,6 +568,51 @@ Global
609568
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|x64.Build.0 = Release|x64
610569
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|x86.ActiveCfg = Release|x86
611570
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|x86.Build.0 = Release|x86
571+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.BETA|Any CPU.ActiveCfg = Debug|x64
572+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.BETA|Any CPU.Build.0 = Debug|x64
573+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.BETA|Any CPU.Deploy.0 = Debug|x64
574+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.BETA|ARM.ActiveCfg = Debug|ARM
575+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.BETA|ARM.Build.0 = Debug|ARM
576+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.BETA|ARM.Deploy.0 = Debug|ARM
577+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.BETA|ARM64.ActiveCfg = Debug|ARM64
578+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.BETA|ARM64.Build.0 = Debug|ARM64
579+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.BETA|ARM64.Deploy.0 = Debug|ARM64
580+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.BETA|x64.ActiveCfg = Debug|x64
581+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.BETA|x64.Build.0 = Debug|x64
582+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.BETA|x64.Deploy.0 = Debug|x64
583+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.BETA|x86.ActiveCfg = Debug|x86
584+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.BETA|x86.Build.0 = Debug|x86
585+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.BETA|x86.Deploy.0 = Debug|x86
586+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|Any CPU.ActiveCfg = Debug|x64
587+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|Any CPU.Build.0 = Debug|x64
588+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|Any CPU.Deploy.0 = Debug|x64
589+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|ARM.ActiveCfg = Debug|ARM
590+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|ARM.Build.0 = Debug|ARM
591+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|ARM.Deploy.0 = Debug|ARM
592+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|ARM64.ActiveCfg = Debug|ARM64
593+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|ARM64.Build.0 = Debug|ARM64
594+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|ARM64.Deploy.0 = Debug|ARM64
595+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|x64.ActiveCfg = Debug|x64
596+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|x64.Build.0 = Debug|x64
597+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|x64.Deploy.0 = Debug|x64
598+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|x86.ActiveCfg = Debug|x86
599+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|x86.Build.0 = Debug|x86
600+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Debug|x86.Deploy.0 = Debug|x86
601+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|Any CPU.ActiveCfg = Release|x64
602+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|Any CPU.Build.0 = Release|x64
603+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|Any CPU.Deploy.0 = Release|x64
604+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|ARM.ActiveCfg = Release|ARM
605+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|ARM.Build.0 = Release|ARM
606+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|ARM.Deploy.0 = Release|ARM
607+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|ARM64.ActiveCfg = Release|ARM64
608+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|ARM64.Build.0 = Release|ARM64
609+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|ARM64.Deploy.0 = Release|ARM64
610+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|x64.ActiveCfg = Release|x64
611+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|x64.Build.0 = Release|x64
612+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|x64.Deploy.0 = Release|x64
613+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|x86.ActiveCfg = Release|x86
614+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|x86.Build.0 = Release|x86
615+
{6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|x86.Deploy.0 = Release|x86
612616
EndGlobalSection
613617
GlobalSection(SolutionProperties) = preSolution
614618
HideSolutionNode = FALSE
@@ -623,8 +627,6 @@ Global
623627
{6221591A-E8F4-4A5E-8F0C-2651C24AD495} = {C75BD686-21A6-4EB3-8D4B-D5A01C019C52}
624628
{BB081E5A-CF3C-490F-8F8E-450A79F6CA33} = {C75BD686-21A6-4EB3-8D4B-D5A01C019C52}
625629
{BCEDF904-F986-42EC-A22D-E0662777B7F9} = {C75BD686-21A6-4EB3-8D4B-D5A01C019C52}
626-
{6AB50ED0-6273-4919-9ADE-50195664EF15} = {D61BA044-4DAC-44AC-93FE-853BDE0475D7}
627-
{D61BA044-4DAC-44AC-93FE-853BDE0475D7} = {0AD530DC-793B-417E-B6E4-9B88746D483E}
628630
{74601E6C-2DFE-4842-B170-047941ABFF2C} = {AB232F35-AAF7-4AE2-B1D2-45DD9BC2F7D7}
629631
{9A99E690-71D2-4E26-9000-0E0920394DFE} = {C75BD686-21A6-4EB3-8D4B-D5A01C019C52}
630632
{30059CA7-0745-4EEC-8D11-B14850A70C98} = {AB232F35-AAF7-4AE2-B1D2-45DD9BC2F7D7}

‎Lottie-Windows/Lottie-Windows-Uwp/Lottie-Windows-Uwp.csproj

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<Project Sdk="MSBuild.Sdk.Extras">
2+
3+
<PropertyGroup>
4+
<TargetFramework>uap10.0.16299</TargetFramework>
5+
<OutputType>winmdobj</OutputType>
6+
7+
8+
<PackageId>CommunityToolkit.Uwp.Lottie</PackageId>
9+
<PackageTags>UWP Toolkit Windows Animations Lottie XAML</PackageTags>
10+
11+
<!--
12+
Turn off debugging information for now. It is causing errors with winmd generation because
13+
the build system is creating CommunityToolkit.WinUI.Lottie.compile.pdb but the winmdexp
14+
task expects the name without the "compile." in it.
15+
-->
16+
<DebugType>none</DebugType>
17+
</PropertyGroup>
18+
19+
<ItemGroup>
20+
<PackageReference Include="Microsoft.UI.Xaml">
21+
<Version>2.5.0</Version>
22+
<Generator>MSBuild:Compile</Generator>
23+
<SubType>Designer</SubType>
24+
</PackageReference>
25+
<PackageReference Include="System.Memory" Version="4.5.4" />
26+
<PackageReference Include="System.Numerics.Vectors">
27+
<Version>4.5.0</Version>
28+
</PackageReference>
29+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
30+
<PackageReference Include="System.Text.Encodings.Web" Version="5.0.1" />
31+
<PackageReference Include="System.Text.Json" Version="5.0.1" />
32+
<PackageReference Include="System.ValueTuple">
33+
<Version>4.5.0</Version>
34+
</PackageReference>
35+
<PackageReference Include="Win2D.uwp">
36+
<Version>1.25.0</Version>
37+
</PackageReference>
38+
</ItemGroup>
39+
40+
<Import Project="..\Lottie-Windows.props" />
41+
<Import Project="..\..\source\Animatables\Animatables.projitems" Label="Shared" />
42+
<Import Project="..\..\source\DotLottie\DotLottie.projitems" Label="Shared" />
43+
<Import Project="..\..\source\CompMetadata\CompMetadata.projitems" Label="Shared" />
44+
<Import Project="..\..\source\GenericData\GenericData.projitems" Label="Shared" />
45+
<Import Project="..\..\source\Lottie\Lottie.projitems" Label="Shared" />
46+
<Import Project="..\..\source\LottieData\LottieData.projitems" Label="Shared" />
47+
<Import Project="..\..\source\LottieMetadata\LottieMetadata.projitems" Label="Shared" />
48+
<Import Project="..\..\source\LottieReader\LottieReader.projitems" Label="Shared" />
49+
<Import Project="..\..\source\LottieToWinComp\LottieToWinComp.projitems" Label="Shared" />
50+
<Import Project="..\..\source\NullablesAttributes\NullablesAttributes.projitems" Label="Shared" />
51+
<Import Project="..\..\source\UIData\UIData.projitems" Label="Shared" />
52+
<Import Project="..\..\source\WinCompData\WinCompData.projitems" Label="Shared" />
53+
<Import Project="..\..\source\WinStorageStreamsData\WinStorageStreamsData.projitems" Label="Shared" />
54+
<Import Project="..\..\source\WinUIXamlMediaData\WinUIXamlMediaData.projitems" Label="Shared" />
55+
<Import Project="..\..\source\YamlData\YamlData.projitems" Label="Shared" />
56+
57+
</Project>

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

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

0 commit comments

Comments
 (0)