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

Merged PR 13076689: Update managed TAEF tests that exist in GE branches to use the new publishing locations of TAEF's managed reference binaries.

Browse Source 
This is a cherry-pick of !12669193 to bring this change from GE to RS branches. I intentionally checked in the GE change to a *_backport branch to prevent it from automatically flowing to RS since there were significant merge conflicts which I wanted to resolve at my own pace, rather than under time pressure when GE changes merged into RS. The change reached ge_current on May 27, but I delayed creating the RS PR while I waited for a prerequisite change to reach rs_es_dev.

This PR intentionally just focuses on cherry-picking the changes from the PR in GE. It does not try to address tests that exist only in RS and not in GE also. I'll address tests unique to RS branches in a separate PR.

Here is the PR description from the original PR in GE:

This PR is another step towards the removal of TAEF's .NET Standard 1.1 binaries. Currently the .NET Standard 1.1 binaries are published to both `$(ONECORE_TAEF_REF_PATH)` and `$(ONECORE_TAEF_REF_PATH)\netstandard1.1`. In a future breaking change, I plan to switch `$(ONECORE_TAEF_REF_PATH)` to use the .NET Standard 2.0 binaries instead of the .NET Standard 1.1 binaries.

I made this change by using the following process:

1. Switch `$(ONECORE_TAEF_REF_PATH)` to the .NET Standard 2.0 binaries and remove the legacy publishing locations under ONECORE_SDKTOOLS.
2. Fix all build breaks while ensuring each directory that had a build break used the correct set of TAEF's managed refernece binaries after the breaking change.
3. Remove the commit from step 1 to revert `$(ONECORE_TAEF_REF_PATH)` back to .NET Standard 1.1 binaries.
4. Fix all build breaks again.

This resulted in the following strategy being used (with a few minor exceptions):

* tests using .NET Framework 4.6 and older use `$(ONECORE_TAEF_REF_PATH)\net452`
* tests using .NET Core 1.x and older use `$(ONECORE_TAEF_REF_PATH)\netstandard1.1`
* Most remaining folders use `$(ONECORE_TAEF_REF_PATH)`, but a few use `$(ONECORE_TAEF_REF_PATH)\netstandard2.0` if they couldn't build against .NET Standard 1.1 binaries after step 3.

For tests using .NET Framework 4.7 and later, I'm using `$(ONECORE_TAEF_REF_PATH)` and enable them to build both with the .NET Standard 2.0 binaries (by adding a reference to netstandard.dll) and with the .NET Standard 1.1 binaries (by adding a reference to System.Runtime.dll). This will enable me to adopt the future breaking change much more easily as all directories (except new churn coming in from RI/FIs) will build fine with the upcoming breaking change.

I'm bringing this change to a GE backport branch since I plan to manually cherry-pick this over to rs_es_dev and create another PR for RS over there. That will enable me to preemptively address all the inevitable merge conflicts with such a large change.

Related work items: #57086814
This commit is contained in:
Phil Deets
2025-06-17 17:52:10 +00:00
committed by Dustin L. Howett
parent 718d7d02de
commit eed3a6fa5e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/host/ft_uia/sources
View File

@@ -48,9 +48,9 @@ REFERENCES = $(CLR_REF_PATH)\System.metadata_dll; \
$(CLR_REF_PATH)\System.Core.metadata_dll; \
$(CLR_REF_PATH)\System.Data.metadata_dll; \
$(CLR_REF_PATH)\System.Drawing.metadata_dll; \
$(ONECORESDKTOOLS_INTERNAL_REF_PATH_L)\wextest\cue\wex.common.managed.metadata_dll; \
$(ONECORESDKTOOLS_INTERNAL_REF_PATH_L)\wextest\cue\wex.logger.interop.metadata_dll; \
$(ONECORESDKTOOLS_INTERNAL_REF_PATH_L)\wextest\cue\te.managed.metadata_dll; \
$(ONECORE_TAEF_REF_PATH)\net452\wex.common.managed.metadata_dll; \
$(ONECORE_TAEF_REF_PATH)\net452\wex.logger.interop.metadata_dll; \
$(ONECORE_TAEF_REF_PATH)\net452\te.managed.metadata_dll; \
$(ONECORESDKTOOLS_PRIVATE_REF_PATH_L)\WinAppDriver\appium-dotnet-driver.metadata_dll; \
$(ONECORESDKTOOLS_PRIVATE_REF_PATH_L)\WinAppDriver\castle.core.metadata_dll; \
$(ONECORESDKTOOLS_PRIVATE_REF_PATH_L)\WinAppDriver\newtonsoft.json.metadata_dll; \