Skip to content

Commit f25352a

Browse files
shimatshimat
committed
update nuget
1 parent 7db99f6 commit f25352a

7 files changed

Lines changed: 27 additions & 34 deletions

File tree

‎SampleBase/SampleBase.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180319\build\OpenCvSharp3-AnyCPU.props" Condition="Exists('..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180319\build\OpenCvSharp3-AnyCPU.props')" />
3+
<Import Project="..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180424-beta-275\build\OpenCvSharp3-AnyCPU.props" Condition="Exists('..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180424-beta-275\build\OpenCvSharp3-AnyCPU.props')" />
44
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -79,16 +79,16 @@
7979
</PropertyGroup>
8080
<ItemGroup>
8181
<Reference Include="OpenCvSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
82-
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180319\lib\net46\OpenCvSharp.dll</HintPath>
82+
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180424-beta-275\lib\net46\OpenCvSharp.dll</HintPath>
8383
</Reference>
8484
<Reference Include="OpenCvSharp.Blob, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
85-
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180319\lib\net46\OpenCvSharp.Blob.dll</HintPath>
85+
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180424-beta-275\lib\net46\OpenCvSharp.Blob.dll</HintPath>
8686
</Reference>
8787
<Reference Include="OpenCvSharp.Extensions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
88-
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180319\lib\net46\OpenCvSharp.Extensions.dll</HintPath>
88+
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180424-beta-275\lib\net46\OpenCvSharp.Extensions.dll</HintPath>
8989
</Reference>
9090
<Reference Include="OpenCvSharp.UserInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
91-
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180319\lib\net46\OpenCvSharp.UserInterface.dll</HintPath>
91+
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180424-beta-275\lib\net46\OpenCvSharp.UserInterface.dll</HintPath>
9292
</Reference>
9393
<Reference Include="PresentationCore" />
9494
<Reference Include="PresentationFramework" />
@@ -342,7 +342,7 @@
342342
<ErrorText>このプロジェクトは、このコンピューターにはない NuGet パッケージを参照しています。これらをダウンロードするには、NuGet パッケージの復元を有効にしてください。詳細については、http://go.microsoft.com/fwlink/?LinkID=322105 を参照してください。不足しているファイルは {0} です。</ErrorText>
343343
</PropertyGroup>
344344
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
345-
<Error Condition="!Exists('..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180319\build\OpenCvSharp3-AnyCPU.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180319\build\OpenCvSharp3-AnyCPU.props'))" />
345+
<Error Condition="!Exists('..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180424-beta-275\build\OpenCvSharp3-AnyCPU.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180424-beta-275\build\OpenCvSharp3-AnyCPU.props'))" />
346346
</Target>
347347
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
348348
Other similar extension points exist, see Microsoft.Common.targets.

‎SampleBase/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="OpenCvSharp3-AnyCPU" version="3.4.1.20180319" targetFramework="net461" />
3+
<package id="OpenCvSharp3-AnyCPU" version="3.4.1.20180424-beta-275" targetFramework="net461" />
44
</packages>

‎SamplesCS/SamplesCS.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\OpenCvSharp3-AnyCPU.3.3.1.20171117\build\OpenCvSharp3-AnyCPU.props" Condition="Exists('..\packages\OpenCvSharp3-AnyCPU.3.3.1.20171117\build\OpenCvSharp3-AnyCPU.props')" />
3+
<Import Project="..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180424-beta-275\build\OpenCvSharp3-AnyCPU.props" Condition="Exists('..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180424-beta-275\build\OpenCvSharp3-AnyCPU.props')" />
44
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -88,16 +88,16 @@
8888
</PropertyGroup>
8989
<ItemGroup>
9090
<Reference Include="OpenCvSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
91-
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.3.1.20171117\lib\net46\OpenCvSharp.dll</HintPath>
91+
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180424-beta-275\lib\net46\OpenCvSharp.dll</HintPath>
9292
</Reference>
9393
<Reference Include="OpenCvSharp.Blob, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
94-
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.3.1.20171117\lib\net46\OpenCvSharp.Blob.dll</HintPath>
94+
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180424-beta-275\lib\net46\OpenCvSharp.Blob.dll</HintPath>
9595
</Reference>
9696
<Reference Include="OpenCvSharp.Extensions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
97-
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.3.1.20171117\lib\net46\OpenCvSharp.Extensions.dll</HintPath>
97+
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180424-beta-275\lib\net46\OpenCvSharp.Extensions.dll</HintPath>
9898
</Reference>
9999
<Reference Include="OpenCvSharp.UserInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
100-
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.3.1.20171117\lib\net46\OpenCvSharp.UserInterface.dll</HintPath>
100+
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180424-beta-275\lib\net46\OpenCvSharp.UserInterface.dll</HintPath>
101101
</Reference>
102102
<Reference Include="PresentationCore" />
103103
<Reference Include="PresentationFramework" />
@@ -169,7 +169,7 @@
169169
<ErrorText>このプロジェクトは、このコンピューターにはない NuGet パッケージを参照しています。これらをダウンロードするには、NuGet パッケージの復元を有効にしてください。詳細については、http://go.microsoft.com/fwlink/?LinkID=322105 を参照してください。不足しているファイルは {0} です。</ErrorText>
170170
</PropertyGroup>
171171
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
172-
<Error Condition="!Exists('..\packages\OpenCvSharp3-AnyCPU.3.3.1.20171117\build\OpenCvSharp3-AnyCPU.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenCvSharp3-AnyCPU.3.3.1.20171117\build\OpenCvSharp3-AnyCPU.props'))" />
172+
<Error Condition="!Exists('..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180424-beta-275\build\OpenCvSharp3-AnyCPU.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180424-beta-275\build\OpenCvSharp3-AnyCPU.props'))" />
173173
</Target>
174174
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
175175
Other similar extension points exist, see Microsoft.Common.targets.

