Additional changes to include weaver to main package

Author: alex-kulakov

Orm/Xtensive.Orm/Xtensive.Orm.csproj

@@ -19,6 +19,7 @@
     <DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Label="Release" Condition="'$(Configuration)'=='Release'">
+    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);IncludeWeaverFiles</TargetsForTfmSpecificContentInPackage>
     <DefineConstants>TRACE;NETSTANDARD</DefineConstants>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>portable</DebugType>
@@ -27,10 +28,14 @@
     <ProjectReference Include="$(SolutionDir)Weaver\Xtensive.Orm.Weaver\Xtensive.Orm.Weaver.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
   <ItemGroup Label="Nuget content">
-    <Content Include="$(SolutionDir)MSBuild\DataObjects.Net.targets" Visible="false" Pack="true" PackagePath="." />
-    <Content Include="NuGetContent\**" Visible="false" Pack="true" PackagePath="." />
-    <Content Include="$(SolutionDir)_Build\$(Configuration)\tools\weaver\**" Visible="false" Pack="true" PackagePath="tools\weaver\" />
-    <TfmSpecificPackageFile Include="$(SolutionDir)_Build\$(Configuration)\tools\weaver\**" Visible="false" Pack="true" PackagePath="tools\weaver\" />
+    <Content Include="$(SolutionDir)MSBuild\DataObjects.Net.targets">
+      <PackagePath>.</PackagePath>
+      <Visible>false</Visible>
+    </Content>
+    <Content Include="$(ProjectDir)NuGetContent\**">
+      <PackagePath>.</PackagePath>
+      <Visible>false</Visible>
+    </Content>
   </ItemGroup>
   <ItemGroup Label="Packages" Condition=" '$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />