From 3a034757160038ab2581298b830577d9b09147a3 Mon Sep 17 00:00:00 2001
From: HU_TAO <z1328775371@126.com>
Date: Thu, 18 Nov 2021 18:02:40 +0800
Subject: [PATCH] [change target framework && algorithm]

---
 Utils/Utils.csproj                       | 26 +++++++++++-----
 WPFTest/App.config                       |  2 +-
 WPFTest/Properties/Resources.Designer.cs |  6 ++--
 WPFTest/Properties/Settings.Designer.cs  |  2 +-
 WPFTest/UI/Chapter6/C6_SY1.xaml.cs       | 20 ++++++++++--
 WPFTest/UI/Chapter6/C6_SY2.xaml.cs       | 20 ++++++++++--
 WPFTest/WPFTest.csproj                   | 39 +++++++++++++++++-------
 dll_csharp/DLLCsharp.cs                  | 13 +++++---
 dll_csharp/dll_csharp.csproj             |  2 +-
 9 files changed, 97 insertions(+), 33 deletions(-)

diff --git a/Utils/Utils.csproj b/Utils/Utils.csproj
index 999d012..4393f9e 100644
--- a/Utils/Utils.csproj
+++ b/Utils/Utils.csproj
@@ -60,14 +60,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="Microsoft.Office.Interop.Word, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Office.Interop.Word.15.0.4797.1003\lib\net20\Microsoft.Office.Interop.Word.dll</HintPath>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
@@ -121,6 +113,24 @@
       <Isolated>False</Isolated>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
+    <COMReference Include="Microsoft.Office.Interop.Excel">
+      <Guid>{00020813-0000-0000-C000-000000000046}</Guid>
+      <VersionMajor>1</VersionMajor>
+      <VersionMinor>9</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+    <COMReference Include="Microsoft.Office.Interop.Word">
+      <Guid>{00020905-0000-0000-C000-000000000046}</Guid>
+      <VersionMajor>8</VersionMajor>
+      <VersionMinor>7</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
     <COMReference Include="VBIDE">
       <Guid>{0002E157-0000-0000-C000-000000000046}</Guid>
       <VersionMajor>5</VersionMajor>
diff --git a/WPFTest/App.config b/WPFTest/App.config
index aeca72c..4f4873b 100644
--- a/WPFTest/App.config
+++ b/WPFTest/App.config
@@ -2,7 +2,7 @@
 <configuration>
     <startup> 
         
-   <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup>
+   <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup>
 
    <!--
   <appSettings>
diff --git a/WPFTest/Properties/Resources.Designer.cs b/WPFTest/Properties/Resources.Designer.cs
index 78be9f8..b8a8389 100644
--- a/WPFTest/Properties/Resources.Designer.cs
+++ b/WPFTest/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace WPFTest.Properties {
     // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
     // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
     // (以 /str 作为命令选项)，或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -47,8 +47,8 @@ namespace WPFTest.Properties {
         }
         
         /// <summary>
-        ///   使用此强类型资源类，为所有资源查找
-        ///   重写当前线程的 CurrentUICulture 属性。
+        ///   重写当前线程的 CurrentUICulture 属性，对
+        ///   使用此强类型资源类的所有资源查找执行重写。
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Globalization.CultureInfo Culture {
diff --git a/WPFTest/Properties/Settings.Designer.cs b/WPFTest/Properties/Settings.Designer.cs
index aeae82d..dde4346 100644
--- a/WPFTest/Properties/Settings.Designer.cs
+++ b/WPFTest/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace WPFTest.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/WPFTest/UI/Chapter6/C6_SY1.xaml.cs b/WPFTest/UI/Chapter6/C6_SY1.xaml.cs
index 88a8a77..59fa2da 100644
--- a/WPFTest/UI/Chapter6/C6_SY1.xaml.cs
+++ b/WPFTest/UI/Chapter6/C6_SY1.xaml.cs
@@ -35,8 +35,16 @@ namespace WPFTest.UI.Chapter6
         {
             // _托管动态链接库DLL的调用过程:
             // <3> 在程序中调用dll中的函数
+            long ret = Int32.MinValue;
             string strText = textBox1.Text.Trim();
-            long ret = DLLCsharp.FactorialF(long.Parse(strText));
+            try
+            {
+                ret = DLLCsharp.FactorialF(long.Parse(strText));
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message);
+            }
             textBox2.Text = String.Concat(ret);
         }
 
@@ -44,8 +52,16 @@ namespace WPFTest.UI.Chapter6
         {
             // _托管动态链接库DLL的调用过程:
             // <3> 在程序中调用dll中的函数
+            long ret = Int32.MinValue;
             string strText = textBox3.Text.Trim();
-            long ret = DLLCsharp.FibonacciF(long.Parse(strText));
+            try
+            {
+                ret = DLLCsharp.FibonacciF(long.Parse(strText));
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message);
+            }
             textBox4.Text = String.Concat(ret);
         }
 