‎SamplesCS/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="OpenCvSharp3-AnyCPU" version="3.3.1.20171117" targetFramework="net461" />
3+
<package id="OpenCvSharp3-AnyCPU" version="3.4.1.20180424-beta-275" targetFramework="net461" />
44
</packages>

‎SamplesCore/SamplesCore.csproj‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.0</TargetFramework>
4+
<TargetFramework>netcoreapp2.0</TargetFramework>
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
66
<AssemblyName>SamplesCore</AssemblyName>
77
<OutputType>Exe</OutputType>
88
<PackageId>SamplesCore</PackageId>
9-
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
10-
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
11-
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
129
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1310
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1411
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
@@ -24,7 +21,7 @@
2421
</ItemGroup>
2522

2623
<ItemGroup>
27-
<PackageReference Include="OpenCvSharp3-AnyCPU" Version="3.4.1.20180319" />
24+
<PackageReference Include="OpenCvSharp3-AnyCPU" Version="3.4.1.20180424-beta-275" />
2825
</ItemGroup>
2926

3027
<ItemGroup>

‎SamplesVB/SamplesVB.vbproj‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\OpenCvSharp3-AnyCPU.3.3.1.20171117\build\OpenCvSharp3-AnyCPU.props" Condition="Exists('..\packages\OpenCvSharp3-AnyCPU.3.3.1.20171117\build\OpenCvSharp3-AnyCPU.props')" />
3+
<Import Project="..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180424-beta-275\build\OpenCvSharp3-AnyCPU.props" Condition="Exists('..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180424-beta-275\build\OpenCvSharp3-AnyCPU.props')" />
44
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -115,21 +115,17 @@
115115
<Prefer32Bit>false</Prefer32Bit>
116116
</PropertyGroup>
117117
<ItemGroup>
118-
<Reference Include="OpenCvSharp">
119-
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.3.1.20171117\lib\net46\OpenCvSharp.dll</HintPath>
120-
<Private>True</Private>
118+
<Reference Include="OpenCvSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
119+
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180424-beta-275\lib\net46\OpenCvSharp.dll</HintPath>
121120
</Reference>
122-
<Reference Include="OpenCvSharp.Blob">
123-
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.3.1.20171117\lib\net46\OpenCvSharp.Blob.dll</HintPath>
124-
<Private>True</Private>
121+
<Reference Include="OpenCvSharp.Blob, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
122+
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180424-beta-275\lib\net46\OpenCvSharp.Blob.dll</HintPath>
125123
</Reference>
126-
<Reference Include="OpenCvSharp.Extensions">
127-
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.3.1.20171117\lib\net46\OpenCvSharp.Extensions.dll</HintPath>
128-
<Private>True</Private>
124+
<Reference Include="OpenCvSharp.Extensions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
125+
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180424-beta-275\lib\net46\OpenCvSharp.Extensions.dll</HintPath>
129126
</Reference>
130-
<Reference Include="OpenCvSharp.UserInterface">
131-
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.3.1.20171117\lib\net46\OpenCvSharp.UserInterface.dll</HintPath>
132-
<Private>True</Private>
127+
<Reference Include="OpenCvSharp.UserInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
128+
<HintPath>..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180424-beta-275\lib\net46\OpenCvSharp.UserInterface.dll</HintPath>
133129
</Reference>
134130
<Reference Include="PresentationCore" />
135131
<Reference Include="PresentationFramework" />
@@ -234,7 +230,7 @@
234230
<ErrorText>このプロジェクトは、このコンピューターにはない NuGet パッケージを参照しています。これらをダウンロードするには、NuGet パッケージの復元を有効にしてください。詳細については、http://go.microsoft.com/fwlink/?LinkID=322105 を参照してください。不足しているファイルは {0} です。</ErrorText>
235231
</PropertyGroup>
236232
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
237-
<Error Condition="!Exists('..\packages\OpenCvSharp3-AnyCPU.3.3.1.20171117\build\OpenCvSharp3-AnyCPU.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenCvSharp3-AnyCPU.3.3.1.20171117\build\OpenCvSharp3-AnyCPU.props'))" />
233+
<Error Condition="!Exists('..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180424-beta-275\build\OpenCvSharp3-AnyCPU.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenCvSharp3-AnyCPU.3.4.1.20180424-beta-275\build\OpenCvSharp3-AnyCPU.props'))" />
238234
</Target>
239235
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
240236
Other similar extension points exist, see Microsoft.Common.targets.

‎SamplesVB/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="OpenCvSharp3-AnyCPU" version="3.3.1.20171117" targetFramework="net461" />
3+
<package id="OpenCvSharp3-AnyCPU" version="3.4.1.20180424-beta-275" targetFramework="net461" />
44
</packages>

0 commit comments

Comments
 (0)