diff --git a/scenarios/windows/msa_prep.py b/scenarios/windows/msa_prep.py index 371743d..0e4174b 100644 --- a/scenarios/windows/msa_prep.py +++ b/scenarios/windows/msa_prep.py @@ -7,7 +7,6 @@ # Setup instructions: ## -import builtins import os import logging import time @@ -118,6 +117,12 @@ def runTest(self): pass time.sleep(1) + # Verify account was set properly + found_account = self._call(["powershell.exe", r"(get-childitem hkcu:\Software\Microsoft\IdentityCRL\UserExtendedProperties\ | select pschildname).pschildname"], expected_exit_code="") + if self.msa_account.lower() != found_account.strip().lower(): + logging.error(f"MSA account verification failed. Expected: {self.msa_account}, Found: {found_account.strip()}") + self.fail("MSA account verification failed.") + # Set auto login MSA Account self._call(["cmd.exe", '/C reg add "HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon" /v DefaultUserName /t REG_SZ /d ' + self.msa_account + ' /f > null 2>&1']) self._call(["cmd.exe", '/C reg add "HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon" /v DefaultPassword /t REG_SZ /d ' + self.dut_password + ' /f > null 2>&1']) diff --git a/setup_src/src_dut_win/dut_setup.cmd b/setup_src/src_dut_win/dut_setup.cmd index 0fb5806..980b576 100644 --- a/setup_src/src_dut_win/dut_setup.cmd +++ b/setup_src/src_dut_win/dut_setup.cmd @@ -1,4 +1,4 @@ -set dut_setup_version=2.0 +set dut_setup_version=2.1 REM Copyright (c) Microsoft. All rights reserved. REM Licensed under the MIT license. See LICENSE file in the project root for full license information. diff --git a/setup_src/src_dut_win/dut_setup.iss b/setup_src/src_dut_win/dut_setup.iss index b599a1b..b6eaa22 100644 --- a/setup_src/src_dut_win/dut_setup.iss +++ b/setup_src/src_dut_win/dut_setup.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "dut_setup" -#define MyAppVersion "2.0" +#define MyAppVersion "2.1" #define MyAppPublisher "Microsoft" [Setup] diff --git a/setup_src/src_host/python_embed_pip.cmd b/setup_src/src_host/python_embed_pip.cmd index 80417e6..d298e9c 100644 --- a/setup_src/src_host/python_embed_pip.cmd +++ b/setup_src/src_host/python_embed_pip.cmd @@ -3,4 +3,4 @@ REM Copyright (c) Microsoft. All rights reserved. REM Licensed under the MIT license. See LICENSE file in the project root for full license information. pushd %~dp0 -python_embed\Scripts\pip.exe %* +..\..\downloads\python_embed\Scripts\pip.exe %* diff --git a/utilities/open_source/InputInject/InputInject/DesktopDuplicationCapturer.cs b/utilities/open_source/InputInject/InputInject/DesktopDuplicationCapturer.cs index d4c1152..1a45c07 100644 --- a/utilities/open_source/InputInject/InputInject/DesktopDuplicationCapturer.cs +++ b/utilities/open_source/InputInject/InputInject/DesktopDuplicationCapturer.cs @@ -45,7 +45,7 @@ public DesktopDuplicationCapturer(uint outputIndex) using var output1 = output.QueryInterfaceOrNull() ?? throw new InvalidOperationException("Failed to query IDXGIOutput1."); - _duplication = output1.DuplicateOutput(_device); + // _duplication = output1.DuplicateOutput(_device); } } diff --git a/utilities/open_source/InputInject/Output/InputInject_win-arm64.zip b/utilities/open_source/InputInject/Output/InputInject_win-arm64.zip index 4ee4932..1720214 100644 Binary files a/utilities/open_source/InputInject/Output/InputInject_win-arm64.zip and b/utilities/open_source/InputInject/Output/InputInject_win-arm64.zip differ diff --git a/utilities/open_source/InputInject/Output/InputInject_win-x64.zip b/utilities/open_source/InputInject/Output/InputInject_win-x64.zip index df0440c..007ca31 100644 Binary files a/utilities/open_source/InputInject/Output/InputInject_win-x64.zip and b/utilities/open_source/InputInject/Output/InputInject_win-x64.zip differ