Skip to content

Commit 9c5168a

Browse files
azchohfiazchohfi
authored
Updated Cake build system to newer version, and updated source to net7.0. (#530)
* Updated Cake build system to newer version, and updated source to net7.0. * Small fix on version number.
1 parent 767465b commit 9c5168a

32 files changed

+88
-321
lines changed

‎.config/dotnet-tools.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"cake.tool": {
6+
"version": "3.0.0",
7+
"commands": [
8+
"dotnet-cake"
9+
]
10+
}
11+
}
12+
}

‎Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
<Choose>
128128
<When Condition="'$(IsTestProject)' != 'true' and '$(IsSampleProject)' != 'true' and '$(IsDesignProject)' != 'true'">
129129
<ItemGroup>
130-
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="16.5.132" PrivateAssets="all" />
130+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.5.22" PrivateAssets="all" />
131131
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
132132

133133
<!-- <EmbeddedResource Include="**\*.rd.xml" />
@@ -145,7 +145,7 @@
145145
</PropertyGroup>
146146

147147
<ItemGroup>
148-
<PackageReference Include="Nerdbank.GitVersioning" Version=" 2.1.65" PrivateAssets="all" />
148+
<PackageReference Include="Nerdbank.GitVersioning" Version="3.5.119" PrivateAssets="all" />
149149
</ItemGroup>
150150

151151
<ItemGroup>

