Permalink
Browse files

Add strongname support (#178)

* Upgrade TargetFrameworkVersion to 4.5

* Add StrongNamed builds
  • Loading branch information...
sisiplac authored and mischastik committed Jan 31, 2019
1 parent 3241d7c commit 989ad928b819b77df52d4a34fd97e194eb28d31b
Showing with 634 additions and 127 deletions.
  1. +2 −0 .gitignore
  2. +3 −3 BetaCameras/BaslerACE/BaslerACE.csproj
  3. +3 −3 BetaCameras/BaslerToF/BaslerToF.csproj
  4. +5 −4 BetaCameras/CameraTemplate/CameraTemplate.csproj
  5. +30 −5 BetaCameras/Kinect2/Kinect2.csproj
  6. +4 −4 BetaCameras/MatrixVision/MatrixVision.vcxproj
  7. +170 −10 BetaCameras/OrbbecOpenNI/OrbbecOpenNI.vcxproj
  8. +3 −3 BetaCameras/Pico/Pico.csproj
  9. +4 −4 BetaCameras/RealSense/RealSense.csproj
  10. +2 −2 BetaCameras/RealSense2/RealSense2.NetStandard.csproj
  11. +2 −2 BetaCameras/RealSense2/RealSense2.csproj
  12. +5 −4 BetaCameras/SVS/SVS.csproj
  13. +3 −3 BetaCameras/Sick.TiM561/Sick.TiM561.csproj
  14. +4 −4 BetaCameras/Sick.VisionaryT/Sick.VisionaryT.csproj
  15. +4 −4 BetaCameras/TIVoxel/TIVoxel.vcxproj
  16. +5 −4 BetaCameras/UEye/UEye.csproj
  17. +7 −7 BetaCameras/WebCam/WebCam.vcxproj
  18. +5 −4 BetaCameras/Xtion2/Xtion2.csproj
  19. +3 −3 BetaCameras/ifm/ifm.csproj
  20. +34 −4 MetriCam2.Controls/MetriCam2.Controls.csproj
  21. +2 −2 MetriCam2/MetriCam2.NetStandard.csproj
  22. +34 −6 MetriCam2/MetriCam2.csproj
  23. +184 −0 MetriCam2_SDK.sln
  24. +7 −4 MetrilusReferencesVersions.props
  25. +3 −3 Samples/MinimalSample/MinimalSample.csproj
  26. +3 −3 Samples/SimpleViewer/SimpleViewer.csproj
  27. +38 −3 Scripts/Jenkinsfile.groovy
  28. +3 −3 Test Programs/StressTest_Freeze/StressTest_Freeze.csproj
  29. +3 −3 Test Programs/StressTest_Sync_Display/StressTest_Sync_Display.csproj
  30. +3 −3 Test Programs/TestGUI/TestGUI.csproj
  31. +3 −3 Test Programs/TestGUI_2/TestGUI_2.csproj
  32. +3 −3 Test Programs/TestGUI_3D/TestGUI_3D.csproj
  33. +3 −3 Test Programs/TestSoftTrigger/TestSoftTrigger.csproj
  34. +3 −3 Tests/LoadCalibrationsTest/LoadCalibrationsTest.csproj
  35. +10 −4 Tests/TestCameraSettings/TestCameraSettings.csproj
  36. +3 −0 Tests/TestCameraSettings/app.config
  37. +10 −4 Tests/UnitTestParameterMechanism/UnitTestParameterMechanism.csproj
  38. +3 −0 Tests/UnitTestParameterMechanism/app.config
  39. 0 libraries/LICENSE-MathNet → lib/License-MathNet.Numerics.txt
  40. 0 libraries/License.txt → lib/License-Metrilus.Util.txt
  41. +18 −0 lib/License-Newtonsoft.Json.txt
  42. BIN {libraries → lib}/MathNet.Numerics.dll
  43. BIN {libraries → lib}/Metrilus.Util.NetStandard.dll
  44. BIN {libraries → lib}/Metrilus.Util.dll
  45. BIN lib/Newtonsoft.Json.dll
  46. 0 libraries/NOTICE-log4net.md → lib/Notice-log4net.md
  47. BIN {libraries → lib}/log4net.dll
  48. BIN lib_strongname/MathNet.Numerics.dll
  49. BIN lib_strongname/Metrilus.Util.dll
  50. BIN lib_strongname/Newtonsoft.Json.dll
  51. BIN lib_strongname/log4net.dll
@@ -14,8 +14,10 @@

# Build results
[Dd]ebug/
[Dd]ebugStrongName/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleaseStrongName/
[Rr]eleases/
x64/
x86/
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\MetrilusReferencesVersions.props" />
<Import Project="$(SolutionDir)MetrilusReferencesVersions.props" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
@@ -43,7 +43,7 @@
<HintPath>Z:\external-libraries\Basler\acA1300\pylon 5.0.11\Basler.Pylon\x64\Basler.Pylon.dll</HintPath>
</Reference>
<Reference Include="Metrilus.Util">
<HintPath>$(MetrilusUtilPath)Metrilus.Util.dll</HintPath>
<HintPath>$(LibrariesPath)Metrilus.Util.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -94,4 +94,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\MetrilusReferencesVersions.props" />
<Import Project="$(SolutionDir)MetrilusReferencesVersions.props" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -61,7 +61,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Metrilus.Util">
<HintPath>$(MetrilusUtilPath)Metrilus.Util.dll</HintPath>
<HintPath>$(LibrariesPath)Metrilus.Util.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -99,4 +99,4 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\MetrilusReferencesVersions.props" />
<Import Project="$(SolutionDir)MetrilusReferencesVersions.props" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -10,8 +10,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MetriCam2.Cameras</RootNamespace>
<AssemblyName>MetriCam2.Cameras.CameraTemplate</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
@@ -55,7 +56,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Metrilus.Util">
<HintPath>$(MetrilusUtilPath)Metrilus.Util.dll</HintPath>
<HintPath>$(LibrariesPath)Metrilus.Util.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -91,4 +92,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\MetrilusReferencesVersions.props" />
<Import Project="$(SolutionDir)MetrilusReferencesVersions.props" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -34,12 +34,37 @@
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseStrongName|AnyCPU'">
<OutputPath>..\..\bin\x64\ReleaseStrongName\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<SignAssembly>true</SignAssembly>
<DelaySign>false</DelaySign>
<AssemblyOriginatorKeyFile>Z:\protection\StrongNameKey\StrongName.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugStrongName|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\..\bin\x64\DebugStrongName\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<SignAssembly>true</SignAssembly>
<DelaySign>false</DelaySign>
<AssemblyOriginatorKeyFile>Z:\protection\StrongNameKey\StrongName.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Metrilus.Util">
<HintPath>$(MetrilusUtilPath)Metrilus.Util.dll</HintPath>
<HintPath>$(LibrariesPath)Metrilus.Util.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Kinect, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=AMD64">
<SpecificVersion>False</SpecificVersion>
<Reference Include="Microsoft.Kinect">
<HintPath>Z:\external-libraries\Microsoft\Kinect2\v2.0_1409\Assemblies\Microsoft.Kinect.dll</HintPath>
</Reference>
<Reference Include="System" />
@@ -89,4 +114,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
@@ -37,11 +37,11 @@
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\MetrilusReferencesVersions.props" />
<Import Project="$(SolutionDir)MetrilusReferencesVersions.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\MetrilusReferencesVersions.props" />
<Import Project="$(SolutionDir)MetrilusReferencesVersions.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -85,7 +85,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<Reference Include="Metrilus.Util">
<HintPath>$(MetrilusUtilPath)Metrilus.Util.dll</HintPath>
<HintPath>$(LibrariesPath)Metrilus.Util.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -123,4 +123,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
Oops, something went wrong.

0 comments on commit 989ad92

Please sign in to comment.