-
Notifications
You must be signed in to change notification settings - Fork 102
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.
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
Push Microsoft/TestAdapterForGoogleTest changes upstream. #288
Open
spebl
wants to merge
146
commits into
csoltenborn:master
Choose a base branch
from
spebl:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Converted the README to describe this particular fork of the project.
Quote path in CreateProcess
…soltenborn#22) * add a message popup when project creation fails due to sdk not found * use sdk version as string when sdk is pre-win10
* addressing feedback * Assorted fit-and-finish * Undo unfinished work for BatchFile resource * Fix some resources comments * Remove unused resources * Additional fixes
* add nuget command line to a tafgt projects packages config so it gets restored on the build server * change gta to tafgt to see if it fixes tets runs * template abstract console integration tests to work when only tafgt is in sln
…extension_guid Uniquify GoogleTestExtensionOptionsPage GUID between GTA/TAfGT
…soltenborn#27) * Add loc targets in proj files * only real sign when we need to
Various engineering improvements
…r_unicode Handle non-ASCII characters in PeParser correctly
Avoid Unicode path to project to satisfy the build system
Localize XAML in wizard
Add an optional extended description…
LEGO: Merge pull request 36
Add lcl files.
Localize option strings
…rn#94) * add null check for native method that returns null on fail * move null check out of loop * add an error to the log on failure and add a null check in the other place it's used as well
# Conflicts: # GoogleTestAdapter/Core/GoogleTestDiscoverer.cs # GoogleTestAdapter/TestAdapter.Tests/TestDiscovererTests.cs # GoogleTestAdapter/TestAdapter/TestDiscoverer.cs # README.md # appveyor.yml
* silence tr1 namespace issues though cmake * add preprocessor def to fix tr1 failures when building tests
…txt (csoltenborn#131) * Support for working directory and environment set through CMakeLists.txt * Update the adapter to remove mention of CTest * Fix test code build breaks * Addressing PR comments
* switch the tafgt package to async * get service async
# Conflicts: # GoogleTestAdapter/Core/GoogleTestDiscoverer.cs # GoogleTestAdapter/Core/Helpers/Utils.cs # GoogleTestAdapter/Core/Runners/PreparingTestRunner.cs # GoogleTestAdapter/Core/Runners/SequentialTestRunner.cs # GoogleTestAdapter/Core/Settings/SettingsWrapper.cs # GoogleTestAdapter/Core/TestCases/NewTestCaseResolver.cs # GoogleTestAdapter/Core/TestCases/TestCaseFactory.cs # GoogleTestAdapter/Core/TestCases/TestCaseResolver.cs # GoogleTestAdapter/DiaResolver.Tests/DiaResolverTests.cs # GoogleTestAdapter/DiaResolver/DiaResolver.cs # GoogleTestAdapter/DiaResolver/DiaResolver.csproj # GoogleTestAdapter/TestAdapter/CommonFunctions.cs # GoogleTestAdapter/TestAdapter/Framework/VsVersion.cs # GoogleTestAdapter/VsPackage.Shared/OptionsPages/GeneralOptionsDialogPage.cs # GoogleTestAdapter/VsPackage.Shared/Settings/RunSettingsService.cs # README.md # appveyor.yml
# Conflicts: # GoogleTestAdapter/Core/Runners/SequentialTestRunner.cs # GoogleTestAdapter/Core/Settings/SettingsWrapper.cs # GoogleTestAdapter/Core/TestCases/TestCaseFactory.cs # GoogleTestAdapter/DiaResolver/PeParser.cs # GoogleTestAdapter/GoogleTestAdapter.sln # GoogleTestAdapter/TestAdapter/CommonFunctions.cs # GoogleTestAdapter/TestAdapter/TestAdapter.csproj # GoogleTestAdapter/TestAdapter/TestExecutor.cs # GoogleTestAdapter/VsPackage.Shared/GoogleTestExtensionOptionsPage.cs # SampleTests/LoadTests/LoadTests.vcxproj
…tenborn#148) * update googletest release to 1.8.1 * update vsix to install on dev16 * update nuget package references to 1.8.1 and add 2019 as supported version * update nuget references in project to latest version * remove flag that is being removed * fix debug build and update default toolset for project template * allow v142 toolset
* added support for asynchronous package loading (csoltenborn#243) * clean up merge
* add signing project for nupkgs
…pter into dev/spebl/MergeLocalizations
…ogleTest into dev/spebl/merge
Wow - I will have a look, but it will take me probably in the order of a couple of weeks, since I'm busy with other stuff right now, I fear... |
Of course! No rush on this at all, I expect it to take a while to go through. In the meantime, I'll make sure the AppVeyor build is passing with the changes. |
Codecov Report
@@ Coverage Diff @@
## master #288 +/- ##
==========================================
- Coverage 71.47% 70.19% -1.28%
==========================================
Files 110 117 +7
Lines 4147 4345 +198
Branches 640 670 +30
==========================================
+ Hits 2964 3050 +86
- Misses 969 1066 +97
- Partials 214 229 +15
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I've been working on merging/molding our changes to work within the existing framework provided by main GoogleTestAdapter repository. I've had to make a few changes on how the project template and localization are included since we have been relying on our build system to do some work for us on that end, but I believe these changes this should now work more generally. Sorry for the large PR but there is quite the cumulation of changes that have built up, along with a ton of resource files being added. I've attempted to merge as best as I could in my development fork, but will fix any outstanding conflicts that may arise from the PR.
Please let me know of any issues or changes that need to be made here to keep it in line with the current repo, or if there are specific changes that look good and others that we should discard.