Skyline/work/20180529 move to net472 #82
Merged
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
A couple of projects (ZedGraph, MSGraph) were moved back to 4.0.
…new DLLS do not support reading MRM chromatograms) * updated minimum .NET framework to 4.6.1 * added <assembly-dependency-ex> feature which allows specifying a subdirectory (<location-prefix>) for the DLL to be installed in (<assembly-dependency> always places the DLL next to the dependent target); I would have preferred to use the <assembly-dependency> feature, but because it is a 'dependency' feature, the value must be a file target, and it seems to strip subfeatures (e.g. <assembly-dependency>/path/to/some.DLL/<location-prefix>x64)
…k/20180518_MoveToNet452
* added Shimadzu TOF DLLs to WXS templates * updated IDPicker project files to .NET 4.6.1
…u AnyCPU DLLs to tarball exclusion list
* fixed id attribute in IDPicker WIX template
* added TOF test file
…k/20180529_MoveToNet472
…to Skyline/work/20180529_MoveToNet472
…to Skyline/work/20180529_MoveToNet472
Former-commit-id: b9c7a11e24be1444f50029d96221d08d9834ab1a
Former-commit-id: 3c678480f74904a62646f5c1fdea8e19a9424f72
Former-commit-id: 5bba2299bff7eec21cb34bf793f1ea4fe13964af
Former-commit-id: e629cdeb385f028abc5626d2f542dc55310f594b
Former-commit-id: 6c0afd83938c55b70023569189daa0c03ec3e0bc
- removed tss_pe.cpp from linking because it crashed with msvc-14.0 - disabled MassLynxRaw for msvc-14.0 (we don't yet have DLLs for that) Former-commit-id: 25629c3445caaaf76c09d807258789d12c4e000d
- restore test library's source (accidentally deleted) back to boost tarball Former-commit-id: 37d7c042f277d3f818fbe869577025f4590df25b
Former-commit-id: c166a3d11404fae9e999303f02b4d500c50e8941
…ide short form activationMethod values, as well as scan polarity and centroiding info. Code by user Parminder Kaur. Former-commit-id: 9de69f0784f254a93943b85d02ffc8827ffdad72
* updated Boost to 1.67 * updated Boost-Build from latest master (this includes some warnings about coming lexer changes; the new lexer isn't turned on yet but it will be more lenient about whitespace in Jamfiles, e.g. requiring a space before semicolons) * removed Boost.Filesystem jam logic about filesystem versions: v2 isn't in the code anymore * removed MSVC version restrictions from Waters reader * fixed some data dependencies copied around with common.copy (which seem to have broken somehow with Boost.Build changes) by using assembly-dependency instead, but this didn't work for doctests, so I moved Embedder's doctest into EmbedderTest * removed `using namespace std;` from BlibFilter and BlibMaker, and fully specified the boost::log::aux::snprintf() calls to disambiguate them from ::snprintf() (which comes from including stdio.h in VC 2017 apparently, but not earlier VC) * updated Agilent test tarball due to forcing fixed point Q1/Q3 masses
…mands for the latest VS version (i.e. the .NET projects)
* restored manifest dependencies to link action * fixed warnings in UIMF reader
* updated project files to Visual Studio 2017 (msvc-14.1) * updated Boost to 1.67 * updated Boost-Build from latest master (this includes some warnings about coming lexer changes; the new lexer isn't turned on yet but it will be more lenient about whitespace in Jamfiles, e.g. requiring a space before semicolons) * added MSVC14 merge modules to installers * added <assembly-dependency-ex> feature which allows specifying a subdirectory (<location-prefix>) for the DLL to be installed in (<assembly-dependency> always places the DLL next to the dependent target); I would have preferred to use the <assembly-dependency> feature, but because it is a 'dependency' feature, the value must be a file target, and it seems to strip subfeatures (e.g. <assembly-dependency>/path/to/some.DLL/<location-prefix>x64) - added Shimadzu QTOF reader (still using old DataReader.dll because new DLLS do not support reading MRM chromatograms) * cleaned up WXS templates by removing redundant Name and Id attributes * updated Google.Protobuf.dll to version 3.5 * fixed getAnalysisDate() returning different time for different host time zones * undefined "H5_HAVE_TIMEZONE" in order to fix VS2015 build. * removed tss_pe.cpp from linking because it crashed with msvc-14.0 * fixed quickbuild not working with spaces in path * updated pwiz RAMPAdapter to provide short form activationMethod values, as well as scan polarity and centroiding info. Code by user Parminder Kaur. * removed Boost.Filesystem jam logic about filesystem versions: v2 isn't in the code anymore * removed MSVC version restrictions from Waters reader * fixed some data dependencies copied around with common.copy (which seem to have broken somehow with Boost.Build changes) by using assembly-dependency instead, but this didn't work for doctests, so I moved Embedder's doctest into EmbedderTest * removed `using namespace std;` from BlibFilter and BlibMaker, and fully specified the boost::log::aux::snprintf() calls to disambiguate them from ::snprintf() (which comes from including stdio.h in VC 2017 apparently, but not earlier VC) * updated Agilent test tarball due to forcing fixed point Q1/Q3 masses * added msvc_setup_script.bat for actions which need to access VS commands for the latest VS version (i.e. the .NET projects) * fixed warnings in UIMF reader * updated appveyor.yml * removed boost.regex from Bumbershoot due to conflict with new Mascot Parser; it was only being used vestigially anyway * replaced boost.regex with boost.xpressive in LibraryBabelFish * changed build-apps.bat to use --abbreviate-paths instead of --hash, removed secure-scl=off since it's no longer relevant, and added unset-optimization flag so TeamCity can use optimization=speed and share many build artifacts with the core build * fixed error trying to create directory '.' (apparently ignored in Boost 1.56 but not 1.62) * fixed status detection in do_topograph_test action * fixed Topograph and IDPicker tests for VS 2017 * made Skyline build targets more granular * fixed overzealous replace all in OptimizeTest (apparently I'm the only one with a '.' in their clone path!) * fixed 'libhdf5.settings: No such file or directory' error on Linux * fixed BiblioSpec openswath/maxquant tests on Linux * commented out Topograph's MSTest:Clean since it doesn't seem to port well to VS 2017 and it may not be worth fixing * fixed Skyline's test DLLs being deleted if build action fails * added --force-extract option for re-extracting tarballs * added --force-generate-version to override --incremental * moved --incremental guard for generating version-ish files into generate-version.jam * added no-clean option to tcbuild.bat
…oWizard/pwiz into Skyline/work/20180529_MoveToNet472
…name and file copy messages ("1 file(s) copied")
…nto Skyline/work/20180529_MoveToNet472
- added instrument config to Shimadzu reader * added Skyline test for basic reading of Shimadzu data
* updated project files to Visual Studio 2017 (msvc-14.1) * updated Boost to 1.67 * updated Boost-Build from latest master (this includes some warnings about coming lexer changes; the new lexer isn't turned on yet but it will be more lenient about whitespace in Jamfiles, e.g. requiring a space before semicolons) * added MSVC14 merge modules to installers * added <assembly-dependency-ex> feature which allows specifying a subdirectory (<location-prefix>) for the DLL to be installed in (<assembly-dependency> always places the DLL next to the dependent target); I would have preferred to use the <assembly-dependency> feature, but because it is a 'dependency' feature, the value must be a file target, and it seems to strip subfeatures (e.g. <assembly-dependency>/path/to/some.DLL/<location-prefix>x64) - added Shimadzu QTOF reader (still using old DataReader.dll because new DLLS do not support reading MRM chromatograms) * cleaned up WXS templates by removing redundant Name and Id attributes * updated Google.Protobuf.dll to version 3.5 * fixed getAnalysisDate() returning different time for different host time zones * undefined "H5_HAVE_TIMEZONE" in order to fix VS2015 build. * removed tss_pe.cpp from linking because it crashed with msvc-14.0 * fixed quickbuild not working with spaces in path * updated pwiz RAMPAdapter to provide short form activationMethod values, as well as scan polarity and centroiding info. Code by user Parminder Kaur. * removed Boost.Filesystem jam logic about filesystem versions: v2 isn't in the code anymore * removed MSVC version restrictions from Waters reader * fixed some data dependencies copied around with common.copy (which seem to have broken somehow with Boost.Build changes) by using assembly-dependency instead, but this didn't work for doctests, so I moved Embedder's doctest into EmbedderTest * removed `using namespace std;` from BlibFilter and BlibMaker, and fully specified the boost::log::aux::snprintf() calls to disambiguate them from ::snprintf() (which comes from including stdio.h in VC 2017 apparently, but not earlier VC) * updated Agilent test tarball due to forcing fixed point Q1/Q3 masses * added msvc_setup_script.bat for actions which need to access VS commands for the latest VS version (i.e. the .NET projects) * fixed warnings in UIMF reader * updated appveyor.yml * removed boost.regex from Bumbershoot due to conflict with new Mascot Parser; it was only being used vestigially anyway * replaced boost.regex with boost.xpressive in LibraryBabelFish * changed build-apps.bat to use --abbreviate-paths instead of --hash, removed secure-scl=off since it's no longer relevant, and added unset-optimization flag so TeamCity can use optimization=speed and share many build artifacts with the core build * fixed error trying to create directory '.' (apparently ignored in Boost 1.56 but not 1.62) * fixed status detection in do_topograph_test action * fixed Topograph and IDPicker tests for VS 2017 * made Skyline build targets more granular * fixed overzealous replace all in OptimizeTest (apparently I'm the only one with a '.' in their clone path!) * fixed 'libhdf5.settings: No such file or directory' error on Linux * fixed BiblioSpec openswath/maxquant tests on Linux * commented out Topograph's MSTest:Clean since it doesn't seem to port well to VS 2017 and it may not be worth fixing * fixed Skyline's test DLLs being deleted if build action fails * added --force-extract option for re-extracting tarballs * added --force-generate-version to override --incremental * moved --incremental guard for generating version-ish files into generate-version.jam * added no-clean option to tcbuild.bat
- added instrument config to Shimadzu reader * added Skyline test for basic reading of Shimadzu data
* fixed SkylineTester to return non-zero exit code when it fails to create zip file * changed SkylineTester to use AttachConsole() instead of AllocConsole() so that it uses the current console instead of creating new windows when building from command-line
…oWizard/pwiz into Skyline/work/20180529_MoveToNet472
|
@bspratt @nickshulman It certainly works better with bjam. The output doesn't get lost this way, although it mysteriously shows up before the msbuild output instead of between the |
bspratt
approved these changes
Aug 9, 2018
|
All 2017 tests passed. Ready to merge? At that point I'll pause the 2017 configs and reconfigure the old configs to use 2017. The existing branches based on older masters will need to be updated before they'll build on the new configs. |
|
Give me another day or two to convince myself that there are no performance
hits. I configured several more machines to build and test VS2013 (master)
then VS2017 (integration). Currently I have a few machines that do this but
run the perf tests on VS2013, so it's not quite apples to apples.
So far what I'm seeing were I do have apples to apples is that some tests
are faster, some are slower, total tests run is slightly higher with the
old build.
…On Thu, Aug 9, 2018 at 10:26 AM, Matt Chambers ***@***.***> wrote:
All 2017 tests passed. Ready to merge? At that point I'll pause the 2017
configs and reconfigure the old configs to use 2017. The existing branches
based on older masters will need to be updated before they'll build on the
new configs.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#82 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/ABJSefrm0hCoxtDyvQHuG_Q6cx2pKVhpks5uPHDigaJpZM4USLe1>
.
|
…g a file, there's no point in putting up a retry dialog as it's an unattended script
…om/ProteoWizard/pwiz into Skyline/work/20180529_MoveToNet472
…ng with unedeletable files
…e source tree can't be removed before updating (maybe a race condition due to asynch call?). Simplify the situation by replacing use of UI element DeleteWIndow with a simple synchronous call to Directory.Delete
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.
No description provided.