Merge projects

kaiidams · Aug 12, 2023 · 8819bb6 · 8819bb6
1 parent 74f2dac
commit 8819bb6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 45 deletions.
diff --git a/NeMoOnnxSharp.Example/NeMoOnnxSharp.Example.csproj b/NeMoOnnxSharp.Example/NeMoOnnxSharp.Example.csproj
@@ -3,16 +3,9 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="Assets\**" />
-    <EmbeddedResource Remove="Assets\**" />
-    <None Remove="Assets\**" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Remove="appsettings.json" />
   </ItemGroup>

diff --git a/NeMoOnnxSharp.Tests/NeMoOnnxSharp.Tests.csproj b/NeMoOnnxSharp.Tests/NeMoOnnxSharp.Tests.csproj
@@ -2,39 +2,22 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <Nullable>disable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="System.Memory" Version="4.5.5" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+    <PackageReference Include="coverlet.collector" Version="3.2.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\NeMoOnnxSharp\NeMoOnnxSharp.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="Data\61-70968-0000-mod.wav">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Data\61-70968-0000.wav">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Data\melspectrogram.bin">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Data\spectrogram.bin">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
 </Project>
diff --git a/NeMoOnnxSharp.sln b/NeMoOnnxSharp.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.32014.148
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NeMoOnnxSharp", "NeMoOnnxSharp\NeMoOnnxSharp.csproj", "{D583F4A1-65A9-4BD2-91D5-8A24E0B325E0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NeMoOnnxSharp.Example", "NeMoOnnxSharp.Example\NeMoOnnxSharp.Example.csproj", "{D583F4A1-65A9-4BD2-91D5-8A24E0B325E0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NeMoOnnxSharp.Tests", "NeMoOnnxSharp.Tests\NeMoOnnxSharp.Tests.csproj", "{5126DAA8-6FFD-4B0A-8F85-9C98DCF64152}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NeMoOnnxSharp", "NeMoOnnxSharp\NeMoOnnxSharp.csproj", "{69A674F7-593C-48C4-A5C7-5BCBC205E281}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NeMoOnnxSharp.Example", "NeMoOnnxSharp.Example\NeMoOnnxSharp.Example.csproj", "{52E3A920-29D9-4E9E-AAE4-EC6A77A6A08D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NeMoOnnxSharp.Tests", "NeMoOnnxSharp.Tests\NeMoOnnxSharp.Tests.csproj", "{4D0C8A9F-0574-4645-A0C2-51393982ACC8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,14 +19,14 @@ Global
 		{D583F4A1-65A9-4BD2-91D5-8A24E0B325E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D583F4A1-65A9-4BD2-91D5-8A24E0B325E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D583F4A1-65A9-4BD2-91D5-8A24E0B325E0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5126DAA8-6FFD-4B0A-8F85-9C98DCF64152}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5126DAA8-6FFD-4B0A-8F85-9C98DCF64152}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5126DAA8-6FFD-4B0A-8F85-9C98DCF64152}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5126DAA8-6FFD-4B0A-8F85-9C98DCF64152}.Release|Any CPU.Build.0 = Release|Any CPU
-		{52E3A920-29D9-4E9E-AAE4-EC6A77A6A08D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{52E3A920-29D9-4E9E-AAE4-EC6A77A6A08D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{52E3A920-29D9-4E9E-AAE4-EC6A77A6A08D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{52E3A920-29D9-4E9E-AAE4-EC6A77A6A08D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{69A674F7-593C-48C4-A5C7-5BCBC205E281}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69A674F7-593C-48C4-A5C7-5BCBC205E281}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69A674F7-593C-48C4-A5C7-5BCBC205E281}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69A674F7-593C-48C4-A5C7-5BCBC205E281}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4D0C8A9F-0574-4645-A0C2-51393982ACC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4D0C8A9F-0574-4645-A0C2-51393982ACC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4D0C8A9F-0574-4645-A0C2-51393982ACC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4D0C8A9F-0574-4645-A0C2-51393982ACC8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/NeMoOnnxSharp/NeMoOnnxSharp.csproj b/NeMoOnnxSharp/NeMoOnnxSharp.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>