From afa7a4d35fe4ca8aecf999394d56bb5d05215683 Mon Sep 17 00:00:00 2001
From: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Mon, 14 Dec 2020 17:16:59 -0800
Subject: [PATCH] fix some issues for samples repo (#870)
* upgrade SciSharp.TensorFlow.Redist version and fix tf not working on netcore 2.1 exception
* update ml.net version
---
samples/Directory.Build.props | 4 ++--
.../TFImageClassification/TFImageClassification.csproj | 3 ++-
.../DeepLearning_ImageClassification.csproj | 4 ++--
.../ImageClassification/ImageClassification.Score.csproj | 3 ++-
.../ImageClassification.Predict.csproj | 3 ++-
.../ImageClassification.Train.csproj | 3 ++-
.../WebApp.Predict/ImageClassification.WebApp.csproj | 3 ++-
.../ImageClassification.Predict.csproj | 3 ++-
.../ImageClassification.Train.csproj | 3 ++-
.../ImageClassification/ImageClassification.Score.fsproj | 4 +++-
.../ImageClassification.Train.fsproj | 3 ++-
.../ImageClassification.Predict.fsproj | 3 ++-
.../ImageClassification.Train.fsproj | 3 ++-
13 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
index ae854cf01..b03e54a08 100644
--- a/samples/Directory.Build.props
+++ b/samples/Directory.Build.props
@@ -1,8 +1,8 @@
- 1.5.0
- 0.17.0
+ 1.5.3
+ 0.17.3
diff --git a/samples/csharp/end-to-end-apps/DeepLearning_ImageClassification_TF/TFImageClassification/TFImageClassification.csproj b/samples/csharp/end-to-end-apps/DeepLearning_ImageClassification_TF/TFImageClassification/TFImageClassification.csproj
index f50ebe766..92a1fe5b1 100644
--- a/samples/csharp/end-to-end-apps/DeepLearning_ImageClassification_TF/TFImageClassification/TFImageClassification.csproj
+++ b/samples/csharp/end-to-end-apps/DeepLearning_ImageClassification_TF/TFImageClassification/TFImageClassification.csproj
@@ -11,7 +11,8 @@
-
+
+
diff --git a/samples/csharp/getting-started/DeepLearning_ImageClassification_Binary/DeepLearning_ImageClassification/DeepLearning_ImageClassification.csproj b/samples/csharp/getting-started/DeepLearning_ImageClassification_Binary/DeepLearning_ImageClassification/DeepLearning_ImageClassification.csproj
index 773af2401..611e2abc7 100644
--- a/samples/csharp/getting-started/DeepLearning_ImageClassification_Binary/DeepLearning_ImageClassification/DeepLearning_ImageClassification.csproj
+++ b/samples/csharp/getting-started/DeepLearning_ImageClassification_Binary/DeepLearning_ImageClassification/DeepLearning_ImageClassification.csproj
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/samples/csharp/getting-started/DeepLearning_ImageClassification_TensorFlow/ImageClassification/ImageClassification.Score.csproj b/samples/csharp/getting-started/DeepLearning_ImageClassification_TensorFlow/ImageClassification/ImageClassification.Score.csproj
index 2fba36928..fc2a408b9 100644
--- a/samples/csharp/getting-started/DeepLearning_ImageClassification_TensorFlow/ImageClassification/ImageClassification.Score.csproj
+++ b/samples/csharp/getting-started/DeepLearning_ImageClassification_TensorFlow/ImageClassification/ImageClassification.Score.csproj
@@ -14,7 +14,8 @@
-
+
+
diff --git a/samples/csharp/getting-started/DeepLearning_ImageClassification_Training/ImageClassification.Predict/ImageClassification.Predict.csproj b/samples/csharp/getting-started/DeepLearning_ImageClassification_Training/ImageClassification.Predict/ImageClassification.Predict.csproj
index deaf89f32..6f620c860 100644
--- a/samples/csharp/getting-started/DeepLearning_ImageClassification_Training/ImageClassification.Predict/ImageClassification.Predict.csproj
+++ b/samples/csharp/getting-started/DeepLearning_ImageClassification_Training/ImageClassification.Predict/ImageClassification.Predict.csproj
@@ -16,7 +16,8 @@
-
+
+
diff --git a/samples/csharp/getting-started/DeepLearning_ImageClassification_Training/ImageClassification.Train/ImageClassification.Train.csproj b/samples/csharp/getting-started/DeepLearning_ImageClassification_Training/ImageClassification.Train/ImageClassification.Train.csproj
index 99f02e069..d60650693 100644
--- a/samples/csharp/getting-started/DeepLearning_ImageClassification_Training/ImageClassification.Train/ImageClassification.Train.csproj
+++ b/samples/csharp/getting-started/DeepLearning_ImageClassification_Training/ImageClassification.Train/ImageClassification.Train.csproj
@@ -15,7 +15,8 @@
-
+
+
diff --git a/samples/csharp/getting-started/DeepLearning_ImageClassification_Training/WebApp.Predict/ImageClassification.WebApp.csproj b/samples/csharp/getting-started/DeepLearning_ImageClassification_Training/WebApp.Predict/ImageClassification.WebApp.csproj
index ab6e7e484..79695aa75 100644
--- a/samples/csharp/getting-started/DeepLearning_ImageClassification_Training/WebApp.Predict/ImageClassification.WebApp.csproj
+++ b/samples/csharp/getting-started/DeepLearning_ImageClassification_Training/WebApp.Predict/ImageClassification.WebApp.csproj
@@ -10,7 +10,8 @@
-
+
+
diff --git a/samples/csharp/getting-started/DeepLearning_TensorFlowEstimator/ImageClassification.Predict/ImageClassification.Predict.csproj b/samples/csharp/getting-started/DeepLearning_TensorFlowEstimator/ImageClassification.Predict/ImageClassification.Predict.csproj
index 5dd611ac4..6e985b208 100644
--- a/samples/csharp/getting-started/DeepLearning_TensorFlowEstimator/ImageClassification.Predict/ImageClassification.Predict.csproj
+++ b/samples/csharp/getting-started/DeepLearning_TensorFlowEstimator/ImageClassification.Predict/ImageClassification.Predict.csproj
@@ -22,7 +22,8 @@
-
+
+
diff --git a/samples/csharp/getting-started/DeepLearning_TensorFlowEstimator/ImageClassification.Train/ImageClassification.Train.csproj b/samples/csharp/getting-started/DeepLearning_TensorFlowEstimator/ImageClassification.Train/ImageClassification.Train.csproj
index a117dfab4..03f0b573f 100644
--- a/samples/csharp/getting-started/DeepLearning_TensorFlowEstimator/ImageClassification.Train/ImageClassification.Train.csproj
+++ b/samples/csharp/getting-started/DeepLearning_TensorFlowEstimator/ImageClassification.Train/ImageClassification.Train.csproj
@@ -17,7 +17,8 @@
-
+
+
diff --git a/samples/fsharp/getting-started/DeepLearning_ImageClassification_TensorFlow/ImageClassification/ImageClassification.Score.fsproj b/samples/fsharp/getting-started/DeepLearning_ImageClassification_TensorFlow/ImageClassification/ImageClassification.Score.fsproj
index 0fb534e31..9a6d38f47 100644
--- a/samples/fsharp/getting-started/DeepLearning_ImageClassification_TensorFlow/ImageClassification/ImageClassification.Score.fsproj
+++ b/samples/fsharp/getting-started/DeepLearning_ImageClassification_TensorFlow/ImageClassification/ImageClassification.Score.fsproj
@@ -13,7 +13,9 @@
-
+
+
+
diff --git a/samples/fsharp/getting-started/DeepLearning_ImageClassification_Training/ImageClassification.Train/ImageClassification.Train.fsproj b/samples/fsharp/getting-started/DeepLearning_ImageClassification_Training/ImageClassification.Train/ImageClassification.Train.fsproj
index f139c27ed..13a535c8a 100644
--- a/samples/fsharp/getting-started/DeepLearning_ImageClassification_Training/ImageClassification.Train/ImageClassification.Train.fsproj
+++ b/samples/fsharp/getting-started/DeepLearning_ImageClassification_Training/ImageClassification.Train/ImageClassification.Train.fsproj
@@ -13,6 +13,7 @@
-
+
+
diff --git a/samples/fsharp/getting-started/DeepLearning_TensorFlowEstimator/ImageClassification.Predict/ImageClassification.Predict.fsproj b/samples/fsharp/getting-started/DeepLearning_TensorFlowEstimator/ImageClassification.Predict/ImageClassification.Predict.fsproj
index 3e4c4e563..a1d1919a7 100644
--- a/samples/fsharp/getting-started/DeepLearning_TensorFlowEstimator/ImageClassification.Predict/ImageClassification.Predict.fsproj
+++ b/samples/fsharp/getting-started/DeepLearning_TensorFlowEstimator/ImageClassification.Predict/ImageClassification.Predict.fsproj
@@ -13,7 +13,8 @@
-
+
+
diff --git a/samples/fsharp/getting-started/DeepLearning_TensorFlowEstimator/ImageClassification.Train/ImageClassification.Train.fsproj b/samples/fsharp/getting-started/DeepLearning_TensorFlowEstimator/ImageClassification.Train/ImageClassification.Train.fsproj
index 3e4c4e563..a1d1919a7 100644
--- a/samples/fsharp/getting-started/DeepLearning_TensorFlowEstimator/ImageClassification.Train/ImageClassification.Train.fsproj
+++ b/samples/fsharp/getting-started/DeepLearning_TensorFlowEstimator/ImageClassification.Train/ImageClassification.Train.fsproj
@@ -13,7 +13,8 @@
-
+
+