Skip to content

Commit b7c6030

Browse files
committed
Bio Mono 3.0
Bio now runs on Mono fully.
1 parent ee3e1a3 commit b7c6030

30 files changed

+46186
-1129
lines changed

.#Bio.csproj

Lines changed: 0 additions & 632 deletions
This file was deleted.

Bio.csproj

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="packages\Ultz.Native.SDL.2.0.14.1\build\net461\Ultz.Native.SDL.props" Condition="Exists('packages\Ultz.Native.SDL.2.0.14.1\build\net461\Ultz.Native.SDL.props')" />
4+
<Import Project="packages\Ultz.Native.GLFW.3.3.3.1\build\net461\Ultz.Native.GLFW.props" Condition="Exists('packages\Ultz.Native.GLFW.3.3.3.1\build\net461\Ultz.Native.GLFW.props')" />
35
<Import Project="packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.props" Condition="Exists('packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.props')" />
46
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
57
<PropertyGroup>
@@ -10,7 +12,7 @@
1012
<AppDesignerFolder>Properties</AppDesignerFolder>
1113
<RootNamespace>Bio</RootNamespace>
1214
<AssemblyName>Bio</AssemblyName>
13-
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
15+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1416
<FileAlignment>512</FileAlignment>
1517
<Deterministic>true</Deterministic>
1618
<TargetFrameworkProfile />
@@ -106,9 +108,6 @@
106108
<Reference Include="CSScriptLib, Version=4.4.6.0, Culture=neutral, processorArchitecture=MSIL">
107109
<HintPath>packages\CS-Script.4.4.6\lib\netstandard2.0\CSScriptLib.dll</HintPath>
108110
</Reference>
109-
<Reference Include="Gma.System.MouseKeyHook, Version=5.6.130.0, Culture=neutral, processorArchitecture=MSIL">
110-
<HintPath>C:\Users\Erikr\source\repos\Imager\Imager\packages\MouseKeyHook.5.6.0\lib\net40\Gma.System.MouseKeyHook.dll</HintPath>
111-
</Reference>
112111
<Reference Include="ICSharpCode.SharpZipLib, Version=1.4.1.12, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
113112
<HintPath>packages\SharpZipLib.1.4.1\lib\netstandard2.0\ICSharpCode.SharpZipLib.dll</HintPath>
114113
</Reference>
@@ -132,6 +131,9 @@
132131
<HintPath>packages\Microsoft.Extensions.DependencyModel.7.0.0\lib\net462\Microsoft.Extensions.DependencyModel.dll</HintPath>
133132
<Private>True</Private>
134133
</Reference>
134+
<Reference Include="OpenTK.Input, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
135+
<HintPath>packages\OpenTK.Input.4.7.5\lib\netstandard2.0\OpenTK.Input.dll</HintPath>
136+
</Reference>
135137
<Reference Include="SharpDX, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
136138
<HintPath>packages\SharpDX.4.2.0\lib\net45\SharpDX.dll</HintPath>
137139
</Reference>
@@ -159,7 +161,6 @@
159161
<Private>True</Private>
160162
</Reference>
161163
<Reference Include="System.Configuration" />
162-
<Reference Include="System.Core" />
163164
<Reference Include="System.DirectoryServices" />
164165
<Reference Include="System.Drawing" />
165166
<Reference Include="System.Drawing.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -175,6 +176,9 @@
175176
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
176177
<HintPath>packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
177178
</Reference>
179+
<Reference Include="System.Reactive, Version=5.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
180+
<HintPath>packages\System.Reactive.5.0.0\lib\net472\System.Reactive.dll</HintPath>
181+
</Reference>
178182
<Reference Include="System.Reflection.Metadata, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
179183
<HintPath>packages\System.Reflection.Metadata.7.0.0\lib\net462\System.Reflection.Metadata.dll</HintPath>
180184
<Private>True</Private>
@@ -217,9 +221,6 @@
217221
</Reference>
218222
<Reference Include="System.Xml.Serialization" />
219223
<Reference Include="WindowsBase" />
220-
<Reference Include="WindowsInput, Version=1.0.4.0, Culture=neutral, PublicKeyToken=9b287f7dc5073cad, processorArchitecture=MSIL">
221-
<HintPath>C:\Users\Erikr\source\repos\Imager\Imager\packages\InputSimulator.1.0.4.0\lib\net20\WindowsInput.dll</HintPath>
222-
</Reference>
223224
<Reference Include="IKVM.Runtime">
224225
<HintPath>packages\IKVM.8.4.4-prerelease0001\lib\net461\IKVM.Runtime.dll</HintPath>
225226
</Reference>
@@ -229,12 +230,6 @@
229230
<Reference Include="IKVM.AWT.WinForms">
230231
<HintPath>packages\IKVM.8.1.5717.0\lib\IKVM.AWT.WinForms.dll</HintPath>
231232
</Reference>
232-
<Reference Include="WindowsInput">
233-
<HintPath>packages\InputSimulator.1.0.4.0\lib\net20\WindowsInput.dll</HintPath>
234-
</Reference>
235-
<Reference Include="freelib-utils">
236-
<HintPath>freelib-utils.dll</HintPath>
237-
</Reference>
238233
<Reference Include="IKVM.Java">
239234
<HintPath>packages\IKVM.8.4.4-prerelease0001\lib\net461\IKVM.Java.dll</HintPath>
240235
</Reference>
@@ -253,6 +248,19 @@
253248
<Reference Include="bioformats_package">
254249
<HintPath>bioformats_package.dll</HintPath>
255250
</Reference>
251+
<Reference Include="System.Core">
252+
<HintPath>packages\System.Core.3.5.21022.801\lib\net20\System.Core.dll</HintPath>
253+
</Reference>
254+
<Reference Include="Microsoft.Bcl.HashCode">
255+
<HintPath>packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
256+
</Reference>
257+
<Reference Include="mscorlib" />
258+
<Reference Include="Microsoft.DotNet.PlatformAbstractions">
259+
<HintPath>packages\Microsoft.DotNet.PlatformAbstractions.3.1.6\lib\net45\Microsoft.DotNet.PlatformAbstractions.dll</HintPath>
260+
</Reference>
261+
<Reference Include="Ultz.Bcl.Half">
262+
<HintPath>packages\Ultz.Bcl.Half.Fallback.1.0.0\lib\netstandard2.0\Ultz.Bcl.Half.dll</HintPath>
263+
</Reference>
256264
</ItemGroup>
257265
<ItemGroup>
258266
<Compile Include="Graphics\AbstractFloodFiller.cs" />
@@ -463,7 +471,6 @@
463471
<DependentUpon>Tools.cs</DependentUpon>
464472
</Compile>
465473
<Compile Include="Source\Units.cs" />
466-
<Compile Include="Source\Win32.cs" />
467474
<Compile Include="Source\XMLView.cs">
468475
<SubType>Form</SubType>
469476
</Compile>
@@ -581,10 +588,6 @@
581588
</ItemGroup>
582589
<ItemGroup>
583590
<Content Include="Bio.ico" />
584-
<Content Include="freelib-utils.dll">
585-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
586-
<IncludeInPackage>true</IncludeInPackage>
587-
</Content>
588591
</ItemGroup>
589592
<ItemGroup>
590593
<None Include=".editorconfig" />
@@ -613,8 +616,8 @@
613616
<Analyzer Include="packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
614617
</ItemGroup>
615618
<ItemGroup>
616-
<ProjectReference Include="..\AForgeNET\AForgeNET\AForgeBio.csproj">
617-
<Project>{CB32276C-4D3D-4DB7-80F8-E4002D7298F8}</Project>
619+
<ProjectReference Include="..\AForgeBio\AForgeBio\AForgeBio.csproj">
620+
<Project>{cb32276c-4d3d-4db7-80f8-e4002d7298f8}</Project>
618621
<Name>AForgeBio</Name>
619622
</ProjectReference>
620623
</ItemGroup>
@@ -627,6 +630,8 @@
627630
<Error Condition="!Exists('packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.targets'))" />
628631
<Error Condition="!Exists('packages\SkiaSharp.NativeAssets.macOS.2.88.3\build\net462\SkiaSharp.NativeAssets.macOS.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.NativeAssets.macOS.2.88.3\build\net462\SkiaSharp.NativeAssets.macOS.targets'))" />
629632
<Error Condition="!Exists('packages\SkiaSharp.NativeAssets.Win32.2.88.3\build\net462\SkiaSharp.NativeAssets.Win32.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.NativeAssets.Win32.2.88.3\build\net462\SkiaSharp.NativeAssets.Win32.targets'))" />
633+
<Error Condition="!Exists('packages\Ultz.Native.GLFW.3.3.3.1\build\net461\Ultz.Native.GLFW.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Ultz.Native.GLFW.3.3.3.1\build\net461\Ultz.Native.GLFW.props'))" />
634+
<Error Condition="!Exists('packages\Ultz.Native.SDL.2.0.14.1\build\net461\Ultz.Native.SDL.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Ultz.Native.SDL.2.0.14.1\build\net461\Ultz.Native.SDL.props'))" />
630635
</Target>
631636
<Import Project="packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.targets" Condition="Exists('packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.targets')" />
632637
<Import Project="packages\SkiaSharp.NativeAssets.macOS.2.88.3\build\net462\SkiaSharp.NativeAssets.macOS.targets" Condition="Exists('packages\SkiaSharp.NativeAssets.macOS.2.88.3\build\net462\SkiaSharp.NativeAssets.macOS.targets')" />

Bio.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bio", "Bio.csproj", "{F920D
77
EndProject
88
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BioApp", "..\BioApp\BioApp.csproj", "{45C2B682-162E-4815-A299-82C5C90DAC1B}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AForgeBio", "..\AForgeNET\AForgeNET\AForgeBio.csproj", "{CB32276C-4D3D-4DB7-80F8-E4002D7298F8}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AForgeBio", "..\AForgeBio\AForgeBio\AForgeBio.csproj", "{CB32276C-4D3D-4DB7-80F8-E4002D7298F8}"
1111
EndProject
1212
Global
1313
GlobalSection(SolutionConfigurationPlatforms) = preSolution

Properties/Resources.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Properties/Settings.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

SharpDX.D3DCompiler.dll

57.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)