Skip to content

Commit ce559aa

Browse files
shimatshimat
committed
update samples' NuGet
1 parent 2cddeb6 commit ce559aa

File tree

5 files changed

+58
-23
lines changed

5 files changed

+58
-23
lines changed

‎sample/CStyleSamplesCS/CStyleSamplesCS.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@
110110
<SpecificVersion>False</SpecificVersion>
111111
<HintPath>..\packages\OpenCvSharp-WithoutDll.2.4.9.20140831\lib\net40\OpenCvSharp.Extensions.dll</HintPath>
112112
</Reference>
113-
<Reference Include="OpenCvSharp.UserInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
114-
<SpecificVersion>False</SpecificVersion>
113+
<Reference Include="OpenCvSharp.UserInterface">
115114
<HintPath>..\packages\OpenCvSharp-WithoutDll.2.4.9.20140831\lib\net40\OpenCvSharp.UserInterface.dll</HintPath>
116115
</Reference>
117116
<Reference Include="PresentationCore">

‎sample/CStyleSamplesVB/CStyleSamplesVB.vbproj

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,25 +103,23 @@
103103
<MyType>WindowsFormsWithCustomSubMain</MyType>
104104
</PropertyGroup>
105105
<ItemGroup>
106-
<Reference Include="OpenCvSharp">
106+
<Reference Include="OpenCvSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
107+
<SpecificVersion>False</SpecificVersion>
107108
<HintPath>..\packages\OpenCvSharp-WithoutDll.2.4.9.20140831\lib\net40\OpenCvSharp.dll</HintPath>
108-
<Private>True</Private>
109109
</Reference>
110110
<Reference Include="OpenCvSharp.Blob, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
111111
<SpecificVersion>False</SpecificVersion>
112112
<HintPath>..\packages\OpenCvSharp-WithoutDll.2.4.9.20140831\lib\net40\OpenCvSharp.Blob.dll</HintPath>
113113
</Reference>
114-
<Reference Include="OpenCvSharp.CPlusPlus, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
115-
<SpecificVersion>False</SpecificVersion>
114+
<Reference Include="OpenCvSharp.CPlusPlus">
116115
<HintPath>..\packages\OpenCvSharp-WithoutDll.2.4.9.20140831\lib\net40\OpenCvSharp.CPlusPlus.dll</HintPath>
117116
</Reference>
118117
<Reference Include="OpenCvSharp.Extensions">
119118
<HintPath>..\packages\OpenCvSharp-WithoutDll.2.4.9.20140831\lib\net40\OpenCvSharp.Extensions.dll</HintPath>
120-
<Private>True</Private>
121119
</Reference>
122-
<Reference Include="OpenCvSharp.UserInterface">
120+
<Reference Include="OpenCvSharp.UserInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
121+
<SpecificVersion>False</SpecificVersion>
123122
<HintPath>..\packages\OpenCvSharp-WithoutDll.2.4.9.20140831\lib\net40\OpenCvSharp.UserInterface.dll</HintPath>
124-
<Private>True</Private>
125123
</Reference>
126124
<Reference Include="PresentationCore">
127125
<RequiredTargetFramework>3.0</RequiredTargetFramework>

‎sample/CppStyleSamplesCS/CppStyleSamplesCS.csproj

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@
7676
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
7777
</PropertyGroup>
7878
<ItemGroup>
79-
<Reference Include="OpenCvSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
80-
<SpecificVersion>False</SpecificVersion>
79+
<Reference Include="OpenCvSharp">
8180
<HintPath>..\packages\OpenCvSharp-WithoutDll.2.4.9.20140831\lib\net40\OpenCvSharp.dll</HintPath>
8281
</Reference>
8382
<Reference Include="OpenCvSharp.Blob, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
@@ -88,8 +87,7 @@
8887
<SpecificVersion>False</SpecificVersion>
8988
<HintPath>..\packages\OpenCvSharp-WithoutDll.2.4.9.20140831\lib\net40\OpenCvSharp.CPlusPlus.dll</HintPath>
9089
</Reference>
91-
<Reference Include="OpenCvSharp.Extensions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
92-
<SpecificVersion>False</SpecificVersion>
90+
<Reference Include="OpenCvSharp.Extensions">
9391
<HintPath>..\packages\OpenCvSharp-WithoutDll.2.4.9.20140831\lib\net40\OpenCvSharp.Extensions.dll</HintPath>
9492
</Reference>
9593
<Reference Include="OpenCvSharp.UserInterface">
@@ -146,15 +144,15 @@
146144
<Compile Include="Samples\BRISKSample.cs" />
147145
<Compile Include="Samples\FREAKSample.cs" />
148146
</ItemGroup>
149-
<ItemGroup>
150-
<None Include="packages.config" />
151-
</ItemGroup>
152147
<ItemGroup>
153148
<ProjectReference Include="..\SampleBase\SampleBase.csproj">
154149
<Project>{2d245c04-0f27-458a-a185-16242a3f918c}</Project>
155150
<Name>SampleBase</Name>
156151
</ProjectReference>
157152
</ItemGroup>
153+
<ItemGroup>
154+
<None Include="packages.config" />
155+
</ItemGroup>
158156
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
159157
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
160158
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

