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.

Sign up for GitHub

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

Agilent MH12 method export #1344

Merged
merged 32 commits into from
Nov 29, 2023
Merged

Agilent MH12 method export #1344

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
4cc9b6b
Agilent Ultivo method
kaipot Dec 7, 2020
dbaee4c
Add BuildAgilentUltivoMethod.exe
kaipot Dec 7, 2020
fe3569b
Remove duplicate dlls
kaipot Dec 7, 2020
d4ec781
Merge branch 'master' into Skyline/work/20201207_agilent_ultivo
kaipot Nov 2, 2022
a56b8d1
Fix merge from master
kaipot Nov 2, 2022
0b52255
Merge branch 'master' into Skyline/work/20201207_agilent_ultivo
kaipot Dec 13, 2022
d5dc8e2
Fix merge from master and rename Ultivo to MassHunter 12
kaipot Dec 13, 2022
e440887
Some reorganization and more renaming
kaipot Dec 13, 2022
f1ed4c9
New DLLs
kaipot Dec 13, 2022
678177e
Add missing files
kaipot Dec 13, 2022
5fd8c79
Remove duplicate dlls
kaipot Dec 14, 2022
5b76c75
Installer changes
kaipot Jan 11, 2023
7bee250
Fix installer
kaipot Jan 12, 2023
d3bc551
Merge branch 'master' into Skyline/work/20201207_agilent_ultivo
kaipot Jan 12, 2023
d2e8246
Fix for triggered method error message
rita-gwen Feb 2, 2023
d62076d
Merge from master
rita-gwen Jul 28, 2023
d037166
Instrument type and error messages updated (items 1&2)
rita-gwen Jul 28, 2023
977d6e3
Agilent software copyright updated.
rita-gwen Aug 7, 2023
28eaa8d
Merge from master
rita-gwen Sep 7, 2023
088774e
New MH12 added
rita-gwen Sep 7, 2023
22c9b68
Removed UTF-16 characters from Resources
rita-gwen Sep 8, 2023
cfa3171
Merge from master
rita-gwen Sep 8, 2023
b05eca6
Master conflict resolution merge
rita-gwen Sep 18, 2023
83b2292
Merge branch 'master' into Skyline/work/20201207_agilent_ultivo
nickshulman Sep 18, 2023
4296892
RC version of MH 12.1 dlls added.
rita-gwen Oct 24, 2023
12054dc
Merge branch 'Skyline/work/20201207_agilent_ultivo' of https://github…
rita-gwen Oct 24, 2023
36ca410
Whitespace edit to retrigger the build
rita-gwen Oct 25, 2023
eacbe28
Merge remote-tracking branch 'remotes/origin/master' into Skyline/wor…
brendanx67 Nov 22, 2023
9464ac7
Merge branch 'master' into Skyline/work/20201207_agilent_ultivo
brendanx67 Nov 22, 2023
37a9a45
Method export libraries are updated to MH12.1 RC9
rita-gwen Nov 28, 2023
fa69b64
Merge branch 'Skyline/work/20201207_agilent_ultivo' of https://github…
rita-gwen Nov 28, 2023
ab4e275
Local merge from master to resolve Resources.resx conflict.
rita-gwen Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion pwiz_tools/Skyline/CommandLine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3041,7 +3041,7 @@ private void ExportInstrumentFile(ExportFileType type, CommandArgs args)
_out.WriteLine(Resources.CommandLine_ExportInstrumentFile_Error__A_template_file_is_required_to_export_a_method_);
return;
}
if (Equals(args.MethodInstrumentType, ExportInstrumentType.AGILENT6400)
if (Equals(args.MethodInstrumentType, ExportInstrumentType.AGILENT6400) || Equals(args.MethodInstrumentType, ExportInstrumentType.AGILENT_ULTIVO)
? !Directory.Exists(args.TemplateFile)
: !File.Exists(args.TemplateFile))
{
Expand All @@ -3054,6 +3054,12 @@ private void ExportInstrumentFile(ExportFileType type, CommandArgs args)
_out.WriteLine(Resources.CommandLine_ExportInstrumentFile_Error__The_folder__0__does_not_appear_to_contain_an_Agilent_QQQ_method_template___The_folder_is_expected_to_have_a__m_extension__and_contain_the_file_qqqacqmethod_xsd_, args.TemplateFile);
return;
}
if (Equals(args.MethodInstrumentType, ExportInstrumentType.AGILENT_ULTIVO) &&
!AgilentUltivoMethodExporter.IsMethodPath(args.TemplateFile))
{
_out.WriteLine(Resources.ExportMethodDlg_OkDialog_The_folder__0__does_not_appear_to_contain_an_Agilent_Ultivo_method_template__The_folder_is_expected_to_have_a__m_extension_, args.TemplateFile);
return;
}
}

if (!args.ExportStrategySet)
Expand Down
Binary file added ...s/BuildMethod/BuildAgilentUltivoMethod/Agilent.MSDrivers.LCQuadrupole.CommonUtilities.dll
View file
Open in desktop
Binary file not shown.
Binary file added ...es/BuildMethod/BuildAgilentUltivoMethod/Agilent.MSDrivers.LCQuadrupole.DataInterfaces.dll
View file
Open in desktop
Binary file not shown.
Binary file added ...e/Executables/BuildMethod/BuildAgilentUltivoMethod/Agilent.MSDrivers.LCQuadrupole.ESW.dll
View file
Open in desktop
Binary file not shown.
Binary file added ...ildMethod/BuildAgilentUltivoMethod/Agilent.MSDrivers.LCQuadrupole.HWConfigResourceMgr.dll
View file
Open in desktop
Binary file not shown.
Binary file added ...uildMethod/BuildAgilentUltivoMethod/Agilent.MSDrivers.LCQuadrupole.KeyValueInterfaces.dll
View file
Open in desktop
Binary file not shown.
Binary file added .../BuildMethod/BuildAgilentUltivoMethod/Agilent.MSDrivers.LCQuadrupole.MRMObjectFactory.dll
View file
Open in desktop
Binary file not shown.
Binary file added .../BuildMethod/BuildAgilentUltivoMethod/Agilent.MSDrivers.LCQuadrupole.MSActualProvider.dll
View file
Open in desktop
Binary file not shown.
Binary file added .../Executables/BuildMethod/BuildAgilentUltivoMethod/Agilent.MSDrivers.LCQuadrupole.MSIF.dll
View file
Open in desktop
Binary file not shown.
Binary file added ...tables/BuildMethod/BuildAgilentUltivoMethod/Agilent.MSDrivers.LCQuadrupole.MSMethodDO.dll
View file
Open in desktop
Binary file not shown.
Binary file added ...s/BuildMethod/BuildAgilentUltivoMethod/Agilent.MSDrivers.LCQuadrupole.MSParamProvider.dll
View file
Open in desktop
Binary file not shown.
Binary file added ...ecutables/BuildMethod/BuildAgilentUltivoMethod/Agilent.MSDrivers.LCQuadrupole.MSTrace.dll
View file
Open in desktop
Binary file not shown.
Binary file added ...ildMethod/BuildAgilentUltivoMethod/Agilent.MSDrivers.LCQuadrupole.MSTraceDataSystemIF.dll
View file
Open in desktop
Binary file not shown.
Binary file added ...cutables/BuildMethod/BuildAgilentUltivoMethod/Agilent.MSDrivers.LCQuadrupole.MSTuneDO.dll
View file
Open in desktop
Binary file not shown.
Binary file added ...d/BuildAgilentUltivoMethod/Agilent.MSDrivers.LCQuadrupole.MethodLocaleServiceProvider.dll
View file
Open in desktop
Binary file not shown.
Binary file added ...BuildMethod/BuildAgilentUltivoMethod/Agilent.MSDrivers.LCQuadrupole.MethodResourceMgr.dll
View file
Open in desktop
Binary file not shown.
Binary file added ...Method/BuildAgilentUltivoMethod/Agilent.MSDrivers.LCQuadrupole.MethodValidationModule.dll
View file
Open in desktop
Binary file not shown.
Binary file added ...AgilentUltivoMethod/Agilent.MSDrivers.LCQuadrupole.ModelSpecificMethodResourceManager.dll
View file
Open in desktop
Binary file not shown.
Binary file added ...es/BuildMethod/BuildAgilentUltivoMethod/Agilent.MSDrivers.LCQuadrupole.ValidationBase.dll
View file
Open in desktop
Binary file not shown.
Binary file added ...uildMethod/BuildAgilentUltivoMethod/Agilent.MassSpectrometry.LCMSAcquisition.MHPlugin.dll
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions pwiz_tools/Skyline/Executables/BuildMethod/BuildAgilentUltivoMethod/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1" />
</startup>
</configuration>
119 changes: 119 additions & 0 deletions .../Skyline/Executables/BuildMethod/BuildAgilentUltivoMethod/BuildAgilentUltivoMethod.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{0A0180A8-6BCB-41B7-8636-D034B1E629BC}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>BuildAgilentUltivoMethod</RootNamespace>
<AssemblyName>BuildAgilentUltivoMethod</AssemblyName>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Agilent.MassSpectrometry.LCMSAcquisition.MHPlugin">
<HintPath>.\Agilent.MassSpectrometry.LCMSAcquisition.MHPlugin.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.CommonUtilities">
<HintPath>.\Agilent.MSDrivers.LCQuadrupole.CommonUtilities.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.DataInterfaces">
<HintPath>.\Agilent.MSDrivers.LCQuadrupole.DataInterfaces.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.ESW">
<HintPath>.\Agilent.MSDrivers.LCQuadrupole.ESW.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.HWConfigResourceMgr">
<HintPath>.\Agilent.MSDrivers.LCQuadrupole.HWConfigResourceMgr.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.KeyValueInterfaces">
<HintPath>.\Agilent.MSDrivers.LCQuadrupole.KeyValueInterfaces.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.MethodLocaleServiceProvider">
<HintPath>.\Agilent.MSDrivers.LCQuadrupole.MethodLocaleServiceProvider.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.MethodResourceMgr">
<HintPath>.\Agilent.MSDrivers.LCQuadrupole.MethodResourceMgr.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.MethodValidationModule">
<HintPath>.\Agilent.MSDrivers.LCQuadrupole.MethodValidationModule.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.ModelSpecificMethodResourceManager">
<HintPath>.\Agilent.MSDrivers.LCQuadrupole.ModelSpecificMethodResourceManager.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.MRMObjectFactory">
<HintPath>.\Agilent.MSDrivers.LCQuadrupole.MRMObjectFactory.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.MSActualProvider">
<HintPath>.\Agilent.MSDrivers.LCQuadrupole.MSActualProvider.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.MSIF">
<HintPath>.\Agilent.MSDrivers.LCQuadrupole.MSIF.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.MSMethodDO">
<HintPath>.\Agilent.MSDrivers.LCQuadrupole.MSMethodDO.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.MSParamProvider">
<HintPath>.\Agilent.MSDrivers.LCQuadrupole.MSParamProvider.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.MSTrace">
<HintPath>.\Agilent.MSDrivers.LCQuadrupole.MSTrace.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.MSTraceDataSystemIF">
<HintPath>.\Agilent.MSDrivers.LCQuadrupole.MSTraceDataSystemIF.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.MSTuneDO">
<HintPath>.\Agilent.MSDrivers.LCQuadrupole.MSTuneDO.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.ValidationBase">
<HintPath>.\Agilent.MSDrivers.LCQuadrupole.ValidationBase.dll</HintPath>
</Reference>
<Reference Include="MethodCreator">
<HintPath>.\MethodCreator.dll</HintPath>
</Reference>
<Reference Include="RapidControlIF">
<HintPath>.\RapidControlIF.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<Content Include="ESWShared.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
Binary file added pwiz_tools/Skyline/Executables/BuildMethod/BuildAgilentUltivoMethod/ESWShared.dll
View file
Open in desktop
Binary file not shown.
Binary file added pwiz_tools/Skyline/Executables/BuildMethod/BuildAgilentUltivoMethod/MethodCreator.dll
View file
Open in desktop
Binary file not shown.
Loading