Mirror
/
EmguCV
mirror of https://github.com/emgucv/emgucv.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Use 2 alternative locations to find System.Runtime.InteropServices.RuntimeInformation.dll

pull/768/head
Canming Huang 3 years ago
parent
0d549d1757
commit
6a46fcc625
1 changed files with 22 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      Emgu.CV.DebuggerVisualizers/Emgu.CV.DebuggerVisualizers.csproj

33
Emgu.CV.DebuggerVisualizers/Emgu.CV.DebuggerVisualizers.csproj
View File

@ -32,12 +32,13 @@
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
<EmguCVLibDirectory>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\libs))</EmguCVLibDirectory>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\libs\Build\$(AssemblyName)\$(Platform)\$(Configuration)\</OutputPath>
<OutputPath>$(EmguCVLibDirectory)\Build\$(AssemblyName)\$(Platform)\$(Configuration)\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@ -48,7 +49,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\libs\Build\$(AssemblyName)\$(Platform)\$(Configuration)\</OutputPath>
<OutputPath>$(EmguCVLibDirectory)\Build\$(AssemblyName)\$(Platform)\$(Configuration)\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@ -58,7 +59,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\libs\Build\$(AssemblyName)\$(Platform)\$(Configuration)\</OutputPath>
<OutputPath>$(EmguCVLibDirectory)\Build\$(AssemblyName)\$(Platform)\$(Configuration)\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
@ -66,7 +67,7 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>..\libs\Build\$(AssemblyName)\$(Platform)\$(Configuration)\</OutputPath>
<OutputPath>$(EmguCVLibDirectory)\Build\$(AssemblyName)\$(Platform)\$(Configuration)\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
@ -76,7 +77,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<OutputPath>$(EmguCVLibDirectory)\Build\$(AssemblyName)\$(Platform)\$(Configuration)\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
@ -85,7 +86,7 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<OutputPath>$(EmguCVLibDirectory)\Build\$(AssemblyName)\$(Platform)\$(Configuration)\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
@ -122,7 +123,7 @@
<Service Include="{B4F97281-0DBD-4835-9ED8-7DFB966E87FF}" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation">
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" GeneratePathProperty="true">
<Version>4.3.0</Version>
</PackageReference>
</ItemGroup>
@ -134,10 +135,20 @@
</ItemGroup>
<Import Project="..\Emgu.CV.Platform\DotNet\Emgu.CV.Platform.Net.projitems" Label="Shared" />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<RuntimeInformationDll1>$(OutputPath)System.Runtime.InteropServices.RuntimeInformation.dll</RuntimeInformationDll1>
<RuntimeInformationDll2>$(PkgSystem_Runtime_InteropServices_RuntimeInformation)\lib\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll</RuntimeInformationDll2>
</PropertyGroup>
<Target Name="DeployBinary" AfterTargets="AfterBuild">
<Message Text="Copying $(OutputPath)$(AssemblyName).dll to ..\libs" Importance="high" />
<Copy SourceFiles="$(OutputPath)$(AssemblyName).dll" DestinationFolder="..\libs" ContinueOnError="true" />
<Message Text="Copying $(OutputPath)System.Runtime.InteropServices.RuntimeInformation.dll to ..\libs" Importance="high" />
<Copy SourceFiles="$(OutputPath)System.Runtime.InteropServices.RuntimeInformation.dll" DestinationFolder="..\libs" ContinueOnError="true" />
<Message Text="Copying $(OutputPath)$(AssemblyName).dll to $(EmguCVLibDirectory)" Importance="high" />
<Copy SourceFiles="$(OutputPath)$(AssemblyName).dll" DestinationFolder="$(EmguCVLibDirectory)" ContinueOnError="true" />
<Message Condition="Exists('$(RuntimeInformationDll1)')" Text="Copying $(RuntimeInformationDll1) to $(EmguCVLibDirectory)" Importance="high" />
<Copy Condition="Exists('$(RuntimeInformationDll1)')" SourceFiles="$(RuntimeInformationDll1)" DestinationFolder="$(EmguCVLibDirectory)" ContinueOnError="true" />
<Message Condition="!Exists('$(RuntimeInformationDll1)')" Text="Copying $(PkgSystem_Runtime_InteropServices_RuntimeInformation)\lib\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll to $(EmguCVLibDirectory)" Importance="high" />
<Copy Condition="!Exists('$(RuntimeInformationDll1)')" SourceFiles="$(PkgSystem_Runtime_InteropServices_RuntimeInformation)\lib\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll" DestinationFolder="$(EmguCVLibDirectory)" ContinueOnError="true" />
</Target>
</Project>
Write Preview
Loading…
Cancel
Save