‎sample/CppStyleSamplesVB/CppStyleSamplesVB.vbproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,7 @@
117117
<SpecificVersion>False</SpecificVersion>
118118
<HintPath>..\packages\OpenCvSharp-WithoutDll.2.4.9.20140831\lib\net40\OpenCvSharp.CPlusPlus.dll</HintPath>
119119
</Reference>
120-
<Reference Include="OpenCvSharp.Extensions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
121-
<SpecificVersion>False</SpecificVersion>
120+
<Reference Include="OpenCvSharp.Extensions">
122121
<HintPath>..\packages\OpenCvSharp-WithoutDll.2.4.9.20140831\lib\net40\OpenCvSharp.Extensions.dll</HintPath>
123122
</Reference>
124123
<Reference Include="OpenCvSharp.UserInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">

‎sample/SampleBase/SampleBase.csproj

Lines changed: 46 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,61 @@
3131
<ErrorReport>prompt</ErrorReport>
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
34+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
35+
<DebugSymbols>true</DebugSymbols>
36+
<OutputPath>bin\x86\Debug\</OutputPath>
37+
<DefineConstants>DEBUG;TRACE</DefineConstants>
38+
<DebugType>full</DebugType>
39+
<PlatformTarget>x86</PlatformTarget>
40+
<ErrorReport>prompt</ErrorReport>
41+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
42+
</PropertyGroup>
43+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
44+
<OutputPath>bin\x86\Release\</OutputPath>
45+
<DefineConstants>TRACE</DefineConstants>
46+
<Optimize>true</Optimize>
47+
<DebugType>pdbonly</DebugType>
48+
<PlatformTarget>x86</PlatformTarget>
49+
<ErrorReport>prompt</ErrorReport>
50+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
51+
</PropertyGroup>
52+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
53+
<DebugSymbols>true</DebugSymbols>
54+
<OutputPath>bin\x64\Debug\</OutputPath>
55+
<DefineConstants>DEBUG;TRACE</DefineConstants>
56+
<DebugType>full</DebugType>
57+
<PlatformTarget>x64</PlatformTarget>
58+
<ErrorReport>prompt</ErrorReport>
59+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
60+
</PropertyGroup>
61+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
62+
<OutputPath>bin\x64\Release\</OutputPath>
63+
<DefineConstants>TRACE</DefineConstants>
64+
<Optimize>true</Optimize>
65+
<DebugType>pdbonly</DebugType>
66+
<PlatformTarget>x64</PlatformTarget>
67+
<ErrorReport>prompt</ErrorReport>
68+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
69+
</PropertyGroup>
3470
<ItemGroup>
35-
<Reference Include="OpenCvSharp">
71+
<Reference Include="OpenCvSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
72+
<SpecificVersion>False</SpecificVersion>
3673
<HintPath>..\packages\OpenCvSharp-AnyCPU.2.4.9.20140831\lib\net40\OpenCvSharp.dll</HintPath>
3774
</Reference>
38-
<Reference Include="OpenCvSharp.Blob">
75+
<Reference Include="OpenCvSharp.Blob, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
76+
<SpecificVersion>False</SpecificVersion>
3977
<HintPath>..\packages\OpenCvSharp-AnyCPU.2.4.9.20140831\lib\net40\OpenCvSharp.Blob.dll</HintPath>
4078
</Reference>
41-
<Reference Include="OpenCvSharp.CPlusPlus">
79+
<Reference Include="OpenCvSharp.CPlusPlus, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
80+
<SpecificVersion>False</SpecificVersion>
4281
<HintPath>..\packages\OpenCvSharp-AnyCPU.2.4.9.20140831\lib\net40\OpenCvSharp.CPlusPlus.dll</HintPath>
4382
</Reference>
44-
<Reference Include="OpenCvSharp.Extensions">
83+
<Reference Include="OpenCvSharp.Extensions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
84+
<SpecificVersion>False</SpecificVersion>
4585
<HintPath>..\packages\OpenCvSharp-AnyCPU.2.4.9.20140831\lib\net40\OpenCvSharp.Extensions.dll</HintPath>
4686
</Reference>
47-
<Reference Include="OpenCvSharp.UserInterface">
87+
<Reference Include="OpenCvSharp.UserInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
88+
<SpecificVersion>False</SpecificVersion>
4889
<HintPath>..\packages\OpenCvSharp-AnyCPU.2.4.9.20140831\lib\net40\OpenCvSharp.UserInterface.dll</HintPath>
4990
</Reference>
5091
<Reference Include="PresentationCore" />

0 commit comments

Comments
 (0)