Merge pull request #381 from yatli/master

update cmake and msbuild files

Author: shaobin

CMakeLists.txt

@@ -39,10 +39,14 @@ ADD_SUBDIRECTORY(src/Trinity.Core)
 ADD_SUBDIRECTORY(src/Modules/LIKQ)
 
 ADD_DOTNET(
-    src/Modules/DataImporter/GraphEngine.DataImporter.sln
+    src/Modules/DataImporter/GraphEngine.DataImporter/GraphEngine.DataImporter.csproj
+    VERSION ${TRINITY_VERSION}
     PACKAGE GraphEngine.DataImporter
     DEPENDS GraphEngine.Core)
-
+TEST_DOTNET(
+    src/Modules/DataImporter/GraphEngine.DataImporter.UnitTest/GraphEngine.DataImporter.UnitTest.csproj
+    DEPENDS GraphEngine.DataImporter
+    ARGUMENTS -- RunConfiguration.TargetPlatform=x64 RunConfiguration.MaxCpuCount=1)
 # The following Modules are Unsupported, provided as-is.
 
 # ADD_SUBDIRECTORY(src/Modules/Unsupported/Storage.Composite)

src/Modules/DataImporter/GraphEngine.DataImporter/GraphEngine.DataImporter.csproj

@@ -15,4 +15,31 @@
   <ItemGroup>
     <TslCodegen Include="TSLGeneratorMetadata.tsl" />
   </ItemGroup>
+  <!-- NuGet package metadata -->
+  <PropertyGroup>
+    <Authors>Microsoft Graph Engine Team</Authors>
+    <Description>GraphEngine data importer.</Description>
+    <Copyright>Copyright 2022</Copyright>
+    <Company>Microsoft Corporation</Company>
+
+    <Version>$(DOTNET_PACKAGE_VERSION)</Version>
+    <AssemblyVersion>$(DOTNET_PACKAGE_VERSION)</AssemblyVersion>
+    <FileVersion>$(DOTNET_PACKAGE_VERSION)</FileVersion>
+    <PackageVersion>$(DOTNET_PACKAGE_VERSION)</PackageVersion>
+
+    <PackageId>GraphEngine.DataImporter</PackageId>
+    <PackageTags>Graph Engine Trinity Data Importer</PackageTags>
+    <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
+    <PackageProjectUrl>https://www.graphengine.io</PackageProjectUrl>
+    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
+    <PackageIcon>logo-64x64.png</PackageIcon>
+    <RepositoryUrl>https://github.com/Microsoft/GraphEngine</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <NoWarn>CS0660,CS0661,CS0612,CS1668</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="..\..\..\..\LICENSE.txt" Pack="true" PackagePath="LICENSE.txt"/>
+    <None Include="..\..\..\..\resources\logo-64x64.png" Pack="true" PackagePath="logo-64x64.png"/>
+  </ItemGroup>
 </Project>

src/Trinity.TSL/Trinity.TSL.CodeTemplates/Trinity.TSL.CodeTemplates.csproj

@@ -9,4 +9,12 @@
   <ItemGroup>
     <ProjectReference Include="../../Trinity.Core/Trinity.Core.csproj" />
   </ItemGroup>
+
+  <!-- Package dependencies -->
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="6.0.6" />
+  </ItemGroup>
 </Project>