Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 10 insertions, 0 deletions

diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs
index dd8401570..2eeaa6e0e 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs
@@ -99,6 +99,11 @@ namespace Tango.MachineService.Controllers
 
                     response.BlobAddress = blob.GenerateReadSignature(TimeSpan.FromMinutes(60));
 
+                    if (!String.IsNullOrWhiteSpace(MachineServiceConfig.CDN_ENDPOINT))
+                    {
+                        response.CdnAddress = MachineServiceConfig.CDN_ENDPOINT + blob.Uri.AbsolutePath;
+                    }
+
                     response.IsUpdateAvailable = true;
                     response.Version = latestVersion.Version;
                     response.Comments = latestVersion.Comments;
@@ -133,6 +138,11 @@ namespace Tango.MachineService.Controllers
                     var container = manager.GetContainer(MachineServiceConfig.MACHINE_STUDIO_VERSIONS_CONTAINER);
                     var blob = container.GetBlockBlobReference(latestVersion.BlobName);
 
+                    if (!String.IsNullOrWhiteSpace(MachineServiceConfig.CDN_ENDPOINT))
+                    {
+                        response.CdnAddress = MachineServiceConfig.CDN_ENDPOINT + blob.Uri.AbsolutePath;
+                    }
+
                     response.BlobAddress = blob.GenerateReadSignature(TimeSpan.FromMinutes(60));
                     response.Version = latestVersion.Version;
                 }