diff --git a/WPFTest/UI/Chapter6/C6_SY2.xaml.cs b/WPFTest/UI/Chapter6/C6_SY2.xaml.cs
index 1ce8d31..8c91372 100644
--- a/WPFTest/UI/Chapter6/C6_SY2.xaml.cs
+++ b/WPFTest/UI/Chapter6/C6_SY2.xaml.cs
@@ -31,11 +31,19 @@ namespace WPFTest.UI.Chapter6
 
         private void btn1_Click_1(object sender, RoutedEventArgs e)
         {
+            int ret = Int32.MinValue;
             string strText1 = textBox1.Text.Trim();
             string strText2 = textBox2.Text.Trim();
             // 非托管动态链接库DLL的调用过程:
             // <3> 在程序中调用重新声明的函数
-            int ret = DllTest.testAdd(int.Parse(strText1), int.Parse(strText2));
+            try
+            {
+                ret = DllTest.testAdd(int.Parse(strText1), int.Parse(strText2));
+            }
+            catch(Exception ex)
+            {
+                MessageBox.Show(ex.Message);
+            }
             textBox3.Text = String.Concat(ret);
         }
 
@@ -43,11 +51,19 @@ namespace WPFTest.UI.Chapter6
 
         private void btn2_Click_1(object sender, RoutedEventArgs e)
         {
+            int ret = Int32.MinValue;
             string strText1 = textBox5.Text.Trim();
             string strText2 = textBox6.Text.Trim();
             // 非托管动态链接库DLL的调用过程:
             // <3> 在程序中调用重新声明的函数
-            int ret = DllTest.testMulti(int.Parse(strText1), int.Parse(strText2));
+            try
+            {
+                ret = DllTest.testMulti(int.Parse(strText1), int.Parse(strText2));
+            }
+            catch(Exception ex)
+            {
+                MessageBox.Show(ex.Message);
+            }
             textBox7.Text = String.Concat(ret);
         }
     }
diff --git a/WPFTest/WPFTest.csproj b/WPFTest/WPFTest.csproj
index 3e1a963..deb9070 100644
--- a/WPFTest/WPFTest.csproj
+++ b/WPFTest/WPFTest.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WPFTest</RootNamespace>
     <AssemblyName>WPFTest</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
@@ -108,14 +108,6 @@
       <HintPath>..\Dll\DotNetSpeech.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="Microsoft.Office.Interop.Word, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Office.Interop.Word.15.0.4797.1003\lib\net20\Microsoft.Office.Interop.Word.dll</HintPath>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Data" />
@@ -417,6 +409,10 @@
       <Project>{041549f7-aa1e-4fd9-9aa7-39a5497b7402}</Project>
       <Name>DeviceInterfaces</Name>
     </ProjectReference>
+    <ProjectReference Include="..\dll_cpp\dll_cpp.vcxproj">
+      <Project>{7d171b5b-87b3-4a56-91fa-fb1fffc1c2c9}</Project>
+      <Name>dll_cpp</Name>
+    </ProjectReference>
     <ProjectReference Include="..\dll_csharp\dll_csharp.csproj">
       <Project>{39fd8fea-a76c-487d-b9be-6ae0eee96a2f}</Project>
       <Name>dll_csharp</Name>
@@ -446,6 +442,24 @@
       <Isolated>False</Isolated>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
+    <COMReference Include="Microsoft.Office.Interop.Excel">
+      <Guid>{00020813-0000-0000-C000-000000000046}</Guid>
+      <VersionMajor>1</VersionMajor>
+      <VersionMinor>9</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+    <COMReference Include="Microsoft.Office.Interop.Word">
+      <Guid>{00020905-0000-0000-C000-000000000046}</Guid>
+      <VersionMajor>8</VersionMajor>
+      <VersionMinor>7</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
     <COMReference Include="VBIDE">
       <Guid>{0002E157-0000-0000-C000-000000000046}</Guid>
       <VersionMajor>5</VersionMajor>
@@ -465,7 +479,10 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>xcopy "$(SolutionDir)WPFTest\UI\Image\*.*" "$(TargetDir)Image\" /y
+    <PostBuildEvent>xcopy /y /d "../../../x64\$(ConfigurationName)\dll_cpp.dll"
+
+
+xcopy "$(SolutionDir)WPFTest\UI\Image\*.*" "$(TargetDir)Image\" /y
 
 
 xcopy "$(SolutionDir)WPFTest\Files\*.*" "$(TargetDir)Files\" /y</PostBuildEvent>
diff --git a/dll_csharp/DLLCsharp.cs b/dll_csharp/DLLCsharp.cs
index 76bdce9..21cbf9f 100644
--- a/dll_csharp/DLLCsharp.cs
+++ b/dll_csharp/DLLCsharp.cs
@@ -40,10 +40,15 @@ namespace dll_csharp
         // 斐波那契数列F(1)=1，F(2)=1, F(n)=F(n-1)+F(n-2)
         public static long FibonacciF(long num)
         {
-            if (num == 1 || num==2)
-                return 1;
-
-            return FibonacciF(num - 1) + FibonacciF(num - 2);
+            if (num == 2 || num == 1) return 1;
+            long dp1 = 1, dp2 = 1, dp3 = 0;
+            for (long i = 2; i < num; i++)
+            {
+                dp3 = dp1 + dp2;
+                dp1 = dp2;
+                dp2 = dp3;
+            }
+            return dp3;
         }
 
         // _托管动态链接库DLL的创建步骤:
diff --git a/dll_csharp/dll_csharp.csproj b/dll_csharp/dll_csharp.csproj
index 5c6d6c6..f5eabd5 100644
--- a/dll_csharp/dll_csharp.csproj
+++ b/dll_csharp/dll_csharp.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>dll_csharp</RootNamespace>
     <AssemblyName>dll_csharp</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
-- 
Gitee