ATxCommon/ATxCommon.csproj

@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ATxCommon</RootNamespace>
     <AssemblyName>ATxCommon</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

ATxConfigTest/ATXConfigTest.csproj

@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ATxConfigTest</RootNamespace>
     <AssemblyName>AutoTxConfigTest</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

ATxConfigTest/App.config

-<?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" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
-</configuration>
\ No newline at end of file
+</configuration>

ATxDiagnostics/ATxDiagnostics.csproj

@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>ATxDiagnostics</RootNamespace>
     <AssemblyName>AutoTxDiagnostics</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />

ATxDiagnostics/App.config

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

ATxService/ATxService.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ATxService</RootNamespace>
     <AssemblyName>AutoTx</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
@@ -26,6 +26,7 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -88,12 +89,21 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
     <Compile Include="RoboCommand.cs">
       <SubType>Component</SubType>
     </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="AutoTx.resx">

ATxService/App.config

-<?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" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
-</configuration>
\ No newline at end of file
+</configuration>

ATxService/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace ATxService.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {

ATxService/Properties/Settings.Designer.cs

+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace ATxService.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+    }
+}

ATxService/Properties/Settings.settings

+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+</SettingsFile>

ATxTray/ATXTray.csproj

@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ATxTray</RootNamespace>
     <AssemblyName>ATxTray</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -66,19 +67,19 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Include="Properties\Settings.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Settings.settings</DependentUpon>

ATxTray/App.config

-<?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" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
-</configuration>
\ No newline at end of file
+</configuration>

