Fix build nuget pacakges and build from VS 2019

Author: artidoro

THIRD-PARTY-NOTICES.TXT

@@ -9,13 +9,13 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(IsStableProject)' == 'true'">
     <MajorVersion>1</MajorVersion>
-    <MinorVersion>1</MinorVersion>
+    <MinorVersion>0</MinorVersion>
     <PatchVersion>0</PatchVersion>
     <PreReleaseLabel>preview</PreReleaseLabel>
   </PropertyGroup>
   <PropertyGroup Condition="'$(IsStableProject)' != 'true'">
     <MajorVersion>0</MajorVersion>
-    <MinorVersion>13</MinorVersion>
+    <MinorVersion>2</MinorVersion>
     <PatchVersion>0</PatchVersion>
     <PreReleaseLabel>preview</PreReleaseLabel>
   </PropertyGroup>

build/BranchInfo.props

@@ -13,6 +13,7 @@
   <!-- Other/Non-Core Product Dependencies -->
   <PropertyGroup>
     <LibtorchVersion>1.0.1</LibtorchVersion>
+    <MklDnnVersion>2019.0.5.20190502</MklDnnVersion>
     <!-- <GoogleProtobufPackageVersion>3.5.1</GoogleProtobufPackageVersion>
     <LightGBMPackageVersion>2.2.3</LightGBMPackageVersion>
     <MicrosoftMLOnnxRuntimePackageVersion>0.3.0</MicrosoftMLOnnxRuntimePackageVersion>

build/Dependencies.props

@@ -24,7 +24,7 @@
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/xamarin/TorchSharp</PackageProjectUrl>
     <!-- space separated -->
-    <PackageTags>TorchSharp PyTorch Torch DL Deep ML Machine Learning</PackageTags>
+    <PackageTags>TorchSharp LibTorch PyTorch Torch DL DNN Deep ML Machine Learning Neural Network</PackageTags>
   </PropertyGroup>
 
   <ItemGroup>
@@ -34,7 +34,8 @@
     <Content Include="$(PackageAssetsPath)$(PackageIdFolderName)\tools\**\*" Pack="true" PackagePath="tools" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(IncludeMLNetNotices)' != 'false'">
+  <ItemGroup Condition="'$(IncludeNotices)' != 'false'">
+    <Content Include="$(RepoRoot)\THIRD-PARTY-NOTICES.TXT" Pack="true" PackagePath="" />
     <Content Include="$(RepoRoot)\LICENSE" Pack="true" PackagePath=""/>
   </ItemGroup>
 

pkg/Directory.Build.props

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
+
+  <PropertyGroup>
+    <Authors></Authors>
+    <Copyright>Copyright (c) Microsoft Corporation</Copyright>
+    <Owners>Microsoft Corporation</Owners>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageDescription>$(MSBuildProjectName) contains the PyTorch C++ frontend LibTorch library version $(LibTorchVersion) 
+    and MKL-DNN library version $(MklDnnVersion) redistributed as a NuGet package. </PackageDescription>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <PackageProjectUrl>https://pytorch.org/</PackageProjectUrl>
+  </PropertyGroup>
+</Project>

pkg/LibTorch.Redist/LibTorch.Redist.nupkgproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework Condition="'$(UseIntrinsics)' != 'true'">netstandard2.0</TargetFramework>
     <TargetFrameworks Condition="'$(UseIntrinsics)' == 'true'">netstandard2.0;netcoreapp3.0</TargetFrameworks>
-    <PackageDescription>.NET Bindings for Torch.</PackageDescription>
+    <PackageDescription>.NET Bindings for Toch.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">

pkg/TorchSharp/TorchSharp.nupkgproj

@@ -65,7 +65,7 @@ exit /b 1
 :VS2019
 :: Setup vars for VS2019
 set __PlatformToolset=v142
-set __VSVersion=15 2017
+set __VSVersion=16 2019
 if NOT "%__BuildArch%" == "arm64" (
     :: Set the environment for the native build
     call "%VS160COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat" %__VCBuildArch%

pkg/_._

@@ -42,7 +42,7 @@
     <LibName Condition="'$(OS)' != 'Windows_NT'">libtorch-shared-with-deps</LibName>
     <LibName Condition="$([MSBuild]::IsOSPlatform('osx'))">libtorch-macos</LibName>
 
-    <LibtorchPath Condition="'$(LibtorchPath)'==''">$(IntermediateOutputRootPath)Microsoft.ML.Libtorch.Redist\$(LibName)-$(LibtorchVersion)\libtorch\share\cmake\Torch</LibtorchPath>
+    <LibtorchPath Condition="'$(LibtorchPath)'==''">$(IntermediateOutputRootPath)Libtorch.Redist\$(LibName)-$(LibtorchVersion)\libtorch\share\cmake\Torch</LibtorchPath>
   </PropertyGroup>
 
   <Target Name="BuildNativeUnix"