automatic office deplyment, bug fixes

Author: jm33-m0

office_deploy/install-office.bat

@@ -1,5 +1,3 @@
 @echo off
-echo Downloading Office, please wait...
-.\setup.exe /download .\office-proplus.xml
-echo Installing Office...
 .\setup.exe /configure .\office-proplus.xml
+@echo on

office_deploy/kms-activate.exe

@@ -2,6 +2,7 @@
 
 using System;
 using System.Diagnostics;
+using System.IO;
 using System.Windows;
 
 namespace kms_activate
@@ -11,6 +12,11 @@ class ActOffice
         public static MainWindow mainW = (MainWindow)Application.Current.MainWindow;
         public static void OfficeActivate()
         {
+            if (!OfficeEnv())
+            {
+                Application.Current.Shutdown();
+            }
+            MessageBox.Show("Make sure to open Office and agree to user terms", "Tips", MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK);
 
             // debug info
             string kmsServerDbg, activateDbg;
@@ -244,7 +250,18 @@ public static void Retail2Vol(string installRoot)
             MessageBox.Show("Converting Office " + version + " retail version to volume version...\n" + log, "Note: You are NOT using volume version", MessageBoxButton.OK, MessageBoxImage.Information);
         }
 
-        public static void OfficeEnv()
+        public static void InstallOffice()
+        {
+            if (!File.Exists("setup.exe") || !File.Exists("office-proplus.xml"))
+            {
+                MessageBox.Show("Make sure setup.exe and office-proplus.xml exist in current directory", "Files missing",
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+                return;
+            }
+            Util.RunProcess("setup.exe", "/configure office-proplus.xml", "./", true);
+        }
+
+        public static bool OfficeEnv()
         {
 
             // look for Office's install path, where OSPP.VBS can be found
@@ -295,13 +312,20 @@ public static void OfficeEnv()
                     MessageBox.Show("Only works with Office 2010 and/or above", "Unsupported version", MessageBoxButton.OK, MessageBoxImage.Error);
                     mainW.button.Content = "Unsupported version";
                     mainW.windows_option.IsChecked = true;
-                    return;
+                    return false;
                 }
                 mainW.OsppPath.Text = officepath;
+
+                return true;
             }
             catch (Exception err)
             {
-                MessageBox.Show(err.ToString(), "Error detecting Office path", MessageBoxButton.OK, MessageBoxImage.Error);
+                MessageBox.Show("Office installation not detected:\n" + err.ToString(), "Error detecting Office path", MessageBoxButton.OK);
+                if (Util.YesNo("Download and install Office 2021 with Office Deployment Tool?", "Install Office"))
+                {
+                    InstallOffice();
+                }
+                return false;
             }
         }
     }

win10-activate/ActOffice.cs

@@ -1,10 +1,10 @@
-using System;
+using Microsoft.Win32;
+
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Windows;
 
-using Microsoft.Win32;
-
 namespace kms_activate
 {
     class ActWin

win10-activate/ActWin.cs

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
-</configuration>
+</configuration>

win10-activate/App.config

@@ -17,12 +17,13 @@ public MainWindow()
             }
             InitializeComponent();
             windows_option.IsChecked = true;
+            ShowDebug.IsChecked = true;
         }
 
         private void Button_Click(object sender, RoutedEventArgs e)
         {
             // when to exit
-            if ((string)button.Content == "Done! Click to exit")
+            if (button.Content.ToString() == "Done! Click to exit")
             {
                 Application.Current.Shutdown();
             }

win10-activate/MainWindow.xaml.cs

@@ -16,11 +16,11 @@
             Remove this element if your application requires this virtualization for backwards
             compatibility.
         -->
-        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
       </requestedPrivileges>
       <applicationRequestMinimum>
         <defaultAssemblyRequest permissionSetReference="Custom" />
-        <PermissionSet class="System.Security.PermissionSet" version="1" Unrestricted="true" ID="Custom" SameSite="site" />
+        <PermissionSet class="System.Security.PermissionSet" version="1" ID="Custom" SameSite="site" Unrestricted="true" />
       </applicationRequestMinimum>
     </security>
   </trustInfo>

win10-activate/Properties/Resources.Designer.cs

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>kms_activate</RootNamespace>
     <AssemblyName>kms-activate</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
@@ -30,6 +30,7 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -57,7 +58,7 @@
     <ManifestKeyFile>win10-activate_TemporaryKey.pfx</ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
-    <GenerateManifests>true</GenerateManifests>
+    <GenerateManifests>false</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
     <SignManifests>false</SignManifests>