1 files changed, 4 insertions, 2 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Publish/PPCPublisher.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Publish/PPCPublisher.cs
index 810c5b3cb..0e6641cfb 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Publish/PPCPublisher.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Publish/PPCPublisher.cs
@@ -63,7 +63,7 @@ namespace Tango.PPC.Common.Publish
         public async Task<LatestVersionResponse> GetRemoteVersion(String machineVersionGuid)
         {
             _client.Environment = Options.Environment;
-            var response = await _client.GetLatestVersion(new LatestVersionRequest() { MachineVersionGuid = machineVersionGuid });
+            var response = await _client.GetLatestVersion(new LatestVersionRequest() { MachineVersionGuid = machineVersionGuid, Tag = Options.Tag });
             return response;
         }
 
@@ -190,6 +190,7 @@ namespace Tango.PPC.Common.Publish
                         MachineVersionGuid = Options.MachineVersionGuid,
                         WithInstaller = !String.IsNullOrWhiteSpace(Options.InstallerProject),
                         FirmwareVersion = GetVersionInfoFromTFP(Options.TfpPath).FileDescriptors.SingleOrDefault(x => x.Destination == VersionFileDestination.Mcu).Version,
+                        Tag = Options.Tag
                     }).Result;
 
                     CreateTupPackage(tempFile).Wait();
@@ -199,7 +200,7 @@ namespace Tango.PPC.Common.Publish
                         String output_folder = Options.InstallerOutputFolder;
                         OnPublishProgress(0, 100, $"Building installer project...");
                         InstallerBuilder installerBuilder = new InstallerBuilder(Options.InstallerProject);
-                        String installer_name = $"PPC Installer_v{Version.Parse(local_version).ToString(3)}.exe";
+                        String installer_name = $"PPC Installer_v{Version.Parse(local_version).ToString(3) + (Options.Tag.IsNotNullOrEmpty() ? $" [{Options.Tag}]" : String.Empty)}.exe";
                         String output_file = Path.Combine(output_folder, installer_name);
                         installerBuilder.Build(local_version, output_file).Wait();
 
@@ -355,6 +356,7 @@ namespace Tango.PPC.Common.Publish
                         versionInfo.ApplicationVersion = GetLocalVersion();
                         versionInfo.Comments = Options.Comments;
                         versionInfo.Firmware = GetVersionInfoFromTFP(Options.TfpPath);
+                        versionInfo.Tag = Options.Tag;
 
                         //Validate the package.
                         versionInfo.Firmware.Validate();