@@ -48,16 +48,15 @@ Example of use:
48
48
<ItemGroup >
49
49
<VSIXPackagesToSign Include =" $(MSBuildThisFileDirectory)..\bin\vsix\*.nupkg" />
50
50
</ItemGroup >
51
- <Exec Condition =" '$(StrideSign)' == 'true'" Command =" $(MSBuildThisFileDirectory)sign\sign code azure-key-vault %(VSIXPackagesToSign.Identity) --description " Stride" --description-url " https://stride3d.net" --publisher-name " Stride" --azure-key-vault-tenant-id " $(StrideSignTenantId) " --azure-key-vault-client-id " $(StrideSignClientId) " --azure-key-vault-client-secret " $(StrideSignClientSecret) " --azure-key-vault- certificate " $(StrideSignKeyVaultCertificate)" --azure-key-vault-url " https://$(StrideSignKeyVaultName).vault.azure.net/" --file-list " sign\nupkgfilter.txt" -v Information" EchoOff =" true" />
51
+ <Exec Condition =" '$(StrideSign)' == 'true'" Command =" $(MSBuildThisFileDirectory)sign\sign code azure-key-vault %(VSIXPackagesToSign.Identity) --description " Stride" --description-url " https://stride3d.net" --publisher-name " Stride" --azure-key-vault-certificate " $(StrideSignKeyVaultCertificate)" --azure-key-vault-url " https://$(StrideSignKeyVaultName).vault.azure.net/" --file-list " sign\nupkgfilter.txt" -v Information" EchoOff =" true" />
52
52
</Target >
53
53
54
54
<!--
55
55
Package Installer: install-prerequisites.exe
56
56
-->
57
57
<Target Name =" PrerequisitesInstaller" DependsOnTargets =" SignCredentialsCheck" >
58
58
<Delete Files =" $(StrideRoot)Bin\Prerequisites\install-prerequisites.exe" />
59
- <Exec Condition =" '$(StrideSign)' == 'true'" Command =' "$(AdvancedInstallerPath)" /edit "$(StrideRoot)sources\prerequisites\prerequisites.aip" /SetAzureKeyVaultParameters -tenant_id $(StrideSignTenantId) -app_id $(StrideSignClientId) -vault_name $(StrideSignKeyVaultName) -certificate_name $(StrideSignKeyVaultCertificate) -enable_signing ' />
60
- <Exec Command =' "$(AdvancedInstallerPath)" /execute "$(StrideRoot)sources\prerequisites\prerequisites.aip" "$(AdvancedInstallerBuildScript)"' EnvironmentVariables =" StrideSignClientSecret=" $(StrideSignClientSecret)" " />
59
+ <Exec Command =' "$(AdvancedInstallerPath)" /execute "$(StrideRoot)sources\prerequisites\prerequisites.aip" "$(AdvancedInstallerBuildScript)"' EnvironmentVariables =" StrideSignKeyVaultCertificate=" StrideSignKeyVaultCertificate" ;StrideSignKeyVaultUrl=" https://$(StrideSignKeyVaultName).vault.azure.net/" " />
61
60
<!-- Note: this exe will be signed as part of GameStudio.nupkg -->
62
61
</Target >
63
62
@@ -321,17 +320,15 @@ Example of use:
321
320
<ItemGroup >
322
321
<LauncherPackagesToSign Include =" $(MSBuildThisFileDirectory)..\bin\launcher\*.nupkg" />
323
322
</ItemGroup >
324
- <Exec Condition =" '$(StrideSign)' == 'true'" Command =" $(MSBuildThisFileDirectory)sign\sign code azure-key-vault %(LauncherPackagesToSign.Identity) --description " Stride" --description-url " https://stride3d.net" --publisher-name " Stride" --azure-key-vault-tenant-id " $(StrideSignTenantId) " --azure-key-vault-client-id " $(StrideSignClientId) " --azure-key-vault-client-secret " $(StrideSignClientSecret) " --azure-key-vault- certificate " $(StrideSignKeyVaultCertificate)" --azure-key-vault-url " https://$(StrideSignKeyVaultName).vault.azure.net/" --file-list " sign\nupkgfilter.txt" -v Information" EchoOff =" true" />
323
+ <Exec Condition =" '$(StrideSign)' == 'true'" Command =" $(MSBuildThisFileDirectory)sign\sign code azure-key-vault %(LauncherPackagesToSign.Identity) --description " Stride" --description-url " https://stride3d.net" --publisher-name " Stride" --azure-key-vault-certificate " $(StrideSignKeyVaultCertificate)" --azure-key-vault-url " https://$(StrideSignKeyVaultName).vault.azure.net/" --file-list " sign\nupkgfilter.txt" -v Information" EchoOff =" true" />
325
324
</Target >
326
325
327
326
<!--
328
327
Package Installer: StrideSetup.exe
329
328
-->
330
329
<Target Name =" PackageInstaller" DependsOnTargets =" PackageLauncher;SignCredentialsCheck" >
331
330
<!-- Run advanced installer -->
332
- <!-- Workaround until env variables are supported in the config -->
333
- <Exec Condition =" '$(StrideSign)' == 'true'" Command =' "$(AdvancedInstallerPath)" /edit "$(StrideRoot)sources\launcher\Setup\setup.aip" /SetAzureKeyVaultParameters -tenant_id $(StrideSignTenantId) -app_id $(StrideSignClientId) -vault_name $(StrideSignKeyVaultName) -certificate_name $(StrideSignKeyVaultCertificate) -enable_signing ' />
334
- <Exec Command =' "$(AdvancedInstallerPath)" /execute "$(StrideRoot)sources\launcher\Setup\setup.aip" "$(AdvancedInstallerBuildScript)"' EnvironmentVariables =" StrideSignClientSecret=" $(StrideSignClientSecret)" " />
331
+ <Exec Command =' "$(AdvancedInstallerPath)" /execute "$(StrideRoot)sources\launcher\Setup\setup.aip" "$(AdvancedInstallerBuildScript)"' EnvironmentVariables =" StrideSignKeyVaultCertificate=" StrideSignKeyVaultCertificate" ;StrideSignKeyVaultUrl=" https://$(StrideSignKeyVaultName).vault.azure.net/" " />
335
332
336
333
<Copy SourceFiles =" $(StrideRoot)sources\launcher\Setup\setup-SetupFiles\StrideSetup.exe" DestinationFolder =" $(StrideRoot)bin\launcher" />
337
334
</Target >
@@ -340,8 +337,7 @@ Example of use:
340
337
Package Installer: launcher-prerequisites.exe
341
338
-->
342
339
<Target Name =" LauncherPrerequisitesInstaller" DependsOnTargets =" SignCredentialsCheck" >
343
- <Exec Condition =" '$(StrideSign)' == 'true'" Command =' "$(AdvancedInstallerPath)" /edit "$(StrideRoot)sources\launcher\Prerequisites\launcher-prerequisites.aip" /SetAzureKeyVaultParameters -tenant_id $(StrideSignTenantId) -app_id $(StrideSignClientId) -vault_name $(StrideSignKeyVaultName) -certificate_name $(StrideSignKeyVaultCertificate) -enable_signing ' />
344
- <Exec Command =' "$(AdvancedInstallerPath)" /execute "$(StrideRoot)sources\launcher\Prerequisites\launcher-prerequisites.aip" "$(AdvancedInstallerBuildScript)"' EnvironmentVariables =" StrideSignClientSecret=" $(StrideSignClientSecret)" " />
340
+ <Exec Command =' "$(AdvancedInstallerPath)" /execute "$(StrideRoot)sources\launcher\Prerequisites\launcher-prerequisites.aip" "$(AdvancedInstallerBuildScript)"' EnvironmentVariables =" StrideSignKeyVaultCertificate=" StrideSignKeyVaultCertificate" ;StrideSignKeyVaultUrl=" https://$(StrideSignKeyVaultName).vault.azure.net/" " />
345
341
</Target >
346
342
347
343
<!--
@@ -369,9 +365,6 @@ Example of use:
369
365
</Target >
370
366
371
367
<Target Name =" SignCredentialsCheck" Condition =" '$(StrideSign)' == 'true'" >
372
- <Error Condition =" '$(StrideSignTenantId)' == ''" Text =" StrideSignTenantId is not set. Please set StrideSign to false if you don't want to sign using code certificates." />
373
- <Error Condition =" '$(StrideSignClientId)' == ''" Text =" StrideSignClientId is not set. Please set StrideSign to false if you don't want to sign using code certificates." />
374
- <Error Condition =" '$(StrideSignClientSecret)' == ''" Text =" StrideSignClientSecret is not set. Please set StrideSign to false if you don't want to sign using code certificates." />
375
368
<Error Condition =" '$(StrideSignKeyVaultCertificate)' == ''" Text =" StrideSignKeyVaultCertificate is not set. Please set StrideSign to false if you don't want to sign using code certificates." />
376
369
<Error Condition =" '$(StrideSignKeyVaultName)' == ''" Text =" StrideSignKeyVaultName is not set. Please set StrideSign to false if you don't want to sign using code certificates." />
377
370
</Target >
@@ -382,7 +375,7 @@ Example of use:
382
375
<ItemGroup >
383
376
<MainPackagesToSign Include =" $(MSBuildThisFileDirectory)..\bin\packages\*.nupkg" />
384
377
</ItemGroup >
385
- <Exec Command =" $(MSBuildThisFileDirectory)sign\sign code azure-key-vault %(MainPackagesToSign.Identity) --description " Stride" --description-url " https://stride3d.net" --publisher-name " Stride" --azure-key-vault-tenant-id " $(StrideSignTenantId) " --azure-key-vault-client-id " $(StrideSignClientId) " --azure-key-vault-client-secret " $(StrideSignClientSecret) " --azure-key-vault- certificate " $(StrideSignKeyVaultCertificate)" --azure-key-vault-url " https://$(StrideSignKeyVaultName).vault.azure.net/" --file-list " sign\nupkgfilter.txt" -v Information" EchoOff =" true" />
378
+ <Exec Command =" $(MSBuildThisFileDirectory)sign\sign code azure-key-vault %(MainPackagesToSign.Identity) --description " Stride" --description-url " https://stride3d.net" --publisher-name " Stride" --azure-key-vault-certificate " $(StrideSignKeyVaultCertificate)" --azure-key-vault-url " https://$(StrideSignKeyVaultName).vault.azure.net/" --file-list " sign\nupkgfilter.txt" -v Information" EchoOff =" true" />
386
379
</Target >
387
380
388
381
</Project >
0 commit comments