diff --git a/.gitignore b/.gitignore index 36cc2b25..b4823350 100644 --- a/.gitignore +++ b/.gitignore @@ -166,6 +166,8 @@ PublishScripts/ # NuGet v3's project.json files produces more ignoreable files *.nuget.props *.nuget.targets +# Autogenerated NuGet.Config file +/NuGet.Config # Microsoft Azure Build Output csx/ @@ -262,4 +264,4 @@ paket-files/ # Python Tools for Visual Studio (PTVS) __pycache__/ -*.pyc \ No newline at end of file +*.pyc diff --git a/BetaCameras/BaslerACE/BaslerACE.csproj b/BetaCameras/BaslerACE/BaslerACE.csproj index f77b04fd..f31c6d0f 100644 --- a/BetaCameras/BaslerACE/BaslerACE.csproj +++ b/BetaCameras/BaslerACE/BaslerACE.csproj @@ -1,97 +1,30 @@ - - - - + - Release - x64 - {474D94F4-857B-4199-97AF-C600AED44406} - Library - Properties MetriCam2.Cameras MetriCam2.Cameras.BaslerACE - v4.5 - 512 - - - - true - ..\..\bin\x64\Debug\ - DEBUG;TRACE - true - full - x64 - prompt - MinimumRecommendedRules.ruleset - false - - - ..\..\bin\x64\Release\ - TRACE - true - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - false + Wrapper for Basler ace cameras + MetriCam 2: Basler ace wrapper" + net472;net45 true + x64 - - False + Z:\external-libraries\Basler\acA1300\pylon 5.0.11\Basler.Pylon\x64\Basler.Pylon.dll + False - - $(LibrariesPath)Metrilus.Util.dll - - - - - - - - - - - SolutionAssemblyInfo.cs - - - - + True True Resources.resx - - {342f049e-668b-4351-b21d-75e4bef5a1e4} - MetriCam2 - - - - - .licenseheader - - - - - ResXFileCodeGenerator - Resources.Designer.cs - + - + - - diff --git a/BetaCameras/BaslerACE/Properties/AssemblyInfo.cs b/BetaCameras/BaslerACE/Properties/AssemblyInfo.cs deleted file mode 100644 index 14a6a097..00000000 --- a/BetaCameras/BaslerACE/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) Metrilus GmbH -// MetriCam 2 is licensed under the MIT license. See License.txt for full license text. - -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("MetriCam 2: BaslerACE")] -[assembly: AssemblyDescription("MetriCam 2 wrapper for Basler ace cameras")] -[assembly: MetriCam2.Attributes.ContainsCameraImplementations] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("85c95f05-ec0c-45b6-8f5f-5bba9f4cbec6")] diff --git a/BetaCameras/BaslerToF/BaslerToF.csproj b/BetaCameras/BaslerToF/BaslerToF.csproj index e051bdaf..fbd4668a 100644 --- a/BetaCameras/BaslerToF/BaslerToF.csproj +++ b/BetaCameras/BaslerToF/BaslerToF.csproj @@ -1,83 +1,21 @@ - - - - + - Debug - AnyCPU - {9CBCE2AB-4E19-4344-B3CF-67D07CC9C8FC} - Library - Properties MetriCam2.Cameras MetriCam2.Cameras.BaslerToF - v4.5 - 512 - - - true - ..\..\bin\x86\Debug\ - DEBUG;TRACE - true - true - full - x86 - prompt - MinimumRecommendedRules.ruleset - false - - - ..\..\bin\x86\Release\ - TRACE + Wrapper for Basler ToF cameras + MetriCam2: Basler ToF wrapper + net472;net45 + x64 true - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - false - - - true - ..\..\bin\x64\Debug\ - DEBUG;TRACE - true - false - full - x64 - prompt - MinimumRecommendedRules.ruleset - false - - - ..\..\bin\x64\Release\ - TRACE - true - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - false + false - - $(LibrariesPath)Metrilus.Util.dll - - - - - Z:\external-libraries\Basler\ToF Camera\v1.3.2.1322\ToFCameraWrapper.dll - - SolutionAssemblyInfo.cs - - - - + True True Resources.resx @@ -87,16 +25,6 @@ - - ResXFileCodeGenerator - Resources.Designer.cs - - - - - {342f049e-668b-4351-b21d-75e4bef5a1e4} - MetriCam2 - + - - + \ No newline at end of file diff --git a/BetaCameras/BaslerToF/Properties/AssemblyInfo.cs b/BetaCameras/BaslerToF/Properties/AssemblyInfo.cs deleted file mode 100644 index ba8138f4..00000000 --- a/BetaCameras/BaslerToF/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("MetriCam 2: Basler ToF wrapper")] -[assembly: AssemblyDescription("MetriCam 2 wrapper for Basler ToF cameras")] -[assembly: MetriCam2.Attributes.ContainsCameraImplementations] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("014658fa-ef37-421d-8fe1-822d363b55fa")] diff --git a/BetaCameras/CameraTemplate/CameraTemplate.csproj b/BetaCameras/CameraTemplate/CameraTemplate.csproj index 314a253a..26e87948 100644 --- a/BetaCameras/CameraTemplate/CameraTemplate.csproj +++ b/BetaCameras/CameraTemplate/CameraTemplate.csproj @@ -1,96 +1,15 @@ - - - - + - Debug - AnyCPU - {C0D82A80-70D7-4782-B4B1-4AF4C31ECC73} - Library - Properties MetriCam2.Cameras MetriCam2.Cameras.CameraTemplate - v4.5 - 512 - + net472;net45;netstandard2.0 + CHANGEME: Wrapper for YOURCAMERAVENDOR cameras + CHANGEME: MetriCam2: YOURCAMERAVENDOR wrapper - - true - ..\..\bin\x86\Debug\ - DEBUG;TRACE - true - full - x86 - prompt - MinimumRecommendedRules.ruleset - - - ..\..\bin\x86\Release\ - TRACE - true - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - - - true - ..\..\bin\x64\Debug\ - DEBUG;TRACE - true - full - x64 - prompt - MinimumRecommendedRules.ruleset - - - ..\..\bin\x64\Release\ - TRACE - true - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - - - - $(LibrariesPath)Metrilus.Util.dll - - - - - - - - - - - - - SolutionAssemblyInfo.cs - - - - - - {342f049e-668b-4351-b21d-75e4bef5a1e4} - MetriCam2 - + - - .licenseheader - + - - - \ No newline at end of file + diff --git a/BetaCameras/CameraTemplate/Properties/AssemblyInfo.cs b/BetaCameras/CameraTemplate/Properties/AssemblyInfo.cs deleted file mode 100644 index e69ee7d9..00000000 --- a/BetaCameras/CameraTemplate/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) Metrilus GmbH -// MetriCam 2 is licensed under the MIT license. See License.txt for full license text. - -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("MetriCam 2: CameraTemplate wrapper")] -[assembly: AssemblyDescription("CHANGEME: MetriCam 2 wrapper for YOURCAMERAVENDOR cameras")] -[assembly: MetriCam2.Attributes.ContainsCameraImplementations] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("85c95f05-ec0c-45b6-8f5f-5bba9f4cbec6")] diff --git a/BetaCameras/Directory.Build.props b/BetaCameras/Directory.Build.props new file mode 100644 index 00000000..c5ed673b --- /dev/null +++ b/BetaCameras/Directory.Build.props @@ -0,0 +1,15 @@ + + + + + ..\..\bin\$(Configuration)\ + + + + + + + .licenseheader + + + diff --git a/BetaCameras/Kinect2/Kinect2.csproj b/BetaCameras/Kinect2/Kinect2.csproj index b1642bcc..13d85903 100644 --- a/BetaCameras/Kinect2/Kinect2.csproj +++ b/BetaCameras/Kinect2/Kinect2.csproj @@ -1,117 +1,28 @@ - - - - + - Debug - AnyCPU - {03558646-61B1-4F4E-BF70-7A623DF27095} - Library - Properties MetriCam2.Cameras MetriCam2.Cameras.Kinect2 - v4.5 - 512 - - - - true - ..\..\bin\x64\Debug\ - DEBUG;TRACE - true - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - ..\..\bin\x64\Release\ - TRACE - true - true - pdbonly - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - ..\..\bin\x64\ReleaseStrongName\ - TRACE - true - true - pdbonly - AnyCPU - prompt - MinimumRecommendedRules.ruleset - true - false - Z:\protection\StrongNameKey\StrongName.snk - - - true - ..\..\bin\x64\DebugStrongName\ - DEBUG;TRACE - true - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - true - false - Z:\protection\StrongNameKey\StrongName.snk + Wrapper for Kinect2 camera + MetriCam2: Microsoft Kinect2 wrapper + net472;net45 + true - - $(LibrariesPath)Metrilus.Util.dll - Z:\external-libraries\Microsoft\Kinect2\v2.0_1409\Assemblies\Microsoft.Kinect.dll - - - - - - - - - - SolutionAssemblyInfo.cs - - - - + True True Resources.resx - - {342f049e-668b-4351-b21d-75e4bef5a1e4} - MetriCam2 - - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - .licenseheader - + - - diff --git a/BetaCameras/Kinect2/Properties/AssemblyInfo.cs b/BetaCameras/Kinect2/Properties/AssemblyInfo.cs deleted file mode 100644 index fe242ed6..00000000 --- a/BetaCameras/Kinect2/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) Metrilus GmbH -// MetriCam 2 is licensed under the MIT license. See License.txt for full license text. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("MetriCam 2: Kinect2 wrapper")] -[assembly: AssemblyDescription("MetriCam 2 wrapper for Kinect2")] -[assembly: MetriCam2.Attributes.ContainsCameraImplementations] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("a08998f7-6d43-4ef6-b2ae-719b72e3a639")] diff --git a/BetaCameras/Kinect4Azure/Kinect4Azure.cs b/BetaCameras/Kinect4Azure/Kinect4Azure.cs index 5300f2ba..9d5ac2ca 100644 --- a/BetaCameras/Kinect4Azure/Kinect4Azure.cs +++ b/BetaCameras/Kinect4Azure/Kinect4Azure.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Drawing; -using System.Drawing.Imaging; using System.Linq; using System.Text; using System.Threading; @@ -11,6 +10,9 @@ using MetriCam2.Exceptions; using Microsoft.Azure.Kinect.Sensor; using System.Buffers; +#if !NETSTANDARD2_0 +using System.Drawing.Imaging; +#endif namespace MetriCam2.Cameras { @@ -190,7 +192,16 @@ ListParamDesc DepthModeDesc #endregion #if !NETSTANDARD2_0 - public override Icon CameraIcon { get => Properties.Resources.MSIcon; } + public override Icon CameraIcon + { + get + { + using (System.IO.MemoryStream ms = new System.IO.MemoryStream(Properties.Resources.MSIcon)) + { + return new Icon(ms); + } + } + } #endif public Kinect4Azure() : base("Kinect4Azure") diff --git a/BetaCameras/Kinect4Azure/Kinect4Azure.csproj b/BetaCameras/Kinect4Azure/Kinect4Azure.csproj index e6bc9179..dec03465 100644 --- a/BetaCameras/Kinect4Azure/Kinect4Azure.csproj +++ b/BetaCameras/Kinect4Azure/Kinect4Azure.csproj @@ -1,105 +1,27 @@ - - - - + - Debug - AnyCPU - {9A292249-66EE-4C9C-A6B7-DD5112E3625F} - Library - Properties MetriCam2.Cameras MetriCam2.Cameras.Kinect4Azure - v4.7.2 - 512 - true - - - - - - true - ..\..\bin\x64\Debug\ - DEBUG;TRACE - true - full - x64 - prompt - MinimumRecommendedRules.ruleset - - - ..\..\bin\x64\Release\ - TRACE + Wrapper for Microsoft Azure Kinect (K4A) cameras + MetriCam2: Microsoft Azure Kinect wrapper + net472;netstandard2.0 + x64 true - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - - ..\..\bin\x64\DebugStrongName\ - x64 - MinimumRecommendedRules.ruleset - true - true - false - Z:\protection\StrongNameKey\StrongName.snk - - - ..\..\bin\x64\ReleaseStrongName\ - x64 - MinimumRecommendedRules.ruleset - true - true - TRACE - true - false - Z:\protection\StrongNameKey\StrongName.snk - - - - $(LibrariesPath)Metrilus.Util.dll - - - - - - - - - - - - - - + True True Resources.resx - - - {342f049e-668b-4351-b21d-75e4bef5a1e4} - MetriCam2 - - - - PublicResXFileCodeGenerator - Resources.Designer.cs - - - 1.2.0 - + - + - - \ No newline at end of file + diff --git a/BetaCameras/Kinect4Azure/Properties/AssemblyInfo.cs b/BetaCameras/Kinect4Azure/Properties/AssemblyInfo.cs deleted file mode 100644 index afeaee05..00000000 --- a/BetaCameras/Kinect4Azure/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) Metrilus GmbH -// MetriCam 2 is licensed under the MIT license. See License.txt for full license text. - -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("MetriCam 2: Kinect4Azure wrapper")] -[assembly: AssemblyDescription("MetriCam 2 wrapper for Microsoft Kinect 4 Azure (K4A) cameras")] -[assembly: MetriCam2.Attributes.ContainsCameraImplementations] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("9a292249-66ee-4c9c-a6b7-dd5112e3625f")] diff --git a/BetaCameras/Kinect4Azure/Properties/Resources.Designer.cs b/BetaCameras/Kinect4Azure/Properties/Resources.Designer.cs index 21c71a2d..c54127da 100644 --- a/BetaCameras/Kinect4Azure/Properties/Resources.Designer.cs +++ b/BetaCameras/Kinect4Azure/Properties/Resources.Designer.cs @@ -63,10 +63,10 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// - public static System.Drawing.Icon MSIcon { + public static byte[] MSIcon { get { object obj = ResourceManager.GetObject("MSIcon", resourceCulture); - return ((System.Drawing.Icon)(obj)); + return ((byte[])(obj)); } } } diff --git a/BetaCameras/Kinect4Azure/Properties/Resources.resx b/BetaCameras/Kinect4Azure/Properties/Resources.resx index eef294b7..e774a0d7 100644 --- a/BetaCameras/Kinect4Azure/Properties/Resources.resx +++ b/BetaCameras/Kinect4Azure/Properties/Resources.resx @@ -119,6 +119,6 @@ - ..\MSIcon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\MSIcon.ico;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/BetaCameras/MatrixVision/MatrixVision.vcxproj b/BetaCameras/MatrixVision/MatrixVision.vcxproj index d1d34d30..f52cbf7f 100644 --- a/BetaCameras/MatrixVision/MatrixVision.vcxproj +++ b/BetaCameras/MatrixVision/MatrixVision.vcxproj @@ -12,7 +12,7 @@ {249420A5-952B-4C58-A35A-377E0CDCC023} - v4.6.1 + v4.7.2 ManagedCProj MetriCam2.Cameras.MatrixVision 10.0.15063.0 @@ -37,21 +37,19 @@ - - true - $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)bin\$(Configuration)\net472\ MetriCam2.Cameras.$(ProjectName) false - $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)bin\$(Configuration)\net472\ MetriCam2.Cameras.$(ProjectName) @@ -85,7 +83,7 @@ - $(LibrariesPath)Metrilus.Util.dll + ..\..\bin\$(Configuration)\net472\Metrilus.Util.dll diff --git a/BetaCameras/OrbbecOpenNI/OrbbecOpenNI.vcxproj b/BetaCameras/OrbbecOpenNI/OrbbecOpenNI.vcxproj index 0ed32bd4..70d0e60f 100644 --- a/BetaCameras/OrbbecOpenNI/OrbbecOpenNI.vcxproj +++ b/BetaCameras/OrbbecOpenNI/OrbbecOpenNI.vcxproj @@ -1,30 +1,6 @@  - - DebugStrongName - Win32 - - - DebugStrongName - x64 - - - Debug - Win32 - - - ReleaseStrongName - Win32 - - - ReleaseStrongName - x64 - - - Release - Win32 - Debug x64 @@ -37,42 +13,12 @@ 15.0 {C82202F8-55DB-4511-B006-C88FF3E4427E} - v4.5.2 + v4.7.2 ManagedCProj OrbbecOpenNI 10.0.15063.0 - - DynamicLibrary - true - v141 - true - Unicode - - - DynamicLibrary - true - v141 - true - Unicode - - - DynamicLibrary - false - v141 - true - Unicode - true - - - DynamicLibrary - false - v141 - true - Unicode - true - DynamicLibrary true @@ -80,13 +26,6 @@ true Unicode - - DynamicLibrary - true - v141 - true - Unicode - DynamicLibrary false @@ -95,111 +34,31 @@ Unicode true - - DynamicLibrary - false - v141 - true - Unicode - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true MetriCam2.Cameras.$(ProjectName) - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - - - true - MetriCam2.Cameras.$(ProjectName) - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - Z:\protection\StrongNameKey\StrongName.snk - false - - - true - MetriCam2.Cameras.$(ProjectName) - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - - - true - MetriCam2.Cameras.$(ProjectName) - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - Z:\protection\StrongNameKey\StrongName.snk - false - - - false - false - true - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - MetriCam2.Cameras.$(ProjectName) - - - false - false - true - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - MetriCam2.Cameras.$(ProjectName) + $(SolutionDir)bin\$(Configuration)\net472\ Z:\protection\StrongNameKey\StrongName.snk false false MetriCam2.Cameras.$(ProjectName) - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - - - false - MetriCam2.Cameras.$(ProjectName) - $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)bin\$(Configuration)\net472\ Z:\protection\StrongNameKey\StrongName.snk false @@ -224,93 +83,6 @@ /ignore:4248 %(AdditionalOptions) - - - Level4 - Disabled - WIN32;_DEBUG;%(PreprocessorDefinitions) - NotUsing - Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Include;%(AdditionalIncludeDirectories) - - - true - 4244;4458;4564 - - - OpenNI2.lib;%(AdditionalDependencies) - Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Lib - - - OrbbecIcon.ico;%(EmbedManagedResourceFile) - /ignore:4248 %(AdditionalOptions) - - - - - Level3 - Disabled - WIN32;_DEBUG;%(PreprocessorDefinitions) - NotUsing - Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Include;%(AdditionalIncludeDirectories) - 4244;4458;4564 - - - OpenNI2.lib;%(AdditionalDependencies) - Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Lib - /ignore:4248 %(AdditionalOptions) - - - - - Level3 - Disabled - WIN32;_DEBUG;%(PreprocessorDefinitions) - NotUsing - Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Include;%(AdditionalIncludeDirectories) - 4244;4458;4564 - - - OpenNI2.lib;%(AdditionalDependencies) - Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Lib - /ignore:4248 %(AdditionalOptions) - - - - - Level3 - WIN32;NDEBUG;%(PreprocessorDefinitions) - NotUsing - Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Include;%(AdditionalIncludeDirectories) - true - true - 4244;4458;4564 - - - OpenNI2.lib;%(AdditionalDependencies) - Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Lib - true - UseFastLinkTimeCodeGeneration - /ignore:4248 %(AdditionalOptions) - - - - - Level3 - WIN32;NDEBUG;%(PreprocessorDefinitions) - NotUsing - Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Include;%(AdditionalIncludeDirectories) - true - true - 4244;4458;4564 - - - OpenNI2.lib;%(AdditionalDependencies) - Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Lib - true - UseFastLinkTimeCodeGeneration - /ignore:4248 %(AdditionalOptions) - - Level3 @@ -328,26 +100,9 @@ /ignore:4248 %(AdditionalOptions) - - - Level3 - WIN32;NDEBUG;%(PreprocessorDefinitions) - NotUsing - Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Include;%(AdditionalIncludeDirectories) - true - 4244;4458;4564 - - - OpenNI2.lib;%(AdditionalDependencies) - Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Lib - UseLinkTimeCodeGeneration - OrbbecIcon.ico;%(EmbedManagedResourceFile) - /ignore:4248 %(AdditionalOptions) - - - $(LibrariesPath)Metrilus.Util.dll + ..\..\bin\$(Configuration)\net472\Metrilus.Util.dll @@ -368,34 +123,16 @@ NotUsing false false - false - false - false - false - false - false false false NotUsing - false - false - false - false - false - false Create - Create - Create - Create - Create - Create Create - Create diff --git a/BetaCameras/Pico/Pico.csproj b/BetaCameras/Pico/Pico.csproj index f3a1c13a..3bba03f2 100644 --- a/BetaCameras/Pico/Pico.csproj +++ b/BetaCameras/Pico/Pico.csproj @@ -1,75 +1,24 @@ - - - - + - Debug - AnyCPU - {1FAD1F90-D37E-40CA-BBF0-6A33E82F8812} - Library - Properties MetriCam2.Cameras - MetriCam2.Cameras.Pico - v4.5 - 512 - - - true - ..\..\bin\x64\Debug\ - full - false - DEBUG;TRACE - prompt - 4 - true - - - ..\..\bin\x64\Release\ - pdbonly - true - TRACE - prompt - 4 + MetriCam2.Cameras.Pico + Wrapper for Pico Zense cameras + MetriCam2: Pico Zense wrapper + net472;net45 true + false - - $(LibrariesPath)Metrilus.Util.dll - - - - - - - - - - - - - - + True True Resources.resx - - - - - - {342f049e-668b-4351-b21d-75e4bef5a1e4} - MetriCam2 - - + - - ResXFileCodeGenerator - Resources.Designer.cs - + - - + \ No newline at end of file diff --git a/BetaCameras/Pico/Properties/AssemblyInfo.cs b/BetaCameras/Pico/Properties/AssemblyInfo.cs deleted file mode 100644 index 075673cd..00000000 --- a/BetaCameras/Pico/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) Metrilus GmbH -// MetriCam 2 is licensed under the MIT license. See License.txt for full license text. - -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("MetriCam2: pico zense wrapper")] -[assembly: AssemblyDescription("Wrapper for Pico Zense cameras")] -[assembly: MetriCam2.Attributes.ContainsCameraImplementations] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("85c95f05-ec0c-45b6-8f5f-5bba9f4cbec6")] diff --git a/BetaCameras/RealSense/Properties/AssemblyInfo.cs b/BetaCameras/RealSense/Properties/AssemblyInfo.cs deleted file mode 100644 index 178a7cdc..00000000 --- a/BetaCameras/RealSense/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (c) Metrilus GmbH -// MetriCam 2 is licensed under the MIT license. See License.txt for full license text. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("MetriCam 2: RealSense wrapper")] -[assembly: AssemblyDescription("MetriCam 2 wrapper for RealSense-based cameras")] -[assembly: MetriCam2.Attributes.ContainsCameraImplementations] -[assembly: MetriCam2.Attributes.NativeDependencies("libpxcclr.cs.dll", "libpxccpp2c.dll")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("6c5fc85f-a613-45cc-9fa1-31f5a2373c0e")] diff --git a/BetaCameras/RealSense/RealSense.csproj b/BetaCameras/RealSense/RealSense.csproj index 2d4b07a3..028efd36 100644 --- a/BetaCameras/RealSense/RealSense.csproj +++ b/BetaCameras/RealSense/RealSense.csproj @@ -1,120 +1,30 @@ - - - - + - Debug - AnyCPU - {F37DB33A-3E53-42C9-A6DC-B012A9A09EAF} - Library - Properties MetriCam2.Cameras MetriCam2.Cameras.RealSense - v4.5 - 512 - - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - x64 - true - - - true - ..\..\bin\x64\Debug\ - DEBUG;TRACE - full - x64 - prompt - MinimumRecommendedRules.ruleset - true - - - ..\..\bin\x64\Release\ - TRACE - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset + Wrapper for Intel RealSense cameras + MetriCam2: Intel RealSense wrapper + net472;net45 + x64 true - - False + Z:\external-libraries\Intel\RealSense SDK\7.0.23.8048\libpxcclr.cs.dll + False - - $(LibrariesPath)Metrilus.Util.dll - - - - - - - - - - - - SolutionAssemblyInfo.cs - - - - + True True Resources.resx - - - - - - - - - {342f049e-668b-4351-b21d-75e4bef5a1e4} - MetriCam2 - - - .licenseheader - + - - ResXFileCodeGenerator - Resources.Designer.cs - - - diff --git a/BetaCameras/RealSense2/Properties/AssemblyInfo.cs b/BetaCameras/RealSense2/Properties/AssemblyInfo.cs deleted file mode 100644 index e4114868..00000000 --- a/BetaCameras/RealSense2/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) Metrilus GmbH -// MetriCam 2 is licensed under the MIT license. See License.txt for full license text. - -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("MetriCam2: libRealSense2 wrapper")] -[assembly: AssemblyDescription("Wrapper for Intel libRealSense2 cameras")] -[assembly: MetriCam2.Attributes.ContainsCameraImplementations] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("85c95f05-ec0c-45b6-8f5f-5bba9f4cbec6")] diff --git a/BetaCameras/RealSense2/Properties/Resources.Designer.cs b/BetaCameras/RealSense2/Properties/Resources.Designer.cs index bdacf7a4..757923f4 100644 --- a/BetaCameras/RealSense2/Properties/Resources.Designer.cs +++ b/BetaCameras/RealSense2/Properties/Resources.Designer.cs @@ -63,10 +63,10 @@ internal class Resources { /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// - internal static System.Drawing.Icon RealSense2Icon { + internal static byte[] RealSense2Icon { get { object obj = ResourceManager.GetObject("RealSense2Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); + return ((byte[])(obj)); } } } diff --git a/BetaCameras/RealSense2/Properties/Resources.resx b/BetaCameras/RealSense2/Properties/Resources.resx index eaad2401..becbbe92 100644 --- a/BetaCameras/RealSense2/Properties/Resources.resx +++ b/BetaCameras/RealSense2/Properties/Resources.resx @@ -119,6 +119,6 @@ - ..\RealSense2Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\RealSense2Icon.ico;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/BetaCameras/RealSense2/RealSense2.NetStandard.csproj b/BetaCameras/RealSense2/RealSense2.NetStandard.csproj deleted file mode 100644 index 42d4b127..00000000 --- a/BetaCameras/RealSense2/RealSense2.NetStandard.csproj +++ /dev/null @@ -1,58 +0,0 @@ - - - - netstandard2.0 - Wrapper for Intel libRealSense2 cameras - Metrilus GmbH - Metrilus GmbH - MetriCam2 - MetriCam2.Cameras.RealSense2 - MetriCam2.Cameras - - - - true - ..\..\bin\Release\ - - - - true - ..\..\bin\Debug\ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Z:\external-libraries\Intel\libRealSense2\2.12.0\AnyCPU\Release\netstandard2.0\Intel.RealSense.dll - - - $(LibrariesPathNetStandard)Metrilus.Util.dll - - - - diff --git a/BetaCameras/RealSense2/RealSense2.cs b/BetaCameras/RealSense2/RealSense2.cs index 58e6102d..d0a01e11 100644 --- a/BetaCameras/RealSense2/RealSense2.cs +++ b/BetaCameras/RealSense2/RealSense2.cs @@ -323,7 +323,16 @@ ParamDesc FirmwareDesc public override string Vendor { get => "Intel"; } #if !NETSTANDARD2_0 - public override Icon CameraIcon { get => Properties.Resources.RealSense2Icon; } + public override Icon CameraIcon + { + get + { + using (System.IO.MemoryStream ms = new System.IO.MemoryStream(Properties.Resources.RealSense2Icon)) + { + return new Icon(ms); + } + } + } #endif #region RealSense Options diff --git a/BetaCameras/RealSense2/RealSense2.csproj b/BetaCameras/RealSense2/RealSense2.csproj index 051f11d1..8c78083b 100644 --- a/BetaCameras/RealSense2/RealSense2.csproj +++ b/BetaCameras/RealSense2/RealSense2.csproj @@ -1,103 +1,33 @@ - - - - + - Debug - AnyCPU - {3032E9B1-F572-4ECB-906A-F7A2B45EF125} - Library - Properties MetriCam2.Cameras - MetriCam2.Cameras.RealSense2 - v4.5 - 512 - - obj_netFramework\ - - - true - ..\..\bin\Debug\ - DEBUG;TRACE + MetriCam2.Cameras.RealSense2 + Wrapper for Intel libRealSense2 cameras + MetriCam2: Intel libRealSense2 wrapper + net472;net45;netstandard2.0 true - true - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - ..\..\bin\Release\ - TRACE - true - true - true - pdbonly - AnyCPU - prompt - MinimumRecommendedRules.ruleset - + false + - - False + Z:\external-libraries\Intel\libRealSense2\2.14.0\AnyCPU\Release\net45\Intel.RealSense.dll + False - - $(LibrariesPath)Metrilus.Util.dll - - - - - - - - - - - SolutionAssemblyInfo.cs - - - - - - - - - - + True True Resources.resx - - - - {342f049e-668b-4351-b21d-75e4bef5a1e4} - MetriCam2 - + - - .licenseheader - + - - - ResXFileCodeGenerator - Resources.Designer.cs - + - - - \ No newline at end of file + diff --git a/BetaCameras/SVS/Properties/AssemblyInfo.cs b/BetaCameras/SVS/Properties/AssemblyInfo.cs deleted file mode 100644 index 1d5786a6..00000000 --- a/BetaCameras/SVS/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) Metrilus GmbH -// MetriCam 2 is licensed under the MIT license. See License.txt for full license text. - -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("MetriCam 2: SVS wrapper")] -[assembly: AssemblyDescription("MetriCam 2 wrapper for SVS VISTEK cameras")] -[assembly: MetriCam2.Attributes.ContainsCameraImplementations] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("25680578-d752-4450-8719-6dcb93e0eb89")] diff --git a/BetaCameras/SVS/SVS.csproj b/BetaCameras/SVS/SVS.csproj index 566dcc8f..26a4d41f 100644 --- a/BetaCameras/SVS/SVS.csproj +++ b/BetaCameras/SVS/SVS.csproj @@ -1,113 +1,23 @@ - - - - + - Debug - AnyCPU - {E71ADD15-22AA-478B-BA64-CBA0DF4DC432} - Library - Properties MetriCam2.Cameras MetriCam2.Cameras.SVS - v4.5 - 512 - - - - true - ..\..\bin\x86\Debug\ - TRACE;DEBUG;WIN32 - true - full - x86 - prompt - MinimumRecommendedRules.ruleset - true - - - ..\..\bin\x86\Release\ - TRACE;WIN32 - true - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - true - - - true - ..\..\bin\x64\Debug\ - TRACE;DEBUG;WIN64 - true - full - x64 - prompt - MinimumRecommendedRules.ruleset - true - - - ..\..\bin\x64\Release\ - TRACE;WIN64 + Wrapper for SVS VISTEK cameras + MetriCam2: SVS wrapper + net472;net45 true - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - true - - $(LibrariesPath)Metrilus.Util.dll - - - - - - - - - - - - - SolutionAssemblyInfo.cs - - - + True True Resources.resx - - - - - - {342f049e-668b-4351-b21d-75e4bef5a1e4} - MetriCam2 - - - .licenseheader - + - - ResXFileCodeGenerator - Resources.Designer.cs - - - - + \ No newline at end of file diff --git a/BetaCameras/Sick.TiM561/Properties/AssemblyInfo.cs b/BetaCameras/Sick.TiM561/Properties/AssemblyInfo.cs deleted file mode 100644 index 34a645c5..00000000 --- a/BetaCameras/Sick.TiM561/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) Metrilus GmbH -// MetriCam 2 is licensed under the MIT license. See License.txt for full license text. - -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("MetriCam 2: SICK TiM561 wrapper")] -[assembly: AssemblyDescription("MetriCam 2 wrapper for SICK TiM561 2D laser scanner")] -[assembly: MetriCam2.Attributes.ContainsCameraImplementations] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("41d6e896-fb86-4ba1-bc99-e2fe4aa89e93")] diff --git a/BetaCameras/Sick.TiM561/Sick.TiM561.csproj b/BetaCameras/Sick.TiM561/Sick.TiM561.csproj index 44e8a2bf..0d6a27b5 100644 --- a/BetaCameras/Sick.TiM561/Sick.TiM561.csproj +++ b/BetaCameras/Sick.TiM561/Sick.TiM561.csproj @@ -1,74 +1,23 @@ - - - - + - Debug - AnyCPU {41D6E896-FB86-4BA1-BC99-E2FE4AA89E93} - Library - Properties MetriCam2.Cameras MetriCam2.Cameras.Sick.TiM561 - v4.6.1 - 512 - - - true - full - false - ..\..\bin\x64\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\..\bin\x64\Release\ - TRACE - prompt - 4 + net472 + Wrapper for SICK TiM561 2D laser scanner + MetriCam2: SICK TiM561 wrapper - - $(LibrariesPath)Metrilus.Util.dll - - - - - - - - - - SolutionAssemblyInfo.cs - - - - - - - - + True True Resources.resx - - - {342f049e-668b-4351-b21d-75e4bef5a1e4} - MetriCam2 - + - - ResXFileCodeGenerator - Resources.Designer.cs - - - + \ No newline at end of file diff --git a/BetaCameras/Sick.VisionaryT.Pro/Properties/AssemblyInfo.cs b/BetaCameras/Sick.VisionaryT.Pro/Properties/AssemblyInfo.cs deleted file mode 100644 index 82f9a647..00000000 --- a/BetaCameras/Sick.VisionaryT.Pro/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) Metrilus GmbH -// MetriCam 2 is licensed under the MIT license. See License.txt for full license text. - -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("MetriCam 2: SICK Visionary-T-Pro wrapper")] -[assembly: AssemblyDescription("MetriCam 2 wrapper for SICK Visionary-T-Pro cameras")] -[assembly: MetriCam2.Attributes.ContainsCameraImplementations] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("658d0052-ccd1-4b52-9af9-6c0ece90cd3e")] diff --git a/BetaCameras/Sick.VisionaryT.Pro/Sick.VisionaryT.Pro.csproj b/BetaCameras/Sick.VisionaryT.Pro/Sick.VisionaryT.Pro.csproj index be9f3dff..b7d25e76 100644 --- a/BetaCameras/Sick.VisionaryT.Pro/Sick.VisionaryT.Pro.csproj +++ b/BetaCameras/Sick.VisionaryT.Pro/Sick.VisionaryT.Pro.csproj @@ -1,97 +1,24 @@ - - - - - - Debug - x64 - {D01829D2-B553-4C4B-B392-2437E6A130B5} - Library - Properties + + MetriCam2.Cameras MetriCam2.Cameras.Sick.VisionaryT.Pro - v4.5 - 512 - - - - true - ..\..\bin\x64\Debug\ - DEBUG;TRACE - full - x64 - prompt - MinimumRecommendedRules.ruleset - true - true - false - - - ..\..\bin\x64\Release\ - TRACE - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset + Wrapper SICK Visionary-T-Pro cameras + MetriCam2: SICK Visionary-T-Pro wrapper + net472;net45 + x64 true - true - false - - $(LibrariesPath)Metrilus.Util.dll - - - False - $(LibrariesPath)Newtonsoft.Json.dll - - - - - - - - - - - - - SolutionAssemblyInfo.cs - - - + True True Resources.resx - - - - {342f049e-668b-4351-b21d-75e4bef5a1e4} - MetriCam2 - - - - - .licenseheader - - - - - PublicResXFileCodeGenerator - Resources.Designer.cs - - - + + + \ No newline at end of file diff --git a/BetaCameras/Sick.VisionaryT/Properties/AssemblyInfo.cs b/BetaCameras/Sick.VisionaryT/Properties/AssemblyInfo.cs deleted file mode 100644 index 5d225526..00000000 --- a/BetaCameras/Sick.VisionaryT/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) Metrilus GmbH -// MetriCam 2 is licensed under the MIT license. See License.txt for full license text. - -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("MetriCam 2: SICK Visionary-T wrapper")] -[assembly: AssemblyDescription("MetriCam 2 wrapper for SICK Visionary-T cameras")] -[assembly: MetriCam2.Attributes.ContainsCameraImplementations] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("658d0052-ccd1-4b52-9af9-6c0ece90cd3e")] diff --git a/BetaCameras/Sick.VisionaryT/Sick.VisionaryT.csproj b/BetaCameras/Sick.VisionaryT/Sick.VisionaryT.csproj index 5f1caa19..40b35310 100644 --- a/BetaCameras/Sick.VisionaryT/Sick.VisionaryT.csproj +++ b/BetaCameras/Sick.VisionaryT/Sick.VisionaryT.csproj @@ -1,182 +1,23 @@ - - - - + - Debug - AnyCPU - {DE18D143-C624-4941-B8A1-0F91262D3350} - Library - Properties MetriCam2.Cameras MetriCam2.Cameras.Sick.VisionaryT - v4.5 - 512 - - - - true - ..\..\bin\x64\Debug\ - DEBUG;TRACE - full - x64 - prompt - MinimumRecommendedRules.ruleset - true - true - false - - - ..\..\bin\x64\Release\ - TRACE - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - true - true - false - - - true - ..\..\bin\x64\DebugStrongName\ - DEBUG;TRACE - full - x64 - prompt - MinimumRecommendedRules.ruleset - true - true - false - true - false - Z:\protection\StrongNameKey\StrongName.snk - - - ..\..\bin\x64\ReleaseStrongName\ - TRACE - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - true - true - false - true - false - Z:\protection\StrongNameKey\StrongName.snk - - - true - ..\..\bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset + Wrapper for SICK Visionary-T cameras + MetriCam2: SICK Visionary-T wrapper + net472;net45 true - true - false - - - ..\..\bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - true - true - false - - - true - ..\..\bin\x86\DebugStrongName\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - true - true - false - true - false - Z:\protection\StrongNameKey\StrongName.snk - - - ..\..\bin\x86\ReleaseStrongName\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - true - true - false - true - false - Z:\protection\StrongNameKey\StrongName.snk - - $(LibrariesPath)Metrilus.Util.dll - - - - - - - - - - - - - SolutionAssemblyInfo.cs - - - - - - + True True Resources.resx - - - - - - {342f049e-668b-4351-b21d-75e4bef5a1e4} - MetriCam2 - - - - - .licenseheader - - - - - PublicResXFileCodeGenerator - Resources.Designer.cs - - - - + + + + \ No newline at end of file diff --git a/BetaCameras/TIVoxel/TIVoxel.vcxproj b/BetaCameras/TIVoxel/TIVoxel.vcxproj index d8819cf9..d384a641 100644 --- a/BetaCameras/TIVoxel/TIVoxel.vcxproj +++ b/BetaCameras/TIVoxel/TIVoxel.vcxproj @@ -12,7 +12,7 @@ {ECF2A55A-67D9-48B7-936C-873FC6C07364} - v4.6.1 + v4.7.2 ManagedCProj MetriCam2.Cameras.TIVoxel TIVoxel @@ -38,21 +38,19 @@ - - false - $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)bin\$(Configuration)\net472\ MetriCam2.Cameras.$(ProjectName) false - $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)bin\$(Configuration)\net472\ MetriCam2.Cameras.$(ProjectName) @@ -92,7 +90,7 @@ - $(LibrariesPath)Metrilus.Util.dll + ..\..\bin\$(Configuration)\net472\Metrilus.Util.dll diff --git a/BetaCameras/UEye/Properties/AssemblyInfo.cs b/BetaCameras/UEye/Properties/AssemblyInfo.cs deleted file mode 100644 index 12f33fca..00000000 --- a/BetaCameras/UEye/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) Metrilus GmbH -// MetriCam 2 is licensed under the MIT license. See License.txt for full license text. - -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("MetriCam 2: IDS uEye wrapper")] -[assembly: AssemblyDescription("MetriCam 2 wrapper for IDS uEye cameras")] -[assembly: MetriCam2.Attributes.ContainsCameraImplementations] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("85430ae4-0f0a-4835-abc1-c5f5975870b8")] diff --git a/BetaCameras/UEye/UEye.csproj b/BetaCameras/UEye/UEye.csproj index 67a99fa3..43e097b9 100644 --- a/BetaCameras/UEye/UEye.csproj +++ b/BetaCameras/UEye/UEye.csproj @@ -1,115 +1,23 @@ - - - - + - Debug - AnyCPU - {68003E12-8D06-4EDC-8578-FC075ED27F80} - Library - Properties MetriCam2.Cameras MetriCam2.Cameras.UEye - v4.5 - 512 - - - - true - ..\..\bin\x86\Debug\ - DEBUG;TRACE - true - true - full - x86 - prompt - MinimumRecommendedRules.ruleset - - - ..\..\bin\x86\Release\ - TRACE - true - true - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - - - true - ..\..\bin\x64\Debug\ - TRACE;DEBUG;_WIN64 - true - true - full - x64 - prompt - MinimumRecommendedRules.ruleset - - - ..\..\bin\x64\Release\ - TRACE;_WIN64 + Wrapper for IDS uEye cameras + MetriCam2: IDS uEye wrapper + net472;net45 true - true - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - - $(LibrariesPath)Metrilus.Util.dll - - - - - - - - - - - - - - SolutionAssemblyInfo.cs - - + True True Resources.resx - - - - - - - - {342f049e-668b-4351-b21d-75e4bef5a1e4} - MetriCam2 - - - .licenseheader - + - - PublicResXFileCodeGenerator - Resources.Designer.cs - - - - + \ No newline at end of file diff --git a/BetaCameras/UEye/uEyeDriverWrapper.cs b/BetaCameras/UEye/uEyeDriverWrapper.cs index 4344af55..866e1983 100644 --- a/BetaCameras/UEye/uEyeDriverWrapper.cs +++ b/BetaCameras/UEye/uEyeDriverWrapper.cs @@ -44,13 +44,7 @@ namespace MetriCam2.Cameras.Internal.uEye internal class uEyeDriverWrapper { #region Driver name - - //TODO: This is not a good option, for some unknown reason _WIN64 has to be defined in 64-bit Assemblies using this DLL as well, otherwise, the wrong DLL is used (-> crash!) -#if _WIN64 public const string DRIVER_DLL_NAME = "ueye_api_64.dll"; -#else - public const string DRIVER_DLL_NAME = "ueye_api.dll"; -#endif #endregion #region API Constants, Structures, Enumeration and Exports diff --git a/BetaCameras/WebCam/WebCam.vcxproj b/BetaCameras/WebCam/WebCam.vcxproj index 24811344..7013078d 100644 --- a/BetaCameras/WebCam/WebCam.vcxproj +++ b/BetaCameras/WebCam/WebCam.vcxproj @@ -1,18 +1,10 @@  - - Debug - Win32 - Debug x64 - - Release - Win32 - Release x64 @@ -20,19 +12,12 @@ {01C2FB4D-1F35-4855-9B53-0480519387C5} - v4.5 + v4.7.2 ManagedCProj MetriCam2.Cameras 8.1 - - DynamicLibrary - true - v110 - true - Unicode - DynamicLibrary true @@ -40,14 +25,6 @@ true Unicode - - DynamicLibrary - false - v110 - true - Unicode - true - DynamicLibrary false @@ -58,56 +35,23 @@ - - - - - - - - - - - - true - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - MetriCam2.Cameras.$(ProjectName) - true - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - MetriCam2.Cameras.$(ProjectName) - - - false - $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)bin\$(Configuration)\net472\ MetriCam2.Cameras.$(ProjectName) false - $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(SolutionDir)bin\$(Configuration)\net472\ MetriCam2.Cameras.$(ProjectName) - - - Level3 - Disabled - WIN32;_DEBUG;%(PreprocessorDefinitions) - Use - true - - - true - strmiids.lib;%(AdditionalDependencies) - - Level3 @@ -122,25 +66,6 @@ WebcamIcon.ico;%(EmbedManagedResourceFile) - - - Level3 - WIN32;NDEBUG;%(PreprocessorDefinitions) - Use - true - Full - AnySuitable - true - Speed - true - StreamingSIMDExtensions2 - - - true - strmiids.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - - Level3 @@ -156,7 +81,7 @@ - $(LibrariesPath)Metrilus.Util.dll + ..\..\bin\$(Configuration)\net472\Metrilus.Util.dll @@ -172,9 +97,7 @@ - Create Create - Create Create @@ -193,13 +116,10 @@ {342f049e-668b-4351-b21d-75e4bef5a1e4} - - - - + \ No newline at end of file diff --git a/BetaCameras/Xtion2/Properties/AssemblyInfo.cs b/BetaCameras/Xtion2/Properties/AssemblyInfo.cs deleted file mode 100644 index 1c0b81a4..00000000 --- a/BetaCameras/Xtion2/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) Metrilus GmbH -// MetriCam 2 is licensed under the MIT license. See License.txt for full license text. - -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("MetriCam 2: Asus Xtion2 wrapper")] -[assembly: AssemblyDescription("MetriCam 2 wrapper for Asus Xtion2 cameras")] -[assembly: MetriCam2.Attributes.ContainsCameraImplementations] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("85c95f05-ec0c-45b6-8f5f-5bba9f4cbec6")] diff --git a/BetaCameras/Xtion2/Xtion2.csproj b/BetaCameras/Xtion2/Xtion2.csproj index 68b210bc..73e59a39 100644 --- a/BetaCameras/Xtion2/Xtion2.csproj +++ b/BetaCameras/Xtion2/Xtion2.csproj @@ -1,113 +1,23 @@ - - - - + - Debug - AnyCPU - {7F2939D1-17AB-4B94-8933-09C76DC0C07A} - Library - Properties MetriCam2.Cameras MetriCam2.Cameras.Xtion2 - v4.5 - 512 - - - - true - ..\..\bin\x86\Debug\ - DEBUG;TRACE - true - full - x86 - prompt - MinimumRecommendedRules.ruleset - true - - - ..\..\bin\x86\Release\ - TRACE - true - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - true - - - true - ..\..\bin\x64\Debug\ - DEBUG;TRACE - true - full - x64 - prompt - MinimumRecommendedRules.ruleset - true - - - ..\..\bin\x64\Release\ - TRACE - true - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset + Wrapper for Asus Xtion2 cameras + MetriCam2: Asus Xtion2 wrapper + net472;net45 true - - $(LibrariesPath)Metrilus.Util.dll - - - - - - - - - - - - - SolutionAssemblyInfo.cs - - + True True Resources.resx - - - - - - - .licenseheader - - - ResXFileCodeGenerator - Resources.Designer.cs - - - {342f049e-668b-4351-b21d-75e4bef5a1e4} - MetriCam2 - + - - - + \ No newline at end of file diff --git a/BetaCameras/ifm/Properties/AssemblyInfo.cs b/BetaCameras/ifm/Properties/AssemblyInfo.cs deleted file mode 100644 index b2ef6a3a..00000000 --- a/BetaCameras/ifm/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) Metrilus GmbH -// MetriCam 2 is licensed under the MIT license. See License.txt for full license text. - -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("MetriCam 2: ifm O3D3xx wrapper")] -[assembly: AssemblyDescription("MetriCam 2 wrapper for ifm O3D3xx")] -[assembly: MetriCam2.Attributes.ContainsCameraImplementations] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("a08998f7-6d43-4ef6-b2ae-719b72e3a639")] diff --git a/BetaCameras/ifm/ifm.csproj b/BetaCameras/ifm/ifm.csproj index f5eb992c..e8bbbd00 100644 --- a/BetaCameras/ifm/ifm.csproj +++ b/BetaCameras/ifm/ifm.csproj @@ -1,117 +1,28 @@ - - - - + - Debug - AnyCPU - {177E27F4-7C6E-4BF7-BDE2-97888EE2682C} - Library - Properties MetriCam2.Cameras MetriCam2.Cameras.ifm - v4.5 - 512 - - - - true - ..\..\bin\x86\Debug\ - DEBUG;TRACE - true - full - x86 - prompt - MinimumRecommendedRules.ruleset - - - ..\..\bin\x86\Release\ - TRACE - true - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - - - true - ..\..\bin\x64\Debug\ - DEBUG;TRACE - true - full - x64 - prompt - MinimumRecommendedRules.ruleset - - - ..\..\bin\x64\Release\ - TRACE - true - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - + net472;net45 + Wrapper for ifm O3D3xx cameras + MetriCam2: ifm O3D3xx wrapper + - - ..\..\packages\xmlrpcnet.3.0.0.266\lib\net20\CookComputing.XmlRpcV2.dll - True - - - $(LibrariesPath)Metrilus.Util.dll - - - - - - - - - - - - - - - SolutionAssemblyInfo.cs - - - - - - + True True Resources.resx - - {342f049e-668b-4351-b21d-75e4bef5a1e4} - MetriCam2 - + - - .licenseheader - - + - - - ResXFileCodeGenerator - Resources.Designer.cs - + + + + - - - + \ No newline at end of file diff --git a/BetaCameras/ifm/packages.config b/BetaCameras/ifm/packages.config deleted file mode 100644 index 95467c77..00000000 --- a/BetaCameras/ifm/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 00000000..70e56864 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,35 @@ + + + + Metrilus + 0.0.0.0 + 0.0.0.0 + MetriCam 2 + Metrilus GmbH + A consistent .NET SDK for Depth Cameras + Copyright © Metrilus GmbH 2013 - 2019 + net472 + true + true + MinimumRecommendedRules.ruleset + ..\bin\$(Configuration)\ + + Z:\releases\Metrilus.Util\.unstable; + Z:\releases\Metrilus.Util\.unstable\master; + + + $(RestoreSources); + https://api.nuget.org/v3/index.json; + + + + + true + false + Z:\protection\StrongNameKey\StrongName.snk + + + + + + diff --git a/Directory.Build.targets b/Directory.Build.targets new file mode 100644 index 00000000..301eabcc --- /dev/null +++ b/Directory.Build.targets @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/MetriCam2.Controls/ChannelSelectorControl.resx b/MetriCam2.Controls/ChannelSelectorControl.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/MetriCam2.Controls/ChannelSelectorControl.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/MetriCam2.Controls/MetriCam2.Controls.csproj b/MetriCam2.Controls/MetriCam2.Controls.csproj index 96fb5e03..7144ebda 100644 --- a/MetriCam2.Controls/MetriCam2.Controls.csproj +++ b/MetriCam2.Controls/MetriCam2.Controls.csproj @@ -1,185 +1,110 @@ - - - - + - Debug - AnyCPU - {9060CBCF-609D-47B3-9245-43D34C540A73} - Library - Properties - MetriCam2.Controls - MetriCam2.Controls - v4.5 - 512 - - - - true - full - false - ..\bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - false - - - pdbonly - true - ..\bin\Release\ - TRACE - prompt - 4 - true - false - - - ..\bin\ReleaseStrongName\ - TRACE - true - true - pdbonly - AnyCPU - prompt - MinimumRecommendedRules.ruleset - false - true - false - Z:\protection\StrongNameKey\StrongName.snk - - - true - ..\bin\DebugStrongName\ - DEBUG;TRACE - true - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - false - true - false - Z:\protection\StrongNameKey\StrongName.snk + net472;net45 - - $(LibrariesPath)Metrilus.Util.dll - - - - - - - - - - - SolutionAssemblyInfo.cs - - - UserControl + + Component - + CameraExplorerControl.cs - + Form - + CameraExplorerDialog.cs - - UserControl + + Component - + CameraSettingsControl.cs - + Form - + CameraConfigurationDialog.cs - + Component - + ChannelSelectorControl.cs - - + + Form - + ChannelSelectorDialog.cs - - UserControl + + Component - + MultiFileSelector.cs - - - True - True - Resources.resx - - + Component - + Slider.cs + + + True + True + Resources.resx + - + CameraExplorerControl.cs - + CameraExplorerDialog.cs - + CameraSettingsControl.cs - + CameraConfigurationDialog.cs - + + ChannelSelectorControl.cs + + ChannelSelectorDialog.cs - + MultiFileSelector.cs - - ResXFileCodeGenerator - Resources.Designer.cs + + Slider.cs - - {342f049e-668b-4351-b21d-75e4bef5a1e4} - MetriCam2 - - + + ResXFileCodeGenerator + Resources.Designer.cs + + .licenseheader - + + + + + + + - - - + \ No newline at end of file diff --git a/MetriCam2.Controls/Properties/AssemblyInfo.cs b/MetriCam2.Controls/Properties/AssemblyInfo.cs deleted file mode 100644 index df0c327a..00000000 --- a/MetriCam2.Controls/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) Metrilus GmbH -// MetriCam 2 is licensed under the MIT license. See License.txt for full license text. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("MetriCam2.Controls")] -[assembly: AssemblyDescription("MetriCam 2-related user controls for Windows.Forms")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("aacd480a-6083-426d-b60c-6e53c16abcf3")] diff --git a/MetriCam2.Controls/Slider.resx b/MetriCam2.Controls/Slider.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/MetriCam2.Controls/Slider.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/MetriCam2/Camera.cs b/MetriCam2/Camera.cs index c15954c7..061c047d 100644 --- a/MetriCam2/Camera.cs +++ b/MetriCam2/Camera.cs @@ -1130,7 +1130,16 @@ private ParamDesc TimeStampDesc /// /// Provides an icon that represents the camera. /// - public virtual System.Drawing.Icon CameraIcon { get { return Properties.Resources.DefaultIcon; } } + public virtual System.Drawing.Icon CameraIcon + { + get + { + using (MemoryStream ms = new MemoryStream(Properties.Resources.DefaultIcon)) + { + return new System.Drawing.Icon(ms); + } + } + } #endif #endregion diff --git a/MetriCam2/MetriCam2.NetStandard.csproj b/MetriCam2/MetriCam2.NetStandard.csproj deleted file mode 100644 index 93f79610..00000000 --- a/MetriCam2/MetriCam2.NetStandard.csproj +++ /dev/null @@ -1,52 +0,0 @@ - - - - netstandard2.0 - MetriCam2 - MetriCam2 - - - - ..\bin\Release\ - - - - ..\bin\Debug\ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(LibrariesPathNetStandard)Metrilus.Util.dll - - - Z:\external-libraries\Newtonsoft.Json\v11.0.2\Bin\netstandard2.0\Newtonsoft.Json.dll - - - - diff --git a/MetriCam2/MetriCam2.csproj b/MetriCam2/MetriCam2.csproj index 0335831f..5558ccf1 100644 --- a/MetriCam2/MetriCam2.csproj +++ b/MetriCam2/MetriCam2.csproj @@ -1,141 +1,49 @@ - - - - + - Debug - AnyCPU - {342F049E-668B-4351-B21D-75E4BEF5A1E4} - Library - Properties - MetriCam2 - MetriCam2 - v4.5 - 512 - - obj_netFramework\ - - - true - ..\bin\Debug\ - TRACE;DEBUG - false - true - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - false - - - ..\bin\Release\ - TRACE - false - true - true - pdbonly - AnyCPU - prompt - MinimumRecommendedRules.ruleset - false - - - ..\bin\ReleaseStrongName\ - TRACE - true - true - pdbonly - AnyCPU - prompt - MinimumRecommendedRules.ruleset - true - false - Z:\protection\StrongNameKey\StrongName.snk - false - - - true - ..\bin\DebugStrongName\ - DEBUG;TRACE - true - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - true - false - Z:\protection\StrongNameKey\StrongName.snk - false + net472;net45;netstandard2.0 + - - $(LibrariesPath)Metrilus.Util.dll - - - $(LibrariesPath)Newtonsoft.Json.dll - - - - - - - - - + + - - SolutionAssemblyInfo.cs - - - - - - - - - - - - - - - + + + + + + + + + True True - MetriCamLocale.resx + Resources.resx - - + True True - Resources.resx + MetriCamLocale.resx + - + ResXFileCodeGenerator - MetriCamLocale.Designer.cs + Resources.Designer.cs - + ResXFileCodeGenerator - Resources.Designer.cs + MetriCamLocale.Designer.cs - - - .licenseheader - + + + - - + + + - - - + \ No newline at end of file diff --git a/MetriCam2/Properties/AssemblyInfo.cs b/MetriCam2/Properties/AssemblyInfo.cs deleted file mode 100644 index 2e5c06ae..00000000 --- a/MetriCam2/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) Metrilus GmbH -// MetriCam 2 is licensed under the MIT license. See License.txt for full license text. - -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("MetriCam2")] -[assembly: AssemblyDescription("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("5178de28-4ef8-4a2c-8466-00814f343187")] diff --git a/MetriCam2/Properties/Resources.Designer.cs b/MetriCam2/Properties/Resources.Designer.cs index 34dedc16..8c7431d3 100644 --- a/MetriCam2/Properties/Resources.Designer.cs +++ b/MetriCam2/Properties/Resources.Designer.cs @@ -61,12 +61,12 @@ internal class Resources { } /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// Looks up a localized resource of type System.Byte[]. /// - internal static System.Drawing.Icon DefaultIcon { + internal static byte[] DefaultIcon { get { object obj = ResourceManager.GetObject("DefaultIcon", resourceCulture); - return ((System.Drawing.Icon)(obj)); + return ((byte[])(obj)); } } } diff --git a/MetriCam2/Properties/Resources.resx b/MetriCam2/Properties/Resources.resx index 1599614f..f739767f 100644 --- a/MetriCam2/Properties/Resources.resx +++ b/MetriCam2/Properties/Resources.resx @@ -119,6 +119,6 @@ - ..\Resources\DefaultIcon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\DefaultIcon.ico;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/MetriCam2_SDK.sln b/MetriCam2_SDK.sln index ece299ba..81a6372c 100644 --- a/MetriCam2_SDK.sln +++ b/MetriCam2_SDK.sln @@ -1,27 +1,36 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.27130.2036 +VisualStudioVersion = 15.0.28307.779 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MetriCam2", "MetriCam2\MetriCam2.csproj", "{342F049E-668B-4351-B21D-75E4BEF5A1E4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MetriCam2", "MetriCam2\MetriCam2.csproj", "{342F049E-668B-4351-B21D-75E4BEF5A1E4}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCam", "BetaCameras\WebCam\WebCam.vcxproj", "{01C2FB4D-1F35-4855-9B53-0480519387C5}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BetaCameras", "BetaCameras", "{4817E415-1337-4CA1-BF30-23D3EA0F806B}" + ProjectSection(SolutionItems) = preProject + BetaCameras\Directory.Build.props = BetaCameras\Directory.Build.props + EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UEye", "BetaCameras\UEye\UEye.csproj", "{68003E12-8D06-4EDC-8578-FC075ED27F80}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UEye", "BetaCameras\UEye\UEye.csproj", "{68003E12-8D06-4EDC-8578-FC075ED27F80}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{1B040287-F8FC-444F-BFF6-E85C9ECF52CC}" + ProjectSection(SolutionItems) = preProject + Tests\Directory.Build.props = Tests\Directory.Build.props + EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoadCalibrationsTest", "Tests\LoadCalibrationsTest\LoadCalibrationsTest.csproj", "{B64515BC-38E8-44B3-AD2B-E13DEFE6DF96}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LoadCalibrationsTest", "Tests\LoadCalibrationsTest\LoadCalibrationsTest.csproj", "{B64515BC-38E8-44B3-AD2B-E13DEFE6DF96}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestCameraSettings", "Tests\TestCameraSettings\TestCameraSettings.csproj", "{27D56448-7608-44D7-BFBA-388A36CB162D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestCameraSettings", "Tests\TestCameraSettings\TestCameraSettings.csproj", "{27D56448-7608-44D7-BFBA-388A36CB162D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{6AB144DD-597B-4900-8768-7C5423630A71}" + ProjectSection(SolutionItems) = preProject + Samples\Directory.Build.props = Samples\Directory.Build.props + EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MinimalSample", "Samples\MinimalSample\MinimalSample.csproj", "{488A05E9-0E28-4B47-B4EB-FD5FFEAB9BDE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MinimalSample", "Samples\MinimalSample\MinimalSample.csproj", "{488A05E9-0E28-4B47-B4EB-FD5FFEAB9BDE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sick.VisionaryT", "BetaCameras\Sick.VisionaryT\Sick.VisionaryT.csproj", "{DE18D143-C624-4941-B8A1-0F91262D3350}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sick.VisionaryT", "BetaCameras\Sick.VisionaryT\Sick.VisionaryT.csproj", "{DE18D143-C624-4941-B8A1-0F91262D3350}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentation", "{0777C39D-936C-49FB-89A5-FA7582C7630D}" ProjectSection(SolutionItems) = preProject @@ -34,563 +43,166 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentat doc\patch_doxyfile.cmd = doc\patch_doxyfile.cmd EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTestParameterMechanism", "Tests\UnitTestParameterMechanism\UnitTestParameterMechanism.csproj", "{E3AB848E-490E-4818-9F4F-C87F22FFEF04}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTestParameterMechanism", "Tests\UnitTestParameterMechanism\UnitTestParameterMechanism.csproj", "{E3AB848E-490E-4818-9F4F-C87F22FFEF04}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MetriCam2.Controls", "MetriCam2.Controls\MetriCam2.Controls.csproj", "{9060CBCF-609D-47B3-9245-43D34C540A73}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MetriCam2.Controls", "MetriCam2.Controls\MetriCam2.Controls.csproj", "{9060CBCF-609D-47B3-9245-43D34C540A73}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SVS", "BetaCameras\SVS\SVS.csproj", "{E71ADD15-22AA-478B-BA64-CBA0DF4DC432}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SVS", "BetaCameras\SVS\SVS.csproj", "{E71ADD15-22AA-478B-BA64-CBA0DF4DC432}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F8B72304-05F7-411A-8A32-8D12BB5BA37E}" ProjectSection(SolutionItems) = preProject .licenseheader = .licenseheader + Directory.Build.props = Directory.Build.props + Directory.Build.targets = Directory.Build.targets Scripts\Jenkinsfile.groovy = Scripts\Jenkinsfile.groovy - MetrilusReferencesVersions.props = MetrilusReferencesVersions.props Scripts\Set Assembly-Info Version.cmd = Scripts\Set Assembly-Info Version.cmd - SolutionAssemblyInfo.cs = SolutionAssemblyInfo.cs + Scripts\SetVersion.cmd = Scripts\SetVersion.cmd SolutionAssemblyInfo.h = SolutionAssemblyInfo.h version.properties = version.properties EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kinect2", "BetaCameras\Kinect2\Kinect2.csproj", "{03558646-61B1-4F4E-BF70-7A623DF27095}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kinect2", "BetaCameras\Kinect2\Kinect2.csproj", "{03558646-61B1-4F4E-BF70-7A623DF27095}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleViewer", "Samples\SimpleViewer\SimpleViewer.csproj", "{DE24F649-A2A1-47E7-9C63-F032946C0C2F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleViewer", "Samples\SimpleViewer\SimpleViewer.csproj", "{DE24F649-A2A1-47E7-9C63-F032946C0C2F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ifm", "BetaCameras\ifm\ifm.csproj", "{177E27F4-7C6E-4BF7-BDE2-97888EE2682C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ifm", "BetaCameras\ifm\ifm.csproj", "{177E27F4-7C6E-4BF7-BDE2-97888EE2682C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CameraTemplate", "BetaCameras\CameraTemplate\CameraTemplate.csproj", "{C0D82A80-70D7-4782-B4B1-4AF4C31ECC73}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CameraTemplate", "BetaCameras\CameraTemplate\CameraTemplate.csproj", "{C0D82A80-70D7-4782-B4B1-4AF4C31ECC73}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OrbbecOpenNI", "BetaCameras\OrbbecOpenNI\OrbbecOpenNI.vcxproj", "{C82202F8-55DB-4511-B006-C88FF3E4427E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RealSense", "BetaCameras\RealSense\RealSense.csproj", "{F37DB33A-3E53-42C9-A6DC-B012A9A09EAF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RealSense", "BetaCameras\RealSense\RealSense.csproj", "{F37DB33A-3E53-42C9-A6DC-B012A9A09EAF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MatrixVision", "BetaCameras\MatrixVision\MatrixVision.vcxproj", "{249420A5-952B-4C58-A35A-377E0CDCC023}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TIVoxel", "BetaCameras\TIVoxel\TIVoxel.vcxproj", "{ECF2A55A-67D9-48B7-936C-873FC6C07364}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RealSense2", "BetaCameras\RealSense2\RealSense2.csproj", "{3032E9B1-F572-4ECB-906A-F7A2B45EF125}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xtion2", "BetaCameras\Xtion2\Xtion2.csproj", "{7F2939D1-17AB-4B94-8933-09C76DC0C07A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sick.TiM561", "BetaCameras\Sick.TiM561\Sick.TiM561.csproj", "{41D6E896-FB86-4BA1-BC99-E2FE4AA89E93}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RealSense2", "BetaCameras\RealSense2\RealSense2.csproj", "{3032E9B1-F572-4ECB-906A-F7A2B45EF125}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MetriCam2.NetStandard", "MetriCam2\MetriCam2.NetStandard.csproj", "{4A36576E-E47F-4993-AD94-D09B989B4CE4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xtion2", "BetaCameras\Xtion2\Xtion2.csproj", "{7F2939D1-17AB-4B94-8933-09C76DC0C07A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RealSense2.NetStandard", "BetaCameras\RealSense2\RealSense2.NetStandard.csproj", "{2E74EB9D-6465-4DEF-9B2C-D13713BA3C4C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sick.TiM561", "BetaCameras\Sick.TiM561\Sick.TiM561.csproj", "{41D6E896-FB86-4BA1-BC99-E2FE4AA89E93}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BaslerToF", "BetaCameras\BaslerToF\BaslerToF.csproj", "{9CBCE2AB-4E19-4344-B3CF-67D07CC9C8FC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BaslerToF", "BetaCameras\BaslerToF\BaslerToF.csproj", "{9CBCE2AB-4E19-4344-B3CF-67D07CC9C8FC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BaslerACE", "BetaCameras\BaslerACE\BaslerACE.csproj", "{474D94F4-857B-4199-97AF-C600AED44406}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BaslerACE", "BetaCameras\BaslerACE\BaslerACE.csproj", "{474D94F4-857B-4199-97AF-C600AED44406}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pico", "BetaCameras\Pico\Pico.csproj", "{1FAD1F90-D37E-40CA-BBF0-6A33E82F8812}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pico", "BetaCameras\Pico\Pico.csproj", "{1FAD1F90-D37E-40CA-BBF0-6A33E82F8812}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sick.VisionaryT.Pro", "BetaCameras\Sick.VisionaryT.Pro\Sick.VisionaryT.Pro.csproj", "{D01829D2-B553-4C4B-B392-2437E6A130B5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sick.VisionaryT.Pro", "BetaCameras\Sick.VisionaryT.Pro\Sick.VisionaryT.Pro.csproj", "{D01829D2-B553-4C4B-B392-2437E6A130B5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kinect4Azure", "BetaCameras\Kinect4Azure\Kinect4Azure.csproj", "{9A292249-66EE-4C9C-A6B7-DD5112E3625F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kinect4Azure", "BetaCameras\Kinect4Azure\Kinect4Azure.csproj", "{9A292249-66EE-4C9C-A6B7-DD5112E3625F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - DebugStrongName|Any CPU = DebugStrongName|Any CPU - DebugStrongName|x64 = DebugStrongName|x64 - DebugStrongName|x86 = DebugStrongName|x86 - Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 - Release|x86 = Release|x86 - ReleaseStrongName|Any CPU = ReleaseStrongName|Any CPU - ReleaseStrongName|x64 = ReleaseStrongName|x64 - ReleaseStrongName|x86 = ReleaseStrongName|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {342F049E-668B-4351-B21D-75E4BEF5A1E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {342F049E-668B-4351-B21D-75E4BEF5A1E4}.Debug|Any CPU.Build.0 = Debug|Any CPU {342F049E-668B-4351-B21D-75E4BEF5A1E4}.Debug|x64.ActiveCfg = Debug|Any CPU {342F049E-668B-4351-B21D-75E4BEF5A1E4}.Debug|x64.Build.0 = Debug|Any CPU - {342F049E-668B-4351-B21D-75E4BEF5A1E4}.Debug|x86.ActiveCfg = Debug|Any CPU - {342F049E-668B-4351-B21D-75E4BEF5A1E4}.Debug|x86.Build.0 = Debug|Any CPU - {342F049E-668B-4351-B21D-75E4BEF5A1E4}.DebugStrongName|Any CPU.ActiveCfg = DebugStrongName|Any CPU - {342F049E-668B-4351-B21D-75E4BEF5A1E4}.DebugStrongName|Any CPU.Build.0 = DebugStrongName|Any CPU - {342F049E-668B-4351-B21D-75E4BEF5A1E4}.DebugStrongName|x64.ActiveCfg = DebugStrongName|Any CPU - {342F049E-668B-4351-B21D-75E4BEF5A1E4}.DebugStrongName|x64.Build.0 = DebugStrongName|Any CPU - {342F049E-668B-4351-B21D-75E4BEF5A1E4}.DebugStrongName|x86.ActiveCfg = DebugStrongName|Any CPU - {342F049E-668B-4351-B21D-75E4BEF5A1E4}.DebugStrongName|x86.Build.0 = DebugStrongName|Any CPU - {342F049E-668B-4351-B21D-75E4BEF5A1E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {342F049E-668B-4351-B21D-75E4BEF5A1E4}.Release|Any CPU.Build.0 = Release|Any CPU {342F049E-668B-4351-B21D-75E4BEF5A1E4}.Release|x64.ActiveCfg = Release|Any CPU {342F049E-668B-4351-B21D-75E4BEF5A1E4}.Release|x64.Build.0 = Release|Any CPU - {342F049E-668B-4351-B21D-75E4BEF5A1E4}.Release|x86.ActiveCfg = Release|Any CPU - {342F049E-668B-4351-B21D-75E4BEF5A1E4}.Release|x86.Build.0 = Release|Any CPU - {342F049E-668B-4351-B21D-75E4BEF5A1E4}.ReleaseStrongName|Any CPU.ActiveCfg = ReleaseStrongName|Any CPU - {342F049E-668B-4351-B21D-75E4BEF5A1E4}.ReleaseStrongName|Any CPU.Build.0 = ReleaseStrongName|Any CPU - {342F049E-668B-4351-B21D-75E4BEF5A1E4}.ReleaseStrongName|x64.ActiveCfg = ReleaseStrongName|Any CPU - {342F049E-668B-4351-B21D-75E4BEF5A1E4}.ReleaseStrongName|x64.Build.0 = ReleaseStrongName|Any CPU - {342F049E-668B-4351-B21D-75E4BEF5A1E4}.ReleaseStrongName|x86.ActiveCfg = ReleaseStrongName|Any CPU - {342F049E-668B-4351-B21D-75E4BEF5A1E4}.ReleaseStrongName|x86.Build.0 = ReleaseStrongName|Any CPU - {01C2FB4D-1F35-4855-9B53-0480519387C5}.Debug|Any CPU.ActiveCfg = Debug|Win32 {01C2FB4D-1F35-4855-9B53-0480519387C5}.Debug|x64.ActiveCfg = Debug|x64 {01C2FB4D-1F35-4855-9B53-0480519387C5}.Debug|x64.Build.0 = Debug|x64 - {01C2FB4D-1F35-4855-9B53-0480519387C5}.Debug|x86.ActiveCfg = Debug|Win32 - {01C2FB4D-1F35-4855-9B53-0480519387C5}.Debug|x86.Build.0 = Debug|Win32 - {01C2FB4D-1F35-4855-9B53-0480519387C5}.DebugStrongName|Any CPU.ActiveCfg = Debug|Win32 - {01C2FB4D-1F35-4855-9B53-0480519387C5}.DebugStrongName|x64.ActiveCfg = Debug|x64 - {01C2FB4D-1F35-4855-9B53-0480519387C5}.DebugStrongName|x86.ActiveCfg = Debug|Win32 - {01C2FB4D-1F35-4855-9B53-0480519387C5}.Release|Any CPU.ActiveCfg = Release|Win32 {01C2FB4D-1F35-4855-9B53-0480519387C5}.Release|x64.ActiveCfg = Release|x64 {01C2FB4D-1F35-4855-9B53-0480519387C5}.Release|x64.Build.0 = Release|x64 - {01C2FB4D-1F35-4855-9B53-0480519387C5}.Release|x86.ActiveCfg = Release|Win32 - {01C2FB4D-1F35-4855-9B53-0480519387C5}.Release|x86.Build.0 = Release|Win32 - {01C2FB4D-1F35-4855-9B53-0480519387C5}.ReleaseStrongName|Any CPU.ActiveCfg = Release|Win32 - {01C2FB4D-1F35-4855-9B53-0480519387C5}.ReleaseStrongName|x64.ActiveCfg = Release|x64 - {01C2FB4D-1F35-4855-9B53-0480519387C5}.ReleaseStrongName|x86.ActiveCfg = Release|Win32 - {68003E12-8D06-4EDC-8578-FC075ED27F80}.Debug|Any CPU.ActiveCfg = Debug|x86 - {68003E12-8D06-4EDC-8578-FC075ED27F80}.Debug|x64.ActiveCfg = Debug|x64 - {68003E12-8D06-4EDC-8578-FC075ED27F80}.Debug|x64.Build.0 = Debug|x64 - {68003E12-8D06-4EDC-8578-FC075ED27F80}.Debug|x86.ActiveCfg = Debug|x86 - {68003E12-8D06-4EDC-8578-FC075ED27F80}.Debug|x86.Build.0 = Debug|x86 - {68003E12-8D06-4EDC-8578-FC075ED27F80}.DebugStrongName|Any CPU.ActiveCfg = Debug|x86 - {68003E12-8D06-4EDC-8578-FC075ED27F80}.DebugStrongName|x64.ActiveCfg = Debug|x64 - {68003E12-8D06-4EDC-8578-FC075ED27F80}.DebugStrongName|x86.ActiveCfg = Debug|x86 - {68003E12-8D06-4EDC-8578-FC075ED27F80}.Release|Any CPU.ActiveCfg = Release|x86 - {68003E12-8D06-4EDC-8578-FC075ED27F80}.Release|x64.ActiveCfg = Release|x64 - {68003E12-8D06-4EDC-8578-FC075ED27F80}.Release|x64.Build.0 = Release|x64 - {68003E12-8D06-4EDC-8578-FC075ED27F80}.Release|x86.ActiveCfg = Release|x86 - {68003E12-8D06-4EDC-8578-FC075ED27F80}.Release|x86.Build.0 = Release|x86 - {68003E12-8D06-4EDC-8578-FC075ED27F80}.ReleaseStrongName|Any CPU.ActiveCfg = Release|x86 - {68003E12-8D06-4EDC-8578-FC075ED27F80}.ReleaseStrongName|x64.ActiveCfg = Release|x64 - {68003E12-8D06-4EDC-8578-FC075ED27F80}.ReleaseStrongName|x86.ActiveCfg = Release|x86 - {B64515BC-38E8-44B3-AD2B-E13DEFE6DF96}.Debug|Any CPU.ActiveCfg = Debug|x86 - {B64515BC-38E8-44B3-AD2B-E13DEFE6DF96}.Debug|x64.ActiveCfg = Debug|x64 - {B64515BC-38E8-44B3-AD2B-E13DEFE6DF96}.Debug|x64.Build.0 = Debug|x64 - {B64515BC-38E8-44B3-AD2B-E13DEFE6DF96}.Debug|x86.ActiveCfg = Debug|x86 - {B64515BC-38E8-44B3-AD2B-E13DEFE6DF96}.Debug|x86.Build.0 = Debug|x86 - {B64515BC-38E8-44B3-AD2B-E13DEFE6DF96}.DebugStrongName|Any CPU.ActiveCfg = Debug|x86 - {B64515BC-38E8-44B3-AD2B-E13DEFE6DF96}.DebugStrongName|x64.ActiveCfg = Debug|x64 - {B64515BC-38E8-44B3-AD2B-E13DEFE6DF96}.DebugStrongName|x86.ActiveCfg = Debug|x86 - {B64515BC-38E8-44B3-AD2B-E13DEFE6DF96}.Release|Any CPU.ActiveCfg = Release|x86 - {B64515BC-38E8-44B3-AD2B-E13DEFE6DF96}.Release|x64.ActiveCfg = Release|x64 - {B64515BC-38E8-44B3-AD2B-E13DEFE6DF96}.Release|x64.Build.0 = Release|x64 - {B64515BC-38E8-44B3-AD2B-E13DEFE6DF96}.Release|x86.ActiveCfg = Release|x86 - {B64515BC-38E8-44B3-AD2B-E13DEFE6DF96}.Release|x86.Build.0 = Release|x86 - {B64515BC-38E8-44B3-AD2B-E13DEFE6DF96}.ReleaseStrongName|Any CPU.ActiveCfg = Release|x86 - {B64515BC-38E8-44B3-AD2B-E13DEFE6DF96}.ReleaseStrongName|x64.ActiveCfg = Release|x64 - {B64515BC-38E8-44B3-AD2B-E13DEFE6DF96}.ReleaseStrongName|x86.ActiveCfg = Release|x86 - {27D56448-7608-44D7-BFBA-388A36CB162D}.Debug|Any CPU.ActiveCfg = Debug|x86 - {27D56448-7608-44D7-BFBA-388A36CB162D}.Debug|x64.ActiveCfg = Debug|x64 - {27D56448-7608-44D7-BFBA-388A36CB162D}.Debug|x64.Build.0 = Debug|x64 - {27D56448-7608-44D7-BFBA-388A36CB162D}.Debug|x86.ActiveCfg = Debug|x86 - {27D56448-7608-44D7-BFBA-388A36CB162D}.Debug|x86.Build.0 = Debug|x86 - {27D56448-7608-44D7-BFBA-388A36CB162D}.DebugStrongName|Any CPU.ActiveCfg = Debug|x86 - {27D56448-7608-44D7-BFBA-388A36CB162D}.DebugStrongName|x64.ActiveCfg = Debug|x64 - {27D56448-7608-44D7-BFBA-388A36CB162D}.DebugStrongName|x86.ActiveCfg = Debug|x86 - {27D56448-7608-44D7-BFBA-388A36CB162D}.Release|Any CPU.ActiveCfg = Release|x86 - {27D56448-7608-44D7-BFBA-388A36CB162D}.Release|x64.ActiveCfg = Release|x64 - {27D56448-7608-44D7-BFBA-388A36CB162D}.Release|x64.Build.0 = Release|x64 - {27D56448-7608-44D7-BFBA-388A36CB162D}.Release|x86.ActiveCfg = Release|x86 - {27D56448-7608-44D7-BFBA-388A36CB162D}.Release|x86.Build.0 = Release|x86 - {27D56448-7608-44D7-BFBA-388A36CB162D}.ReleaseStrongName|Any CPU.ActiveCfg = Release|x86 - {27D56448-7608-44D7-BFBA-388A36CB162D}.ReleaseStrongName|x64.ActiveCfg = Release|x64 - {27D56448-7608-44D7-BFBA-388A36CB162D}.ReleaseStrongName|x86.ActiveCfg = Release|x86 - {488A05E9-0E28-4B47-B4EB-FD5FFEAB9BDE}.Debug|Any CPU.ActiveCfg = Debug|x86 + {68003E12-8D06-4EDC-8578-FC075ED27F80}.Debug|x64.ActiveCfg = Debug|Any CPU + {68003E12-8D06-4EDC-8578-FC075ED27F80}.Debug|x64.Build.0 = Debug|Any CPU + {68003E12-8D06-4EDC-8578-FC075ED27F80}.Release|x64.ActiveCfg = Release|Any CPU + {68003E12-8D06-4EDC-8578-FC075ED27F80}.Release|x64.Build.0 = Release|Any CPU + {B64515BC-38E8-44B3-AD2B-E13DEFE6DF96}.Debug|x64.ActiveCfg = Debug|Any CPU + {B64515BC-38E8-44B3-AD2B-E13DEFE6DF96}.Debug|x64.Build.0 = Debug|Any CPU + {B64515BC-38E8-44B3-AD2B-E13DEFE6DF96}.Release|x64.ActiveCfg = Release|Any CPU + {B64515BC-38E8-44B3-AD2B-E13DEFE6DF96}.Release|x64.Build.0 = Release|Any CPU + {27D56448-7608-44D7-BFBA-388A36CB162D}.Debug|x64.ActiveCfg = Debug|Any CPU + {27D56448-7608-44D7-BFBA-388A36CB162D}.Debug|x64.Build.0 = Debug|Any CPU + {27D56448-7608-44D7-BFBA-388A36CB162D}.Release|x64.ActiveCfg = Release|Any CPU + {27D56448-7608-44D7-BFBA-388A36CB162D}.Release|x64.Build.0 = Release|Any CPU {488A05E9-0E28-4B47-B4EB-FD5FFEAB9BDE}.Debug|x64.ActiveCfg = Debug|x64 {488A05E9-0E28-4B47-B4EB-FD5FFEAB9BDE}.Debug|x64.Build.0 = Debug|x64 - {488A05E9-0E28-4B47-B4EB-FD5FFEAB9BDE}.Debug|x86.ActiveCfg = Debug|x86 - {488A05E9-0E28-4B47-B4EB-FD5FFEAB9BDE}.Debug|x86.Build.0 = Debug|x86 - {488A05E9-0E28-4B47-B4EB-FD5FFEAB9BDE}.DebugStrongName|Any CPU.ActiveCfg = Debug|x86 - {488A05E9-0E28-4B47-B4EB-FD5FFEAB9BDE}.DebugStrongName|x64.ActiveCfg = Debug|x64 - {488A05E9-0E28-4B47-B4EB-FD5FFEAB9BDE}.DebugStrongName|x86.ActiveCfg = Debug|x86 - {488A05E9-0E28-4B47-B4EB-FD5FFEAB9BDE}.Release|Any CPU.ActiveCfg = Release|x86 {488A05E9-0E28-4B47-B4EB-FD5FFEAB9BDE}.Release|x64.ActiveCfg = Release|x64 {488A05E9-0E28-4B47-B4EB-FD5FFEAB9BDE}.Release|x64.Build.0 = Release|x64 - {488A05E9-0E28-4B47-B4EB-FD5FFEAB9BDE}.Release|x86.ActiveCfg = Release|x86 - {488A05E9-0E28-4B47-B4EB-FD5FFEAB9BDE}.Release|x86.Build.0 = Release|x86 - {488A05E9-0E28-4B47-B4EB-FD5FFEAB9BDE}.ReleaseStrongName|Any CPU.ActiveCfg = Release|x86 - {488A05E9-0E28-4B47-B4EB-FD5FFEAB9BDE}.ReleaseStrongName|x64.ActiveCfg = Release|x64 - {488A05E9-0E28-4B47-B4EB-FD5FFEAB9BDE}.ReleaseStrongName|x86.ActiveCfg = Release|x86 - {DE18D143-C624-4941-B8A1-0F91262D3350}.Debug|Any CPU.ActiveCfg = Debug|x86 - {DE18D143-C624-4941-B8A1-0F91262D3350}.Debug|x64.ActiveCfg = Debug|x64 - {DE18D143-C624-4941-B8A1-0F91262D3350}.Debug|x64.Build.0 = Debug|x64 - {DE18D143-C624-4941-B8A1-0F91262D3350}.Debug|x86.ActiveCfg = Debug|x86 - {DE18D143-C624-4941-B8A1-0F91262D3350}.Debug|x86.Build.0 = Debug|x86 - {DE18D143-C624-4941-B8A1-0F91262D3350}.DebugStrongName|Any CPU.ActiveCfg = Debug|x86 - {DE18D143-C624-4941-B8A1-0F91262D3350}.DebugStrongName|x64.ActiveCfg = DebugStrongName|x64 - {DE18D143-C624-4941-B8A1-0F91262D3350}.DebugStrongName|x64.Build.0 = DebugStrongName|x64 - {DE18D143-C624-4941-B8A1-0F91262D3350}.DebugStrongName|x86.ActiveCfg = DebugStrongName|x86 - {DE18D143-C624-4941-B8A1-0F91262D3350}.DebugStrongName|x86.Build.0 = DebugStrongName|x86 - {DE18D143-C624-4941-B8A1-0F91262D3350}.Release|Any CPU.ActiveCfg = Release|x86 - {DE18D143-C624-4941-B8A1-0F91262D3350}.Release|x64.ActiveCfg = Release|x64 - {DE18D143-C624-4941-B8A1-0F91262D3350}.Release|x64.Build.0 = Release|x64 - {DE18D143-C624-4941-B8A1-0F91262D3350}.Release|x86.ActiveCfg = Release|x86 - {DE18D143-C624-4941-B8A1-0F91262D3350}.Release|x86.Build.0 = Release|x86 - {DE18D143-C624-4941-B8A1-0F91262D3350}.ReleaseStrongName|Any CPU.ActiveCfg = Release|x86 - {DE18D143-C624-4941-B8A1-0F91262D3350}.ReleaseStrongName|x64.ActiveCfg = ReleaseStrongName|x64 - {DE18D143-C624-4941-B8A1-0F91262D3350}.ReleaseStrongName|x64.Build.0 = ReleaseStrongName|x64 - {DE18D143-C624-4941-B8A1-0F91262D3350}.ReleaseStrongName|x86.ActiveCfg = ReleaseStrongName|x86 - {DE18D143-C624-4941-B8A1-0F91262D3350}.ReleaseStrongName|x86.Build.0 = ReleaseStrongName|x86 - {E3AB848E-490E-4818-9F4F-C87F22FFEF04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E3AB848E-490E-4818-9F4F-C87F22FFEF04}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DE18D143-C624-4941-B8A1-0F91262D3350}.Debug|x64.ActiveCfg = Debug|Any CPU + {DE18D143-C624-4941-B8A1-0F91262D3350}.Debug|x64.Build.0 = Debug|Any CPU + {DE18D143-C624-4941-B8A1-0F91262D3350}.Release|x64.ActiveCfg = Release|Any CPU + {DE18D143-C624-4941-B8A1-0F91262D3350}.Release|x64.Build.0 = Release|Any CPU {E3AB848E-490E-4818-9F4F-C87F22FFEF04}.Debug|x64.ActiveCfg = Debug|Any CPU {E3AB848E-490E-4818-9F4F-C87F22FFEF04}.Debug|x64.Build.0 = Debug|Any CPU - {E3AB848E-490E-4818-9F4F-C87F22FFEF04}.Debug|x86.ActiveCfg = Debug|Any CPU - {E3AB848E-490E-4818-9F4F-C87F22FFEF04}.Debug|x86.Build.0 = Debug|Any CPU - {E3AB848E-490E-4818-9F4F-C87F22FFEF04}.DebugStrongName|Any CPU.ActiveCfg = Debug|Any CPU - {E3AB848E-490E-4818-9F4F-C87F22FFEF04}.DebugStrongName|x64.ActiveCfg = Debug|Any CPU - {E3AB848E-490E-4818-9F4F-C87F22FFEF04}.DebugStrongName|x86.ActiveCfg = Debug|Any CPU - {E3AB848E-490E-4818-9F4F-C87F22FFEF04}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E3AB848E-490E-4818-9F4F-C87F22FFEF04}.Release|Any CPU.Build.0 = Release|Any CPU {E3AB848E-490E-4818-9F4F-C87F22FFEF04}.Release|x64.ActiveCfg = Release|Any CPU {E3AB848E-490E-4818-9F4F-C87F22FFEF04}.Release|x64.Build.0 = Release|Any CPU - {E3AB848E-490E-4818-9F4F-C87F22FFEF04}.Release|x86.ActiveCfg = Release|Any CPU - {E3AB848E-490E-4818-9F4F-C87F22FFEF04}.Release|x86.Build.0 = Release|Any CPU - {E3AB848E-490E-4818-9F4F-C87F22FFEF04}.ReleaseStrongName|Any CPU.ActiveCfg = Release|Any CPU - {E3AB848E-490E-4818-9F4F-C87F22FFEF04}.ReleaseStrongName|x64.ActiveCfg = Release|Any CPU - {E3AB848E-490E-4818-9F4F-C87F22FFEF04}.ReleaseStrongName|x86.ActiveCfg = Release|Any CPU - {9060CBCF-609D-47B3-9245-43D34C540A73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9060CBCF-609D-47B3-9245-43D34C540A73}.Debug|Any CPU.Build.0 = Debug|Any CPU {9060CBCF-609D-47B3-9245-43D34C540A73}.Debug|x64.ActiveCfg = Debug|Any CPU {9060CBCF-609D-47B3-9245-43D34C540A73}.Debug|x64.Build.0 = Debug|Any CPU - {9060CBCF-609D-47B3-9245-43D34C540A73}.Debug|x86.ActiveCfg = Debug|Any CPU - {9060CBCF-609D-47B3-9245-43D34C540A73}.Debug|x86.Build.0 = Debug|Any CPU - {9060CBCF-609D-47B3-9245-43D34C540A73}.DebugStrongName|Any CPU.ActiveCfg = DebugStrongName|Any CPU - {9060CBCF-609D-47B3-9245-43D34C540A73}.DebugStrongName|Any CPU.Build.0 = DebugStrongName|Any CPU - {9060CBCF-609D-47B3-9245-43D34C540A73}.DebugStrongName|x64.ActiveCfg = DebugStrongName|Any CPU - {9060CBCF-609D-47B3-9245-43D34C540A73}.DebugStrongName|x64.Build.0 = DebugStrongName|Any CPU - {9060CBCF-609D-47B3-9245-43D34C540A73}.DebugStrongName|x86.ActiveCfg = DebugStrongName|Any CPU - {9060CBCF-609D-47B3-9245-43D34C540A73}.DebugStrongName|x86.Build.0 = DebugStrongName|Any CPU - {9060CBCF-609D-47B3-9245-43D34C540A73}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9060CBCF-609D-47B3-9245-43D34C540A73}.Release|Any CPU.Build.0 = Release|Any CPU {9060CBCF-609D-47B3-9245-43D34C540A73}.Release|x64.ActiveCfg = Release|Any CPU {9060CBCF-609D-47B3-9245-43D34C540A73}.Release|x64.Build.0 = Release|Any CPU - {9060CBCF-609D-47B3-9245-43D34C540A73}.Release|x86.ActiveCfg = Release|Any CPU - {9060CBCF-609D-47B3-9245-43D34C540A73}.Release|x86.Build.0 = Release|Any CPU - {9060CBCF-609D-47B3-9245-43D34C540A73}.ReleaseStrongName|Any CPU.ActiveCfg = ReleaseStrongName|Any CPU - {9060CBCF-609D-47B3-9245-43D34C540A73}.ReleaseStrongName|Any CPU.Build.0 = ReleaseStrongName|Any CPU - {9060CBCF-609D-47B3-9245-43D34C540A73}.ReleaseStrongName|x64.ActiveCfg = ReleaseStrongName|Any CPU - {9060CBCF-609D-47B3-9245-43D34C540A73}.ReleaseStrongName|x64.Build.0 = ReleaseStrongName|Any CPU - {9060CBCF-609D-47B3-9245-43D34C540A73}.ReleaseStrongName|x86.ActiveCfg = ReleaseStrongName|Any CPU - {9060CBCF-609D-47B3-9245-43D34C540A73}.ReleaseStrongName|x86.Build.0 = ReleaseStrongName|Any CPU - {E71ADD15-22AA-478B-BA64-CBA0DF4DC432}.Debug|Any CPU.ActiveCfg = Debug|x86 - {E71ADD15-22AA-478B-BA64-CBA0DF4DC432}.Debug|x64.ActiveCfg = Debug|x64 - {E71ADD15-22AA-478B-BA64-CBA0DF4DC432}.Debug|x64.Build.0 = Debug|x64 - {E71ADD15-22AA-478B-BA64-CBA0DF4DC432}.Debug|x86.ActiveCfg = Debug|x86 - {E71ADD15-22AA-478B-BA64-CBA0DF4DC432}.Debug|x86.Build.0 = Debug|x86 - {E71ADD15-22AA-478B-BA64-CBA0DF4DC432}.DebugStrongName|Any CPU.ActiveCfg = Debug|x86 - {E71ADD15-22AA-478B-BA64-CBA0DF4DC432}.DebugStrongName|x64.ActiveCfg = Debug|x64 - {E71ADD15-22AA-478B-BA64-CBA0DF4DC432}.DebugStrongName|x86.ActiveCfg = Debug|x86 - {E71ADD15-22AA-478B-BA64-CBA0DF4DC432}.Release|Any CPU.ActiveCfg = Release|x86 - {E71ADD15-22AA-478B-BA64-CBA0DF4DC432}.Release|x64.ActiveCfg = Release|x64 - {E71ADD15-22AA-478B-BA64-CBA0DF4DC432}.Release|x64.Build.0 = Release|x64 - {E71ADD15-22AA-478B-BA64-CBA0DF4DC432}.Release|x86.ActiveCfg = Release|x86 - {E71ADD15-22AA-478B-BA64-CBA0DF4DC432}.Release|x86.Build.0 = Release|x86 - {E71ADD15-22AA-478B-BA64-CBA0DF4DC432}.ReleaseStrongName|Any CPU.ActiveCfg = Release|x86 - {E71ADD15-22AA-478B-BA64-CBA0DF4DC432}.ReleaseStrongName|x64.ActiveCfg = Release|x64 - {E71ADD15-22AA-478B-BA64-CBA0DF4DC432}.ReleaseStrongName|x86.ActiveCfg = Release|x86 - {03558646-61B1-4F4E-BF70-7A623DF27095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03558646-61B1-4F4E-BF70-7A623DF27095}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E71ADD15-22AA-478B-BA64-CBA0DF4DC432}.Debug|x64.ActiveCfg = Debug|Any CPU + {E71ADD15-22AA-478B-BA64-CBA0DF4DC432}.Debug|x64.Build.0 = Debug|Any CPU + {E71ADD15-22AA-478B-BA64-CBA0DF4DC432}.Release|x64.ActiveCfg = Release|Any CPU + {E71ADD15-22AA-478B-BA64-CBA0DF4DC432}.Release|x64.Build.0 = Release|Any CPU {03558646-61B1-4F4E-BF70-7A623DF27095}.Debug|x64.ActiveCfg = Debug|Any CPU {03558646-61B1-4F4E-BF70-7A623DF27095}.Debug|x64.Build.0 = Debug|Any CPU - {03558646-61B1-4F4E-BF70-7A623DF27095}.Debug|x86.ActiveCfg = Debug|Any CPU - {03558646-61B1-4F4E-BF70-7A623DF27095}.Debug|x86.Build.0 = Debug|Any CPU - {03558646-61B1-4F4E-BF70-7A623DF27095}.DebugStrongName|Any CPU.ActiveCfg = DebugStrongName|Any CPU - {03558646-61B1-4F4E-BF70-7A623DF27095}.DebugStrongName|Any CPU.Build.0 = DebugStrongName|Any CPU - {03558646-61B1-4F4E-BF70-7A623DF27095}.DebugStrongName|x64.ActiveCfg = DebugStrongName|Any CPU - {03558646-61B1-4F4E-BF70-7A623DF27095}.DebugStrongName|x64.Build.0 = DebugStrongName|Any CPU - {03558646-61B1-4F4E-BF70-7A623DF27095}.DebugStrongName|x86.ActiveCfg = DebugStrongName|Any CPU - {03558646-61B1-4F4E-BF70-7A623DF27095}.DebugStrongName|x86.Build.0 = DebugStrongName|Any CPU - {03558646-61B1-4F4E-BF70-7A623DF27095}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03558646-61B1-4F4E-BF70-7A623DF27095}.Release|Any CPU.Build.0 = Release|Any CPU {03558646-61B1-4F4E-BF70-7A623DF27095}.Release|x64.ActiveCfg = Release|Any CPU {03558646-61B1-4F4E-BF70-7A623DF27095}.Release|x64.Build.0 = Release|Any CPU - {03558646-61B1-4F4E-BF70-7A623DF27095}.Release|x86.ActiveCfg = Release|Any CPU - {03558646-61B1-4F4E-BF70-7A623DF27095}.Release|x86.Build.0 = Release|Any CPU - {03558646-61B1-4F4E-BF70-7A623DF27095}.ReleaseStrongName|Any CPU.ActiveCfg = ReleaseStrongName|Any CPU - {03558646-61B1-4F4E-BF70-7A623DF27095}.ReleaseStrongName|Any CPU.Build.0 = ReleaseStrongName|Any CPU - {03558646-61B1-4F4E-BF70-7A623DF27095}.ReleaseStrongName|x64.ActiveCfg = ReleaseStrongName|Any CPU - {03558646-61B1-4F4E-BF70-7A623DF27095}.ReleaseStrongName|x64.Build.0 = ReleaseStrongName|Any CPU - {03558646-61B1-4F4E-BF70-7A623DF27095}.ReleaseStrongName|x86.ActiveCfg = ReleaseStrongName|Any CPU - {03558646-61B1-4F4E-BF70-7A623DF27095}.ReleaseStrongName|x86.Build.0 = ReleaseStrongName|Any CPU - {DE24F649-A2A1-47E7-9C63-F032946C0C2F}.Debug|Any CPU.ActiveCfg = Debug|x86 {DE24F649-A2A1-47E7-9C63-F032946C0C2F}.Debug|x64.ActiveCfg = Debug|x64 {DE24F649-A2A1-47E7-9C63-F032946C0C2F}.Debug|x64.Build.0 = Debug|x64 - {DE24F649-A2A1-47E7-9C63-F032946C0C2F}.Debug|x86.ActiveCfg = Debug|x86 - {DE24F649-A2A1-47E7-9C63-F032946C0C2F}.Debug|x86.Build.0 = Debug|x86 - {DE24F649-A2A1-47E7-9C63-F032946C0C2F}.DebugStrongName|Any CPU.ActiveCfg = Debug|x86 - {DE24F649-A2A1-47E7-9C63-F032946C0C2F}.DebugStrongName|x64.ActiveCfg = Debug|x64 - {DE24F649-A2A1-47E7-9C63-F032946C0C2F}.DebugStrongName|x86.ActiveCfg = Debug|x86 - {DE24F649-A2A1-47E7-9C63-F032946C0C2F}.Release|Any CPU.ActiveCfg = Release|x86 {DE24F649-A2A1-47E7-9C63-F032946C0C2F}.Release|x64.ActiveCfg = Release|x64 {DE24F649-A2A1-47E7-9C63-F032946C0C2F}.Release|x64.Build.0 = Release|x64 - {DE24F649-A2A1-47E7-9C63-F032946C0C2F}.Release|x86.ActiveCfg = Release|x86 - {DE24F649-A2A1-47E7-9C63-F032946C0C2F}.Release|x86.Build.0 = Release|x86 - {DE24F649-A2A1-47E7-9C63-F032946C0C2F}.ReleaseStrongName|Any CPU.ActiveCfg = Release|x86 - {DE24F649-A2A1-47E7-9C63-F032946C0C2F}.ReleaseStrongName|x64.ActiveCfg = Release|x64 - {DE24F649-A2A1-47E7-9C63-F032946C0C2F}.ReleaseStrongName|x86.ActiveCfg = Release|x86 - {177E27F4-7C6E-4BF7-BDE2-97888EE2682C}.Debug|Any CPU.ActiveCfg = Debug|x86 - {177E27F4-7C6E-4BF7-BDE2-97888EE2682C}.Debug|x64.ActiveCfg = Debug|x64 - {177E27F4-7C6E-4BF7-BDE2-97888EE2682C}.Debug|x64.Build.0 = Debug|x64 - {177E27F4-7C6E-4BF7-BDE2-97888EE2682C}.Debug|x86.ActiveCfg = Debug|x86 - {177E27F4-7C6E-4BF7-BDE2-97888EE2682C}.Debug|x86.Build.0 = Debug|x86 - {177E27F4-7C6E-4BF7-BDE2-97888EE2682C}.DebugStrongName|Any CPU.ActiveCfg = Debug|x86 - {177E27F4-7C6E-4BF7-BDE2-97888EE2682C}.DebugStrongName|x64.ActiveCfg = Debug|x64 - {177E27F4-7C6E-4BF7-BDE2-97888EE2682C}.DebugStrongName|x86.ActiveCfg = Debug|x86 - {177E27F4-7C6E-4BF7-BDE2-97888EE2682C}.Release|Any CPU.ActiveCfg = Release|x86 - {177E27F4-7C6E-4BF7-BDE2-97888EE2682C}.Release|x64.ActiveCfg = Release|x64 - {177E27F4-7C6E-4BF7-BDE2-97888EE2682C}.Release|x64.Build.0 = Release|x64 - {177E27F4-7C6E-4BF7-BDE2-97888EE2682C}.Release|x86.ActiveCfg = Release|x86 - {177E27F4-7C6E-4BF7-BDE2-97888EE2682C}.Release|x86.Build.0 = Release|x86 - {177E27F4-7C6E-4BF7-BDE2-97888EE2682C}.ReleaseStrongName|Any CPU.ActiveCfg = Release|x86 - {177E27F4-7C6E-4BF7-BDE2-97888EE2682C}.ReleaseStrongName|x64.ActiveCfg = Release|x64 - {177E27F4-7C6E-4BF7-BDE2-97888EE2682C}.ReleaseStrongName|x86.ActiveCfg = Release|x86 - {C0D82A80-70D7-4782-B4B1-4AF4C31ECC73}.Debug|Any CPU.ActiveCfg = Debug|x86 - {C0D82A80-70D7-4782-B4B1-4AF4C31ECC73}.Debug|x64.ActiveCfg = Debug|x64 - {C0D82A80-70D7-4782-B4B1-4AF4C31ECC73}.Debug|x64.Build.0 = Debug|x64 - {C0D82A80-70D7-4782-B4B1-4AF4C31ECC73}.Debug|x86.ActiveCfg = Debug|x86 - {C0D82A80-70D7-4782-B4B1-4AF4C31ECC73}.Debug|x86.Build.0 = Debug|x86 - {C0D82A80-70D7-4782-B4B1-4AF4C31ECC73}.DebugStrongName|Any CPU.ActiveCfg = Debug|x86 - {C0D82A80-70D7-4782-B4B1-4AF4C31ECC73}.DebugStrongName|x64.ActiveCfg = Debug|x64 - {C0D82A80-70D7-4782-B4B1-4AF4C31ECC73}.DebugStrongName|x86.ActiveCfg = Debug|x86 - {C0D82A80-70D7-4782-B4B1-4AF4C31ECC73}.Release|Any CPU.ActiveCfg = Release|x86 - {C0D82A80-70D7-4782-B4B1-4AF4C31ECC73}.Release|x64.ActiveCfg = Release|x64 - {C0D82A80-70D7-4782-B4B1-4AF4C31ECC73}.Release|x64.Build.0 = Release|x64 - {C0D82A80-70D7-4782-B4B1-4AF4C31ECC73}.Release|x86.ActiveCfg = Release|x86 - {C0D82A80-70D7-4782-B4B1-4AF4C31ECC73}.Release|x86.Build.0 = Release|x86 - {C0D82A80-70D7-4782-B4B1-4AF4C31ECC73}.ReleaseStrongName|Any CPU.ActiveCfg = Release|x86 - {C0D82A80-70D7-4782-B4B1-4AF4C31ECC73}.ReleaseStrongName|x64.ActiveCfg = Release|x64 - {C0D82A80-70D7-4782-B4B1-4AF4C31ECC73}.ReleaseStrongName|x86.ActiveCfg = Release|x86 - {C82202F8-55DB-4511-B006-C88FF3E4427E}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {177E27F4-7C6E-4BF7-BDE2-97888EE2682C}.Debug|x64.ActiveCfg = Debug|Any CPU + {177E27F4-7C6E-4BF7-BDE2-97888EE2682C}.Debug|x64.Build.0 = Debug|Any CPU + {177E27F4-7C6E-4BF7-BDE2-97888EE2682C}.Release|x64.ActiveCfg = Release|Any CPU + {177E27F4-7C6E-4BF7-BDE2-97888EE2682C}.Release|x64.Build.0 = Release|Any CPU + {C0D82A80-70D7-4782-B4B1-4AF4C31ECC73}.Debug|x64.ActiveCfg = Debug|Any CPU + {C0D82A80-70D7-4782-B4B1-4AF4C31ECC73}.Debug|x64.Build.0 = Debug|Any CPU + {C0D82A80-70D7-4782-B4B1-4AF4C31ECC73}.Release|x64.ActiveCfg = Release|Any CPU + {C0D82A80-70D7-4782-B4B1-4AF4C31ECC73}.Release|x64.Build.0 = Release|Any CPU {C82202F8-55DB-4511-B006-C88FF3E4427E}.Debug|x64.ActiveCfg = Debug|x64 {C82202F8-55DB-4511-B006-C88FF3E4427E}.Debug|x64.Build.0 = Debug|x64 - {C82202F8-55DB-4511-B006-C88FF3E4427E}.Debug|x86.ActiveCfg = Debug|Win32 - {C82202F8-55DB-4511-B006-C88FF3E4427E}.Debug|x86.Build.0 = Debug|Win32 - {C82202F8-55DB-4511-B006-C88FF3E4427E}.DebugStrongName|Any CPU.ActiveCfg = DebugStrongName|Win32 - {C82202F8-55DB-4511-B006-C88FF3E4427E}.DebugStrongName|x64.ActiveCfg = DebugStrongName|x64 - {C82202F8-55DB-4511-B006-C88FF3E4427E}.DebugStrongName|x64.Build.0 = DebugStrongName|x64 - {C82202F8-55DB-4511-B006-C88FF3E4427E}.DebugStrongName|x86.ActiveCfg = DebugStrongName|Win32 - {C82202F8-55DB-4511-B006-C88FF3E4427E}.DebugStrongName|x86.Build.0 = DebugStrongName|Win32 - {C82202F8-55DB-4511-B006-C88FF3E4427E}.Release|Any CPU.ActiveCfg = Release|Win32 {C82202F8-55DB-4511-B006-C88FF3E4427E}.Release|x64.ActiveCfg = Release|x64 {C82202F8-55DB-4511-B006-C88FF3E4427E}.Release|x64.Build.0 = Release|x64 - {C82202F8-55DB-4511-B006-C88FF3E4427E}.Release|x86.ActiveCfg = Release|Win32 - {C82202F8-55DB-4511-B006-C88FF3E4427E}.Release|x86.Build.0 = Release|Win32 - {C82202F8-55DB-4511-B006-C88FF3E4427E}.ReleaseStrongName|Any CPU.ActiveCfg = ReleaseStrongName|Win32 - {C82202F8-55DB-4511-B006-C88FF3E4427E}.ReleaseStrongName|x64.ActiveCfg = ReleaseStrongName|x64 - {C82202F8-55DB-4511-B006-C88FF3E4427E}.ReleaseStrongName|x64.Build.0 = ReleaseStrongName|x64 - {C82202F8-55DB-4511-B006-C88FF3E4427E}.ReleaseStrongName|x86.ActiveCfg = ReleaseStrongName|Win32 - {C82202F8-55DB-4511-B006-C88FF3E4427E}.ReleaseStrongName|x86.Build.0 = ReleaseStrongName|Win32 - {F37DB33A-3E53-42C9-A6DC-B012A9A09EAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F37DB33A-3E53-42C9-A6DC-B012A9A09EAF}.Debug|Any CPU.Build.0 = Debug|Any CPU {F37DB33A-3E53-42C9-A6DC-B012A9A09EAF}.Debug|x64.ActiveCfg = Debug|x64 {F37DB33A-3E53-42C9-A6DC-B012A9A09EAF}.Debug|x64.Build.0 = Debug|x64 - {F37DB33A-3E53-42C9-A6DC-B012A9A09EAF}.Debug|x86.ActiveCfg = Debug|Any CPU - {F37DB33A-3E53-42C9-A6DC-B012A9A09EAF}.Debug|x86.Build.0 = Debug|Any CPU - {F37DB33A-3E53-42C9-A6DC-B012A9A09EAF}.DebugStrongName|Any CPU.ActiveCfg = Debug|Any CPU - {F37DB33A-3E53-42C9-A6DC-B012A9A09EAF}.DebugStrongName|x64.ActiveCfg = Debug|x64 - {F37DB33A-3E53-42C9-A6DC-B012A9A09EAF}.DebugStrongName|x86.ActiveCfg = Debug|Any CPU - {F37DB33A-3E53-42C9-A6DC-B012A9A09EAF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F37DB33A-3E53-42C9-A6DC-B012A9A09EAF}.Release|Any CPU.Build.0 = Release|Any CPU {F37DB33A-3E53-42C9-A6DC-B012A9A09EAF}.Release|x64.ActiveCfg = Release|x64 {F37DB33A-3E53-42C9-A6DC-B012A9A09EAF}.Release|x64.Build.0 = Release|x64 - {F37DB33A-3E53-42C9-A6DC-B012A9A09EAF}.Release|x86.ActiveCfg = Release|Any CPU - {F37DB33A-3E53-42C9-A6DC-B012A9A09EAF}.Release|x86.Build.0 = Release|Any CPU - {F37DB33A-3E53-42C9-A6DC-B012A9A09EAF}.ReleaseStrongName|Any CPU.ActiveCfg = Release|Any CPU - {F37DB33A-3E53-42C9-A6DC-B012A9A09EAF}.ReleaseStrongName|x64.ActiveCfg = Release|x64 - {F37DB33A-3E53-42C9-A6DC-B012A9A09EAF}.ReleaseStrongName|x86.ActiveCfg = Release|Any CPU - {249420A5-952B-4C58-A35A-377E0CDCC023}.Debug|Any CPU.ActiveCfg = Debug|x64 {249420A5-952B-4C58-A35A-377E0CDCC023}.Debug|x64.ActiveCfg = Debug|x64 {249420A5-952B-4C58-A35A-377E0CDCC023}.Debug|x64.Build.0 = Debug|x64 - {249420A5-952B-4C58-A35A-377E0CDCC023}.Debug|x86.ActiveCfg = Debug|x64 - {249420A5-952B-4C58-A35A-377E0CDCC023}.DebugStrongName|Any CPU.ActiveCfg = Debug|x64 - {249420A5-952B-4C58-A35A-377E0CDCC023}.DebugStrongName|x64.ActiveCfg = Debug|x64 - {249420A5-952B-4C58-A35A-377E0CDCC023}.DebugStrongName|x86.ActiveCfg = Debug|x64 - {249420A5-952B-4C58-A35A-377E0CDCC023}.Release|Any CPU.ActiveCfg = Release|x64 {249420A5-952B-4C58-A35A-377E0CDCC023}.Release|x64.ActiveCfg = Release|x64 {249420A5-952B-4C58-A35A-377E0CDCC023}.Release|x64.Build.0 = Release|x64 - {249420A5-952B-4C58-A35A-377E0CDCC023}.Release|x86.ActiveCfg = Release|x64 - {249420A5-952B-4C58-A35A-377E0CDCC023}.ReleaseStrongName|Any CPU.ActiveCfg = Release|x64 - {249420A5-952B-4C58-A35A-377E0CDCC023}.ReleaseStrongName|x64.ActiveCfg = Release|x64 - {249420A5-952B-4C58-A35A-377E0CDCC023}.ReleaseStrongName|x86.ActiveCfg = Release|x64 - {ECF2A55A-67D9-48B7-936C-873FC6C07364}.Debug|Any CPU.ActiveCfg = Debug|x64 {ECF2A55A-67D9-48B7-936C-873FC6C07364}.Debug|x64.ActiveCfg = Debug|x64 {ECF2A55A-67D9-48B7-936C-873FC6C07364}.Debug|x64.Build.0 = Debug|x64 - {ECF2A55A-67D9-48B7-936C-873FC6C07364}.Debug|x86.ActiveCfg = Debug|x64 - {ECF2A55A-67D9-48B7-936C-873FC6C07364}.DebugStrongName|Any CPU.ActiveCfg = Debug|x64 - {ECF2A55A-67D9-48B7-936C-873FC6C07364}.DebugStrongName|x64.ActiveCfg = Debug|x64 - {ECF2A55A-67D9-48B7-936C-873FC6C07364}.DebugStrongName|x86.ActiveCfg = Debug|x64 - {ECF2A55A-67D9-48B7-936C-873FC6C07364}.Release|Any CPU.ActiveCfg = Release|x64 {ECF2A55A-67D9-48B7-936C-873FC6C07364}.Release|x64.ActiveCfg = Release|x64 {ECF2A55A-67D9-48B7-936C-873FC6C07364}.Release|x64.Build.0 = Release|x64 - {ECF2A55A-67D9-48B7-936C-873FC6C07364}.Release|x86.ActiveCfg = Release|x64 - {ECF2A55A-67D9-48B7-936C-873FC6C07364}.ReleaseStrongName|Any CPU.ActiveCfg = Release|x64 - {ECF2A55A-67D9-48B7-936C-873FC6C07364}.ReleaseStrongName|x64.ActiveCfg = Release|x64 - {ECF2A55A-67D9-48B7-936C-873FC6C07364}.ReleaseStrongName|x86.ActiveCfg = Release|x64 - {3032E9B1-F572-4ECB-906A-F7A2B45EF125}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3032E9B1-F572-4ECB-906A-F7A2B45EF125}.Debug|Any CPU.Build.0 = Debug|Any CPU {3032E9B1-F572-4ECB-906A-F7A2B45EF125}.Debug|x64.ActiveCfg = Debug|Any CPU {3032E9B1-F572-4ECB-906A-F7A2B45EF125}.Debug|x64.Build.0 = Debug|Any CPU - {3032E9B1-F572-4ECB-906A-F7A2B45EF125}.Debug|x86.ActiveCfg = Debug|Any CPU - {3032E9B1-F572-4ECB-906A-F7A2B45EF125}.Debug|x86.Build.0 = Debug|Any CPU - {3032E9B1-F572-4ECB-906A-F7A2B45EF125}.DebugStrongName|Any CPU.ActiveCfg = Debug|Any CPU - {3032E9B1-F572-4ECB-906A-F7A2B45EF125}.DebugStrongName|x64.ActiveCfg = Debug|Any CPU - {3032E9B1-F572-4ECB-906A-F7A2B45EF125}.DebugStrongName|x86.ActiveCfg = Debug|Any CPU - {3032E9B1-F572-4ECB-906A-F7A2B45EF125}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3032E9B1-F572-4ECB-906A-F7A2B45EF125}.Release|Any CPU.Build.0 = Release|Any CPU {3032E9B1-F572-4ECB-906A-F7A2B45EF125}.Release|x64.ActiveCfg = Release|Any CPU {3032E9B1-F572-4ECB-906A-F7A2B45EF125}.Release|x64.Build.0 = Release|Any CPU - {3032E9B1-F572-4ECB-906A-F7A2B45EF125}.Release|x86.ActiveCfg = Release|Any CPU - {3032E9B1-F572-4ECB-906A-F7A2B45EF125}.Release|x86.Build.0 = Release|Any CPU - {3032E9B1-F572-4ECB-906A-F7A2B45EF125}.ReleaseStrongName|Any CPU.ActiveCfg = Release|Any CPU - {3032E9B1-F572-4ECB-906A-F7A2B45EF125}.ReleaseStrongName|x64.ActiveCfg = Release|Any CPU - {3032E9B1-F572-4ECB-906A-F7A2B45EF125}.ReleaseStrongName|x86.ActiveCfg = Release|Any CPU - {7F2939D1-17AB-4B94-8933-09C76DC0C07A}.Debug|Any CPU.ActiveCfg = Debug|x86 - {7F2939D1-17AB-4B94-8933-09C76DC0C07A}.Debug|x64.ActiveCfg = Debug|x64 - {7F2939D1-17AB-4B94-8933-09C76DC0C07A}.Debug|x64.Build.0 = Debug|x64 - {7F2939D1-17AB-4B94-8933-09C76DC0C07A}.Debug|x86.ActiveCfg = Debug|x86 - {7F2939D1-17AB-4B94-8933-09C76DC0C07A}.Debug|x86.Build.0 = Debug|x86 - {7F2939D1-17AB-4B94-8933-09C76DC0C07A}.DebugStrongName|Any CPU.ActiveCfg = Debug|x86 - {7F2939D1-17AB-4B94-8933-09C76DC0C07A}.DebugStrongName|x64.ActiveCfg = Debug|x64 - {7F2939D1-17AB-4B94-8933-09C76DC0C07A}.DebugStrongName|x86.ActiveCfg = Debug|x86 - {7F2939D1-17AB-4B94-8933-09C76DC0C07A}.Release|Any CPU.ActiveCfg = Release|x86 - {7F2939D1-17AB-4B94-8933-09C76DC0C07A}.Release|x64.ActiveCfg = Release|x64 - {7F2939D1-17AB-4B94-8933-09C76DC0C07A}.Release|x64.Build.0 = Release|x64 - {7F2939D1-17AB-4B94-8933-09C76DC0C07A}.Release|x86.ActiveCfg = Release|x86 - {7F2939D1-17AB-4B94-8933-09C76DC0C07A}.Release|x86.Build.0 = Release|x86 - {7F2939D1-17AB-4B94-8933-09C76DC0C07A}.ReleaseStrongName|Any CPU.ActiveCfg = Release|x86 - {7F2939D1-17AB-4B94-8933-09C76DC0C07A}.ReleaseStrongName|x64.ActiveCfg = Release|x64 - {7F2939D1-17AB-4B94-8933-09C76DC0C07A}.ReleaseStrongName|x86.ActiveCfg = Release|x86 - {41D6E896-FB86-4BA1-BC99-E2FE4AA89E93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {41D6E896-FB86-4BA1-BC99-E2FE4AA89E93}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7F2939D1-17AB-4B94-8933-09C76DC0C07A}.Debug|x64.ActiveCfg = Debug|Any CPU + {7F2939D1-17AB-4B94-8933-09C76DC0C07A}.Debug|x64.Build.0 = Debug|Any CPU + {7F2939D1-17AB-4B94-8933-09C76DC0C07A}.Release|x64.ActiveCfg = Release|Any CPU + {7F2939D1-17AB-4B94-8933-09C76DC0C07A}.Release|x64.Build.0 = Release|Any CPU {41D6E896-FB86-4BA1-BC99-E2FE4AA89E93}.Debug|x64.ActiveCfg = Debug|Any CPU {41D6E896-FB86-4BA1-BC99-E2FE4AA89E93}.Debug|x64.Build.0 = Debug|Any CPU - {41D6E896-FB86-4BA1-BC99-E2FE4AA89E93}.Debug|x86.ActiveCfg = Debug|Any CPU - {41D6E896-FB86-4BA1-BC99-E2FE4AA89E93}.Debug|x86.Build.0 = Debug|Any CPU - {41D6E896-FB86-4BA1-BC99-E2FE4AA89E93}.DebugStrongName|Any CPU.ActiveCfg = Debug|Any CPU - {41D6E896-FB86-4BA1-BC99-E2FE4AA89E93}.DebugStrongName|x64.ActiveCfg = Debug|Any CPU - {41D6E896-FB86-4BA1-BC99-E2FE4AA89E93}.DebugStrongName|x86.ActiveCfg = Debug|Any CPU - {41D6E896-FB86-4BA1-BC99-E2FE4AA89E93}.Release|Any CPU.ActiveCfg = Release|Any CPU - {41D6E896-FB86-4BA1-BC99-E2FE4AA89E93}.Release|Any CPU.Build.0 = Release|Any CPU {41D6E896-FB86-4BA1-BC99-E2FE4AA89E93}.Release|x64.ActiveCfg = Release|Any CPU {41D6E896-FB86-4BA1-BC99-E2FE4AA89E93}.Release|x64.Build.0 = Release|Any CPU - {41D6E896-FB86-4BA1-BC99-E2FE4AA89E93}.Release|x86.ActiveCfg = Release|Any CPU - {41D6E896-FB86-4BA1-BC99-E2FE4AA89E93}.Release|x86.Build.0 = Release|Any CPU - {41D6E896-FB86-4BA1-BC99-E2FE4AA89E93}.ReleaseStrongName|Any CPU.ActiveCfg = Release|Any CPU - {41D6E896-FB86-4BA1-BC99-E2FE4AA89E93}.ReleaseStrongName|x64.ActiveCfg = Release|Any CPU - {41D6E896-FB86-4BA1-BC99-E2FE4AA89E93}.ReleaseStrongName|x86.ActiveCfg = Release|Any CPU - {4A36576E-E47F-4993-AD94-D09B989B4CE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A36576E-E47F-4993-AD94-D09B989B4CE4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A36576E-E47F-4993-AD94-D09B989B4CE4}.Debug|x64.ActiveCfg = Debug|Any CPU - {4A36576E-E47F-4993-AD94-D09B989B4CE4}.Debug|x64.Build.0 = Debug|Any CPU - {4A36576E-E47F-4993-AD94-D09B989B4CE4}.Debug|x86.ActiveCfg = Debug|Any CPU - {4A36576E-E47F-4993-AD94-D09B989B4CE4}.Debug|x86.Build.0 = Debug|Any CPU - {4A36576E-E47F-4993-AD94-D09B989B4CE4}.DebugStrongName|Any CPU.ActiveCfg = Debug|Any CPU - {4A36576E-E47F-4993-AD94-D09B989B4CE4}.DebugStrongName|x64.ActiveCfg = Debug|Any CPU - {4A36576E-E47F-4993-AD94-D09B989B4CE4}.DebugStrongName|x86.ActiveCfg = Debug|Any CPU - {4A36576E-E47F-4993-AD94-D09B989B4CE4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A36576E-E47F-4993-AD94-D09B989B4CE4}.Release|Any CPU.Build.0 = Release|Any CPU - {4A36576E-E47F-4993-AD94-D09B989B4CE4}.Release|x64.ActiveCfg = Release|Any CPU - {4A36576E-E47F-4993-AD94-D09B989B4CE4}.Release|x64.Build.0 = Release|Any CPU - {4A36576E-E47F-4993-AD94-D09B989B4CE4}.Release|x86.ActiveCfg = Release|Any CPU - {4A36576E-E47F-4993-AD94-D09B989B4CE4}.Release|x86.Build.0 = Release|Any CPU - {4A36576E-E47F-4993-AD94-D09B989B4CE4}.ReleaseStrongName|Any CPU.ActiveCfg = Release|Any CPU - {4A36576E-E47F-4993-AD94-D09B989B4CE4}.ReleaseStrongName|x64.ActiveCfg = Release|Any CPU - {4A36576E-E47F-4993-AD94-D09B989B4CE4}.ReleaseStrongName|x86.ActiveCfg = Release|Any CPU - {2E74EB9D-6465-4DEF-9B2C-D13713BA3C4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E74EB9D-6465-4DEF-9B2C-D13713BA3C4C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E74EB9D-6465-4DEF-9B2C-D13713BA3C4C}.Debug|x64.ActiveCfg = Debug|Any CPU - {2E74EB9D-6465-4DEF-9B2C-D13713BA3C4C}.Debug|x64.Build.0 = Debug|Any CPU - {2E74EB9D-6465-4DEF-9B2C-D13713BA3C4C}.Debug|x86.ActiveCfg = Debug|Any CPU - {2E74EB9D-6465-4DEF-9B2C-D13713BA3C4C}.Debug|x86.Build.0 = Debug|Any CPU - {2E74EB9D-6465-4DEF-9B2C-D13713BA3C4C}.DebugStrongName|Any CPU.ActiveCfg = Debug|Any CPU - {2E74EB9D-6465-4DEF-9B2C-D13713BA3C4C}.DebugStrongName|x64.ActiveCfg = Debug|Any CPU - {2E74EB9D-6465-4DEF-9B2C-D13713BA3C4C}.DebugStrongName|x86.ActiveCfg = Debug|Any CPU - {2E74EB9D-6465-4DEF-9B2C-D13713BA3C4C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E74EB9D-6465-4DEF-9B2C-D13713BA3C4C}.Release|Any CPU.Build.0 = Release|Any CPU - {2E74EB9D-6465-4DEF-9B2C-D13713BA3C4C}.Release|x64.ActiveCfg = Release|Any CPU - {2E74EB9D-6465-4DEF-9B2C-D13713BA3C4C}.Release|x64.Build.0 = Release|Any CPU - {2E74EB9D-6465-4DEF-9B2C-D13713BA3C4C}.Release|x86.ActiveCfg = Release|Any CPU - {2E74EB9D-6465-4DEF-9B2C-D13713BA3C4C}.Release|x86.Build.0 = Release|Any CPU - {2E74EB9D-6465-4DEF-9B2C-D13713BA3C4C}.ReleaseStrongName|Any CPU.ActiveCfg = Release|Any CPU - {2E74EB9D-6465-4DEF-9B2C-D13713BA3C4C}.ReleaseStrongName|x64.ActiveCfg = Release|Any CPU - {2E74EB9D-6465-4DEF-9B2C-D13713BA3C4C}.ReleaseStrongName|x86.ActiveCfg = Release|Any CPU - {9CBCE2AB-4E19-4344-B3CF-67D07CC9C8FC}.Debug|Any CPU.ActiveCfg = Debug|x86 {9CBCE2AB-4E19-4344-B3CF-67D07CC9C8FC}.Debug|x64.ActiveCfg = Debug|x64 {9CBCE2AB-4E19-4344-B3CF-67D07CC9C8FC}.Debug|x64.Build.0 = Debug|x64 - {9CBCE2AB-4E19-4344-B3CF-67D07CC9C8FC}.Debug|x86.ActiveCfg = Debug|x86 - {9CBCE2AB-4E19-4344-B3CF-67D07CC9C8FC}.Debug|x86.Build.0 = Debug|x86 - {9CBCE2AB-4E19-4344-B3CF-67D07CC9C8FC}.DebugStrongName|Any CPU.ActiveCfg = Debug|x86 - {9CBCE2AB-4E19-4344-B3CF-67D07CC9C8FC}.DebugStrongName|x64.ActiveCfg = Debug|x64 - {9CBCE2AB-4E19-4344-B3CF-67D07CC9C8FC}.DebugStrongName|x86.ActiveCfg = Debug|x86 - {9CBCE2AB-4E19-4344-B3CF-67D07CC9C8FC}.Release|Any CPU.ActiveCfg = Release|x86 {9CBCE2AB-4E19-4344-B3CF-67D07CC9C8FC}.Release|x64.ActiveCfg = Release|x64 {9CBCE2AB-4E19-4344-B3CF-67D07CC9C8FC}.Release|x64.Build.0 = Release|x64 - {9CBCE2AB-4E19-4344-B3CF-67D07CC9C8FC}.Release|x86.ActiveCfg = Release|x86 - {9CBCE2AB-4E19-4344-B3CF-67D07CC9C8FC}.Release|x86.Build.0 = Release|x86 - {9CBCE2AB-4E19-4344-B3CF-67D07CC9C8FC}.ReleaseStrongName|Any CPU.ActiveCfg = Release|x86 - {9CBCE2AB-4E19-4344-B3CF-67D07CC9C8FC}.ReleaseStrongName|x64.ActiveCfg = Release|x64 - {9CBCE2AB-4E19-4344-B3CF-67D07CC9C8FC}.ReleaseStrongName|x86.ActiveCfg = Release|x86 - {474D94F4-857B-4199-97AF-C600AED44406}.Debug|Any CPU.ActiveCfg = Debug|x64 {474D94F4-857B-4199-97AF-C600AED44406}.Debug|x64.ActiveCfg = Debug|x64 {474D94F4-857B-4199-97AF-C600AED44406}.Debug|x64.Build.0 = Debug|x64 - {474D94F4-857B-4199-97AF-C600AED44406}.Debug|x86.ActiveCfg = Debug|x64 - {474D94F4-857B-4199-97AF-C600AED44406}.DebugStrongName|Any CPU.ActiveCfg = Debug|x64 - {474D94F4-857B-4199-97AF-C600AED44406}.DebugStrongName|x64.ActiveCfg = Debug|x64 - {474D94F4-857B-4199-97AF-C600AED44406}.DebugStrongName|x86.ActiveCfg = Debug|x64 - {474D94F4-857B-4199-97AF-C600AED44406}.Release|Any CPU.ActiveCfg = Release|x64 {474D94F4-857B-4199-97AF-C600AED44406}.Release|x64.ActiveCfg = Release|x64 {474D94F4-857B-4199-97AF-C600AED44406}.Release|x64.Build.0 = Release|x64 - {474D94F4-857B-4199-97AF-C600AED44406}.Release|x86.ActiveCfg = Release|x64 - {474D94F4-857B-4199-97AF-C600AED44406}.ReleaseStrongName|Any CPU.ActiveCfg = Release|x64 - {474D94F4-857B-4199-97AF-C600AED44406}.ReleaseStrongName|x64.ActiveCfg = Release|x64 - {474D94F4-857B-4199-97AF-C600AED44406}.ReleaseStrongName|x86.ActiveCfg = Release|x64 - {1FAD1F90-D37E-40CA-BBF0-6A33E82F8812}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1FAD1F90-D37E-40CA-BBF0-6A33E82F8812}.Debug|Any CPU.Build.0 = Debug|Any CPU {1FAD1F90-D37E-40CA-BBF0-6A33E82F8812}.Debug|x64.ActiveCfg = Debug|Any CPU {1FAD1F90-D37E-40CA-BBF0-6A33E82F8812}.Debug|x64.Build.0 = Debug|Any CPU - {1FAD1F90-D37E-40CA-BBF0-6A33E82F8812}.Debug|x86.ActiveCfg = Debug|Any CPU - {1FAD1F90-D37E-40CA-BBF0-6A33E82F8812}.Debug|x86.Build.0 = Debug|Any CPU - {1FAD1F90-D37E-40CA-BBF0-6A33E82F8812}.DebugStrongName|Any CPU.ActiveCfg = Debug|Any CPU - {1FAD1F90-D37E-40CA-BBF0-6A33E82F8812}.DebugStrongName|x64.ActiveCfg = Debug|Any CPU - {1FAD1F90-D37E-40CA-BBF0-6A33E82F8812}.DebugStrongName|x86.ActiveCfg = Debug|Any CPU - {1FAD1F90-D37E-40CA-BBF0-6A33E82F8812}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1FAD1F90-D37E-40CA-BBF0-6A33E82F8812}.Release|Any CPU.Build.0 = Release|Any CPU {1FAD1F90-D37E-40CA-BBF0-6A33E82F8812}.Release|x64.ActiveCfg = Release|Any CPU {1FAD1F90-D37E-40CA-BBF0-6A33E82F8812}.Release|x64.Build.0 = Release|Any CPU - {1FAD1F90-D37E-40CA-BBF0-6A33E82F8812}.Release|x86.ActiveCfg = Release|Any CPU - {1FAD1F90-D37E-40CA-BBF0-6A33E82F8812}.Release|x86.Build.0 = Release|Any CPU - {1FAD1F90-D37E-40CA-BBF0-6A33E82F8812}.ReleaseStrongName|Any CPU.ActiveCfg = Release|Any CPU - {1FAD1F90-D37E-40CA-BBF0-6A33E82F8812}.ReleaseStrongName|x64.ActiveCfg = Release|Any CPU - {1FAD1F90-D37E-40CA-BBF0-6A33E82F8812}.ReleaseStrongName|x86.ActiveCfg = Release|Any CPU - {D01829D2-B553-4C4B-B392-2437E6A130B5}.Debug|Any CPU.ActiveCfg = Debug|x64 {D01829D2-B553-4C4B-B392-2437E6A130B5}.Debug|x64.ActiveCfg = Debug|x64 {D01829D2-B553-4C4B-B392-2437E6A130B5}.Debug|x64.Build.0 = Debug|x64 - {D01829D2-B553-4C4B-B392-2437E6A130B5}.Debug|x86.ActiveCfg = Debug|x64 - {D01829D2-B553-4C4B-B392-2437E6A130B5}.DebugStrongName|Any CPU.ActiveCfg = Release|x64 - {D01829D2-B553-4C4B-B392-2437E6A130B5}.DebugStrongName|Any CPU.Build.0 = Release|x64 - {D01829D2-B553-4C4B-B392-2437E6A130B5}.DebugStrongName|x64.ActiveCfg = Debug|x64 - {D01829D2-B553-4C4B-B392-2437E6A130B5}.DebugStrongName|x86.ActiveCfg = DebugStrongName|x64 - {D01829D2-B553-4C4B-B392-2437E6A130B5}.Release|Any CPU.ActiveCfg = Release|x64 {D01829D2-B553-4C4B-B392-2437E6A130B5}.Release|x64.ActiveCfg = Release|x64 {D01829D2-B553-4C4B-B392-2437E6A130B5}.Release|x64.Build.0 = Release|x64 - {D01829D2-B553-4C4B-B392-2437E6A130B5}.Release|x86.ActiveCfg = Release|x64 - {D01829D2-B553-4C4B-B392-2437E6A130B5}.ReleaseStrongName|Any CPU.ActiveCfg = Release|x64 - {D01829D2-B553-4C4B-B392-2437E6A130B5}.ReleaseStrongName|Any CPU.Build.0 = Release|x64 - {D01829D2-B553-4C4B-B392-2437E6A130B5}.ReleaseStrongName|x64.ActiveCfg = Release|x64 - {D01829D2-B553-4C4B-B392-2437E6A130B5}.ReleaseStrongName|x86.ActiveCfg = ReleaseStrongName|x64 - {9A292249-66EE-4C9C-A6B7-DD5112E3625F}.Debug|Any CPU.ActiveCfg = Debug|x64 {9A292249-66EE-4C9C-A6B7-DD5112E3625F}.Debug|x64.ActiveCfg = Debug|x64 {9A292249-66EE-4C9C-A6B7-DD5112E3625F}.Debug|x64.Build.0 = Debug|x64 - {9A292249-66EE-4C9C-A6B7-DD5112E3625F}.Debug|x86.ActiveCfg = Debug|x64 - {9A292249-66EE-4C9C-A6B7-DD5112E3625F}.DebugStrongName|Any CPU.ActiveCfg = DebugStrongName|x64 - {9A292249-66EE-4C9C-A6B7-DD5112E3625F}.DebugStrongName|x64.ActiveCfg = DebugStrongName|x64 - {9A292249-66EE-4C9C-A6B7-DD5112E3625F}.DebugStrongName|x64.Build.0 = DebugStrongName|x64 - {9A292249-66EE-4C9C-A6B7-DD5112E3625F}.DebugStrongName|x86.ActiveCfg = DebugStrongName|x64 - {9A292249-66EE-4C9C-A6B7-DD5112E3625F}.Release|Any CPU.ActiveCfg = Release|x64 {9A292249-66EE-4C9C-A6B7-DD5112E3625F}.Release|x64.ActiveCfg = Release|x64 {9A292249-66EE-4C9C-A6B7-DD5112E3625F}.Release|x64.Build.0 = Release|x64 - {9A292249-66EE-4C9C-A6B7-DD5112E3625F}.Release|x86.ActiveCfg = Release|x64 - {9A292249-66EE-4C9C-A6B7-DD5112E3625F}.ReleaseStrongName|Any CPU.ActiveCfg = ReleaseStrongName|x64 - {9A292249-66EE-4C9C-A6B7-DD5112E3625F}.ReleaseStrongName|x64.ActiveCfg = ReleaseStrongName|x64 - {9A292249-66EE-4C9C-A6B7-DD5112E3625F}.ReleaseStrongName|x64.Build.0 = ReleaseStrongName|x64 - {9A292249-66EE-4C9C-A6B7-DD5112E3625F}.ReleaseStrongName|x86.ActiveCfg = ReleaseStrongName|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -615,7 +227,6 @@ Global {3032E9B1-F572-4ECB-906A-F7A2B45EF125} = {4817E415-1337-4CA1-BF30-23D3EA0F806B} {7F2939D1-17AB-4B94-8933-09C76DC0C07A} = {4817E415-1337-4CA1-BF30-23D3EA0F806B} {41D6E896-FB86-4BA1-BC99-E2FE4AA89E93} = {4817E415-1337-4CA1-BF30-23D3EA0F806B} - {2E74EB9D-6465-4DEF-9B2C-D13713BA3C4C} = {4817E415-1337-4CA1-BF30-23D3EA0F806B} {9CBCE2AB-4E19-4344-B3CF-67D07CC9C8FC} = {4817E415-1337-4CA1-BF30-23D3EA0F806B} {474D94F4-857B-4199-97AF-C600AED44406} = {4817E415-1337-4CA1-BF30-23D3EA0F806B} {1FAD1F90-D37E-40CA-BBF0-6A33E82F8812} = {4817E415-1337-4CA1-BF30-23D3EA0F806B} diff --git a/MetrilusReferencesVersions.props b/MetrilusReferencesVersions.props deleted file mode 100644 index 522e5e94..00000000 --- a/MetrilusReferencesVersions.props +++ /dev/null @@ -1,25 +0,0 @@ - - - - - $(SolutionDir)lib\ - - - $(SolutionDir)lib_strongname\ - - - $(SolutionDir)lib_netstandard2.0\ - - - - - - $(LibrariesPath) - true - - - $(LibrariesPathNetStandard) - true - - - \ No newline at end of file diff --git a/Samples/Directory.Build.props b/Samples/Directory.Build.props new file mode 100644 index 00000000..00e08eb2 --- /dev/null +++ b/Samples/Directory.Build.props @@ -0,0 +1,12 @@ + + + + + ..\..\bin\Samples\$(Configuration)\ + + + + .licenseheader + + + diff --git a/Samples/MinimalSample/MinimalSample.csproj b/Samples/MinimalSample/MinimalSample.csproj index 7b379a88..06c39f2e 100644 --- a/Samples/MinimalSample/MinimalSample.csproj +++ b/Samples/MinimalSample/MinimalSample.csproj @@ -1,127 +1,18 @@ - - - - + - Debug - AnyCPU - {488A05E9-0E28-4B47-B4EB-FD5FFEAB9BDE} Exe - Properties MetriCam2.Samples.MinimalSample - MinimalSample - v4.7.2 - 512 - - false - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - - - true - ..\..\bin\Samples\x64\Debug\ - DEBUG;TRACE - false - full - x64 - prompt - MinimumRecommendedRules.ruleset - false - - - ..\..\bin\Samples\x64\Release\ - TRACE - true - true - pdbonly + A minimal sample for using MetriCam 2 + MetriCam 2: Minimal Sample + net472 + x64 x64 - prompt - MinimumRecommendedRules.ruleset - false - - true - ..\..\bin\Samples\x86\Debug\ - DEBUG;TRACE - true - full - x86 - prompt - MinimumRecommendedRules.ruleset - false - - - ..\..\bin\Samples\x86\Release\ - TRACE - true - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - false - - - - $(LibrariesPath)Metrilus.Util.dll - - - - - - - - - - - - - SolutionAssemblyInfo.cs - - - - - - - .licenseheader - - - - - False - .NET Framework 3.5 SP1 - false - + + - - {9a292249-66ee-4c9c-a6b7-dd5112e3625f} - Kinect4Azure - - - {342f049e-668b-4351-b21d-75e4bef5a1e4} - MetriCam2 - + - - \ No newline at end of file diff --git a/Samples/MinimalSample/Properties/AssemblyInfo.cs b/Samples/MinimalSample/Properties/AssemblyInfo.cs deleted file mode 100644 index f539073f..00000000 --- a/Samples/MinimalSample/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) Metrilus GmbH -// MetriCam 2 is licensed under the MIT license. See License.txt for full license text. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("MetriCam 2: Minimal Sample")] -[assembly: AssemblyDescription("A minimal sample for using MetriCam 2")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("5248f5c9-b483-460d-afbb-b2bebac0e953")] diff --git a/Samples/SimpleViewer/Properties/AssemblyInfo.cs b/Samples/SimpleViewer/Properties/AssemblyInfo.cs deleted file mode 100644 index e7d001f1..00000000 --- a/Samples/SimpleViewer/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) Metrilus GmbH -// MetriCam 2 is licensed under the MIT license. See License.txt for full license text. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("MetriCam 2: Simple Viewer")] -[assembly: AssemblyDescription("A simple viewer for MetriCam 2 cameras")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("d36f3e90-f9b8-497d-a86d-75c749302a0e")] \ No newline at end of file diff --git a/Samples/SimpleViewer/SimpleViewer.csproj b/Samples/SimpleViewer/SimpleViewer.csproj index 5fa0ad3b..ac74506c 100644 --- a/Samples/SimpleViewer/SimpleViewer.csproj +++ b/Samples/SimpleViewer/SimpleViewer.csproj @@ -1,137 +1,58 @@ - - - - + - Debug - AnyCPU - {DE24F649-A2A1-47E7-9C63-F032946C0C2F} - WinExe - Properties + Exe MetriCam2.Samples.SimpleViewer - SimpleViewer - v4.7.2 - 512 - - - - true - ..\..\bin\Samples\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - false - true - - - ..\..\bin\Samples\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - false - true - - - true - ..\..\bin\Samples\x64\Debug\ - DEBUG;TRACE - full - x64 - prompt - MinimumRecommendedRules.ruleset - true - false - true - - - ..\..\bin\Samples\x64\Release\ - TRACE - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - true - false - true - - + A simple viewer for MetriCam 2 cameras + MetriCam 2: Simple Viewer MetrilusPlainAppIcon.ico + net472 + x64 + x64 + true - - - $(LibrariesPath)Metrilus.Util.dll - - - - - - - - - - - - - - - SolutionAssemblyInfo.cs + + + Form + + + SimpleViewer.cs - + + True True - True Settings.settings - - Form - - - SimpleViewer.cs + + True + True + Resources.resx - - - + + + SimpleViewer.cs - + + ResXFileCodeGenerator + Resources.Designer.cs + - - {9a292249-66ee-4c9c-a6b7-dd5112e3625f} - Kinect4Azure - - - {9060cbcf-609d-47b3-9245-43d34c540a73} - MetriCam2.Controls - - - {342f049e-668b-4351-b21d-75e4bef5a1e4} - MetriCam2 - + + SettingsSingleFileGenerator + Settings.Designer.cs + .licenseheader - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - + + + + + \ No newline at end of file diff --git a/Scripts/Jenkinsfile.groovy b/Scripts/Jenkinsfile.groovy index a84b153b..ac7400c1 100644 --- a/Scripts/Jenkinsfile.groovy +++ b/Scripts/Jenkinsfile.groovy @@ -9,12 +9,6 @@ pipeline { def V_MINOR = "${versionInfo['VERSION_MINOR']}" def V_BUILD = "${versionInfo['VERSION_BUILD']}" - def dllsToDeployX64 = 'CookComputing.XmlRpcV2 MetriCam2.Cameras.BaslerACE MetriCam2.Cameras.BaslerToF MetriCam2.Cameras.ifm MetriCam2.Cameras.Kinect2 MetriCam2.Cameras.Kinect4Azure MetriCam2.Cameras.MatrixVision MetriCam2.Cameras.OrbbecOpenNI MetriCam2.Cameras.Sick.TiM561 MetriCam2.Cameras.Sick.VisionaryT MetriCam2.Cameras.Sick.VisionaryT.Pro MetriCam2.Cameras.SVS MetriCam2.Cameras.TIVoxel MetriCam2.Cameras.UEye MetriCam2.Cameras.WebCam MetriCam2.Cameras.Pico' - def dllsToDeployAnyCPU = 'Intel.RealSense log4net MathNet.Numerics MetriCam2 MetriCam2.Cameras.RealSense2 MetriCam2.Controls Metrilus.Util Newtonsoft.Json' - def dllsToDeployNetStandard = 'MetriCam2 MetriCam2.Cameras.RealSense2 Metrilus.Util' - def dllsToDeployX64StrongName = 'MetriCam2.Cameras.Kinect2 MetriCam2.Cameras.Kinect4Azure MetriCam2.Cameras.OrbbecOpenNI MetriCam2.Cameras.Sick.VisionaryT' - def dllsToDeployAnyCPUStrongName = 'log4net MathNet.Numerics MetriCam2 MetriCam2.Controls Metrilus.Util Newtonsoft.Json' - def currentBranch = "${env.GITHUB_BRANCH_NAME}" def msbuildToolName = 'MSBuild Release/x64 [v15.0 / VS2017]' def solutionFilename = 'MetriCam2_SDK.sln' @@ -23,11 +17,10 @@ pipeline { def niceVersion = "${releaseVersion}" def releaseFolder = getReleaseFolder(currentBranch, niceVersion) + def targetFrameworks = "net45 net472 netstandard2.0" def releaseDirectory = "Z:\\releases\\MetriCam2\\${releaseFolder}" - def releaseLibraryDirectory = "${releaseDirectory}\\lib" - def releaseSuffixNetStandard20 = "_netstandard2.0" - def releaseSuffixDebug = "_debug" - def releaseSuffixStrongName = "_strongname" + def releaseLibraryDirectory = "lib" + def folderSuffixDebug = "_debug" def STATUS_CONTEXT = 'MetriCam2 CI' def BUILD_DATETIME = new Date(currentBuild.startTimeInMillis).format("yyyyMMdd-HHmm") @@ -45,12 +38,11 @@ pipeline { %NUGET_EXE% restore ''' - bat ''' - @echo Checking References ... - %REFERENCE_CHECKER% -j "%JOB_NAME%" "%WORKSPACE%" - ''' + echo "Setting version number for C# projects..." + bat "\"Scripts\\SetVersion.cmd\" \"Directory.Build.props\" ${releaseVersion}" - bat "\"Scripts\\Set Assembly-Info Version.cmd\" \"SolutionAssemblyInfo.cs\" ${releaseVersion}" + echo "Setting version for C++/CLI projects..." + bat "\"Scripts\\Set Assembly-Info Version.cmd\" \"SolutionAssemblyInfo.h\" ${releaseVersion}" } } @@ -58,24 +50,10 @@ pipeline { steps { bat "\"${tool msbuildToolName}\" ${solutionFilename} /p:Configuration=Release;Platform=x64" bat "\"${tool msbuildToolName}\" ${solutionFilename} /p:Configuration=Debug;Platform=x64" - bat "\"${tool msbuildToolName}\" ${solutionFilename} /p:Configuration=ReleaseStrongName;Platform=x64" - bat "\"${tool msbuildToolName}\" ${solutionFilename} /p:Configuration=DebugStrongName;Platform=x64" } } stage('Publish') { - environment { - def RELEASE_DIR_X64 = 'bin\\x64\\Release\\' - def DEBUG_DIR_X64 = 'bin\\x64\\Debug\\' - def RELEASE_DIR_X64_STRONGNAME = 'bin\\x64\\ReleaseStrongName\\' - def DEBUG_DIR_X64_STRONGNAME = 'bin\\x64\\DebugStrongName\\' - def RELEASE_DIR_ANYCPU = 'bin\\Release\\' - def DEBUG_DIR_ANYCPU = 'bin\\Debug\\' - def RELEASE_DIR_ANYCPU_STRONGNAME = 'bin\\ReleaseStrongName\\' - def DEBUG_DIR_ANYCPU_STRONGNAME = 'bin\\DebugStrongName\\' - def RELEASE_DIR_NETSTANDARD = 'bin\\Release\\netstandard2.0\\' - def DEBUG_DIR_NETSTANDARD = 'bin\\Debug\\netstandard2.0\\' - } steps { script { if (fileExists(releaseDirectory)) { @@ -91,19 +69,12 @@ pipeline { mkdir \"${releaseDirectory}\" if errorlevel 1 GOTO StepFailed - mkdir \"${releaseLibraryDirectory}\" - if errorlevel 1 GOTO StepFailed - mkdir \"${releaseLibraryDirectory}${releaseSuffixDebug}\" - if errorlevel 1 GOTO StepFailed - mkdir \"${releaseLibraryDirectory}${releaseSuffixNetStandard20}\" - if errorlevel 1 GOTO StepFailed - mkdir \"${releaseLibraryDirectory}${releaseSuffixNetStandard20}${releaseSuffixDebug}\" - if errorlevel 1 GOTO StepFailed - mkdir \"${releaseLibraryDirectory}${releaseSuffixStrongName}\" - if errorlevel 1 GOTO StepFailed - mkdir \"${releaseLibraryDirectory}${releaseSuffixStrongName}${releaseSuffixDebug}\" - if errorlevel 1 GOTO StepFailed - + for %%t in (%targetFrameworks%) do ( + mkdir \"${releaseDirectory}\\%%t\\${releaseLibraryDirectory}\" + if errorlevel 1 GOTO StepFailed + mkdir \"${releaseDirectory}\\%%t\\${releaseLibraryDirectory}${folderSuffixDebug}\" + if errorlevel 1 GOTO StepFailed + ) exit /b 0 :StepFailed @@ -113,66 +84,24 @@ pipeline { bat ''' echo Publishing Libraries and Dependencies ... - REM No error check for PDB files, since dependencies don't have them. - FOR %%p IN (%dllsToDeployX64%) DO ( - COPY /Y "%RELEASE_DIR_X64%%%p.dll" "%releaseLibraryDirectory%" + for %%t in (%targetFrameworks%) do ( + xcopy /Y /V \"bin\\Release\\%%t\\*.dll\" "%releaseDirectory%\\%%t\\%releaseLibraryDirectory%" if errorlevel 1 GOTO StepFailed - COPY /Y "%RELEASE_DIR_X64%%%p.pdb" "%releaseLibraryDirectory%" - - COPY /Y "%DEBUG_DIR_X64%%%p.dll" "%releaseLibraryDirectory%%releaseSuffixDebug%" + xcopy /Y /V \"bin\\Release\\%%t\\*.pdb\" "%releaseDirectory%\\%%t\\%releaseLibraryDirectory%" if errorlevel 1 GOTO StepFailed - COPY /Y "%DEBUG_DIR_X64%%%p.pdb" "%releaseLibraryDirectory%%releaseSuffixDebug%" - ) - COPY /Y "BetaCameras\\OrbbecOpenNI\\MetriCam2.Orbbec.props" "%releaseLibraryDirectory%" - if errorlevel 1 GOTO StepFailed - COPY /Y "BetaCameras\\OrbbecOpenNI\\MetriCam2.Orbbec.props" "%releaseLibraryDirectory%%releaseSuffixDebug%" - if errorlevel 1 GOTO StepFailed - COPY /Y "BetaCameras\\Kinect4Azure\\MetriCam2.Kinect4Azure.props" "%releaseLibraryDirectory%" - if errorlevel 1 GOTO StepFailed - COPY /Y "BetaCameras\\Kinect4Azure\\MetriCam2.Kinect4Azure.props" "%releaseLibraryDirectory%%releaseSuffixDebug%" - if errorlevel 1 GOTO StepFailed - FOR %%p IN (%dllsToDeployAnyCPU%) DO ( - COPY /Y "%RELEASE_DIR_ANYCPU%%%p.dll" "%releaseLibraryDirectory%" + xcopy /Y /V \"bin\\Debug\\%%t\\*.dll\" "%releaseDirectory%\\%%t\\%releaseLibraryDirectory%%folderSuffixDebug%" if errorlevel 1 GOTO StepFailed - COPY /Y "%RELEASE_DIR_ANYCPU%%%p.pdb" "%releaseLibraryDirectory%" - - COPY /Y "%DEBUG_DIR_ANYCPU%%%p.dll" "%releaseLibraryDirectory%%releaseSuffixDebug%" + xcopy /Y /V \"bin\\Debug\\%%t\\*.pdb\" "%releaseDirectory%\\%%t\\%releaseLibraryDirectory%%folderSuffixDebug%" if errorlevel 1 GOTO StepFailed - COPY /Y "%DEBUG_DIR_ANYCPU%%%p.pdb" "%releaseLibraryDirectory%%releaseSuffixDebug%" ) - FOR %%p IN (%dllsToDeployNetStandard%) DO ( - COPY /Y "%RELEASE_DIR_NETSTANDARD%%%p.dll" "%releaseLibraryDirectory%%releaseSuffixNetStandard20%" - if errorlevel 1 GOTO StepFailed - COPY /Y "%RELEASE_DIR_NETSTANDARD%%%p.pdb" "%releaseLibraryDirectory%%releaseSuffixNetStandard20%" - COPY /Y "%DEBUG_DIR_NETSTANDARD%%%p.dll" "%releaseLibraryDirectory%%releaseSuffixNetStandard20%%releaseSuffixDebug%" - if errorlevel 1 GOTO StepFailed - COPY /Y "%DEBUG_DIR_NETSTANDARD%%%p.pdb" "%releaseLibraryDirectory%%releaseSuffixNetStandard20%%releaseSuffixDebug%" - ) - FOR %%p IN (%dllsToDeployX64StrongName%) DO ( - COPY /Y "%RELEASE_DIR_X64_STRONGNAME%%%p.dll" "%releaseLibraryDirectory%%releaseSuffixStrongName%" - if errorlevel 1 GOTO StepFailed - COPY /Y "%RELEASE_DIR_X64_STRONGNAME%%%p.pdb" "%releaseLibraryDirectory%%releaseSuffixStrongName%" - - COPY /Y "%DEBUG_DIR_X64_STRONGNAME%%%p.dll" "%releaseLibraryDirectory%%releaseSuffixStrongName%%releaseSuffixDebug%" - if errorlevel 1 GOTO StepFailed - COPY /Y "%DEBUG_DIR_X64_STRONGNAME%%%p.pdb" "%releaseLibraryDirectory%%releaseSuffixStrongName%%releaseSuffixDebug%" - ) - COPY /Y "BetaCameras\\OrbbecOpenNI\\MetriCam2.Orbbec.props" "%releaseLibraryDirectory%%releaseSuffixStrongName%" + echo Publishing Camera-specific .props Files ... + + COPY /Y "BetaCameras\\OrbbecOpenNI\\MetriCam2.Orbbec.props" "%releaseDirectory%" if errorlevel 1 GOTO StepFailed - COPY /Y "BetaCameras\\OrbbecOpenNI\\MetriCam2.Orbbec.props" "%releaseLibraryDirectory%%releaseSuffixStrongName%%releaseSuffixDebug%" + COPY /Y "BetaCameras\\Kinect4Azure\\MetriCam2.Kinect4Azure.props" "%releaseDirectory%" if errorlevel 1 GOTO StepFailed - FOR %%p IN (%dllsToDeployAnyCPUStrongName%) DO ( - COPY /Y "%RELEASE_DIR_ANYCPU_STRONGNAME%%%p.dll" "%releaseLibraryDirectory%%releaseSuffixStrongName%" - if errorlevel 1 GOTO StepFailed - COPY /Y "%RELEASE_DIR_ANYCPU_STRONGNAME%%%p.pdb" "%releaseLibraryDirectory%%releaseSuffixStrongName%" - - COPY /Y "%DEBUG_DIR_ANYCPU_STRONGNAME%%%p.dll" "%releaseLibraryDirectory%%releaseSuffixStrongName%%releaseSuffixDebug%" - if errorlevel 1 GOTO StepFailed - COPY /Y "%DEBUG_DIR_ANYCPU_STRONGNAME%%%p.pdb" "%releaseLibraryDirectory%%releaseSuffixStrongName%%releaseSuffixDebug%" - ) - exit /b 0 :StepFailed @@ -185,15 +114,6 @@ pipeline { copy \"License.txt\" \"${releaseDirectory}\" if errorlevel 1 GOTO StepFailed - copy \"lib\\License-MathNet.Numerics.txt\" \"${releaseDirectory}\" - if errorlevel 1 GOTO StepFailed - copy \"lib\\License-Newtonsoft.Json.txt\" \"${releaseDirectory}\" - if errorlevel 1 GOTO StepFailed - copy \"lib\\License-Metrilus.Util.txt\" \"${releaseDirectory}\" - if errorlevel 1 GOTO StepFailed - copy \"lib\\Notice-log4net.md\" \"${releaseDirectory}\" - if errorlevel 1 GOTO StepFailed - exit /b 0 :StepFailed diff --git a/Scripts/SetVersion.cmd b/Scripts/SetVersion.cmd new file mode 100644 index 00000000..b4db0c0d --- /dev/null +++ b/Scripts/SetVersion.cmd @@ -0,0 +1,7 @@ +@echo off + +echo Updating Version: %2 +@powershell -Command "(get-content \"%~f1\")" ^ + " |foreach-object { $_ -replace \"^^(\s*^)[^^^<]*\", \"`${1}%2\" }" ^ + " |foreach-object { $_ -replace \"^^(\s*^)[^^^<]*\", \"`${1}%2\" }" ^ + " |set-content \"%~f1\"" diff --git a/SolutionAssemblyInfo.cs b/SolutionAssemblyInfo.cs deleted file mode 100644 index e053117b..00000000 --- a/SolutionAssemblyInfo.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Reflection; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Metrilus GmbH")] -[assembly: AssemblyProduct("MetriCam 2")] -[assembly: AssemblyCopyright("Copyright © 2013 - 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("11.0.0.0")] -[assembly: AssemblyFileVersion("11.0.0.0")] - -// REMINDER: Also update SolutionAssemblyInfo.h \ No newline at end of file diff --git a/Tests/Directory.Build.props b/Tests/Directory.Build.props new file mode 100644 index 00000000..5b04f358 --- /dev/null +++ b/Tests/Directory.Build.props @@ -0,0 +1,12 @@ + + + + + ..\..\bin\Tests\$(Configuration)\ + + + + .licenseheader + + + diff --git a/Tests/LoadCalibrationsTest/LoadCalibrationsTest.csproj b/Tests/LoadCalibrationsTest/LoadCalibrationsTest.csproj index c3c70aad..bdb83b1b 100644 --- a/Tests/LoadCalibrationsTest/LoadCalibrationsTest.csproj +++ b/Tests/LoadCalibrationsTest/LoadCalibrationsTest.csproj @@ -1,101 +1,15 @@ - - - - + - Debug - AnyCPU - {B64515BC-38E8-44B3-AD2B-E13DEFE6DF96} Exe - Properties MetriCam2.Tests.LoadCalibrationsTest Test.LoadCalibrations - v4.5 - 512 - + net472 - - true - ..\..\bin\Tests\x86\Debug\ - DEBUG;TRACE - true - full - x86 - prompt - MinimumRecommendedRules.ruleset - false - - - ..\..\bin\Tests\x86\Release\ - TRACE - true - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - false - - - true - ..\..\bin\Tests\x64\Debug\ - DEBUG;TRACE - true - full - x64 - prompt - MinimumRecommendedRules.ruleset - false - - - ..\..\bin\Tests\x64\Release\ - TRACE - true - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - false - - - - $(LibrariesPath)Metrilus.Util.dll - - - - - - - - - - - - - - - {03558646-61b1-4f4e-bf70-7a623df27095} - Kinect2 - - - {342f049e-668b-4351-b21d-75e4bef5a1e4} - MetriCam2 - + + - - .licenseheader - - + - - diff --git a/Tests/LoadCalibrationsTest/Properties/AssemblyInfo.cs b/Tests/LoadCalibrationsTest/Properties/AssemblyInfo.cs deleted file mode 100644 index cee87527..00000000 --- a/Tests/LoadCalibrationsTest/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (c) Metrilus GmbH -// MetriCam 2 is licensed under the MIT license. See License.txt for full license text. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("LoadCalibrationsTest")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("LoadCalibrationsTest")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("658e2aed-1311-4d17-8020-bb1506c5031b")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Tests/LoadCalibrationsTest/app.config b/Tests/LoadCalibrationsTest/app.config index 51278a45..312bb3f2 100644 --- a/Tests/LoadCalibrationsTest/app.config +++ b/Tests/LoadCalibrationsTest/app.config @@ -1,3 +1,3 @@ - + diff --git a/Tests/TestCameraSettings/Properties/AssemblyInfo.cs b/Tests/TestCameraSettings/Properties/AssemblyInfo.cs deleted file mode 100644 index 653499ad..00000000 --- a/Tests/TestCameraSettings/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (c) Metrilus GmbH -// MetriCam 2 is licensed under the MIT license. See License.txt for full license text. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("TestCameraSettings")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("TestCameraSettings")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("d30e51fa-6c10-4b81-bdb3-57e9e457fa2b")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Tests/TestCameraSettings/TestCameraSettings.csproj b/Tests/TestCameraSettings/TestCameraSettings.csproj index a1fdc18b..1f951374 100644 --- a/Tests/TestCameraSettings/TestCameraSettings.csproj +++ b/Tests/TestCameraSettings/TestCameraSettings.csproj @@ -1,263 +1,19 @@ - - - - + - Debug - AnyCPU - {27D56448-7608-44D7-BFBA-388A36CB162D} Exe - Properties MetriCam2.Tests.TestCameraSettings Test.CameraSettings - v4.5 - 512 - false - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true + net472 - - true - ..\..\bin\Tests\x64\Debug\ - DEBUG;TRACE - full - x64 - prompt - MinimumRecommendedRules.ruleset - false - - - ..\..\bin\Tests\x64\Release\ - TRACE - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - false - - - true - ..\..\bin\Tests\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - false - - - ..\..\bin\Tests\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - false - - - - $(LibrariesPath)Metrilus.Util.dll - - - - - - - - - - - - - - - - {eacc7e80-3e2e-4616-af7b-0b81a1e68082} - SVS - - - {68003e12-8d06-4edc-8578-fc075ed27f80} - UEye - - - {342f049e-668b-4351-b21d-75e4bef5a1e4} - MetriCam2 - - - - False - - - - - Exclude - False - Satellite - - - False - - - - - Exclude - False - Satellite - - - False - - - - - Exclude - False - Satellite - - - False - - - - - Exclude - False - Satellite - - - False - - - - - Exclude - False - Satellite - - - False - - - - - Exclude - False - Satellite - - - False - - - - - Exclude - False - Satellite - - - False - - - - - Exclude - False - Satellite - - - False - - - - - Exclude - False - Satellite - - - False - - - - - Exclude - False - Satellite - - - False - - - - - Exclude - False - Satellite - - - False - - - - - Exclude - False - Satellite - - - - - False - Microsoft .NET Framework 4 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - false - - - False - Windows Installer 4.5 - true - + - + + + - - .licenseheader - - + - - diff --git a/Tests/TestCameraSettings/app.config b/Tests/TestCameraSettings/app.config index 51278a45..312bb3f2 100644 --- a/Tests/TestCameraSettings/app.config +++ b/Tests/TestCameraSettings/app.config @@ -1,3 +1,3 @@ - + diff --git a/Tests/UnitTestParameterMechanism/Properties/AssemblyInfo.cs b/Tests/UnitTestParameterMechanism/Properties/AssemblyInfo.cs deleted file mode 100644 index 44a27dff..00000000 --- a/Tests/UnitTestParameterMechanism/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) Metrilus GmbH -// MetriCam 2 is licensed under the MIT license. See License.txt for full license text. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("UnitTest for Parameter Mechanism")] -[assembly: AssemblyDescription("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("911b7b1c-fcfe-4f28-a488-31728027788e")] diff --git a/Tests/UnitTestParameterMechanism/UnitTestParameterMechanism.csproj b/Tests/UnitTestParameterMechanism/UnitTestParameterMechanism.csproj index a45aafda..e7bd5ec0 100644 --- a/Tests/UnitTestParameterMechanism/UnitTestParameterMechanism.csproj +++ b/Tests/UnitTestParameterMechanism/UnitTestParameterMechanism.csproj @@ -1,86 +1,18 @@ - - - - + - Debug - AnyCPU - {E3AB848E-490E-4818-9F4F-C87F22FFEF04} Exe - Properties MetriCam2.Tests.UnitTestParameterMechanism Test.UnitTestParameterMechanism - v4.5 - 512 - + net472 - - AnyCPU - true - full - false - ..\..\bin\Tests\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - AnyCPU - pdbonly - true - ..\..\bin\Tests\Release\ - TRACE - prompt - 4 - false - - - - $(LibrariesPath)Metrilus.Util.dll - - - - - - - - - - - - SolutionAssemblyInfo.cs - - - - - - {c0d82a80-70d7-4782-b4b1-4af4c31ecc73} - CameraTemplate - - - {342f049e-668b-4351-b21d-75e4bef5a1e4} - MetriCam2 - + + - - .licenseheader - - - Designer - + - - - + \ No newline at end of file diff --git a/Tests/UnitTestParameterMechanism/app.config b/Tests/UnitTestParameterMechanism/app.config index 51278a45..312bb3f2 100644 --- a/Tests/UnitTestParameterMechanism/app.config +++ b/Tests/UnitTestParameterMechanism/app.config @@ -1,3 +1,3 @@ - + diff --git a/lib/License-MathNet.Numerics.txt b/lib/License-MathNet.Numerics.txt deleted file mode 100644 index 6f8b2918..00000000 --- a/lib/License-MathNet.Numerics.txt +++ /dev/null @@ -1,8 +0,0 @@ -Math.NET Numerics License (MIT/X11) -Copyright (c) 2002-2018 Math.NET - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/lib/License-Metrilus.Util.txt b/lib/License-Metrilus.Util.txt deleted file mode 100644 index fc3eb501..00000000 --- a/lib/License-Metrilus.Util.txt +++ /dev/null @@ -1,34 +0,0 @@ -Metrilus.Util references log4net which is licensed under the Apache 2.0 license. -You can find a copy of the license in the file LICENSE-AL2.0, or online: -http://www.apache.org/licenses/LICENSE-2.0 - -Metrilus.Util references Math.Net Numerics which is licensed under the MIT license. -You can find a copy of the license in the file LICENSE-MathNet, or online: -https://numerics.mathdotnet.com/License.html - - -Metrilus.Util is licensed under the following license (which is a modified FreeBSD License): -================================================================================ - -Copyright (c) 2014, Metrilus GmbH -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/lib/License-Newtonsoft.Json.txt b/lib/License-Newtonsoft.Json.txt deleted file mode 100644 index 0c2edce8..00000000 --- a/lib/License-Newtonsoft.Json.txt +++ /dev/null @@ -1,18 +0,0 @@ -Copyright (c) 2007 James Newton-King - -Permission is hereby granted, free of charge, to any person obtaining a copy of this -software and associated documentation files (the "Software"), to deal in the Software -without restriction, including without limitation the rights to use, copy, modify, -merge, publish, distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice shall be included in all copies -or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A -PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE -OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/lib/MathNet.Numerics.dll b/lib/MathNet.Numerics.dll deleted file mode 100644 index 07b728d2..00000000 Binary files a/lib/MathNet.Numerics.dll and /dev/null differ diff --git a/lib/Metrilus.Util.dll b/lib/Metrilus.Util.dll deleted file mode 100644 index 73fcce69..00000000 Binary files a/lib/Metrilus.Util.dll and /dev/null differ diff --git a/lib/Newtonsoft.Json.dll b/lib/Newtonsoft.Json.dll deleted file mode 100644 index 80699020..00000000 Binary files a/lib/Newtonsoft.Json.dll and /dev/null differ diff --git a/lib/Notice-log4net.md b/lib/Notice-log4net.md deleted file mode 100644 index 29deee30..00000000 --- a/lib/Notice-log4net.md +++ /dev/null @@ -1,5 +0,0 @@ - Apache log4net - Copyright 2004-2013 The Apache Software Foundation - - This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). diff --git a/lib/log4net.dll b/lib/log4net.dll deleted file mode 100644 index 93fb476c..00000000 Binary files a/lib/log4net.dll and /dev/null differ diff --git a/lib_netstandard2.0/Metrilus.Util.dll b/lib_netstandard2.0/Metrilus.Util.dll deleted file mode 100644 index b79b6899..00000000 Binary files a/lib_netstandard2.0/Metrilus.Util.dll and /dev/null differ diff --git a/lib_strongname/MathNet.Numerics.dll b/lib_strongname/MathNet.Numerics.dll deleted file mode 100644 index 07b728d2..00000000 Binary files a/lib_strongname/MathNet.Numerics.dll and /dev/null differ diff --git a/lib_strongname/Metrilus.Util.dll b/lib_strongname/Metrilus.Util.dll deleted file mode 100644 index 6531d2ac..00000000 Binary files a/lib_strongname/Metrilus.Util.dll and /dev/null differ diff --git a/lib_strongname/Newtonsoft.Json.dll b/lib_strongname/Newtonsoft.Json.dll deleted file mode 100644 index be6558d2..00000000 Binary files a/lib_strongname/Newtonsoft.Json.dll and /dev/null differ diff --git a/lib_strongname/log4net.dll b/lib_strongname/log4net.dll deleted file mode 100644 index 93fb476c..00000000 Binary files a/lib_strongname/log4net.dll and /dev/null differ