-
Notifications
You must be signed in to change notification settings - Fork 177
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Add "OS validation" functionality to NSIS bootstrapper * Issue #962: Add RemotePayloads support for MsuPackage * Issue #965: Retry strategy for DigitalSignature * Implemented the most obvious/acceptable static code analysis recommendations * Added IISCertificate support * Added `GlobalSuppressions*.cs` files to suppress non-meaningful warnings * Added support for `IISCertificate` element. * Added missing `FirewallExtension.ru.wxl` file * Fixed problem with UninstallFullUI' display icon not being added to all `features` * "Added LaunchApplicationAction" is extended with support for stock UI * U-Tests are completed and `BuildSamples` enabled on AppVeyor * Samples - Fixed "UrlReservation" sample - Fixed "Release Folder" sample - Added `UninstallFullUI.cs` sample - Projects are migrated on target v4.6.1 * BuildMultilanguageMsi improvements - returns path of the built MSI file - prints additional build progress messages in output
- Loading branch information
oleg.shilo
authored and
oleg.shilo
committed
Feb 1, 2021
1 parent
e456236
commit b07e3ed
Showing
21 changed files
with
417 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| using System; | ||
| using Microsoft.Build; | ||
| using Microsoft.Build.Framework; | ||
| using Microsoft.Build.Utilities; | ||
|
|
||
| namespace WixSharp.Build | ||
| { | ||
| public class SetEnvVar : Task | ||
| { | ||
| [Required] | ||
| public string Values { get; set; } | ||
|
|
||
| public override bool Execute() | ||
| { | ||
| string[] vals = Values.Replace(";;", "$(separator)").Split(';'); | ||
|
|
||
| foreach (string keyValue in vals) | ||
| try | ||
| { | ||
| string[] parts = keyValue.Replace("$(separator)", ";").Split('='); | ||
| Environment.SetEnvironmentVariable(parts[0].Trim(), parts[1].Trim()); | ||
| } | ||
| catch { } | ||
| return true; | ||
| } | ||
| } | ||
| } |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <Project> | ||
|
|
||
| <UsingTask AssemblyFile="C:\Users\osh\Documents\Visual Studio 2013\Projects\ClassLibrary1\SetEnvVar.dll" TaskName="SetEnvVar" /> | ||
|
|
||
| <Target Name="AfterBuild"> | ||
| <SetEnvVar Values="PROJECTNAME=$(ProjectName)"/> | ||
| <Exec Command=""C:\Users\osh\Documents\Visual Studio 2013\Projects\ClassLibrary1\bin\Debug\script.exe"" /> | ||
| </Target> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| //css_args /ac | ||
| using System.Diagnostics; | ||
| using System.Text; | ||
| using System.Reflection; | ||
| // using System.Windows.Forms; | ||
| using System.IO; | ||
| using System.Linq; | ||
| using System; | ||
|
|
||
| void main() | ||
| { | ||
| string version = Assembly.LoadFrom(@"WixSharp\WixSharp.dll").GetName().Version.ToString(); | ||
|
|
||
| Directory.GetDirectories(@"WixSharp\Samples", "*", SearchOption.AllDirectories) | ||
| .Where(dir => | ||
| { | ||
| return !dir.ToLower().Contains("sourcebasedir") && !dir.ToLower().Contains("wildcard files") && | ||
| (dir.EndsWith(@"bin\debug", StringComparison.OrdinalIgnoreCase) || | ||
| dir.EndsWith(@"bin\release", StringComparison.OrdinalIgnoreCase) || | ||
| dir.EndsWith(@"obj\debug", StringComparison.OrdinalIgnoreCase) || | ||
| dir.EndsWith(@"obj\release", StringComparison.OrdinalIgnoreCase)); | ||
| }) | ||
| .ToList() | ||
| .ForEach(dir => | ||
| { | ||
| Console.WriteLine("del dir: " + dir); | ||
| Directory.Delete(dir, true); | ||
| }); | ||
|
|
||
| var exclusions = "echo.exe;registrator.exe;registrator.exe;myapp.exe;some.exe;cscs.exe".Split(';'); | ||
| bool deleted = false; | ||
|
|
||
| var filesToDelete = Directory.GetFiles(@"WixSharp\Samples", "*.exe", SearchOption.AllDirectories) | ||
| .Where(x => !Path.GetDirectoryName(x).ToLower().EndsWith(@"wix_bin\bin")) | ||
| .Where(x => !Path.GetDirectoryName(x).ToLower().EndsWith("appfiles")) | ||
| .Where(x => !exclusions.Contains(Path.GetFileName(x.ToLower()))) | ||
| .ToList(); | ||
|
|
||
| if (filesToDelete.Any()) | ||
| Console.WriteLine("!!!!!!!!!!!!! SOME FILES WILL BE DELETED !!!!!!!!! "); | ||
|
|
||
| filesToDelete.ForEach(exe => | ||
| { | ||
| Console.WriteLine("!!!!!!!!!!!!! " + exe); | ||
| File.Delete(exe); | ||
| deleted = true; | ||
| }); | ||
|
|
||
| string outputFile = Path.GetFullPath("WixSharp." + version + ".7z"); | ||
| string inputDir = Path.GetFullPath("WixSharp"); | ||
|
|
||
| string app = Path.GetFullPath(@".\.build\7z.exe"); | ||
| string args = @"a -r -t7z " + outputFile + " " + inputDir + @"\*.*"; | ||
|
|
||
| run(app, args); | ||
| } | ||
|
|
||
| void run(string app, string args) | ||
| { | ||
| var p = new Process(); | ||
| p.StartInfo.FileName = app; | ||
| p.StartInfo.Arguments = args; | ||
| p.StartInfo.UseShellExecute = false; | ||
| p.StartInfo.RedirectStandardOutput = true; | ||
| p.StartInfo.CreateNoWindow = true; | ||
| p.Start(); | ||
|
|
||
| string line = null; | ||
|
|
||
| while (null != (line = p.StandardOutput.ReadLine())) | ||
| Console.WriteLine(line); | ||
|
|
||
| p.WaitForExit(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
+0 Bytes
(100%)
...amples/Wix# Samples/DTF (ManagedCA)/Different Scenarios/ExternalAssembly/CustomAction.dll
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
...ples/Wix# Samples/DTF (ManagedCA)/Different Scenarios/ExternalAssembly/DispalyMessage.dll
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
Source/src/WixSharp.Samples/Wix# Samples/External_UI/Msi/MyProduct.msi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Oops, something went wrong.