Skip to content
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

Skyline/work/20180529 move to net472 #82

Merged
merged 84 commits into from Aug 15, 2018

Commits on May 18, 2018

  1. Move Skyline from to .Net framework 4.5.1 to 4.5.2.

    A couple of projects (ZedGraph, MSGraph) were moved back to 4.0.
    Nicholas Shulman committed May 18, 2018
    Copy the full SHA
    0c7daf0 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2018

  1. - added Shimadzu QTOF reader (still using old DataReader.dll because …

    …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)
    chambm committed May 22, 2018
    Copy the full SHA
    3d3442f View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'remotes/origin/master' into Skyline/wor…

    …k/20180518_MoveToNet452
    Nicholas Shulman committed May 22, 2018
    Copy the full SHA
    391788b View commit details
    Browse the repository at this point in the history
  3. * cleaned up WXS templates by removing redundant Name and Id attributes

    * added Shimadzu TOF DLLs to WXS templates
    * updated IDPicker project files to .NET 4.6.1
    chambm committed May 22, 2018
    Copy the full SHA
    b194a15 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2018

  1. * added missing DLLs back to vendor_api_Shimadzu.7z and added Shimadz…

    …u AnyCPU DLLs to tarball exclusion list
    chambm committed May 23, 2018
    Copy the full SHA
    c9d4b03 View commit details
    Browse the repository at this point in the history
  2. * restored correct version of x86 DataReader.dll

    * fixed id attribute in IDPicker WIX template
    chambm committed May 23, 2018
    Copy the full SHA
    bd7f054 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2018

  1. * added TIC chromatogram for TOF

    * added TOF test file
    chambm committed May 29, 2018
    Copy the full SHA
    be49000 View commit details
    Browse the repository at this point in the history
  2. Move Skyline to .net 4.72

    Nicholas Shulman committed May 29, 2018
    Copy the full SHA
    44be388 View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'remotes/origin/master' into Skyline/wor…

    …k/20180529_MoveToNet472
    Nicholas Shulman committed May 29, 2018
    Copy the full SHA
    6a2ab19 View commit details
    Browse the repository at this point in the history
  4. Merge remote-tracking branch 'remotes/origin/feature/Shimadzu-TOF' in…

    …to Skyline/work/20180529_MoveToNet472
    Nicholas Shulman committed May 29, 2018
    Copy the full SHA
    c7be1b4 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    c1e1c9e View commit details
    Browse the repository at this point in the history
  6. Move more projects to 4.72

    Nicholas Shulman committed May 29, 2018
    Copy the full SHA
    47df146 View commit details
    Browse the repository at this point in the history
  7. Update Google.Protobuf.dll to version 3.5

    Nicholas Shulman committed May 29, 2018
    Copy the full SHA
    963f442 View commit details
    Browse the repository at this point in the history
  8. Copy the full SHA
    0ef14d7 View commit details
    Browse the repository at this point in the history
  9. Merge remote-tracking branch 'remotes/origin/feature/Shimadzu-TOF' in…

    …to Skyline/work/20180529_MoveToNet472
    Nicholas Shulman committed May 29, 2018
    Copy the full SHA
    58d5cff View commit details
    Browse the repository at this point in the history