‎Lottie-Windows.sln

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -548,26 +548,26 @@ Global
548548
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.BETA|x64.Build.0 = Debug|x64
549549
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.BETA|x86.ActiveCfg = Debug|x86
550550
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.BETA|x86.Build.0 = Debug|x86
551-
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|Any CPU.ActiveCfg = Debug|x64
552-
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|Any CPU.Build.0 = Debug|x64
551+
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
552+
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
553553
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|ARM.ActiveCfg = Debug|x64
554554
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|ARM.Build.0 = Debug|x64
555555
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|ARM64.ActiveCfg = Debug|x64
556556
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|ARM64.Build.0 = Debug|x64
557557
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|x64.ActiveCfg = Debug|x64
558558
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|x64.Build.0 = Debug|x64
559-
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|x86.ActiveCfg = Debug|x86
560-
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|x86.Build.0 = Debug|x86
561-
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|Any CPU.ActiveCfg = Release|x64
562-
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|Any CPU.Build.0 = Release|x64
559+
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|x86.ActiveCfg = Debug|Any CPU
560+
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|x86.Build.0 = Debug|Any CPU
561+
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
562+
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|Any CPU.Build.0 = Release|Any CPU
563563
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|ARM.ActiveCfg = Release|x64
564564
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|ARM.Build.0 = Release|x64
565565
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|ARM64.ActiveCfg = Release|x64
566566
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|ARM64.Build.0 = Release|x64
567567
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|x64.ActiveCfg = Release|x64
568568
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|x64.Build.0 = Release|x64
569-
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|x86.ActiveCfg = Release|x86
570-
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|x86.Build.0 = Release|x86
569+
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|x86.ActiveCfg = Release|Any CPU
570+
{C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|x86.Build.0 = Release|Any CPU
571571
{6AB50ED0-6273-4919-9ADE-50195664EF15}.BETA|Any CPU.ActiveCfg = Debug|x64
572572
{6AB50ED0-6273-4919-9ADE-50195664EF15}.BETA|Any CPU.Build.0 = Debug|x64
573573
{6AB50ED0-6273-4919-9ADE-50195664EF15}.BETA|Any CPU.Deploy.0 = Debug|x64

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<PackageReference Include="System.Numerics.Vectors">
2727
<Version>4.5.0</Version>
2828
</PackageReference>
29-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
29+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
3030
<PackageReference Include="System.Text.Encodings.Web" Version="5.0.1" />
3131
<PackageReference Include="System.Text.Json" Version="5.0.1" />
3232
<PackageReference Include="System.ValueTuple">

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0-windows10.0.18362.0</TargetFramework>
4+
<TargetFramework>net7.0-windows10.0.18362.0</TargetFramework>
55
<OutputType>Library</OutputType>
66

77
<PackageId>CommunityToolkit.WinUI.Lottie</PackageId>
88
<PackageTags>WinUI3 Toolkit Windows Animations Lottie XAML</PackageTags>
99

1010
<Nullable>enable</Nullable>
1111
<CsWinRTIncludes>Microsoft</CsWinRTIncludes>
12-
<Platforms>x64;x86</Platforms>
1312
<DefineConstants>WINAPPSDK</DefineConstants>
1413
<SignAssembly>True</SignAssembly>
1514
</PropertyGroup>
1615

1716
<ItemGroup>
18-
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.0.30" />
19-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.3" />
17+
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.4" />
18+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.3.230331000" />
2019
</ItemGroup>
2120

2221
<Import Project="..\Lottie-Windows.props" />

‎LottieGen/Common.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PropertyGroup Label="Configuration">
55
<Import_RootNamespace>LottieGen</Import_RootNamespace>
66
<OutputType>Exe</OutputType>
7-
<TargetFramework>net5.0</TargetFramework>
7+
<TargetFramework>net7.0</TargetFramework>
88
<RootNamespace>LottieGen</RootNamespace>
99
<Configurations>Debug;Release</Configurations>
1010
<LangVersion>latest</LangVersion>

‎LottieGen/MSBuildTask/LottieGen.MsBuild.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</PropertyGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.9.0" />
24+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.5.0" />
2525
</ItemGroup>
2626

2727
<!--
@@ -58,7 +58,7 @@
5858
</packageTypes>
5959
</metadata>
6060
<files>
61-
<file src="]]>$([MsBuild]::NormalizePath('$(MsBuildThisFileDirectory)..\win-x64\bin\AnyCPU\$(Configuration)\net5.0\win-x64\publish\LottieGen.exe'))<![CDATA[" target="bin" />
61+
<file src="]]>$([MsBuild]::NormalizePath('$(MsBuildThisFileDirectory)..\win-x64\bin\AnyCPU\$(Configuration)\net7.0\win-x64\publish\LottieGen.exe'))<![CDATA[" target="bin" />
6262
<file src="]]>$(MsBuildThisFileDirectory)$(_LottieGenNuspecPropsFile)<![CDATA[" target="build/native/" />
6363
<file src="]]>$(MsBuildThisFileDirectory)$(_LottieGenNuspecPropsFile)<![CDATA[" target="build/win/" />
6464
<file src="]]>$([MsBuild]::NormalizePath('$(MsBuildThisFileDirectory)..\MSBuildTask\bin\AnyCPU\$(Configuration)\net472\$(AssemblyName).dll'))<![CDATA[" target="bin/" />

‎LottieGen/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
LottieGen is a tool for generating C#, C++, and other outputs from Lottie / Bodymovin JSON files. LottieGen is built as a [.NET global tool](https://docs.microsoft.com/en-us/dotnet/core/tools/global-tools), which means it will run anywhere .NET Core is available, including Linux and Mac.
44

5-
LottieGen requires [.NET Core 5.0 SDK](https://dotnet.microsoft.com/download/dotnet-core/5.0) or later.
5+
LottieGen requires [.NET Core 7.0 SDK](https://dotnet.microsoft.com/download/dotnet-core/7.0) or later.
66

77
# Run without installation
88

9-
Local builds can be run directly. Just install [.NET Core 5.0](https://dotnet.microsoft.com/download/dotnet-core/5.0), build the LottieGen.sln solution and run the output.
9+
Local builds can be run directly. Just install [.NET Core 7.0](https://dotnet.microsoft.com/download/dotnet-core/7.0), build the LottieGen.sln solution and run the output.
1010

11-
f:\GitHub\Lottie-Windows\LottieGen\DotnetTool\bin\AnyCpu\Debug\net5.0\lottiegen.exe
11+
f:\GitHub\Lottie-Windows\LottieGen\DotnetTool\bin\AnyCpu\Debug\net7.0\lottiegen.exe
1212

1313
And of course you can copy LottieGen to a directory and run directly without installing it, for example:
1414

15-
copy f:\GitHub\Lottie-Windows\LottieGen\DotnetTool\bin\AnyCpu\Debug\net5.0\* d:\mybuildtools
15+
copy f:\GitHub\Lottie-Windows\LottieGen\DotnetTool\bin\AnyCpu\Debug\net7.0\* d:\mybuildtools
1616

1717

1818
# Install as a .NET Core global tool

‎LottieViewer/LottieViewer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@
223223
<Version>4.5.4</Version>
224224
</PackageReference>
225225
<PackageReference Include="System.Runtime.CompilerServices.Unsafe">
226-
<Version>5.0.0</Version>
226+
<Version>6.0.0</Version>
227227
</PackageReference>
228228
<PackageReference Include="System.Text.Json">
229229
<Version>5.0.1</Version>

‎azure-pipelines.yml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pr:
1010
- rel/*
1111

1212
pool:
13-
vmImage: windows-2019
13+
vmImage: windows-2022
1414

1515
variables:
1616
BuildConfiguration: Lottie-Windows
@@ -20,15 +20,15 @@ steps:
2020
- task: BatchScript@1
2121
displayName: Setup Environment Variables
2222
inputs:
23-
filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\Common7\\Tools\\VsDevCmd.bat"
23+
filename: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Common7\\Tools\\VsDevCmd.bat"
2424
arguments: -no_logo
2525
modifyEnvironment: true
2626

2727
# Install NuGet tools.
2828
- task: NuGetToolInstaller@1
29-
displayName: Use NuGet 5.8.1
29+
displayName: Use NuGet 6.5.0
3030
inputs:
31-
versionSpec: 5.8.1
31+
versionSpec: 6.5.0
3232

3333
# Install Nerbank.GitVersioning.
3434
- task: DotNetCoreCLI@2
@@ -39,17 +39,10 @@ steps:
3939
arguments: install --tool-path . nbgv
4040

4141
# .NET Core SDK Installer.
42-
# 2.2.x is needed to build the UWP code.
43-
# 5.0.x is used for everything else that the UWP apps don't depend on.
4442
- task: UseDotNet@2
4543
inputs:
4644
packageType: 'sdk' # Options: runtime, sdk
47-
version: '2.2.x'
48-
49-
- task: UseDotNet@2
50-
inputs:
51-
packageType: 'sdk' # Options: runtime, sdk
52-
version: '5.0.x'
45+
version: '7.0.x'
5346

5447
# Nerdbank.GitVersioning
5548
- script: nbgv cloud
@@ -61,7 +54,7 @@ steps:
6154
displayName: Insider SDK
6255

6356
# Run the build.
64-
- powershell: .\build.ps1 -target=Package
57+
- powershell: .\build.ps1 --target=Package
6558
displayName: Build
6659
workingDirectory: .\build
6760

0 commit comments

Comments
 (0)