Skip to content

Commit 7c30d06

Browse files
PuppetApp build with CodeQL analysis (#541)
* create build-puppet-app.yml * RestorePackagesForNewtonsoftJson before BuildNewtonsoftJson * use 1ES-PT-Windows-2019 * Use .Net Core sdk 3.0.100
1 parent 78c6872 commit 7c30d06

File tree

2 files changed

+82
-2
lines changed

2 files changed

+82
-2
lines changed

.azuredevops/build-puppet-app.yml

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
pr:
2+
- master
3+
4+
pool:
5+
name: 1ES-PT-Windows-2019
6+
os: windows
7+
8+
variables:
9+
- group: 'AppCenter-SDK Unity Credentials and Info'
10+
- group: 'appcenter-sdk Internal NuGet feed credentials'
11+
- name: Codeql.Cadence
12+
value: 0
13+
14+
jobs:
15+
- job:
16+
displayName: Build and CodeQL PuppetApp Android
17+
steps:
18+
- checkout: self
19+
submodules: recursive
20+
21+
- task: CodeQL3000Init@0
22+
displayName: CodeQL Initialize
23+
24+
- task: AzureKeyVault@2
25+
displayName: 'Download KeyValult Variables'
26+
inputs:
27+
azureSubscription: 'AC - Dev Infra & Build Pool'
28+
KeyVaultName: 'mobile-center-sdk'
29+
SecretsFilter: 'appcenter-sdk-unity-serial-number-windows,appcenter-sdk-unity-username,appcenter-sdk-unity-password,appcensk-appcenter-token,appcenter-sdk-blob-storage-access-secret'
30+
RunAsPreJob: false
31+
32+
- task: PowerShell@2
33+
displayName: 'Install Unity'
34+
inputs:
35+
targetType: filePath
36+
filePath: ./build.ps1
37+
arguments: '-Target="Install-Unity-Windows" -Verbosity="Diagnostic"'
38+
39+
- task: PowerShell@2
40+
displayName: 'Activate Unity'
41+
inputs:
42+
targetType: filePath
43+
filePath: ./build.ps1
44+
arguments: '-Target="RegisterUnity" -UnitySerialNumber="$(appcenter-sdk-unity-serial-number-windows)" -UnityUsername="$(appcenter-sdk-unity-username)" -UnityPassword="$(appcenter-sdk-unity-password)" -Verbosity="Diagnostic"'
45+
46+
- task: PowerShell@2
47+
displayName: 'Download Android NDK'
48+
inputs:
49+
targetType: 'inline'
50+
script: |
51+
& ./build.ps1 --target="DownloadNdk" --NdkUrl="$(ANDROID_NDK_URL)" --Verbosity="Diagnostic"
52+
53+
- task: UseDotNet@2
54+
displayName: 'Use .Net Core sdk 3.0.100'
55+
inputs:
56+
version: 3.0.100
57+
58+
- task: PowerShell@2
59+
displayName: 'Run Cake Target "BuildPuppetApps"'
60+
inputs:
61+
targetType: 'inline'
62+
script: |
63+
& ./build.ps1 --target="BuildPuppetApps" --NuGetPassword="$(NUGET_PASSWORD)" --NuGetFeedId="$(NUGET_FEED_ID)" --Verbosity="Diagnostic" --StorageAuthParams="$(STORAGE_AUTH_PARAMS)"
64+
65+
- task: PowerShell@2
66+
displayName: 'Unregister Unity'
67+
inputs:
68+
targetType: filePath
69+
filePath: ./build.ps1
70+
arguments: '-Target="UnregisterUnity" -UnitySerialNumber="$(appcenter-sdk-unity-serial-number-windows)" -UnityUsername="$(appcenter-sdk-unity-username)" -UnityPassword="$(appcenter-sdk-unity-password)" -Verbosity="Diagnostic"'
71+
condition: always()
72+
73+
- task: CodeQL3000Finalize@0
74+
displayName: CodeQL Finalize

build.cake

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,14 @@ Task("Externals-Uwp-IL2CPP-Dependencies")
425425
}
426426
}).OnError(HandleError);
427427

428+
Task("RestorePackagesForNewtonsoftJson")
429+
.Does(() =>
430+
{
431+
NuGetRestore("./Modules/Newtonsoft.Json-for-Unity/Src/Newtonsoft.Json/Newtonsoft.Json.csproj");
432+
});
433+
428434
Task("BuildNewtonsoftJson")
435+
.IsDependentOn("RestorePackagesForNewtonsoftJson")
429436
.WithCriteria(IsRunningOnWindows)
430437
.Does(() =>
431438
{
@@ -436,11 +443,10 @@ Task("BuildNewtonsoftJson")
436443

437444
Information("Building Newtonsoft.Json project...");
438445
MSBuild(Path.Combine(projectPath, "Newtonsoft.Json.csproj"), c => c
439-
.WithRestore()
440446
.WithProperty("UnityBuild", "AOT")
441447
.SetConfiguration("Release"));
442448

443-
Information($"Moveing Newtonsoft.Json to {outputDirectory}...");
449+
Information($"Moving Newtonsoft.Json to {outputDirectory}...");
444450
DeleteFileIfExists(Path.Combine(outputDirectory, assemblyName));
445451
MoveFileToDirectory(assemblyPath, outputDirectory);
446452
}).OnError(HandleError);

0 commit comments

Comments
 (0)