Skip to content

Commit 96d8296

Browse files
migueldeicazamigueldeicaza
committed
Revert the changes up to using the new library to load Dlls to test CI
1 parent 3cc4c57 commit 96d8296

13 files changed

Lines changed: 32 additions & 274 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ script:
1111
- cp -R $TRAVIS_BUILD_DIR/native/*.dylib $TRAVIS_BUILD_DIR/tests/TensorFlowSharp.Tests.CSharp/bin/Release/
1212
- cd $TRAVIS_BUILD_DIR/packages/xunit.runner.console.2.2.0/tools
1313
- mono --arch=64 xunit.console.exe "$TRAVIS_BUILD_DIR/tests/TensorFlowSharp.Tests/bin/Release/TensorFlowSharp.Tests.dll" "$TRAVIS_BUILD_DIR/tests/TensorFlowSharp.Tests.CSharp/bin/Release/TensorFlowSharp.Tests.CSharp.dll"
14-
mono: "5.12.0"
14+
mono: "5.4.1"
1515
dotnet: "2.1.4"
1616
os: "osx"

‎Examples/ExampleObjectDetection/ExampleObjectDetection.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<Reference Include="System.IO.Compression" />
4747
<Reference Include="System.IO.Compression.FileSystem" />
4848
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
49-
<HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\net471\System.ValueTuple.dll</HintPath>
49+
<HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath>
5050
</Reference>
5151
<Reference Include="System.Xml.Linq" />
5252
<Reference Include="System.Data.DataSetExtensions" />

‎Examples/ExampleObjectDetection/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Mono.Options" version="5.3.0.1" targetFramework="net471" />
4-
<package id="SharpZipLib" version="0.86.0" targetFramework="net471" />
5-
<package id="System.ValueTuple" version="4.4.0" targetFramework="net471" />
3+
<package id="Mono.Options" version="5.3.0.1" targetFramework="net461" />
4+
<package id="SharpZipLib" version="0.86.0" targetFramework="net461" />
5+
<package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
66
</packages>

‎Learn/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="System.ValueTuple" version="4.3.1" targetFramework="net471" />
3+
<package id="System.ValueTuple" version="4.3.1" targetFramework="net461" />
44
</packages>

‎OpGenerator/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Google.Protobuf" version="3.4.1" targetFramework="net471" />
4-
<package id="Google.Protobuf.Tools" version="3.4.0" targetFramework="net471" />
5-
<package id="protobuf-net" version="2.3.2" targetFramework="net471" />
3+
<package id="Google.Protobuf" version="3.4.1" targetFramework="net461" />
4+
<package id="Google.Protobuf.Tools" version="3.4.0" targetFramework="net461" />
5+
<package id="protobuf-net" version="2.3.2" targetFramework="net461" />
66
</packages>

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ using (var session = new TFSession())
9494
Here is an F# scripting version of the same example, you can use this in F# Interactive:
9595

9696
```fsharp
97-
#r @"packages\TensorFlowSharp.1.4.0\lib\net471\TensorFlowSharp.dll"
97+
#r @"packages\TensorFlowSharp.1.4.0\lib\net461\TensorFlowSharp.dll"
9898
9999
open System
100100
open System.IO

‎SampleTest/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="CsvHelper" version="2.16.3.0" targetFramework="net45" />
4-
<package id="System.ValueTuple" version="4.3.1" targetFramework="net471" />
4+
<package id="System.ValueTuple" version="4.3.1" targetFramework="net461" />
55
</packages>

‎TensorFlowSharp/TensorFlowSharp.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
55
<RootNamespace>TensorFlowSharp</RootNamespace>
66
<AssemblyName>TensorFlowSharp</AssemblyName>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

‎TensorFlowSharp/UnmanagedLibrary.cs‎

Lines changed: 0 additions & 242 deletions
This file was deleted.

‎docfx/articles/start.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ using (var session = new TFSession())
9494
Here is an F# scripting version of the same example, you can use this in F# Interactive:
9595

9696
```
97-
#r @"packages\TensorFlowSharp.1.4.0\lib\net471\TensorFlowSharp.dll"
97+
#r @"packages\TensorFlowSharp.1.4.0\lib\net461\TensorFlowSharp.dll"
9898
9999
open System
100100
open System.IO

0 commit comments

Comments
 (0)