Merge branch 'net46'

This commit is contained in:
Kevin
2017-09-01 18:47:22 +08:00
2 changed files with 14 additions and 0 deletions
@@ -21,6 +21,10 @@
<DocumentationFile>bin\Release\netstandard2.0\OSS.Http.Extention.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="OSS.Common" Version="1.2.0" />
@@ -30,4 +34,8 @@
<ProjectReference Include="..\OSS.Http\OSS.Http.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
+6
View File
@@ -25,4 +25,10 @@
<DocumentationFile>bin\Release\netstandard2.0\OSS.Http.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Properties\**" />
<EmbeddedResource Remove="Properties\**" />
<None Remove="Properties\**" />
</ItemGroup>
</Project>