@@ -48,16 +48,15 @@ Example of use:
4848 <ItemGroup >
4949 <VSIXPackagesToSign Include =" $(MSBuildThisFileDirectory)..\bin\vsix\*.nupkg" />
5050 </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-tenant-id " $(StrideSignTenantId)" --azure-key-vault-client-id " $(StrideSignClientId)" --azure-key-vault-certificate " $(StrideSignKeyVaultCertificate)" --azure-key-vault-url " https://$(StrideSignKeyVaultName).vault.azure.net/" --file-list " sign\nupkgfilter.txt" -v Information" />
5252 </Target >
5353
5454 <!--
5555 Package Installer: install-prerequisites.exe
5656 -->
5757 <Target Name =" PrerequisitesInstaller" DependsOnTargets =" SignCredentialsCheck" >
5858 <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/" ;StrideSignTenantId=" $(StrideSignTenantId)" ;StrideSignClientId=" $(StrideSignClientId)" " />
6160 <!-- Note: this exe will be signed as part of GameStudio.nupkg -->
6261 </Target >
6362
@@ -321,17 +320,15 @@ Example of use:
321320 <ItemGroup >
322321 <LauncherPackagesToSign Include =" $(MSBuildThisFileDirectory)..\bin\launcher\*.nupkg" />
323322 </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-tenant-id " $(StrideSignTenantId)" --azure-key-vault-client-id " $(StrideSignClientId)" --azure-key-vault-certificate " $(StrideSignKeyVaultCertificate)" --azure-key-vault-url " https://$(StrideSignKeyVaultName).vault.azure.net/" --file-list " sign\nupkgfilter.txt" -v Information" />
325324 </Target >
326325
327326 <!--
328327 Package Installer: StrideSetup.exe
329328 -->
330329 <Target Name =" PackageInstaller" DependsOnTargets =" PackageLauncher;SignCredentialsCheck" >
331330 <!-- 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/" ;StrideSignTenantId=" $(StrideSignTenantId)" ;StrideSignClientId=" $(StrideSignClientId)" " />
335332
336333 <Copy SourceFiles =" $(StrideRoot)sources\launcher\Setup\setup-SetupFiles\StrideSetup.exe" DestinationFolder =" $(StrideRoot)bin\launcher" />
337334 </Target >
@@ -340,8 +337,7 @@ Example of use:
340337 Package Installer: launcher-prerequisites.exe
341338 -->
342339 <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/" ;StrideSignTenantId=" $(StrideSignTenantId)" ;StrideSignClientId=" $(StrideSignClientId)" " />
345341 </Target >
346342
347343 <!--
@@ -371,7 +367,6 @@ Example of use:
371367 <Target Name =" SignCredentialsCheck" Condition =" '$(StrideSign)' == 'true'" >
372368 <Error Condition =" '$(StrideSignTenantId)' == ''" Text =" StrideSignTenantId is not set. Please set StrideSign to false if you don't want to sign using code certificates." />
373369 <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." />
375370 <Error Condition =" '$(StrideSignKeyVaultCertificate)' == ''" Text =" StrideSignKeyVaultCertificate is not set. Please set StrideSign to false if you don't want to sign using code certificates." />
376371 <Error Condition =" '$(StrideSignKeyVaultName)' == ''" Text =" StrideSignKeyVaultName is not set. Please set StrideSign to false if you don't want to sign using code certificates." />
377372 </Target >
@@ -382,7 +377,7 @@ Example of use:
382377 <ItemGroup >
383378 <MainPackagesToSign Include =" $(MSBuildThisFileDirectory)..\bin\packages\*.nupkg" />
384379 </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 " />
380+ <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-certificate " $(StrideSignKeyVaultCertificate)" --azure-key-vault-url " https://$(StrideSignKeyVaultName).vault.azure.net/" --file-list " sign\nupkgfilter.txt" -v Information" />
386381 </Target >
387382
388383</Project >
0 commit comments