Skip to content

Add unittest redist holder for all test projects. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SanftMonster merged 2 commits into from
Apr 28, 2023
Merged

Add unittest redist holder for all test projects. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c4c529
Add unittest redist holder for all test projects.
SanftMonster Apr 28, 2023
9d85f74
Move redist holder to another folder.
SanftMonster Apr 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions TensorFlow.NET.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand All @@ -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}
Expand Down
3 changes: 3 additions & 0 deletions helpers/Tensorflow.UnitTest.RedistHolder/EmptyClass.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
internal class EmptyClass
{
}
12 changes: 12 additions & 0 deletions helpers/Tensorflow.UnitTest.RedistHolder/Tensorflow.UnitTest.RedistHolder.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion src/TensorFlowNet.Benchmarks/Tensorflow.Benchmark.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion test/TensorFlowNET.Graph.UnitTest/TensorFlowNET.Graph.UnitTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion test/TensorFlowNET.Keras.UnitTest/Tensorflow.Keras.UnitTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions test/TensorFlowNET.Native.UnitTest/Tensorflow.Native.UnitTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion test/TensorFlowNET.UnitTest/Tensorflow.Binding.UnitTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion test/TensorflowNET.Hub.Unittest/Tensorflow.Hub.Unittest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>