MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd

@@ -221,7 +221,6 @@ goto dk_done
 
 set "_work=%~dp0"
 if "%_work:~-1%"=="\" set "_work=%_work:~0,-1%"
-set "_workp=%_work:'=''%"
 
 set "_batf=%~f0"
 set "_batp=%_batf:'=''%"
@@ -1500,7 +1499,6 @@ set _prids=
 set _config=
 set _version=
 set _License=
-set _oMSI=
 exit /b
 
 ::========================================================================================================================================
@@ -1612,26 +1610,13 @@ call :dk_color %Gray% "Skipping Because Project/Visio Mode     [%%#]"
 
 if not defined skipprocess (
 
-set no365=
-if "%oVer%"=="15" (echo %%# | findstr /i "O365HomePremRetail" %nul% && set no365=1)
-if "%oVer%"=="16" (echo %%# | findstr /i "O365" %nul% && set no365=1)
-
-if defined no365 (
+echo %%# | findstr /i "O365" %nul% && (
 set _License=MondoRetail
 set _altoffid=MondoRetail
 call :ks_osppready
 echo Converting Unsupported O365 Office      [%%# To MondoRetail]
 )
 
-if not defined _oMSI (
-echo %%# | findstr /i "ARM" %nul% && (
-set _License=MondoRetail
-set _altoffid=MondoRetail
-call :ks_osppready
-echo Converting Unsupported OEM-ARM Office   [%%# To MondoRetail]
-)
-)
-
 set keytype=zero
 for /f "delims=" %%a in ('%psc% "$f=[io.file]::ReadAllText('!_batp!') -split ':offtsid\:.*';iex ($f[1])" %nul6%') do (
 echo "%%a" | findstr /r ".*-.*-.*-.*-.*" %nul1% && (set tsids=!tsids! %%a& set _actid=%%a)
@@ -1680,7 +1665,6 @@ exit /b
 call :ts_reset
 call :dk_actids 0ff1ce15-a989-479d-af46-f275c6370663
 
-set _oMSI=1
 set oVer=%1
 for /f "skip=2 tokens=2*" %%a in ('"reg query %2\Common\InstallRoot /v Path" %nul6%') do (set "_oRoot=%%b")
 for /f "skip=2 tokens=2*" %%a in ('"reg query %2\Common\ProductVersion /v LastProduct" %nul6%') do (set "_version=%%b")
@@ -6725,26 +6709,17 @@ namespace LibTSforge.PhysicalStore
 }
 '@
 $ErrorActionPreference = 'Stop'
-$binPath = Join-Path -Path $env:_workp -ChildPath "BIN\LibTSforge.dll"
+$cp = [CodeDom.Compiler.CompilerParameters] [string[]]@("System.dll", "System.Core.dll", "System.ServiceProcess.dll", "System.Xml.dll")
+$cp.CompilerOptions = "/unsafe"
+$lang = If ((Get-Host).Version.Major -gt 2) { "CSharp" } Else { "CSharpVersion3" }
 
-if (Test-Path -Path $binPath) {
-    Write-Host "LibTSforge.dll found in BIN folder. Loading the DLL..."
-    Add-Type -Path $binPath
-}
-else {
-    $cp = [CodeDom.Compiler.CompilerParameters] [string[]]@("System.dll", "System.Core.dll", "System.ServiceProcess.dll", "System.Xml.dll")
-    $cp.CompilerOptions = "/unsafe"
-    $lang = If ((Get-Host).Version.Major -gt 2) { "CSharp" } Else { "CSharpVersion3" }
-
-    $ctemp = "$env:SystemRoot\Temp\"
-    if (-Not (Test-Path -Path $ctemp)) { New-Item -Path $ctemp -ItemType Directory > $null }
-    $env:TMP = $ctemp
-    $env:TEMP = $ctemp
-
-    $cp.GenerateInMemory = $true
-    Add-Type -Language $lang -TypeDefinition $src -CompilerParameters $cp
-}
+$ctemp = "$env:SystemRoot\Temp\"
+if (-Not (Test-Path -Path $ctemp)) { New-Item -Path $ctemp -ItemType Directory > $null }
+$env:TMP = $ctemp
+$env:TEMP = $ctemp
 
+$cp.GenerateInMemory = $true
+Add-Type -Language $lang -TypeDefinition $src -CompilerParameters $cp
 if ($env:_debug -eq '0') {
     [LibTSforge.Logger]::HideOutput = $true
 }