jprdonnelly/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2025-12-19 18:11:39 -05:00
Code Issues Projects Releases Wiki Activity

Convert the solution file to the new SLNX format (#19328)

Browse Source
This commit is contained in:
Dustin L. Howett
2025-09-09 15:01:03 -05:00
committed by GitHub
parent 4a34a76504
commit d6714f3ca9
12 changed files with 1096 additions and 2392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/OpenConsole.psm1
View File

@@ -264,13 +264,13 @@ function Invoke-OpenConsoleTests()
#.SYNOPSIS
# Builds OpenConsole.sln using msbuild. Any arguments get passed on to msbuild.
# Builds OpenConsole.slnx using msbuild. Any arguments get passed on to msbuild.
function Invoke-OpenConsoleBuild()
{
$root = Find-OpenConsoleRoot
& "$root\dep\nuget\nuget.exe" restore "$root\OpenConsole.sln"
& "$root\dep\nuget\nuget.exe" restore "$root\OpenConsole.slnx"
& "$root\dep\nuget\nuget.exe" restore "$root\dep\nuget\packages.config"
msbuild.exe "$root\OpenConsole.sln" @args
msbuild.exe "$root\OpenConsole.slnx" @args
}
#.SYNOPSIS

6
tools/bcz.cmd
View File

@@ -73,11 +73,11 @@ if "%_SKIP_NUGET_RESTORE%" == "1" (
echo Skipped nuget restore
) else (
echo Performing nuget restore...
nuget.exe restore %OPENCON%\OpenConsole.sln
nuget.exe restore %OPENCON%\OpenConsole.slnx
)
@rem /p:GenerateAppxPackageOnBuild=false will prevent us from building the whole .msix package when building the wapproj project.
set _BUILD_CMDLINE="%MSBUILD%" %OPENCON%\OpenConsole.sln /t:"%_MSBUILD_TARGET%" /m /p:Configuration=%_LAST_BUILD_CONF% /p:GenerateAppxPackageOnBuild=false /p:Platform=%ARCH% %_APPX_ARGS%
set _BUILD_CMDLINE="%MSBUILD%" %OPENCON%\OpenConsole.slnx /t:"%_MSBUILD_TARGET%" /m /p:Configuration=%_LAST_BUILD_CONF% /p:GenerateAppxPackageOnBuild=false /p:Platform=%ARCH% %_APPX_ARGS%
echo %_BUILD_CMDLINE%
echo Starting build...
@@ -135,7 +135,7 @@ setlocal enabledelayedexpansion
rem TODO:GH#2172 Find a way to only rebuild the metaproj if the sln changed
rem First generate the metaproj file
set MSBuildEmitSolution=1
"%msbuild%" %OPENCON%\OpenConsole.sln /t:ValidateSolutionConfiguration /m > NUL
"%msbuild%" %OPENCON%\OpenConsole.slnx /t:ValidateSolutionConfiguration /m > NUL
set MSBuildEmitSolution=
rem Use bx.ps1 to figure out which target we're looking at

6
tools/bx.ps1
View File

@@ -11,11 +11,11 @@ $projectPath = $projects.FullName
# Parse the solution's metaproj file.
[xml]$Metaproj = Get-Content "$env:OPENCON\OpenConsole.sln.metaproj"
[xml]$Metaproj = Get-Content "$env:OPENCON\OpenConsole.slnx.metaproj"
$targets = $Metaproj.Project.Target
# Most projects are in OpenConsole.sln.metaproj as "<project>.*proj.metaproj".
# Most projects are in OpenConsole.slnx.metaproj as "<project>.*proj.metaproj".
# We'll filter to search for these first and foremost.
$msBuildCondition = "'%(ProjectReference.Identity)' == '$projectPath.metaproj'"
@@ -25,7 +25,7 @@ $msBuildCondition = "'%(ProjectReference.Identity)' == '$projectPath.metaproj'"
$matchingTargets = $targets | Where-Object { $_.MSBuild.Condition -eq $msBuildCondition }
# If we didn't find a target, it's possible that the project didn't have a
# .metaproj in OpenConsole.sln.metaproj. Try filtering again, but leave off the
# .metaproj in OpenConsole.slnx.metaproj. Try filtering again, but leave off the
# .metaproj extension.
if ($matchingTargets.length -eq 0)
{

2
tools/razzle.cmd
View File

@@ -21,7 +21,7 @@ rem Add nuget to PATH
set PATH=%OPENCON%\dep\nuget;%PATH%
rem Run nuget restore so you can use vswhere
nuget restore %OPENCON%\OpenConsole.sln -Verbosity quiet
nuget restore %OPENCON%\OpenConsole.slnx -Verbosity quiet
nuget restore %OPENCON%\dep\nuget\packages.config -Verbosity quiet
:FIND_MSBUILD