Skip to content

K
Kivii.Client.Lims.ExcelToPdf.V4.5
Commit 00c3e878 by Neo Turing
Options

框架变更：.net 4.5 调整至 .net 4.0

parent e74a1309
Showing with 43 additions and 24 deletions
.gitignore
...@@ -8,3 +8,5 @@ ...@@ -8,3 +8,5 @@
/Src/packages /Src/packages
/Src/obj/Release /Src/obj/Release
/Src/.vs/Kivii.Client.Lims.ExcelToPdf.V4.5 /Src/.vs/Kivii.Client.Lims.ExcelToPdf.V4.5
/Src/bin/x86/Debug
/Src/obj/x86/Debug
Src/App.config
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
</startup> </startup>
</configuration> </configuration>
Src/FrmServer.Designer.cs
...@@ -561,7 +561,7 @@ ...@@ -561,7 +561,7 @@
this.Controls.Add(this.pnlLeft); this.Controls.Add(this.pnlLeft);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "FrmServer"; this.Name = "FrmServer";
this.Text = "Office转PDF V4.3"; this.Text = "Office转PDF V4.0_2024.11110";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmServer_FormClosing); this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmServer_FormClosing);
this.Load += new System.EventHandler(this.FrmServer_Load); this.Load += new System.EventHandler(this.FrmServer_Load);
this.cmsNotify.ResumeLayout(false); this.cmsNotify.ResumeLayout(false);
......
Src/Kivii.Client.Lims.ExcelToPdf.V4.5.csproj → Src/Kivii.Client.Lims.ExcelToPdf.V4.0.csproj
...@@ -8,9 +8,10 @@ ...@@ -8,9 +8,10 @@
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<RootNamespace>Kivii.Lims.ExcelToPdf</RootNamespace> <RootNamespace>Kivii.Lims.ExcelToPdf</RootNamespace>
<AssemblyName>Office转PDF客户端</AssemblyName> <AssemblyName>Office转PDF客户端</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic> <Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
...@@ -34,21 +35,38 @@ ...@@ -34,21 +35,38 @@
<PropertyGroup> <PropertyGroup>
<ApplicationIcon>F.ico</ApplicationIcon> <ApplicationIcon>F.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Kivii.Common.V4.5, Version=5.6.2024.10240, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Kivii.Common.V4.0, Version=5.6.2024.10240, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Kivii.Common.5.6.2024.10240\lib\net45\Kivii.Common.V4.5.dll</HintPath> <HintPath>..\..\packages\Kivii.Common.5.6.2024.10240\lib\net40\Kivii.Common.V4.0.dll</HintPath>
</Reference>
<Reference Include="Kivii.Core.V4.5, Version=5.6.2024.10000, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Kivii.Core.5.6.2024.10000\lib\net45\Kivii.Core.V4.5.dll</HintPath>
</Reference> </Reference>
<Reference Include="Kivii.Linq.V4.5, Version=5.6.2024.10000, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Kivii.Linq.V4.0, Version=5.6.2024.10000, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Kivii.Linq.5.6.2024.10000\lib\net45\Kivii.Linq.V4.5.dll</HintPath> <HintPath>..\..\packages\Kivii.Linq.5.6.2024.10000\lib\net40\Kivii.Linq.V4.0.dll</HintPath>
</Reference> </Reference>
<Reference Include="Kivii.Office.V4.5, Version=5.6.2023.12000, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Kivii.Office.V4.0, Version=5.6.2023.12000, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Kivii.Office.5.6.2023.12000\lib\net45\Kivii.Office.V4.5.dll</HintPath> <HintPath>..\..\packages\Kivii.Office.5.6.2023.12000\lib\net40\Kivii.Office.V4.0.dll</HintPath>
</Reference> </Reference>
<Reference Include="Kivii.RabbitMq.V4.5, Version=5.6.2024.10120, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Kivii.RabbitMq.V4.0, Version=5.6.2024.10120, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Kivii.RabbitMq.5.6.2024.10120\lib\net45\Kivii.RabbitMq.V4.5.dll</HintPath> <HintPath>..\..\packages\Kivii.RabbitMq.5.6.2024.10120\lib\net40\Kivii.RabbitMq.V4.0.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
...@@ -58,7 +76,6 @@ ...@@ -58,7 +76,6 @@
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Deployment" /> <Reference Include="System.Deployment" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
......
Src/Properties/AssemblyInfo.cs
...@@ -33,5 +33,5 @@ using System.Runtime.InteropServices; ...@@ -33,5 +33,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示: //通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.4.2024.10240")] [assembly: AssemblyVersion("5.4.2024.11110")]
[assembly: AssemblyFileVersion("5.4.2024.10240")] [assembly: AssemblyFileVersion("5.4.2024.11110")]
Src/Properties/Settings.Designer.cs
...@@ -12,7 +12,7 @@ namespace Kivii.Lims.ExcelToPdf.Properties { ...@@ -12,7 +12,7 @@ namespace Kivii.Lims.ExcelToPdf.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.7.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
......
Src/packages.config
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Kivii.Common" version="5.6.2024.10240" targetFramework="net45" /> <package id="Kivii.Common" version="5.6.2024.10240" targetFramework="net40" />
<package id="Kivii.Core" version="5.6.2024.10000" targetFramework="net45" /> <package id="Kivii.Linq" version="5.6.2024.10000" targetFramework="net40" />
<package id="Kivii.Linq" version="5.6.2024.10000" targetFramework="net45" /> <package id="Kivii.Office" version="5.6.2023.12000" targetFramework="net40" />
<package id="Kivii.Office" version="5.6.2023.12000" targetFramework="net45" /> <package id="Kivii.RabbitMq" version="5.6.2024.10120" targetFramework="net40" />
<package id="Kivii.RabbitMq" version="5.6.2024.10120" targetFramework="net45" />
</packages> </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