Skip to content

Restore VS2022 support #13524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaelDCurran merged 7 commits into from
Mar 24, 2022
Merged

Restore VS2022 support #13524

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bcd6230
UIA Remote operations library back to upstream
LeonarddeR Mar 22, 2022
fe0bec4
Support building with VS2022 again
LeonarddeR Mar 23, 2022
31aa5eb
Override platform toolset to always use the toolset detected by scons
LeonarddeR Mar 23, 2022
bacce2f
Make a note in the readme about toolset
LeonarddeR Mar 23, 2022
83b4a51
Review actions
LeonarddeR Mar 24, 2022
2e88d21
Merge branch 'master' into uiaUpstream
michaelDCurran Mar 24, 2022
11924f0
Update what's new
michaelDCurran Mar 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Override platform toolset to always use the toolset detected by scons
  • Loading branch information
@LeonarddeR
LeonarddeR committed Mar 23, 2022
commit 31aa5ebd6cb4f04332a07e29d111a5dfc9f7423f
13 changes: 10 additions & 3 deletions nvdaHelper/microsoft-ui-uiautomation/sconscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ MSUIA_sourceDir = Dir('#include/microsoft-ui-uiautomation/src/uiAutomation')
MSUIA_lib_outDir = Dir('lib')
MSUIA_include_outDir = Dir('include')
MSUIA_solutionFile = MSUIA_sourceDir.File('UIAutomation.sln')
msvc = env.get('MSVC_VERSION').replace(".", "")

MSUIA_wrapper_libs = env.Command(
>
Expand All @@ -66,11 +67,14 @@ MSUIA_wrapper_libs = env.Command(
],
action = [
# Fetch any required NuGet packages
f"msbuild {MSUIA_solutionFile} /t:Restore /p:RestorePackagesConfig=true,Configuration=Release,Platform=x86",
f"msbuild /nologo {MSUIA_solutionFile} /t:Restore /p:RestorePackagesConfig=true,Configuration=Release,Platform=x86",
# Remove any old generated files
Delete(MSUIA_sourceDir.Dir('microsoft.ui.uiautomation/Generated Files')),
# Do the actual build
"msbuild /t:Build /p:Configuration=Release,Platform=x86,OutDir={outDir}/ $SOURCE".format(outDir=MSUIA_lib_outDir.abspath)
"msbuild /nologo /t:Build /p:Configuration=Release,Platform=x86,PlatformToolset=v{msvc},OutDir={outDir}/ $SOURCE".format(
msvc=msvc,
outDir=MSUIA_lib_outDir.abspath
)
],
)
env.Ignore(MSUIA_wrapper_libs,MSUIA_sourceDir.File('microsoft.ui.uiautomation/Microsoft.UI.UIAutomation_h.h'))
Expand All @@ -88,7 +92,10 @@ MSUIA_abstraction_libs = env.Command(
glob.glob(os.path.join(MSUIA_sourceDir.abspath, 'UiaOperationAbstraction', '*.h')),
],
action = [
"msbuild /t:Build /p:Configuration=Release,Platform=x86,OutDir={outDir}/ $SOURCE".format(outDir=MSUIA_lib_outDir.abspath),
"msbuild /nologo /t:Build /p:Configuration=Release,Platform=x86,PlatformToolset=v{msvc},OutDir={outDir}/ $SOURCE".format(
msvc=msvc,
outDir=MSUIA_lib_outDir.abspath
),
]
)

Expand Down