ATxTray/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace ATxTray.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {

ATxTray/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace ATxTray.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

AutoTx.sln.DotSettings

@@ -21,6 +21,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>

Scripts/Deploy-NewBuild.ps1

-# Helper script to facilitate the package-deploy-update cycle. Its purpose is to
-# automate reading the updater config (optionally just using the default
-# location) and subsequently call the `Make-Package.ps1` and
-# `Provide-UpdaterPackage.ps1` scripts followed by a removal of the update
-# marker file for the local computer, all using the parameters collected from
-# the configuration file.
-
-[CmdletBinding()]
-Param(
-    [String] $UpdaterSettings = "C:\Tools\AutoTx-Updater\UpdaterConfig.inc.ps1"
-)
-
-$ErrorActionPreference = "Stop"
-
-try {
-    . $UpdaterSettings
-}
-catch {
-    $ex = $_.Exception.Message
-    Write-Host "Error reading settings file: '$($UpdaterSettings)' [$($ex)]"
-    Exit
-}
-
-# Make sure to run from the directory containing the script itself:
-$BaseDir = $(Split-Path $MyInvocation.MyCommand.Path)
-Push-Location $BaseDir
-
-.\Make-Package.ps1
-.\Provide-UpdaterPackage.ps1 -UpdaterSettings $UpdaterSettings
-
-$Marker = "$($UpdateSourcePath)\Service\UpdateMarkers\$($env:COMPUTERNAME)"
-if (Test-Path $Marker) {
-    Remove-Item -Force -Verbose $Marker
-}
-
-Pop-Location
\ No newline at end of file

Scripts/Install-NewestPackage.ps1

-# Helper script to locate the latest AutoTx installation package (expected to be
-# in a subdirectory of this script with a name like `build_2019-04-23_12-34-56`)
-# and call the installer script from *within* that package.
-
-# Make sure to run from the directory containing the script itself:
-$BaseDir = $(Split-Path $MyInvocation.MyCommand.Path)
-Push-Location $BaseDir
-
-
-$PackageDir = Get-ChildItem -Directory -Name |
-    Where-Object {$_ -match 'build_[0-9]{4}-[0-9]{2}-[0-9]{2}_'} |
-    Sort-Object |
-    Select-Object -Last 1
-
-
-Write-Host -NoNewLine "Installing package ["
-Write-Host -NoNewLine $PackageDir -Fore Green
-Write-Host  "] ..."
-Write-Host  ""
-
-cd $PackageDir
-./Install-Service.ps1
-
-# Return to the original location before the script was called:
-Pop-Location
\ No newline at end of file

Scripts/Install-Service.ps1

-# Helper script to install the AutoTx service on a computer. It is intended to
-# be run from *within* an AutoTx installation package created with the
-# `Make-Package.ps1` script.
-#
-# NOTE: the script will NOT update an existing installation of AutoTx!
-
-# set our requirements:
-#Requires -version 5.1
-#Requires -RunAsAdministrator
-
-[CmdletBinding()]
-Param(
-    [Parameter(Mandatory = $False)][switch] $StartService
-)
-
-function Start-MyService {
-    Write-Host -NoNewLine "Starting service $($ServiceName): "
-    try {
-        Start-Service $ServiceName
-        Write-Host "[OK]" -Fore Green
-    } catch {
-        $ex = $_.Exception
-        Write-Host "[FAILED]" -Fore Red
-        Write-Host $ex.Message
-        Write-Host "Please check if your configuration is valid!"
-        Write-Host "Showing last 20 lines of service log file:"
-        Write-Host "=========================================="
-        Get-Content $ServiceLog -Tail 20
-    }
-}
-
-
-function Copy-ServiceFiles {
-    if (Test-Path -Type Container $ServiceDir) {
-        Write-Host "Target directory [$($ServiceDir)] exists, stopping!"
-        Exit 1
-    }
-
-    Write-Host -NoNewLine "Updating / installing service files: "
-    $TargetDir = New-Item -ItemType Container -Force -Path $ServiceDir
-    try {
-        Copy-Item -Recurse -Force -Path "$ServiceName\*" -Destination $ServiceDir
-        Copy-Item -Recurse -Force -Path "conf-example" -Destination $ServiceDir
-        # create a dummy log file, so admins can already start watching it:
-        Out-File -FilePath $ServiceLog -InputObject "$($ServiceName) installed" -Encoding utf8
-        Write-Host "[OK]" -Fore Green
-    } catch {
-        $ex = $_.Exception
-        Write-Host "[FAILED]" -Fore Red
-        Write-Host $ex.Message
-        Exit
-    }
-}
-
-
-function Install-Service {
-    Write-Host "Installing service $($ServiceName)... "
-    Write-Host "========================================================================"
-    $InstallUtil = "C:\Windows\Microsoft.NET\Framework\v4.0.30319\InstallUtil.exe"
-    $ServiceExe = $ServiceDir + "\" + $ServiceName + ".exe"
-    $ArgList = ("/username=$ServiceUser", "/password=$ServicePasswd", "/unattended", "$ServiceExe")
-    $InstallProcess = Start-Process -FilePath "$InstallUtil" -ArgumentList $ArgList -Wait -NoNewWindow -PassThru
-    Write-Host "========================================================================"
-    Write-Host "InstallUtil exit code: $($InstallProcess.ExitCode)"
-    Write-Host "========================================================================"
-}
-
-
-function Add-PerfMonGroupMember {
-    $GroupName = "Performance Monitor Users"
-    try {
-        Add-LocalGroupMember -Group $GroupName -Member $ServiceUser
-        Write-Host $("Successfully added user [$($ServiceUser)] to the local"
-            "group [$($GroupName)].")
-    } catch [Microsoft.PowerShell.Commands.MemberExistsException] {
-        Write-Host $("User [$($ServiceUser)] is already a member of the local"
-            "group [$($GroupName)], no action required.")
-    } catch {
-        Write-Host $("Adding user [$($ServiceUser)] to the local group"
-            "[$($GroupName)] failed: $($_.Exception.Message)")
-    }
-}
-
-
-$ErrorActionPreference = "Stop"
-
-
-$LocalConfiguration = ".\ScriptsConfig.ps1"
-if (Test-Path $LocalConfiguration) {
-    . $LocalConfiguration
-} else {
-    Write-Host "Can't find configuration '$LocalConfiguration'!" -Fore Red
-    Exit
-}
-
-$ServiceLog = "$($ServiceDir)\var\$($env:COMPUTERNAME).$($ServiceName).log"
-
-
-$Service = Get-Service $ServiceName -ErrorAction SilentlyContinue
-if ($Service) {
-    Write-Host "Service $($ServiceName) already installed! Please use the" `
-        "Updater to do service updates. Stopping."
-    Exit 1
-}
-
-Copy-ServiceFiles
-Install-Service
-Add-PerfMonGroupMember
-
-Write-Host "`nWatching the service log file can be done like this:`n" `
-    "`n> Get-Content -Wait -Tail 50 $($ServiceLog)`n"
-
-if ($StartService) {
-    Start-MyService    
-} else {
-    Write-Host "Service installation has completed.`n" `
-        "`nNOTE: the service has not been started. Create and/or check`n" `
-        "the configuration files and start the service manually using:`n" `
-        "`n> Start-Service $($ServiceName)`n"
-}
\ No newline at end of file

Scripts/Provide-UpdaterPackage.ps1

-# Helper script to locate the latest AutoTx installation package (expected to be
-# in a subdirectory of this script with a name like `build_2019-04-23_12-34-56`)
-# and copy it to the correct path so it can be picked up the AutoTx-Updater.
-#
-# NOTE: the script will prune a few files (currently hardcoded) from the package
-# copied to the central update location to prevent sensitive information from
-# being accidentially leaked through a publicly accessible location (see the
-# `$Exclude` variable below).
-
-
-[CmdletBinding()]
-Param(
-    [Parameter(Mandatory=$True)][String] $UpdaterSettings
-)
-
-
-try {
-    . $UpdaterSettings
-}
-catch {
-    $ex = $_.Exception.Message
-    Write-Host "Error reading settings file: '$($UpdaterSettings)' [$($ex)]"
-    Exit
-}
-
-
-# Make sure to run from the directory containing the script itself:
-$BaseDir = $(Split-Path $MyInvocation.MyCommand.Path)
-Push-Location $BaseDir
-
-
-$UpdateBinariesPath = "$($UpdateSourcePath)\Service\Binaries"
-
-$PackageDir = Get-ChildItem -Directory -Name |
-    Where-Object {$_ -match $Pattern} |
-    Sort-Object |
-    Select-Object -Last 1
-
-if ([string]::IsNullOrEmpty($PackageDir)) {
-    Write-Host "ERROR: couldn't find any directories matching '$($Pattern)'!"
-    Exit
-}
-
-
-try {
-    # exclude some files not be distributed:
-    $Exclude = @("ScriptsConfig.ps1", "Install-Service.ps1")
-    Copy-Item -Recurse -Force -ErrorAction Stop `
-        -Path $PackageDir `
-        -Exclude $Exclude `
-        -Destination $UpdateBinariesPath
-    Write-Host "Copied package [$($PackageDir)] to [$($UpdateBinariesPath)]."
-}
-catch {
-    $ex = $_.Exception.Message
-    Write-Host "Error copying service package: $($ex)"
-    Exit
-}
-
-# Return to the original location before the script was called:
-Pop-Location
\ No newline at end of file

Scripts/Run-ElevatedPowerShell.ps1

-Start-Process powershell.exe -ArgumentList '-noprofile' -Verb RunAs