From 72956826a7b6716b5093e8f63130f91c46074b32 Mon Sep 17 00:00:00 2001 From: Brad Nicholes Date: Tue, 27 Sep 2022 15:22:20 -0600 Subject: [PATCH 1/6] Add the wix installer to create the msi install --- LICENSE.rtf | 74 + RemoteApplicationPublisher.sln | 14 +- RemoteApplicationPublisher/HelpSystem.cs | 4 +- RemoteApplicationPublisher/Program.cs | 7 +- .../RemoteAppAboutWindow.Designer.cs | 6 +- .../RemoteAppAboutWindow.cs | 3 + .../RemoteAppEditWindow.Designer.cs | 4 +- .../RemoteAppEditWindow.cs | 7 +- .../RemoteAppFunction.cs | 6 +- .../RemoteAppHostOptions.Designer.cs | 6 +- .../RemoteAppHostOptions.cs | 4 +- RemoteApplicationPublisher/RemoteAppLib.cs | 1 + .../RemoteAppMainForm.cs | 2 + .../RemoteAppMainWindow.Designer.cs | 4 +- .../RemoteAppMainWindow.cs | 5 +- .../RemoteApplicationPublisher.csproj | 8 +- .../CommonStrings.wxl | 7 + .../Component-generated.wxs | 2053 +++++++++++++++++ RemoteApplicationPublisherSetup/Product.wxs | 64 + .../RemoteApplicationPublisherSetup.wixproj | 78 + .../install-banner.bmp | Bin 0 -> 85896 bytes .../install-panel.bmp | Bin 0 -> 461816 bytes azure-pipelines.yml | 13 +- 23 files changed, 2348 insertions(+), 22 deletions(-) create mode 100644 LICENSE.rtf create mode 100644 RemoteApplicationPublisherSetup/CommonStrings.wxl create mode 100644 RemoteApplicationPublisherSetup/Component-generated.wxs create mode 100644 RemoteApplicationPublisherSetup/Product.wxs create mode 100644 RemoteApplicationPublisherSetup/RemoteApplicationPublisherSetup.wixproj create mode 100644 RemoteApplicationPublisherSetup/install-banner.bmp create mode 100644 RemoteApplicationPublisherSetup/install-panel.bmp diff --git a/LICENSE.rtf b/LICENSE.rtf new file mode 100644 index 0000000..4b8e7b5 --- /dev/null +++ b/LICENSE.rtf @@ -0,0 +1,74 @@ +{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fmodern\fprq1\fcharset0 Courier New;}} +{\colortbl ;\red0\green0\blue255;} +{\*\generator Riched20 10.0.18362}{\*\mmathPr\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 +\pard\widctlpar\f0\fs21 Apache License\par + Version 2.0, January 2004\par + {{\field{\*\fldinst{HYPERLINK http://www.apache.org/licenses/ }}{\fldrslt{http://www.apache.org/licenses/\ul0\cf0}}}}\f0\fs21\par +\par + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\par +\par + 1. Definitions.\par +\par + "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.\par +\par + "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.\par +\par + "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition,\par + "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or\par + otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.\par +\par + "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.\par +\par + "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.\par +\par + "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.\par +\par + "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).\par +\par + "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.\par +\par + "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."\par +\par + "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.\par +\par + 2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.\par +\par + 3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.\par +\par + 4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:\par +\par + (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and\par +\par + (b) You must cause any modified files to carry prominent notices stating that You changed the files; and\par +\par + (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and\par +\par + (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.\par +\par + You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.\par +\par + 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.\par +\par + 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.\par +\par + 7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.\par +\par + 8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.\par +\par + 9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.\par +\par + END OF TERMS AND CONDITIONS\par +\par + APPENDIX: How to apply the Apache License to your work.\par +\par + To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.\par +\par + Copyright [yyyy] [name of copyright owner]\par +\par + Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at\par +\par + {{\field{\*\fldinst{HYPERLINK http://www.apache.org/licenses/LICENSE-2.0 }}{\fldrslt{http://www.apache.org/licenses/LICENSE-2.0\ul0\cf0}}}}\f0\fs21\par +\par + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.\par +} + \ No newline at end of file diff --git a/RemoteApplicationPublisher.sln b/RemoteApplicationPublisher.sln index df99d7a..ec10792 100644 --- a/RemoteApplicationPublisher.sln +++ b/RemoteApplicationPublisher.sln @@ -1,26 +1,26 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 -VisualStudioVersion = 17.1.32414.318 +VisualStudioVersion = 17.3.32901.215 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RemoteApplicationPublisher", "RemoteApplicationPublisher\RemoteApplicationPublisher.csproj", "{E23CF4FE-4FA6-4554-8A06-D741D336DB0A}" EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "RemoteApplicationPublisherSetup", "RemoteApplicationPublisherSetup\RemoteApplicationPublisherSetup.wixproj", "{5EEA7966-CB7D-4FE5-8B6E-7B416A4C4EB0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 - Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E23CF4FE-4FA6-4554-8A06-D741D336DB0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E23CF4FE-4FA6-4554-8A06-D741D336DB0A}.Debug|Any CPU.Build.0 = Debug|Any CPU {E23CF4FE-4FA6-4554-8A06-D741D336DB0A}.Debug|x64.ActiveCfg = Debug|x64 {E23CF4FE-4FA6-4554-8A06-D741D336DB0A}.Debug|x64.Build.0 = Debug|x64 - {E23CF4FE-4FA6-4554-8A06-D741D336DB0A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E23CF4FE-4FA6-4554-8A06-D741D336DB0A}.Release|Any CPU.Build.0 = Release|Any CPU {E23CF4FE-4FA6-4554-8A06-D741D336DB0A}.Release|x64.ActiveCfg = Release|x64 {E23CF4FE-4FA6-4554-8A06-D741D336DB0A}.Release|x64.Build.0 = Release|x64 + {5EEA7966-CB7D-4FE5-8B6E-7B416A4C4EB0}.Debug|x64.ActiveCfg = Debug|x64 + {5EEA7966-CB7D-4FE5-8B6E-7B416A4C4EB0}.Debug|x64.Build.0 = Debug|x64 + {5EEA7966-CB7D-4FE5-8B6E-7B416A4C4EB0}.Release|x64.ActiveCfg = Release|x64 + {5EEA7966-CB7D-4FE5-8B6E-7B416A4C4EB0}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/RemoteApplicationPublisher/HelpSystem.cs b/RemoteApplicationPublisher/HelpSystem.cs index 13c84c4..7dcad31 100644 --- a/RemoteApplicationPublisher/HelpSystem.cs +++ b/RemoteApplicationPublisher/HelpSystem.cs @@ -1,4 +1,6 @@ -using System.Collections; +using System; +using System.Collections; +using System.Windows.Forms; namespace RemoteApplicationPublisher { diff --git a/RemoteApplicationPublisher/Program.cs b/RemoteApplicationPublisher/Program.cs index 550cf17..441df5a 100644 --- a/RemoteApplicationPublisher/Program.cs +++ b/RemoteApplicationPublisher/Program.cs @@ -1,3 +1,6 @@ +using System; +using System.Windows.Forms; + namespace RemoteApplicationPublisher { internal static class Program @@ -10,7 +13,9 @@ static void Main() { // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. - ApplicationConfiguration.Initialize(); + Application.SetHighDpiMode(HighDpiMode.SystemAware); + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); Application.Run(new RemoteAppMainWindow()); } } diff --git a/RemoteApplicationPublisher/RemoteAppAboutWindow.Designer.cs b/RemoteApplicationPublisher/RemoteAppAboutWindow.Designer.cs index d7acd3d..b24c9dd 100644 --- a/RemoteApplicationPublisher/RemoteAppAboutWindow.Designer.cs +++ b/RemoteApplicationPublisher/RemoteAppAboutWindow.Designer.cs @@ -1,4 +1,8 @@ -namespace RemoteApplicationPublisher +using System; +using System.Drawing; +using System.Windows.Forms; + +namespace RemoteApplicationPublisher { [Microsoft.VisualBasic.CompilerServices.DesignerGenerated()] public partial class RemoteAppAboutWindow : Form diff --git a/RemoteApplicationPublisher/RemoteAppAboutWindow.cs b/RemoteApplicationPublisher/RemoteAppAboutWindow.cs index 474845d..9f9ba83 100644 --- a/RemoteApplicationPublisher/RemoteAppAboutWindow.cs +++ b/RemoteApplicationPublisher/RemoteAppAboutWindow.cs @@ -1,4 +1,7 @@  +using System; +using System.Windows.Forms; + namespace RemoteApplicationPublisher { diff --git a/RemoteApplicationPublisher/RemoteAppEditWindow.Designer.cs b/RemoteApplicationPublisher/RemoteAppEditWindow.Designer.cs index 890d165..c077209 100644 --- a/RemoteApplicationPublisher/RemoteAppEditWindow.Designer.cs +++ b/RemoteApplicationPublisher/RemoteAppEditWindow.Designer.cs @@ -1,4 +1,6 @@ -namespace RemoteApplicationPublisher +using System.Windows.Forms; + +namespace RemoteApplicationPublisher { public partial class RemoteAppEditWindow { diff --git a/RemoteApplicationPublisher/RemoteAppEditWindow.cs b/RemoteApplicationPublisher/RemoteAppEditWindow.cs index bceae29..1d7d278 100644 --- a/RemoteApplicationPublisher/RemoteAppEditWindow.cs +++ b/RemoteApplicationPublisher/RemoteAppEditWindow.cs @@ -1,4 +1,9 @@ -namespace RemoteApplicationPublisher + +using System; +using System.IO; +using System.Windows.Forms; + +namespace RemoteApplicationPublisher { public partial class RemoteAppEditWindow : Form diff --git a/RemoteApplicationPublisher/RemoteAppFunction.cs b/RemoteApplicationPublisher/RemoteAppFunction.cs index 24e36e2..4050676 100644 --- a/RemoteApplicationPublisher/RemoteAppFunction.cs +++ b/RemoteApplicationPublisher/RemoteAppFunction.cs @@ -1,5 +1,9 @@ -using System.Diagnostics; +using System; +using System.Diagnostics; +using System.Drawing; +using System.IO; using System.Text.RegularExpressions; +using System.Windows.Forms; using Microsoft.Win32; namespace RemoteApplicationPublisher diff --git a/RemoteApplicationPublisher/RemoteAppHostOptions.Designer.cs b/RemoteApplicationPublisher/RemoteAppHostOptions.Designer.cs index 9e30e96..5360eb9 100644 --- a/RemoteApplicationPublisher/RemoteAppHostOptions.Designer.cs +++ b/RemoteApplicationPublisher/RemoteAppHostOptions.Designer.cs @@ -1,4 +1,8 @@ -namespace RemoteApplicationPublisher +using System; +using System.Drawing; +using System.Windows.Forms; + +namespace RemoteApplicationPublisher { public partial class RemoteAppHostOptions : Form { diff --git a/RemoteApplicationPublisher/RemoteAppHostOptions.cs b/RemoteApplicationPublisher/RemoteAppHostOptions.cs index a15e7a2..2c2e059 100644 --- a/RemoteApplicationPublisher/RemoteAppHostOptions.cs +++ b/RemoteApplicationPublisher/RemoteAppHostOptions.cs @@ -1,4 +1,6 @@ -using Microsoft.Win32; +using System; +using System.Windows.Forms; +using Microsoft.Win32; namespace RemoteApplicationPublisher { diff --git a/RemoteApplicationPublisher/RemoteAppLib.cs b/RemoteApplicationPublisher/RemoteAppLib.cs index b216dae..4f61da7 100644 --- a/RemoteApplicationPublisher/RemoteAppLib.cs +++ b/RemoteApplicationPublisher/RemoteAppLib.cs @@ -1,4 +1,5 @@  +using System; using Microsoft.Win32; namespace RemoteApplicationPublisher diff --git a/RemoteApplicationPublisher/RemoteAppMainForm.cs b/RemoteApplicationPublisher/RemoteAppMainForm.cs index 4e1243b..19f8339 100644 --- a/RemoteApplicationPublisher/RemoteAppMainForm.cs +++ b/RemoteApplicationPublisher/RemoteAppMainForm.cs @@ -1,3 +1,5 @@ +using System.Windows.Forms; + namespace RemoteApplicationPublisher { public partial class RemoteAppMainForm : Form diff --git a/RemoteApplicationPublisher/RemoteAppMainWindow.Designer.cs b/RemoteApplicationPublisher/RemoteAppMainWindow.Designer.cs index d467ecf..44d8505 100644 --- a/RemoteApplicationPublisher/RemoteAppMainWindow.Designer.cs +++ b/RemoteApplicationPublisher/RemoteAppMainWindow.Designer.cs @@ -1,4 +1,6 @@ -namespace RemoteApplicationPublisher +using System.Windows.Forms; + +namespace RemoteApplicationPublisher { public partial class RemoteAppMainWindow { diff --git a/RemoteApplicationPublisher/RemoteAppMainWindow.cs b/RemoteApplicationPublisher/RemoteAppMainWindow.cs index 67e19dd..c95aaad 100644 --- a/RemoteApplicationPublisher/RemoteAppMainWindow.cs +++ b/RemoteApplicationPublisher/RemoteAppMainWindow.cs @@ -1,4 +1,7 @@ -using System.Diagnostics; +using System; +using System.Diagnostics; +using System.Drawing; +using System.Windows.Forms; namespace RemoteApplicationPublisher { diff --git a/RemoteApplicationPublisher/RemoteApplicationPublisher.csproj b/RemoteApplicationPublisher/RemoteApplicationPublisher.csproj index f077ddf..4da7aa7 100644 --- a/RemoteApplicationPublisher/RemoteApplicationPublisher.csproj +++ b/RemoteApplicationPublisher/RemoteApplicationPublisher.csproj @@ -5,15 +5,17 @@ net6.0-windows enable true - enable + disable app.manifest + RemoteApplicationPublisher.Program + x64 - + 1701;1702;8618;8601 - + 1701;1702;8618;8601 diff --git a/RemoteApplicationPublisherSetup/CommonStrings.wxl b/RemoteApplicationPublisherSetup/CommonStrings.wxl new file mode 100644 index 0000000..0c30b5e --- /dev/null +++ b/RemoteApplicationPublisherSetup/CommonStrings.wxl @@ -0,0 +1,7 @@ + + + + RemoteApplicationPublisher + OneIdentity + + diff --git a/RemoteApplicationPublisherSetup/Component-generated.wxs b/RemoteApplicationPublisherSetup/Component-generated.wxs new file mode 100644 index 0000000..8105180 --- /dev/null +++ b/RemoteApplicationPublisherSetup/Component-generated.wxs @@ -0,0 +1,2053 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/RemoteApplicationPublisherSetup/Product.wxs b/RemoteApplicationPublisherSetup/Product.wxs new file mode 100644 index 0000000..b931a89 --- /dev/null +++ b/RemoteApplicationPublisherSetup/Product.wxs @@ -0,0 +1,64 @@ + + + + + + + + + https://github.com/OneIdentity/RemoteApplicationPublisher + + + VersionNT64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/RemoteApplicationPublisherSetup/RemoteApplicationPublisherSetup.wixproj b/RemoteApplicationPublisherSetup/RemoteApplicationPublisherSetup.wixproj new file mode 100644 index 0000000..86024cb --- /dev/null +++ b/RemoteApplicationPublisherSetup/RemoteApplicationPublisherSetup.wixproj @@ -0,0 +1,78 @@ + + + + Release + x64 + 3.10 + 5eea7966-cb7d-4fe5-8b6e-7b416a4c4eb0 + 2.0 + RemoteApplicationPublisherSetup-$(Configuration)-$(Platform) + Package + RemoteApplicationPublisherSetup + false + + + Debug;SourceDir=bin\$(Configuration)\publish + bin\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + False + ICE61;ICE63;ICE64 + + + bin\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + SourceDir=bin\$(Configuration)\publish + ICE61;ICE63;ICE64 + + + + + + + + RemoteApplicationPublisher + {E23CF4FE-4FA6-4554-8A06-D741D336DB0A} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + + + $(WixExtDir)\WixUIExtension.dll + WixUIExtension + + + $(WixExtDir)\WixUtilExtension.dll + WixUtilExtension + + + $(WixExtDir)\WixNetFxExtension.dll + WixNetFxExtension + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/RemoteApplicationPublisherSetup/install-banner.bmp b/RemoteApplicationPublisherSetup/install-banner.bmp new file mode 100644 index 0000000000000000000000000000000000000000..81d43e3cfcf4b798ff0ceb0ed5023f81e7fe02e8 GIT binary patch literal 85896 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 literal 0 HcmV?d00001 diff --git a/RemoteApplicationPublisherSetup/install-panel.bmp b/RemoteApplicationPublisherSetup/install-panel.bmp new file mode 100644 index 0000000000000000000000000000000000000000..569e817ba44e55f745930de6eef165b96905dbdc GIT binary patch literal 461816 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 Date: Tue, 27 Sep 2022 15:24:45 -0600 Subject: [PATCH 2/6] fix typo --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9497765..3d473f9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -40,7 +40,7 @@ steps: configuration: '$(buildConfiguration)' displayName: 'Build $(solution)' - - task: VSBuild@1 +- task: VSBuild@1 inputs: solution: '$(setupProject)' platform: '$(buildPlatform)' From c6f8bebd2801f890a9b189a7718411f71db1f23e Mon Sep 17 00:00:00 2001 From: Brad Nicholes Date: Tue, 27 Sep 2022 15:28:48 -0600 Subject: [PATCH 3/6] test installer build --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3d473f9..9b3225a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -46,7 +46,7 @@ steps: platform: '$(buildPlatform)' configuration: '$(buildConfiguration)' displayName: 'Build $(setupProject)' - condition: and(succeeded(), eq(variables.isReleaseBranch, true)) + #condition: and(succeeded(), eq(variables.isReleaseBranch, true)) - task: ArchiveFiles@2 inputs: From 1b6ab71fd2de92fffe181074c4c04ff31d7c4d35 Mon Sep 17 00:00:00 2001 From: Brad Nicholes Date: Tue, 27 Sep 2022 15:42:36 -0600 Subject: [PATCH 4/6] Copy the installer to the stage folder --- azure-pipelines.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9b3225a..b73799a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -58,6 +58,13 @@ steps: verbose: true displayName: 'Zip artifacts' +- task: CopyFiles@2 + inputs: + sourceFolder: '$(Build.SourcesDirectory)\$(setupProjectDir)' + contents: '**\bin\$(buildConfiguration)\en-us\*.msi' + targetFolder: $(Build.ArtifactStagingDirectory) + displayName: 'Copy installer to staging folder' + - task: PublishBuildArtifacts@1 inputs: pathToPublish: '$(Build.ArtifactStagingDirectory)' From 87e655f4cc4a76fbb46359095644f2a8277d1b1c Mon Sep 17 00:00:00 2001 From: Brad Nicholes Date: Tue, 27 Sep 2022 16:00:29 -0600 Subject: [PATCH 5/6] Finalize the installer --- .../RemoteAppPublisherSetup.vdproj | 782 ------------------ .../RemoteApplicationPublisher.csproj | 1 + azure-pipelines.yml | 5 +- 3 files changed, 5 insertions(+), 783 deletions(-) delete mode 100644 RemoteAppPublisherSetup/RemoteAppPublisherSetup.vdproj diff --git a/RemoteAppPublisherSetup/RemoteAppPublisherSetup.vdproj b/RemoteAppPublisherSetup/RemoteAppPublisherSetup.vdproj deleted file mode 100644 index 00f531a..0000000 --- a/RemoteAppPublisherSetup/RemoteAppPublisherSetup.vdproj +++ /dev/null @@ -1,782 +0,0 @@ -"DeployProject" -{ -"VSVersion" = "3:800" -"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}" -"IsWebType" = "8:FALSE" -"ProjectName" = "8:RemoteAppPublisherSetup" -"LanguageId" = "3:1033" -"CodePage" = "3:1252" -"UILanguageId" = "3:1033" -"SccProjectName" = "8:" -"SccLocalPath" = "8:" -"SccAuxPath" = "8:" -"SccProvider" = "8:" - "Hierarchy" - { - "Entry" - { - "MsmKey" = "8:_5F02B2B1009E40F282F9F4AD720DB5E7" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_C916CCC806404850BCD381E32A332DD5" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - } - "Configurations" - { - "Debug" - { - "DisplayName" = "8:Debug" - "IsDebugOnly" = "11:TRUE" - "IsReleaseOnly" = "11:FALSE" - "OutputFilename" = "8:Debug\\RemoteAppPublisherSetup.msi" - "PackageFilesAs" = "3:2" - "PackageFileSize" = "3:-2147483648" - "CabType" = "3:1" - "Compression" = "3:2" - "SignOutput" = "11:FALSE" - "CertificateFile" = "8:" - "PrivateKeyFile" = "8:" - "TimeStampServer" = "8:" - "InstallerBootstrapper" = "3:2" - "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" - { - "Enabled" = "11:TRUE" - "PromptEnabled" = "11:TRUE" - "PrerequisitesLocation" = "2:2" - "Url" = "8:" - "ComponentsUrl" = "8:" - "Items" - { - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.7.2" - { - "Name" = "8:Microsoft .NET Framework 4.7.2 (x86 and x64)" - "ProductCode" = "8:.NETFramework,Version=v4.7.2" - } - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.NetCore.DesktopRuntime.6.0.x64" - { - "Name" = "8:.NET Desktop Runtime 6.0.9 (x64)" - "ProductCode" = "8:Microsoft.NetCore.DesktopRuntime.6.0.x64" - } - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.NetCore.DesktopRuntime.6.0.x86" - { - "Name" = "8:.NET Desktop Runtime 6.0.9 (x86)" - "ProductCode" = "8:Microsoft.NetCore.DesktopRuntime.6.0.x86" - } - } - } - } - "Release" - { - "DisplayName" = "8:Release" - "IsDebugOnly" = "11:FALSE" - "IsReleaseOnly" = "11:TRUE" - "OutputFilename" = "8:Release\\RemoteAppPublisherSetup.msi" - "PackageFilesAs" = "3:2" - "PackageFileSize" = "3:-2147483648" - "CabType" = "3:1" - "Compression" = "3:2" - "SignOutput" = "11:FALSE" - "CertificateFile" = "8:" - "PrivateKeyFile" = "8:" - "TimeStampServer" = "8:" - "InstallerBootstrapper" = "3:2" - "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" - { - "Enabled" = "11:TRUE" - "PromptEnabled" = "11:TRUE" - "PrerequisitesLocation" = "2:1" - "Url" = "8:" - "ComponentsUrl" = "8:" - } - } - } - "Deployable" - { - "CustomAction" - { - } - "DefaultFeature" - { - "Name" = "8:DefaultFeature" - "Title" = "8:" - "Description" = "8:" - } - "ExternalPersistence" - { - "LaunchCondition" - { - "{A06ECF26-33A3-4562-8140-9B0E340D4F24}:_304BCBBF943E4B078070D79A5F43677F" - { - "Name" = "8:.NET Core" - "Message" = "8:[VSDNETCOREMSG]" - "AllowLaterVersions" = "11:FALSE" - "InstallUrl" = "8:https://dotnet.microsoft.com/download/dotnet-core/[NetCoreVerMajorDotMinor]" - "IsNETCore" = "11:TRUE" - "Architecture" = "2:0" - "Runtime" = "2:0" - } - } - } - "File" - { - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5F02B2B1009E40F282F9F4AD720DB5E7" - { - "SourcePath" = "8:..\\RemoteApplicationPublisher\\SafeguardLogo.ico" - "TargetName" = "8:SafeguardLogo.ico" - "Tag" = "8:" - "Folder" = "8:_E25A5BAC2025406094F08B49B0EB4C9A" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } - } - "FileType" - { - } - "Folder" - { - "{1525181F-901A-416C-8A58-119130FE478E}:_3D91351DEAA24991A380B3585B0BA26B" - { - "Name" = "8:#1916" - "AlwaysCreate" = "11:FALSE" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Property" = "8:DesktopFolder" - "Folders" - { - } - } - "{1525181F-901A-416C-8A58-119130FE478E}:_B3D0D7198D824A7B8134BAA55F031F7D" - { - "Name" = "8:#1919" - "AlwaysCreate" = "11:FALSE" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Property" = "8:ProgramMenuFolder" - "Folders" - { - } - } - "{3C67513D-01DD-4637-8A68-80971EB9504F}:_E25A5BAC2025406094F08B49B0EB4C9A" - { - "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]" - "Name" = "8:#1925" - "AlwaysCreate" = "11:FALSE" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Property" = "8:TARGETDIR" - "Folders" - { - } - } - } - "LaunchCondition" - { - } - "Locator" - { - } - "MsiBootstrapper" - { - "LangId" = "3:1033" - "RequiresElevation" = "11:FALSE" - } - "Product" - { - "Name" = "8:Microsoft Visual Studio" - "ProductName" = "8:RemoteAppPublisherSetup" - "ProductCode" = "8:{D4AF76C5-F0AE-430B-93C2-148208FECB3F}" - "PackageCode" = "8:{BB29FEE4-4F09-4584-9680-6F68CED51C2E}" - "UpgradeCode" = "8:{A063B0E5-6F6F-4B0B-8642-22AFF9220C88}" - "AspNetVersion" = "8:4.0.30319.0" - "RestartWWWService" = "11:FALSE" - "RemovePreviousVersions" = "11:FALSE" - "DetectNewerInstalledVersion" = "11:TRUE" - "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.0" - "Manufacturer" = "8:OneIdentity" - "ARPHELPTELEPHONE" = "8:" - "ARPHELPLINK" = "8:" - "Title" = "8:RemoteAppPublisherSetup" - "Subject" = "8:" - "ARPCONTACT" = "8:OneIdentity" - "Keywords" = "8:" - "ARPCOMMENTS" = "8:" - "ARPURLINFOABOUT" = "8:" - "ARPPRODUCTICON" = "8:" - "ARPIconIndex" = "3:0" - "SearchPath" = "8:" - "UseSystemSearchPath" = "11:TRUE" - "TargetPlatform" = "3:0" - "PreBuildEvent" = "8:" - "PostBuildEvent" = "8:" - "RunPostBuildEvent" = "3:0" - } - "Registry" - { - "HKLM" - { - "Keys" - { - "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_FB3D710E4C594555B7EB840AF679DC03" - { - "Name" = "8:Software" - "Condition" = "8:" - "AlwaysCreate" = "11:FALSE" - "DeleteAtUninstall" = "11:FALSE" - "Transitive" = "11:FALSE" - "Keys" - { - "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_559B048C960543959A37766F752193A1" - { - "Name" = "8:[Manufacturer]" - "Condition" = "8:" - "AlwaysCreate" = "11:FALSE" - "DeleteAtUninstall" = "11:FALSE" - "Transitive" = "11:FALSE" - "Keys" - { - } - "Values" - { - } - } - } - "Values" - { - } - } - } - } - "HKCU" - { - "Keys" - { - "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_BE8C737FE2874F258C3B143A89729D0A" - { - "Name" = "8:Software" - "Condition" = "8:" - "AlwaysCreate" = "11:FALSE" - "DeleteAtUninstall" = "11:FALSE" - "Transitive" = "11:FALSE" - "Keys" - { - "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_65971A45023949F7A899BC2927A6BC9D" - { - "Name" = "8:[Manufacturer]" - "Condition" = "8:" - "AlwaysCreate" = "11:FALSE" - "DeleteAtUninstall" = "11:FALSE" - "Transitive" = "11:FALSE" - "Keys" - { - } - "Values" - { - } - } - } - "Values" - { - } - } - } - } - "HKCR" - { - "Keys" - { - } - } - "HKU" - { - "Keys" - { - } - } - "HKPU" - { - "Keys" - { - } - } - } - "Sequences" - { - } - "Shortcut" - { - "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_79A0737CBA354F3EB8ABAD15A326F10B" - { - "Name" = "8:Remote Application Publisher" - "Arguments" = "8:" - "Description" = "8:" - "ShowCmd" = "3:1" - "IconIndex" = "3:0" - "Transitive" = "11:FALSE" - "Target" = "8:_C916CCC806404850BCD381E32A332DD5" - "Folder" = "8:_B3D0D7198D824A7B8134BAA55F031F7D" - "WorkingFolder" = "8:_E25A5BAC2025406094F08B49B0EB4C9A" - "Icon" = "8:_5F02B2B1009E40F282F9F4AD720DB5E7" - "Feature" = "8:" - } - "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_E5B23CE5F864445392766657CDA37532" - { - "Name" = "8:Remote Application Publisher" - "Arguments" = "8:" - "Description" = "8:" - "ShowCmd" = "3:1" - "IconIndex" = "3:0" - "Transitive" = "11:FALSE" - "Target" = "8:_C916CCC806404850BCD381E32A332DD5" - "Folder" = "8:_3D91351DEAA24991A380B3585B0BA26B" - "WorkingFolder" = "8:_E25A5BAC2025406094F08B49B0EB4C9A" - "Icon" = "8:_5F02B2B1009E40F282F9F4AD720DB5E7" - "Feature" = "8:" - } - } - "UserInterface" - { - "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_1DC106A3C1954B77A22DE6BEDB0ECBE0" - { - "UseDynamicProperties" = "11:FALSE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdBasicDialogs.wim" - } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_24F5AD7F5FF6427E8B9EBE7027AA913E" - { - "Name" = "8:#1901" - "Sequence" = "3:2" - "Attributes" = "3:2" - "Dialogs" - { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_5D11ED64098241D8952D009CA5C1BE71" - { - "Sequence" = "3:100" - "DisplayName" = "8:Progress" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdAdminProgressDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - "ShowProgress" - { - "Name" = "8:ShowProgress" - "DisplayName" = "8:#1009" - "Description" = "8:#1109" - "Type" = "3:5" - "ContextData" = "8:1;True=1;False=0" - "Attributes" = "3:0" - "Setting" = "3:0" - "Value" = "3:1" - "DefaultValue" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - } - } - } - } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_67580C4ECB4240A2BEAB62D47FE75EF1" - { - "Name" = "8:#1902" - "Sequence" = "3:1" - "Attributes" = "3:3" - "Dialogs" - { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_49A50DB7DABD4716AE872BEE8B1D09E6" - { - "Sequence" = "3:100" - "DisplayName" = "8:Finished" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdFinishedDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - "UpdateText" - { - "Name" = "8:UpdateText" - "DisplayName" = "8:#1058" - "Description" = "8:#1158" - "Type" = "3:15" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:1" - "Value" = "8:#1258" - "DefaultValue" = "8:#1258" - "UsePlugInResources" = "11:TRUE" - } - } - } - } - } - "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_88BA41C8AE734DD5A31807CD86CC3302" - { - "UseDynamicProperties" = "11:FALSE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdUserInterface.wim" - } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_8D34958A516D4522896476C115A4A3FF" - { - "Name" = "8:#1900" - "Sequence" = "3:2" - "Attributes" = "3:1" - "Dialogs" - { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_2304D40CF403426490FC2C88DBAC914D" - { - "Sequence" = "3:300" - "DisplayName" = "8:Confirm Installation" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdAdminConfirmDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - } - } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_47013908219E44AE92B15721D2E3F384" - { - "Sequence" = "3:100" - "DisplayName" = "8:Welcome" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdAdminWelcomeDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - "CopyrightWarning" - { - "Name" = "8:CopyrightWarning" - "DisplayName" = "8:#1002" - "Description" = "8:#1102" - "Type" = "3:3" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:1" - "Value" = "8:#1202" - "DefaultValue" = "8:#1202" - "UsePlugInResources" = "11:TRUE" - } - "Welcome" - { - "Name" = "8:Welcome" - "DisplayName" = "8:#1003" - "Description" = "8:#1103" - "Type" = "3:3" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:1" - "Value" = "8:#1203" - "DefaultValue" = "8:#1203" - "UsePlugInResources" = "11:TRUE" - } - } - } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_A054FBFC2EB84B69960F0196D1F3D19E" - { - "Sequence" = "3:200" - "DisplayName" = "8:Installation Folder" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdAdminFolderDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - } - } - } - } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_ABC6D3F4C8CF46FC9901E5257B0EC66B" - { - "Name" = "8:#1900" - "Sequence" = "3:1" - "Attributes" = "3:1" - "Dialogs" - { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_27B91C08CC7640EDBB859436C4835B3E" - { - "Sequence" = "3:100" - "DisplayName" = "8:Welcome" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdWelcomeDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - "CopyrightWarning" - { - "Name" = "8:CopyrightWarning" - "DisplayName" = "8:#1002" - "Description" = "8:#1102" - "Type" = "3:3" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:1" - "Value" = "8:#1202" - "DefaultValue" = "8:#1202" - "UsePlugInResources" = "11:TRUE" - } - "Welcome" - { - "Name" = "8:Welcome" - "DisplayName" = "8:#1003" - "Description" = "8:#1103" - "Type" = "3:3" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:1" - "Value" = "8:#1203" - "DefaultValue" = "8:#1203" - "UsePlugInResources" = "11:TRUE" - } - } - } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_339297C6938948CAAD190F85DC455C3E" - { - "Sequence" = "3:300" - "DisplayName" = "8:Confirm Installation" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdConfirmDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - } - } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_71097937ADA644C8AB3283371BDA161C" - { - "Sequence" = "3:200" - "DisplayName" = "8:Installation Folder" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdFolderDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - "InstallAllUsersVisible" - { - "Name" = "8:InstallAllUsersVisible" - "DisplayName" = "8:#1059" - "Description" = "8:#1159" - "Type" = "3:5" - "ContextData" = "8:1;True=1;False=0" - "Attributes" = "3:0" - "Setting" = "3:0" - "Value" = "3:1" - "DefaultValue" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - } - } - } - } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_C368F198CE47490E986345F110336A09" - { - "Name" = "8:#1901" - "Sequence" = "3:1" - "Attributes" = "3:2" - "Dialogs" - { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_253B149FA6454F2FB3195D7AF84B1137" - { - "Sequence" = "3:100" - "DisplayName" = "8:Progress" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdProgressDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - "ShowProgress" - { - "Name" = "8:ShowProgress" - "DisplayName" = "8:#1009" - "Description" = "8:#1109" - "Type" = "3:5" - "ContextData" = "8:1;True=1;False=0" - "Attributes" = "3:0" - "Setting" = "3:0" - "Value" = "3:1" - "DefaultValue" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - } - } - } - } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_E7AE5803CCD54C8DB3BC6E37B94C22E4" - { - "Name" = "8:#1902" - "Sequence" = "3:2" - "Attributes" = "3:3" - "Dialogs" - { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_663D2DE43D674C20B4CAF98E8FF1E789" - { - "Sequence" = "3:100" - "DisplayName" = "8:Finished" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdAdminFinishedDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" - "UsePlugInResources" = "11:TRUE" - } - } - } - } - } - } - "MergeModule" - { - } - "ProjectOutput" - { - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C916CCC806404850BCD381E32A332DD5" - { - "SourcePath" = "8:..\\RemoteApplicationPublisher\\obj\\Debug\\net6.0-windows\\apphost.exe" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_E25A5BAC2025406094F08B49B0EB4C9A" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - "ProjectOutputGroupRegister" = "3:1" - "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:PublishItems" - "OutputProjectGuid" = "8:{E23CF4FE-4FA6-4554-8A06-D741D336DB0A}" - "ShowKeyOutput" = "11:TRUE" - "PublishProfilePath" = "8:Properties\\PublishProfiles\\FolderProfile.pubxml" - "ExcludeFilters" - { - } - } - } - } -} diff --git a/RemoteApplicationPublisher/RemoteApplicationPublisher.csproj b/RemoteApplicationPublisher/RemoteApplicationPublisher.csproj index 4da7aa7..5bb9cb0 100644 --- a/RemoteApplicationPublisher/RemoteApplicationPublisher.csproj +++ b/RemoteApplicationPublisher/RemoteApplicationPublisher.csproj @@ -9,6 +9,7 @@ app.manifest RemoteApplicationPublisher.Program x64 + x64 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b73799a..9167347 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -46,7 +46,7 @@ steps: platform: '$(buildPlatform)' configuration: '$(buildConfiguration)' displayName: 'Build $(setupProject)' - #condition: and(succeeded(), eq(variables.isReleaseBranch, true)) + condition: and(succeeded(), eq(variables.isReleaseBranch, true)) - task: ArchiveFiles@2 inputs: @@ -57,6 +57,7 @@ steps: replaceExistingArchive: true verbose: true displayName: 'Zip artifacts' + condition: and(succeeded(), eq(variables.isReleaseBranch, true)) - task: CopyFiles@2 inputs: @@ -64,12 +65,14 @@ steps: contents: '**\bin\$(buildConfiguration)\en-us\*.msi' targetFolder: $(Build.ArtifactStagingDirectory) displayName: 'Copy installer to staging folder' + condition: and(succeeded(), eq(variables.isReleaseBranch, true)) - task: PublishBuildArtifacts@1 inputs: pathToPublish: '$(Build.ArtifactStagingDirectory)' artifactName: 'RemoteAppliationPublisher' displayName: 'Publishing the artifacts' + condition: and(succeeded(), eq(variables.isReleaseBranch, true)) - task: GitHubRelease@1 inputs: From 38ae7b9cd01fc335e0f7faa84ea66c704bb828d9 Mon Sep 17 00:00:00 2001 From: Brad Nicholes Date: Tue, 27 Sep 2022 16:03:47 -0600 Subject: [PATCH 6/6] Don't build the installer with the solution. --- RemoteApplicationPublisher.sln | 1 - 1 file changed, 1 deletion(-) diff --git a/RemoteApplicationPublisher.sln b/RemoteApplicationPublisher.sln index ec10792..22d3dd6 100644 --- a/RemoteApplicationPublisher.sln +++ b/RemoteApplicationPublisher.sln @@ -18,7 +18,6 @@ Global {E23CF4FE-4FA6-4554-8A06-D741D336DB0A}.Release|x64.ActiveCfg = Release|x64 {E23CF4FE-4FA6-4554-8A06-D741D336DB0A}.Release|x64.Build.0 = Release|x64 {5EEA7966-CB7D-4FE5-8B6E-7B416A4C4EB0}.Debug|x64.ActiveCfg = Debug|x64 - {5EEA7966-CB7D-4FE5-8B6E-7B416A4C4EB0}.Debug|x64.Build.0 = Debug|x64 {5EEA7966-CB7D-4FE5-8B6E-7B416A4C4EB0}.Release|x64.ActiveCfg = Release|x64 {5EEA7966-CB7D-4FE5-8B6E-7B416A4C4EB0}.Release|x64.Build.0 = Release|x64 EndGlobalSection