Commits on May 30, 2018

  1. Copy the full SHA
    8f51c34 View commit details
    Browse the repository at this point in the history
  2. Move Topograph to .Net 4.7.2

    Nicholas Shulman committed May 30, 2018
    Copy the full SHA
    9d2c4e2 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    2e4b170 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2018

  1. Branch for enabling building with Visual Studio 2015

    Former-commit-id: b9c7a11e24be1444f50029d96221d08d9834ab1a
    nickshulman authored and chambm committed Jun 7, 2018
    Copy the full SHA
    825a34c View commit details
    Browse the repository at this point in the history
  2. Empty commit message

    Former-commit-id: 3c678480f74904a62646f5c1fdea8e19a9424f72
    nickshulman authored and chambm committed Jun 7, 2018
    Copy the full SHA
    e748f20 View commit details
    Browse the repository at this point in the history
  3. Empty commit message

    Former-commit-id: 5bba2299bff7eec21cb34bf793f1ea4fe13964af
    nickshulman authored and chambm committed Jun 7, 2018
    Copy the full SHA
    0a9d18b View commit details
    Browse the repository at this point in the history
  4. Fix 32 bit build.

    Former-commit-id: e629cdeb385f028abc5626d2f542dc55310f594b
    nickshulman authored and chambm committed Jun 7, 2018
    Copy the full SHA
    744429b View commit details
    Browse the repository at this point in the history
  5. Undefine "H5_HAVE_TIMEZONE" in order to fix VS2015 build.

    Former-commit-id: 6c0afd83938c55b70023569189daa0c03ec3e0bc
    nickshulman authored and chambm committed Jun 7, 2018
    Copy the full SHA
    9591684 View commit details
    Browse the repository at this point in the history
  6. - updated to Boost 1.62 and added support for building with msvc-14.0

    - 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
    chambm authored and chambm committed Jun 7, 2018
    Copy the full SHA
    a5bcc35 View commit details
    Browse the repository at this point in the history
  7. - fix GCC compile

    - restore test library's source (accidentally deleted) back to boost tarball
    
    Former-commit-id: 37d7c042f277d3f818fbe869577025f4590df25b
    chambm authored and chambm committed Jun 7, 2018
    Copy the full SHA
    eaa2035 View commit details
    Browse the repository at this point in the history
  8. - fixed quickbuild not working with spaces in path

    Former-commit-id: c166a3d11404fae9e999303f02b4d500c50e8941
    chambm authored and chambm committed Jun 7, 2018
    Copy the full SHA
    19e403c View commit details
    Browse the repository at this point in the history
  9. [pwiz VS2015 compatibility branch]: Updating pwiz RAMPAdapter to prov…

    …ide short form activationMethod values, as well as scan polarity and centroiding info. Code by user Parminder Kaur.
    
    Former-commit-id: 9de69f0784f254a93943b85d02ffc8827ffdad72
    pcbrefugee authored and chambm committed Jun 7, 2018
    Copy the full SHA
    0c559bd View commit details
    Browse the repository at this point in the history
  10. * 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)
    * 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
    chambm committed Jun 7, 2018
    Copy the full SHA
    2c86c96 View commit details
    Browse the repository at this point in the history
  11. * added msvc_setup_script.bat for actions which need to access VS com…

    …mands for the latest VS version (i.e. the .NET projects)
    chambm committed Jun 7, 2018
    Copy the full SHA
    b36e586 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2018

  1. * restored customizations to testing.jam

    * restored manifest dependencies to link action
    * fixed warnings in UIMF reader
    chambm committed Jun 8, 2018
    Copy the full SHA
    b292cc8 View commit details
    Browse the repository at this point in the history
  2. * updated appveyor.yml

    chambm committed Jun 8, 2018
    Copy the full SHA
    4601c69 View commit details
    Browse the repository at this point in the history
  3. * reverted Boost.Build changes due to broken make/copy behavior

    * reverted changes from make/copy to assembly-dependency (since it doesn't work on non-MSVC toolsets)
    chambm committed Jun 8, 2018
    Copy the full SHA
    71baca7 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    3effad8 View commit details
    Browse the repository at this point in the history
  5. * fixed Linux compile errors

    chambm committed Jun 8, 2018
    Copy the full SHA
    9fd5e1c View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2018

  1. * removed boost.regex from Bumbershoot due to conflict with new Masco…

    …t Parser; it was only being used vestigially anyway
    chambm committed Jun 11, 2018
    Copy the full SHA
    61f963b View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    1da31d1 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2018

  1. Copy the full SHA
    864c1c9 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'remotes/origin/feature/VS2017-update' i…

    …nto Skyline/work/20180529_MoveToNet472
    chambm committed Jun 13, 2018
    Copy the full SHA
    cc4d26b View commit details
    Browse the repository at this point in the history
  3. Merge branch 'Skyline/work/20180529_MoveToNet472' of github.com:Prote…

    …oWizard/pwiz into Skyline/work/20180529_MoveToNet472
    chambm committed Jun 13, 2018
    Copy the full SHA
    ecf8ac0 View commit details
    Browse the repository at this point in the history
  4. * 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
    chambm committed Jun 13, 2018
    Copy the full SHA
    1f94119 View commit details
    Browse the repository at this point in the history
  5. * fixed error trying to create directory '.' (apparently ignored in B…

    …oost 1.56 but not 1.62)
    chambm committed Jun 13, 2018
    Copy the full SHA
    7545c87 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    0bbdb72 View commit details
    Browse the repository at this point in the history
  7. Revert "* reverted Boost.Build changes due to broken make/copy behavior"

    This reverts commit 71baca7.
    
    * fixed make targets with new boost.build code by adding <dependency> on a build target, which makes all build features <relevant> (so <location> is calculated properly)
    * fixed status detection in do_topograph_test action
    chambm committed Jun 13, 2018
    Copy the full SHA
    34b2ae7 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2018

  1. Copy the full SHA
    3f9fdff View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2018

  1. SkylineNightly: dynamically set the bjam toolset value based on Targe…

    …tFrameworkVersion in Skyline.csproj (4.7.x or higher uses bjam toolset msvc-14.1, otherwise msvc-12.0)
    bspratt committed Jun 20, 2018
    Copy the full SHA
    2b0e29c View commit details
    Browse the repository at this point in the history
  2. Revert "SkylineNightly: dynamically set the bjam toolset value based …

    …on TargetFrameworkVersion in Skyline.csproj (4.7.x or higher uses bjam toolset msvc-14.1, otherwise msvc-12.0)"
    
    This reverts commit 2b0e29c - a couple of files got added by mistake.
    bspratt committed Jun 20, 2018
    Copy the full SHA
    8ab4435 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2018

  1. * 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!)
    chambm committed Jul 6, 2018
    Copy the full SHA
    e87be7b View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    50e72f4 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    92e2b27 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    8f74cd5 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2018

  1. * 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
    chambm committed Jul 9, 2018
    Copy the full SHA
    7a30463 View commit details
    Browse the repository at this point in the history
  2. Skyline: put more of test exit code in try-catch block to attempt to …

    …isolate an issue that's been prematurely cutting off nightly tests
    bspratt committed Jul 9, 2018
    Copy the full SHA
    694aa64 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2018

  1. Skyline: still trying to track down problem with early overnight test…

    … termination, adding a catch for System.ComponentModel.InvalidAsynchronousStateException alongside the existing catch for InvalidOperationException on the hunch that it's the same condition but the OS now throws a different exception for it
    bspratt committed Jul 10, 2018
    Copy the full SHA
    012195b View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2018

  1. * added --force-extract option for re-extracting tarballs

    * moved --incremental guard for generating version-ish files into generate-version.jam
    chambm committed Jul 11, 2018
    Copy the full SHA
    676e3c7 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    277c14f View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2018

  1. * fixed IDPicker dependency issues with installer (I hope)

    * fixed --force-extract with libraries loaded via libraries/*.jam
    * added no-clean option to tcbuild.bat
    chambm committed Jul 12, 2018
    Copy the full SHA
    ea54be4 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    44d369c View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2018

  1. Copy the full SHA
    a814f7d View commit details
    Browse the repository at this point in the history
  2. Fix a problem where the SkylineNightly zip installer could fail due t…

    …o an attempt to include the unit test DLL more than once
    bspratt committed Jul 18, 2018
    Copy the full SHA
    783b718 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2018

  1. Copy the full SHA
    0a601e9 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2018

  1. Copy the full SHA
    c20a6d6 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    15d1748 View commit details
    Browse the repository at this point in the history
  3. * moved all .NET projects 4.7.2

    * 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
    Nicholas Shulman authored and chambm committed Jul 25, 2018
    Copy the full SHA
    a851627 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'Skyline/work/20180529_MoveToNet472' of github.com:Prote…

    …oWizard/pwiz into Skyline/work/20180529_MoveToNet472
    chambm committed Jul 25, 2018
    Copy the full SHA
    471520a View commit details
    Browse the repository at this point in the history
  5. * reduced verbosity in MSVC build log by filtering out compiled file …

    …name and file copy messages ("1 file(s) copied")
    chambm committed Jul 25, 2018
    Copy the full SHA
    7c064bc View commit details
    Browse the repository at this point in the history
  6. Merge remote-tracking branch 'remotes/origin/feature/VS2017-update' i…

    …nto Skyline/work/20180529_MoveToNet472
    chambm committed Jul 25, 2018
    Copy the full SHA
    143c93a View commit details
    Browse the repository at this point in the history
  7. * fixed Shimadzu Jamfile

    - added instrument config to Shimadzu reader
    * added Skyline test for basic reading of Shimadzu data
    chambm committed Jul 25, 2018
    Copy the full SHA
    bb12a0d View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2018

  1. Copy the full SHA
    e9649fa View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2018

  1. Copy the full SHA
    fc748de View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    213a93a View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2018

  1. Copy the full SHA
    c151340 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2018

  1. * moved all .NET projects 4.7.2

    * 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
    Nicholas Shulman authored and chambm committed Aug 8, 2018
    Copy the full SHA
    ee53b94 View commit details
    Browse the repository at this point in the history
  2. * fixed Shimadzu Jamfile

    - added instrument config to Shimadzu reader
    * added Skyline test for basic reading of Shimadzu data
    chambm committed Aug 8, 2018
    Copy the full SHA
    b3c7607 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    33176b6 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    f39294a View commit details
    Browse the repository at this point in the history
  5. * fixed SkylineNightly.zip build (was missing SkylineNightlyShim)

    * 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
    chambm committed Aug 8, 2018
    Copy the full SHA
    467d14f View commit details
    Browse the repository at this point in the history
  6. Merge branch 'Skyline/work/20180529_MoveToNet472' of github.com:Prote…

    …oWizard/pwiz into Skyline/work/20180529_MoveToNet472
    chambm committed Aug 8, 2018
    Copy the full SHA
    29f3a03 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2018

  1. Copy the full SHA
    1bb7ac6 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2018

  1. SkylineTester: when scripted nightly build encounters trouble deletin…

    …g a file, there's no point in putting up a retry dialog as it's an unattended script
    bspratt committed Aug 13, 2018
    Copy the full SHA
    3c0e38c View commit details
    Browse the repository at this point in the history
  2. Merge branch 'Skyline/work/20180529_MoveToNet472' of https://github.c…

    …om/ProteoWizard/pwiz into Skyline/work/20180529_MoveToNet472
    bspratt committed Aug 13, 2018
    Copy the full SHA
    9ac5a78 View commit details
    Browse the repository at this point in the history
  3. SkylineNightly: change an overly specific expection catcher for deali…

    …ng with unedeletable files
    bspratt committed Aug 13, 2018
    Copy the full SHA
    ec960da View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2018

  1. SkylineTester: attempt to solve unattended nightly build problem wher…

    …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
    bspratt committed Aug 14, 2018
    Copy the full SHA
    e6f04f6 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    7ea7e82 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2018

  1. Copy the full SHA
    8cf757a View commit details
    Browse the repository at this point in the history