Updates in new setup done regarding wix binaries location and .NET pr…

…erequisites wrapper behavior
PawelTroka · Jul 6, 2017 · 949af8f · 949af8f
1 parent 90f37d8
commit 949af8f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/Computator.NET.Setup/BootstrapperBuilder.cs b/Computator.NET.Setup/BootstrapperBuilder.cs
@@ -9,6 +9,8 @@ public class BootstrapperBuilder
     {
         public void Build()
         {
+            Compiler.WixLocation = Path.Combine(Environment.ExpandEnvironmentVariables(@"%USERPROFILE%"), ".nuget", "packages", "wixsharp.wix.bin", "3.11.0", "tools", "bin");
+
             var projectBuilder = new ProjectBuilder("4.6.1");
             var projectBuilderNet40 = new ProjectBuilder("4.0");
 
@@ -29,15 +31,25 @@ public void Build()
                 new Bundle("Computator.NET",
                     new ExePackage(packegeGroupRefNet40Path)
                     {
+                        Name = "Microsoft .NET Framework 4.0 Full (Web Installer)",
+                        Description = "The Microsoft .NET Framework 4 web installer package downloads and installs the .NET Framework components required to run on the target machine architecture and OS. An Internet connection is required during the installation. .NET Framework 4 is required to run and develop applications to target the .NET Framework 4.",
+                        DetectCondition = "NETFRAMEWORK40 OR VersionNT >= v6.0",
                         InstallCondition = "VersionNT < v6.0",
                         InstallCommand = "-q",
-                        Compressed = true
+                        UninstallCommand = "-uninstall -q -norestart",
+                        Compressed = true,
+                        //AttributesDefinition = "Visible=no",
                     },
                     new ExePackage(packegeGroupRefNetPath)
                     {
+                        Name = "Microsoft .NET Framework 4.6.1 (Web Installer)",
+                        Description = "The Microsoft .NET Framework 4.6.1 is a highly compatible, in-place update to the Microsoft .NET Framework 4, Microsoft .NET Framework 4.5, Microsoft .NET Framework 4.5.1, Microsoft .NET Framework 4.5.2 and Microsoft .NET Framework 4.6. The web installer is a small package that automatically determines and downloads only the components applicable for a particular platform.",
+                        DetectCondition = "NETFRAMEWORK45 >= 394254",
                         InstallCondition = "VersionNT >= v6.0",
                         InstallCommand = "-q",
-                        Compressed = true
+                        UninstallCommand = "-uninstall -q -norestart",
+                        Compressed = true,
+                        //AttributesDefinition = "Visible=no",
                     },
                     productMsiPackageNet40,
                     productMsiPackage)

diff --git a/Computator.NET.Setup/PackageGroupRefWrapper.cs b/Computator.NET.Setup/PackageGroupRefWrapper.cs
@@ -24,13 +24,14 @@ public string Build()
 
             var wrapperBundle = new Bundle(packegeGroupRef, new PackageGroupRef(packegeGroupRef))
             {
+                UpgradeCode = new Guid("4E11B932-46CF-48AE-BF37-FEAB24F5FB7B"),
                 Version = _netVersion.RealVersion,
                 //Application = new SilentBootstrapperApplication(),
             };
 
             Console.WriteLine($"Building {nameof(PackageGroupRefWrapper)} for {nameof(PackageGroupRef)} '{packegeGroupRef}' for .NET version '{_netVersion}'");
             var wrapperPath = wrapperBundle.Build(packegeGroupRefPath);
-            Console.WriteLine($"Build succesful, path is '{wrapperPath}'");
+            Console.WriteLine($"Build successful, path is '{wrapperPath}'");
 
             return wrapperPath;
         }