Skip to content

Commit

Permalink
Bump version (Commit-1)
Browse files Browse the repository at this point in the history
  • Loading branch information
liqunfu committed Mar 29, 2019
1 parent 764c8c4 commit ecef337
Show file tree
Hide file tree
Showing 37 changed files with 126 additions and 126 deletions.
2 changes: 1 addition & 1 deletion CNTK.Common.props
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<!-- CntkVersion:
CNTK version which should be used where CNTK version is required. Ex: print version or tag CNTK binaries. Default value is the last released version of CNTK. -->
<!-- NOTE: Modify both CntkVersion and PublicBuild during MAJOR RELEASE -->
<CntkVersion>2.6</CntkVersion>
<CntkVersion>2.7</CntkVersion>

<!-- PublicBuild:
True if build binaries are meant to shared publicly with CNTK community. -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
</NuGetPackageImportStamp>
</PropertyGroup>
<ItemGroup>
<Reference Include="Cntk.Core.Managed-2.6, Version=1.0.0.0, Culture=neutral, PublicKeyToken=21fff2ec8197defe, processorArchitecture=AMD64">
<HintPath>..\packages\CNTK.CPUOnly.2.6.0\lib\net45\x64\Cntk.Core.Managed-2.6.dll</HintPath>
<Reference Include="Cntk.Core.Managed-2.7, Version=1.0.0.0, Culture=neutral, PublicKeyToken=21fff2ec8197defe, processorArchitecture=AMD64">
<HintPath>..\packages\CNTK.CPUOnly.2.7.0\lib\net45\x64\Cntk.Core.Managed-2.7.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
Expand Down Expand Up @@ -148,16 +148,16 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets')" />
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" />
<Import Project="..\packages\CNTK.CPUOnly.2.6.0\build\net45\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.6.0\build\net45\CNTK.CPUOnly.targets')" />
<Import Project="..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets')" />
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" />
<Import Project="..\packages\CNTK.CPUOnly.2.7.0\build\net45\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.7.0\build\net45\CNTK.CPUOnly.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.6.0\build\net45\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.6.0\build\net45\CNTK.CPUOnly.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.7.0\build\net45\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.7.0\build\net45\CNTK.CPUOnly.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CNTK.CPUOnly" version="2.6.0" targetFramework="net45" />
<package id="CNTK.Deps.MKL" version="2.6.0" targetFramework="net45" />
<package id="CNTK.Deps.OpenCV.Zip" version="2.6.0" targetFramework="net45" />
<package id="CNTK.CPUOnly" version="2.7.0" targetFramework="net45" />
<package id="CNTK.Deps.MKL" version="2.7.0" targetFramework="net45" />
<package id="CNTK.Deps.OpenCV.Zip" version="2.7.0" targetFramework="net45" />
<package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net45" />
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,16 @@
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets')" />
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\native\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" />
<Import Project="..\packages\CNTK.CPUOnly.2.6.0\build\native\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.6.0\build\native\CNTK.CPUOnly.targets')" />
<Import Project="..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets')" />
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\native\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" />
<Import Project="..\packages\CNTK.CPUOnly.2.7.0\build\native\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.7.0\build\native\CNTK.CPUOnly.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\native\CNTK.Deps.OpenCV.Zip.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.6.0\build\native\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.6.0\build\native\CNTK.CPUOnly.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\native\CNTK.Deps.OpenCV.Zip.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.7.0\build\native\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.7.0\build\native\CNTK.CPUOnly.targets'))" />
</Target>
</Project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CNTK.CPUOnly" version="2.6.0" targetFramework="native" />
<package id="CNTK.Deps.MKL" version="2.6.0" targetFramework="native" />
<package id="CNTK.Deps.OpenCV.Zip" version="2.6.0" targetFramework="native" />
<package id="CNTK.CPUOnly" version="2.7.0" targetFramework="native" />
<package id="CNTK.Deps.MKL" version="2.7.0" targetFramework="native" />
<package id="CNTK.Deps.OpenCV.Zip" version="2.7.0" targetFramework="native" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -98,18 +98,18 @@
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\CNTK.Deps.Cuda.2.6.0\build\native\CNTK.Deps.Cuda.targets" Condition="Exists('..\packages\CNTK.Deps.Cuda.2.6.0\build\native\CNTK.Deps.Cuda.targets')" />
<Import Project="..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets')" />
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\native\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" />
<Import Project="..\packages\CNTK.GPU.2.6.0\build\native\CNTK.GPU.targets" Condition="Exists('..\packages\CNTK.GPU.2.6.0\build\native\CNTK.GPU.targets')" />
<Import Project="..\packages\CNTK.Deps.Cuda.2.7.0\build\native\CNTK.Deps.Cuda.targets" Condition="Exists('..\packages\CNTK.Deps.Cuda.2.7.0\build\native\CNTK.Deps.Cuda.targets')" />
<Import Project="..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets')" />
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\native\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" />
<Import Project="..\packages\CNTK.GPU.2.7.0\build\native\CNTK.GPU.targets" Condition="Exists('..\packages\CNTK.GPU.2.7.0\build\native\CNTK.GPU.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\CNTK.Deps.Cuda.2.6.0\build\native\CNTK.Deps.Cuda.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.Cuda.2.6.0\build\native\CNTK.Deps.Cuda.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\native\CNTK.Deps.OpenCV.Zip.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.GPU.2.6.0\build\native\CNTK.GPU.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.GPU.2.6.0\build\native\CNTK.GPU.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.Deps.Cuda.2.7.0\build\native\CNTK.Deps.Cuda.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.Cuda.2.7.0\build\native\CNTK.Deps.Cuda.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\native\CNTK.Deps.OpenCV.Zip.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.GPU.2.7.0\build\native\CNTK.GPU.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.GPU.2.7.0\build\native\CNTK.GPU.targets'))" />
</Target>
</Project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CNTK.Deps.Cuda" version="2.6.0" targetFramework="native" />
<package id="CNTK.Deps.MKL" version="2.6.0" targetFramework="native" />
<package id="CNTK.Deps.OpenCV.Zip" version="2.6.0" targetFramework="native" />
<package id="CNTK.GPU" version="2.6.0" targetFramework="native" />
<package id="CNTK.Deps.Cuda" version="2.7.0" targetFramework="native" />
<package id="CNTK.Deps.MKL" version="2.7.0" targetFramework="native" />
<package id="CNTK.Deps.OpenCV.Zip" version="2.7.0" targetFramework="native" />
<package id="CNTK.GPU" version="2.7.0" targetFramework="native" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets')" />
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" />
<Import Project="..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets')" />
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.6.0\build\net45\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.6.0\build\net45\CNTK.CPUOnly.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.7.0\build\net45\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.7.0\build\net45\CNTK.CPUOnly.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CNTK.CPUOnly" version="2.6.0" targetFramework="net45" />
<package id="CNTK.Deps.MKL" version="2.6.0" targetFramework="net45" />
<package id="CNTK.Deps.OpenCV.Zip" version="2.6.0" targetFramework="net45" />
<package id="CNTK.CPUOnly" version="2.7.0" targetFramework="net45" />
<package id="CNTK.Deps.MKL" version="2.7.0" targetFramework="net45" />
<package id="CNTK.Deps.OpenCV.Zip" version="2.7.0" targetFramework="net45" />
</packages>
Loading

0 comments on commit ecef337

Please sign in to comment.