diff --git a/build.proj b/build.proj index c9be14e930..22aa9588f2 100644 --- a/build.proj +++ b/build.proj @@ -31,6 +31,7 @@ CreateOrUpdateCurrentVersionFile; RestoreProjects; + BuildRedist; BuildNative; $(TraversalBuildDependsOn); DownloadExternalTestFiles; @@ -44,6 +45,14 @@ Properties="MSBuildWarningsAsMessages=NU1503" /> + + + + + diff --git a/build/Dependencies.props b/build/Dependencies.props index 3a46917114..0b6af3cdc9 100644 --- a/build/Dependencies.props +++ b/build/Dependencies.props @@ -11,5 +11,6 @@ 0.0.0.5 4.5.0 0.11.0 + 1.10.0 diff --git a/build/sign.proj b/build/sign.proj index 8f8523474c..498ed7b433 100644 --- a/build/sign.proj +++ b/build/sign.proj @@ -30,7 +30,10 @@ - + + + + Microsoft diff --git a/pkg/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.TensorFlow.Redist.nupkgproj b/pkg/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.TensorFlow.Redist.nupkgproj new file mode 100644 index 0000000000..af34bb4f81 --- /dev/null +++ b/pkg/Microsoft.ML.TensorFlow.Redist/Microsoft.ML.TensorFlow.Redist.nupkgproj @@ -0,0 +1,17 @@ + + + + netstandard2.0 + $(MSBuildProjectName) contains the TensorFlow C library version $(TensorFlowVersion) redistributed as a NuGet package. + https://github.com/tensorflow/tensorflow/blob/master/LICENSE + https://www.tensorflow.org/install/install_c + https://github.com/tensorflow/tensorflow/releases/tag/v$(TensorFlowVersion) + $(PackageTags) TensorFlow + + + + + + + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 113da3575a..ee32523d8e 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -12,6 +12,15 @@ $(WarningsNotAsErrors);1591 $(MSBuildThisFileDirectory)\Source.ruleset + + x64 + + $(BaseOutputPath)$(TargetArchitecture).$(Configuration)\Native + + win + linux + osx + $(PackageRid)-$(TargetArchitecture) diff --git a/src/Native/build.proj b/src/Native/build.proj index ab338ac855..5e9d7989cb 100644 --- a/src/Native/build.proj +++ b/src/Native/build.proj @@ -3,7 +3,6 @@ true - x64 True @@ -26,21 +25,14 @@ - $(BaseOutputPath)$(TargetArchitecture).$(Configuration)\Native - - lib - .dll - .so - .dylib - - .pdb - .so.dbg - .dylib.dwarf - - win - linux - osx - $(PackageRid)-$(TargetArchitecture) + lib + .dll + .so + .dylib + + .pdb + .so.dbg + .dylib.dwarf + + + + netstandard2.0 + + + + + + + + + + + + + + + + + + + + + + <_downloadFiles Include="@(TensorFlowArchive)" Url="%(Identity)" DestinationFile="%(DownloadFile)" /> + + + + + + + + + + + <_filesToCheckSum Include="@(TensorFlowArchive->'%(DownloadFile)')" DestinationPath="%(DownloadShaFile)" /> + + + + + + + + + + + + $([System.IO.File]::ReadAllText('%(LocalShaFile)')) + $([System.IO.File]::ReadAllText('%(DownloadShaFile)')) + + + + + + + + + + + + + + + + + + + + <_fileFromArchive Include="%(TensorFlowArchive.FilesFromArchive)" ExtractDirectory="%(TensorFlowArchive.ExtractDirectory)" Runtime="%(TensorFlowArchive.Runtime)" /> + <_fileFromArchive DestinationFile="%(FileName)%(Extension)"/> + + <_fileFromArchive Condition="'%(Runtime)' == 'osx-x64'" DestinationFile="%(FileName).dylib" /> + <_fileFromArchive PackagePath="runtimes\%(_fileFromArchive.Runtime)\native\%(_fileFromArchive.DestinationFile)" /> + + + <_fileFromArchive Condition="'%(DestinationFile)' == 'LICENSE'" PackagePath="%(_fileFromArchive.DestinationFile)" Runtime="" /> + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Redist/Microsoft.ML.TensorFlow.Redist/libtensorflow-cpu-darwin-x86_64-1.10.0.tar.gz.sha b/src/Redist/Microsoft.ML.TensorFlow.Redist/libtensorflow-cpu-darwin-x86_64-1.10.0.tar.gz.sha new file mode 100644 index 0000000000..da8b53866b --- /dev/null +++ b/src/Redist/Microsoft.ML.TensorFlow.Redist/libtensorflow-cpu-darwin-x86_64-1.10.0.tar.gz.sha @@ -0,0 +1 @@ +77218EC4DA96A73B15B8AA5637C9F21B389510A9FAF4DCF06DF5B81A5403015C6BA3EEE29BD8BA5B0694F40C671D8E6722D554C4F93F95C33F29AB491C70263C \ No newline at end of file diff --git a/src/Redist/Microsoft.ML.TensorFlow.Redist/libtensorflow-cpu-linux-x86_64-1.10.0.tar.gz.sha b/src/Redist/Microsoft.ML.TensorFlow.Redist/libtensorflow-cpu-linux-x86_64-1.10.0.tar.gz.sha new file mode 100644 index 0000000000..6b865984ec --- /dev/null +++ b/src/Redist/Microsoft.ML.TensorFlow.Redist/libtensorflow-cpu-linux-x86_64-1.10.0.tar.gz.sha @@ -0,0 +1 @@ +B9E9CD95BC6A28297ACAB0D684FBBFAFF1F9AE893432AC2D208120D767101AC20E2C55BC79E59DBE6E5BD9EC802026694960FA12137BB303061C5A21B62BD29E \ No newline at end of file diff --git a/src/Redist/Microsoft.ML.TensorFlow.Redist/libtensorflow-cpu-windows-x86_64-1.10.0.zip.sha b/src/Redist/Microsoft.ML.TensorFlow.Redist/libtensorflow-cpu-windows-x86_64-1.10.0.zip.sha new file mode 100644 index 0000000000..92ce0db9fb --- /dev/null +++ b/src/Redist/Microsoft.ML.TensorFlow.Redist/libtensorflow-cpu-windows-x86_64-1.10.0.zip.sha @@ -0,0 +1 @@ +66F3A9522917076038AE9CCA11FE805DD516C60B3A3E156B78C2E4BD0E3E5785A9D0380C5E06411473EF14A72B72FD93F954AA3496A12D1FAF0FA3393970E700 \ No newline at end of file diff --git a/src/Redist/build.proj b/src/Redist/build.proj new file mode 100644 index 0000000000..6891516cc0 --- /dev/null +++ b/src/Redist/build.proj @@ -0,0 +1,6 @@ + + + + + +