Commit d3027881 by 施晓雨

更新nuget ,解决contact合并sheet的问题

parent 3477fcec
......@@ -5,8 +5,6 @@ VisualStudioVersion = 15.0.28307.329
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kivii.Client.OfficeSample", "Kivii.Client.OfficeSample\Kivii.Client.OfficeSample.csproj", "{F2390914-2306-416C-A087-27BABA9A705C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kivii.Office.OpenXml.V4.0", "..\..\K5\Functions-V5.4\Kivii.Office.OpenXml\Src\Kivii.Office.OpenXml.V4.0.csproj", "{035CC24B-2C04-4AC2-A016-187D2D81F74C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
......@@ -20,12 +18,6 @@ Global
{F2390914-2306-416C-A087-27BABA9A705C}.DevTest|Any CPU.Build.0 = Debug|Any CPU
{F2390914-2306-416C-A087-27BABA9A705C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F2390914-2306-416C-A087-27BABA9A705C}.Release|Any CPU.Build.0 = Release|Any CPU
{035CC24B-2C04-4AC2-A016-187D2D81F74C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{035CC24B-2C04-4AC2-A016-187D2D81F74C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{035CC24B-2C04-4AC2-A016-187D2D81F74C}.DevTest|Any CPU.ActiveCfg = DevTest|Any CPU
{035CC24B-2C04-4AC2-A016-187D2D81F74C}.DevTest|Any CPU.Build.0 = DevTest|Any CPU
{035CC24B-2C04-4AC2-A016-187D2D81F74C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{035CC24B-2C04-4AC2-A016-187D2D81F74C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
......@@ -38,6 +38,9 @@
<Reference Include="Kivii.Core.V4.0, Version=5.4.2019.9250, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Kivii.Core.5.4.2019.9250\lib\net40\Kivii.Core.V4.0.dll</HintPath>
</Reference>
<Reference Include="Kivii.Office.OpenXml.V4.0, Version=5.4.2019.10000, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Kivii.Office.OpenXml.5.4.2019.10000\lib\net40\Kivii.Office.OpenXml.V4.0.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
......@@ -86,18 +89,12 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="附页模板.xlsx">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="首页模板.xlsx">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\K5\Functions-V5.4\Kivii.Office.OpenXml\Src\Kivii.Office.OpenXml.V4.0.csproj">
<Project>{035cc24b-2c04-4ac2-a016-187d2d81f74c}</Project>
<Name>Kivii.Office.OpenXml.V4.0</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
......
......@@ -2,5 +2,5 @@
<packages>
<package id="Kivii.Common" version="5.4.2019.9250" targetFramework="net40" />
<package id="Kivii.Core" version="5.4.2019.9250" targetFramework="net40" />
<package id="Kivii.Office.OpenXml" version="5.4.2019.9230" targetFramework="net40" />
<package id="Kivii.Office.OpenXml" version="5.4.2019.10000" targetFramework="net40" />
</packages>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment