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

.NET Core 3.0 #521

Merged
merged 13 commits into from
Jan 8, 2020
Merged

.NET Core 3.0 #521

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
648193e
.NET Core 3.0 implementation of mzLib
rmillikin Oct 16, 2019
07d584e
small fixes
rmillikin Oct 16, 2019
291689e
edit csproj and assemblyinfo
rmillikin Oct 16, 2019
0f5eff2
fix mistake in nuspec file
rmillikin Oct 16, 2019
731acb7
align paths in .csproj to appveyor expected paths
rmillikin Oct 16, 2019
88fbf92
update uniprot list count
rmillikin Oct 16, 2019
d62d51a
update unimod test again...
rmillikin Oct 16, 2019
d15da56
update nuspec file with dependencies
rmillikin Oct 17, 2019
363aaa5
Merge branch 'master' into DotNetCore3
rmillikin Nov 8, 2019
50631fe
Merge branch 'master' into DotNetCore3
rmillikin Jan 8, 2020
596bb1f
merge conflicts
rmillikin Jan 8, 2020
f98f158
delete TestVariantProtein file
rmillikin Jan 8, 2020
3363298
update ptm list unit test
rmillikin Jan 8, 2020
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
12 changes: 6 additions & 6 deletions BayesianEstimation/BayesianEstimation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net471</TargetFrameworks>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net471'">

<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net471|AnyCPU'">

<PropertyGroup Condition="'$(Configuration)'=='Release'">
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MathNet.Numerics" Version="4.8.1" />
</ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions Chemistry/Chemistry.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net471</TargetFrameworks>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net471'">
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net471|AnyCPU'">

<PropertyGroup Condition="'$(Configuration)'=='Release'">
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\MzLibUtil\MzLibUtil.csproj" />
</ItemGroup>
Expand Down
27 changes: 13 additions & 14 deletions FlashLFQ/FlashLFQ.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net471'">
<DefineConstants>NETFRAMEWORK</DefineConstants>

<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net471|AnyCPU'">

<PropertyGroup Condition="'$(Configuration)'=='Release'">
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MathNet.Numerics" Version="4.8.1" />
<PackageReference Include="NetSerializer" Version="4.1.1" />
<PackageReference Include="SharpLearning.Optimization" Version="[0.28.0]" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\BayesianEstimation\BayesianEstimation.csproj" />
<ProjectReference Include="..\Chemistry\Chemistry.csproj" />
Expand All @@ -22,11 +27,5 @@
<ProjectReference Include="..\ThermoRawFileReader\ThermoRawFileReader.csproj" />
<ProjectReference Include="..\UsefulProteomicsDatabases\UsefulProteomicsDatabases.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="NetSerializer" Version="4.1.0" />
<PackageReference Include="SharpLearning.Containers" Version="[0.28.0]" />
<PackageReference Include="SharpLearning.Optimization" Version="[0.28.0]" />
</ItemGroup>


</Project>
12 changes: 6 additions & 6 deletions MassSpectrometry/MassSpectrometry.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net471</TargetFrameworks>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net471'">
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net471|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)'=='Release'">
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
Expand All @@ -18,8 +18,8 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\MzLibUtil\MzLibUtil.csproj" />
<ProjectReference Include="..\Chemistry\Chemistry.csproj" />
<ProjectReference Include="..\MzLibUtil\MzLibUtil.csproj" />
</ItemGroup>

</Project>
16 changes: 8 additions & 8 deletions Mgf/Mgf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net471</TargetFrameworks>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net471'">
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net471|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)'=='Release'">
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\MzLibUtil\MzLibUtil.csproj" />
<ProjectReference Include="..\MassSpectrometry\MassSpectrometry.csproj" />
<ProjectReference Include="..\Chemistry\Chemistry.csproj" />
<ProjectReference Include="..\MassSpectrometry\MassSpectrometry.csproj" />
<ProjectReference Include="..\MzLibUtil\MzLibUtil.csproj" />
<ProjectReference Include="..\UsefulProteomicsDatabases\UsefulProteomicsDatabases.csproj" />
</ItemGroup>

</Project>
</Project>
12 changes: 6 additions & 6 deletions MzIdentML/MzIdentML.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net471</TargetFrameworks>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net471'">
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net471|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)'=='Release'">
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\MzLibUtil\MzLibUtil.csproj" />
<ProjectReference Include="..\MassSpectrometry\MassSpectrometry.csproj" />
<ProjectReference Include="..\MzLibUtil\MzLibUtil.csproj" />
</ItemGroup>

</Project>
19 changes: 8 additions & 11 deletions MzLibUtil/MzLibUtil.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net471</TargetFrameworks>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net471'">
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
<DefineConstants>ONLYNETSTANDARD</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net471|AnyCPU'">

<PropertyGroup Condition="'$(Configuration)'=='Release'">
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net471'">
<Reference Include="System.Management" />
<ItemGroup>
<PackageReference Include="Easy.Common" Version="3.5.0" />
<PackageReference Include="Microsoft.Win32.Registry" Version="4.6.0" />
</ItemGroup>

</Project>
Loading