Compare commits

...

4 Commits

3 changed files with 1584 additions and 532 deletions

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff