Merge pull request #1 from AsakusaRinne/add_cv_compatibility

Add unittest redist holder for all test projects.

TensorFlow.NET.sln

@@ -31,7 +31,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{01A1787F-A9B
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{1B0918B9-65AD-4F34-A287-AF4597B27DBD}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "console", "console", "{E1A5D2B7-10AF-4876-85C0-7714EF274214}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "helpers", "helpers", "{E1A5D2B7-10AF-4876-85C0-7714EF274214}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tensorflow.UnitTest.RedistHolder", "UnitTestRedistHolder\Tensorflow.UnitTest.RedistHolder.csproj", "{C087FFF9-4387-4628-8B3F-91C213FB947D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -262,13 +264,31 @@ Global
 		{7DEA8760-E401-4872-81F3-405F185A13A0}.Release|x64.Build.0 = Release|Any CPU
 		{7DEA8760-E401-4872-81F3-405F185A13A0}.Release|x86.ActiveCfg = Release|Any CPU
 		{7DEA8760-E401-4872-81F3-405F185A13A0}.Release|x86.Build.0 = Release|Any CPU
+		{C087FFF9-4387-4628-8B3F-91C213FB947D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C087FFF9-4387-4628-8B3F-91C213FB947D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C087FFF9-4387-4628-8B3F-91C213FB947D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C087FFF9-4387-4628-8B3F-91C213FB947D}.Debug|x64.Build.0 = Debug|Any CPU
+		{C087FFF9-4387-4628-8B3F-91C213FB947D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C087FFF9-4387-4628-8B3F-91C213FB947D}.Debug|x86.Build.0 = Debug|Any CPU
+		{C087FFF9-4387-4628-8B3F-91C213FB947D}.GPU|Any CPU.ActiveCfg = Debug|Any CPU
+		{C087FFF9-4387-4628-8B3F-91C213FB947D}.GPU|Any CPU.Build.0 = Debug|Any CPU
+		{C087FFF9-4387-4628-8B3F-91C213FB947D}.GPU|x64.ActiveCfg = Debug|Any CPU
+		{C087FFF9-4387-4628-8B3F-91C213FB947D}.GPU|x64.Build.0 = Debug|Any CPU
+		{C087FFF9-4387-4628-8B3F-91C213FB947D}.GPU|x86.ActiveCfg = Debug|Any CPU
+		{C087FFF9-4387-4628-8B3F-91C213FB947D}.GPU|x86.Build.0 = Debug|Any CPU
+		{C087FFF9-4387-4628-8B3F-91C213FB947D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C087FFF9-4387-4628-8B3F-91C213FB947D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C087FFF9-4387-4628-8B3F-91C213FB947D}.Release|x64.ActiveCfg = Release|Any CPU
+		{C087FFF9-4387-4628-8B3F-91C213FB947D}.Release|x64.Build.0 = Release|Any CPU
+		{C087FFF9-4387-4628-8B3F-91C213FB947D}.Release|x86.ActiveCfg = Release|Any CPU
+		{C087FFF9-4387-4628-8B3F-91C213FB947D}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{FD682AC0-7B2D-45D3-8B0D-C6D678B04144} = {01A1787F-A9BE-4221-84E8-6360DD010AB6}
-		{3A6EB896-604F-4E25-B677-B8103BCF3D2E} = {1B0918B9-65AD-4F34-A287-AF4597B27DBD}
+		{3A6EB896-604F-4E25-B677-B8103BCF3D2E} = {E1A5D2B7-10AF-4876-85C0-7714EF274214}
 		{23C28035-2FCE-41F3-9A12-E73CE8A5AE32} = {1B0918B9-65AD-4F34-A287-AF4597B27DBD}
 		{03F06299-3F4B-4449-A709-3A647657BC0C} = {E1A5D2B7-10AF-4876-85C0-7714EF274214}
 		{49D71826-C03D-4FA7-9BAC-22C1327E65CF} = {01A1787F-A9BE-4221-84E8-6360DD010AB6}
@@ -279,6 +299,7 @@ Global
 		{3F5388FF-FBB4-462B-8F6F-829FFBAEB8A3} = {1B0918B9-65AD-4F34-A287-AF4597B27DBD}
 		{9738D16A-CFA0-405C-A7DF-D3D203B0CB18} = {01A1787F-A9BE-4221-84E8-6360DD010AB6}
 		{7DEA8760-E401-4872-81F3-405F185A13A0} = {1B0918B9-65AD-4F34-A287-AF4597B27DBD}
+		{C087FFF9-4387-4628-8B3F-91C213FB947D} = {E1A5D2B7-10AF-4876-85C0-7714EF274214}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {2DEAD3CC-486B-4918-A607-50B0DE7B114A}

helpers/Tensorflow.UnitTest.RedistHolder/EmptyClass.cs

@@ -0,0 +1,3 @@
+internal class EmptyClass
+{
+}

helpers/Tensorflow.UnitTest.RedistHolder/Tensorflow.UnitTest.RedistHolder.csproj

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.11.3" />
+    <PackageReference Include="SciSharp.TensorFlow.Redist-Lite" Version="2.6.0" />
+  </ItemGroup>
+
+</Project>

src/TensorFlowNet.Benchmarks/Tensorflow.Benchmark.csproj

@@ -37,10 +37,10 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
-    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.11.0" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\UnitTestRedistHolder\Tensorflow.UnitTest.RedistHolder.csproj" />
     <ProjectReference Include="..\TensorFlowNET.Keras\Tensorflow.Keras.csproj" />
   </ItemGroup>
 

test/TensorFlowNET.Graph.UnitTest/TensorFlowNET.Graph.UnitTest.csproj

@@ -31,11 +31,11 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.11.3" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\TensorFlowNET.Core\Tensorflow.Binding.csproj" />
+    <ProjectReference Include="..\..\UnitTestRedistHolder\Tensorflow.UnitTest.RedistHolder.csproj" />
     <ProjectReference Include="..\TensorFlowNET.Keras.UnitTest\Tensorflow.Keras.UnitTest.csproj" />
   </ItemGroup>
 

test/TensorFlowNET.Keras.UnitTest/Tensorflow.Keras.UnitTest.csproj

@@ -20,11 +20,11 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.11.3" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\TensorFlowNET.Keras\Tensorflow.Keras.csproj" />
+    <ProjectReference Include="..\..\UnitTestRedistHolder\Tensorflow.UnitTest.RedistHolder.csproj" />
   </ItemGroup>
 
   <ItemGroup>

test/TensorFlowNET.Native.UnitTest/Tensorflow.Native.UnitTest.csproj

@@ -51,12 +51,11 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.11.3" />
-    <PackageReference Include="SciSharp.TensorFlow.Redist-Lite" Version="2.6.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\TensorFlowNET.Core\Tensorflow.Binding.csproj" />
+    <ProjectReference Include="..\..\UnitTestRedistHolder\Tensorflow.UnitTest.RedistHolder.csproj" />
   </ItemGroup>
 
 </Project>

test/TensorFlowNET.UnitTest/Tensorflow.Binding.UnitTest.csproj

@@ -45,12 +45,12 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
-    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.11.3" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\TensorFlowNET.Core\Tensorflow.Binding.csproj" />
     <ProjectReference Include="..\..\src\TensorFlowNET.Text\Tensorflow.Text.csproj" />
+    <ProjectReference Include="..\..\UnitTestRedistHolder\Tensorflow.UnitTest.RedistHolder.csproj" />
   </ItemGroup>
 
   <ItemGroup>

test/TensorflowNET.Hub.Unittest/Tensorflow.Hub.Unittest.csproj

@@ -13,11 +13,11 @@
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
     <PackageReference Include="coverlet.collector" Version="3.1.2" />
-    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.11.3" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\TensorflowNET.Hub\Tensorflow.Hub.csproj" />
+    <ProjectReference Include="..\..\UnitTestRedistHolder\Tensorflow.UnitTest.RedistHolder.csproj" />
   </ItemGroup>
 
 </Project>