From a6c23597417cb404280be48f68ba7895779b0609 Mon Sep 17 00:00:00 2001
From: Colin <colin@mmin.us>
Date: Tue, 29 Aug 2023 23:52:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95dotnetbar2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AIMS/AIMS.csproj                              | 12 +--
 AIMS/Program.cs                               | 59 +++++---------
 AIMS/app.manifest                             | 79 +++++++++++++++++++
 AIMSControls/AIMSControls.csproj              | 11 +--
 DocumentManagement/DocumentManagement.csproj  |  9 ++-
 DrawGraph/DrawGraph.csproj                    |  9 ++-
 .../DrawGraphManagement.csproj                | 13 +--
 DrawGraphManagement/packages.config           |  4 -
 8 files changed, 123 insertions(+), 73 deletions(-)
 create mode 100644 AIMS/app.manifest
 delete mode 100644 DrawGraphManagement/packages.config

diff --git a/AIMS/AIMS.csproj b/AIMS/AIMS.csproj
index bbeb004..dc2f2d9 100644
--- a/AIMS/AIMS.csproj
+++ b/AIMS/AIMS.csproj
@@ -39,19 +39,14 @@
   <PropertyGroup>
     <StartupObject>AIMS.Program</StartupObject>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="DCSoft.Writer, Version=1.2015.12.23, Culture=neutral, PublicKeyToken=2e40e961ea876340, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>DLL\DCSoft.Writer.dll</HintPath>
     </Reference>
-    <Reference Include="DevComponents.DotNetBar.SuperGrid, Version=12.5.0.2, Culture=neutral, PublicKeyToken=c39c3242a43eee2b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Extensions\DevComponents.DotNetBar.SuperGrid.dll</HintPath>
-    </Reference>
-    <Reference Include="DevComponents.DotNetBar2, Version=12.5.0.2, Culture=neutral, PublicKeyToken=c39c3242a43eee2b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\DotNetBar for Windows Forms\DevComponents.DotNetBar2.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Net.Http">
@@ -80,6 +75,7 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
+    <None Include="app.manifest" />
     <None Include="appsettings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
diff --git a/AIMS/Program.cs b/AIMS/Program.cs
index 9f96d68..3d54681 100644
--- a/AIMS/Program.cs
+++ b/AIMS/Program.cs
@@ -56,56 +56,35 @@ namespace AIMS
         }
         static void MainStart(string[] args)
         {
-            /**
-      * 当前用户是管理员的时候，直接启动应用程序
-      * 如果不是管理员，则使用启动对象启动程序，以确保使用管理员身份运行
-      */
             //获得当前登录的Windows用户标示
             System.Security.Principal.WindowsIdentity identity = System.Security.Principal.WindowsIdentity.GetCurrent();
             //创建Windows用户主题
             Application.EnableVisualStyles();
 
             System.Security.Principal.WindowsPrincipal principal = new System.Security.Principal.WindowsPrincipal(identity);
-            //判断当前登录用户是否为管理员
-            if (principal.IsInRole(System.Security.Principal.WindowsBuiltInRole.Administrator))
-            {
-                //如果是管理员，则直接运行
 
-                if (PublicMethod.FindProcess("AIMSAutoUpdate"))
-                {
-                    return;
-                }
-                BindExceptionHandler();
-                Application.EnableVisualStyles();
-                Application.SetCompatibleTextRenderingDefault(false);
+            //如果是管理员，则直接运行
 
-                //Process instance = RunningInstance();
-                //if (instance == null)
-                //{ 
-                UpdateProgram(args);
-                Application.Run(new FormLogin());
-                //}
-                //else
-                //{
-                //    /*1.2 已经有一个实例在运行*/
-                //    HandleRunningInstance(instance);
-                //}
-            }
-            else
+            if (PublicMethod.FindProcess("AIMSAutoUpdate"))
             {
-                //创建启动对象
-                System.Diagnostics.ProcessStartInfo startInfo = new System.Diagnostics.ProcessStartInfo();
-                //设置运行文件
-                startInfo.FileName = System.Windows.Forms.Application.ExecutablePath;
-                //设置启动参数
-                startInfo.Arguments = String.Join(" ", args);
-                //设置启动动作,确保以管理员身份运行
-                startInfo.Verb = "runas";
-                //如果不是管理员，则启动UAC
-                System.Diagnostics.Process.Start(startInfo);
-                //退出
-                System.Windows.Forms.Application.Exit();
+                return;
             }
+            BindExceptionHandler();
+            Application.EnableVisualStyles();
+            Application.SetCompatibleTextRenderingDefault(false);
+
+            //Process instance = RunningInstance();
+            //if (instance == null)
+            //{ 
+            UpdateProgram(args);
+            Application.Run(new FormLogin());
+            //}
+            //else
+            //{
+            //    /*1.2 已经有一个实例在运行*/
+            //    HandleRunningInstance(instance);
+            //}
+
         }
 
         static void UpdateProgram(string[] args)
diff --git a/AIMS/app.manifest b/AIMS/app.manifest
new file mode 100644
index 0000000..bccb6c0
--- /dev/null
+++ b/AIMS/app.manifest
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC 清单选项
+             如果想要更改 Windows 用户帐户控制级别，请使用
+             以下节点之一替换 requestedExecutionLevel 节点。
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            指定 requestedExecutionLevel 元素将禁用文件和注册表虚拟化。
+            如果你的应用程序需要此虚拟化来实现向后兼容性，则移除此
+            元素。
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- 设计此应用程序与其一起工作且已针对此应用程序进行测试的
+           Windows 版本的列表。取消评论适当的元素，
+           Windows 将自动选择最兼容的环境。 -->
+
+      <!-- Windows Vista -->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
+
+      <!-- Windows 8 -->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+
+      <!-- Windows 8.1 -->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
+
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+
+    </application>
+  </compatibility>
+
+  <!-- 指示该应用程序可感知 DPI 且 Windows 在 DPI 较高时将不会对其进行
+       自动缩放。Windows Presentation Foundation (WPF)应用程序自动感知 DPI，无需
+       选择加入。选择加入此设置的 Windows 窗体应用程序(面向 .NET Framework 4.6)还应
+       在其 app.config 中将 "EnableWindowsFormsHighDpiAutoResizing" 设置设置为 "true"。
+       
+       将应用程序设为感知长路径。请参阅 https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation -->
+  <!--
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+      <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
+    </windowsSettings>
+  </application>
+  -->
+
+  <!-- 启用 Windows 公共控件和对话框的主题(Windows XP 和更高版本) -->
+  <!--
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+  -->
+
+</assembly>
diff --git a/AIMSControls/AIMSControls.csproj b/AIMSControls/AIMSControls.csproj
index dcb719a..ba958a1 100644
--- a/AIMSControls/AIMSControls.csproj
+++ b/AIMSControls/AIMSControls.csproj
@@ -38,14 +38,6 @@
     <Reference Include="DCSoft.Writer">
       <HintPath>..\AIMS\Extensions\DCSoft.Writer.dll</HintPath>
     </Reference>
-    <Reference Include="DevComponents.DotNetBar.SuperGrid, Version=12.5.0.2, Culture=neutral, PublicKeyToken=c39c3242a43eee2b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\AIMS\Extensions\DevComponents.DotNetBar.SuperGrid.dll</HintPath>
-    </Reference>
-    <Reference Include="DevComponents.DotNetBar2, Version=12.5.0.2, Culture=neutral, PublicKeyToken=c39c3242a43eee2b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\AIMS\Extensions\DevComponents.DotNetBar2.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>False</EmbedInteropTypes>
@@ -1605,6 +1597,9 @@
     <None Include="Resources\GCSusers.png" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="DotNetBar2">
+      <Version>1.0.1</Version>
+    </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>13.0.3</Version>
     </PackageReference>
diff --git a/DocumentManagement/DocumentManagement.csproj b/DocumentManagement/DocumentManagement.csproj
index 307a210..215e0b4 100644
--- a/DocumentManagement/DocumentManagement.csproj
+++ b/DocumentManagement/DocumentManagement.csproj
@@ -43,10 +43,6 @@
     <Reference Include="DCSoft.Writer">
       <HintPath>..\AIMS\Extensions\DCSoft.Writer.dll</HintPath>
     </Reference>
-    <Reference Include="DevComponents.DotNetBar2, Version=12.5.0.2, Culture=neutral, PublicKeyToken=c39c3242a43eee2b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\AIMS\Extensions\DevComponents.DotNetBar2.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>False</EmbedInteropTypes>
@@ -249,6 +245,11 @@
       <Name>AIMSExtension</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="DotNetBar2">
+      <Version>1.0.1</Version>
+    </PackageReference>
+  </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.
diff --git a/DrawGraph/DrawGraph.csproj b/DrawGraph/DrawGraph.csproj
index 5503530..c68f9f4 100644
--- a/DrawGraph/DrawGraph.csproj
+++ b/DrawGraph/DrawGraph.csproj
@@ -38,10 +38,6 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DevComponents.DotNetBar2, Version=12.5.0.2, Culture=neutral, PublicKeyToken=c39c3242a43eee2b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\AIMS\Extensions\DevComponents.DotNetBar2.dll</HintPath>
-    </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\AIMS\Extensions\Newtonsoft.Json.dll</HintPath>
@@ -330,5 +326,10 @@
   <ItemGroup>
     <EmbeddedResource Include="Resources\bjtp.png" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="DotNetBar2">
+      <Version>1.0.1</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/DrawGraphManagement/DrawGraphManagement.csproj b/DrawGraphManagement/DrawGraphManagement.csproj
index 39170a2..6086164 100644
--- a/DrawGraphManagement/DrawGraphManagement.csproj
+++ b/DrawGraphManagement/DrawGraphManagement.csproj
@@ -74,10 +74,6 @@
     <Reference Include="DCSoft.Writer">
       <HintPath>..\AIMS\Extensions\DCSoft.Writer.dll</HintPath>
     </Reference>
-    <Reference Include="DevComponents.DotNetBar2, Version=12.5.0.2, Culture=neutral, PublicKeyToken=c39c3242a43eee2b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\AIMS\Extensions\DevComponents.DotNetBar2.dll</HintPath>
-    </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\AIMS\Extensions\Newtonsoft.Json.dll</HintPath>
@@ -170,7 +166,6 @@
       <DesignTime>True</DesignTime>
     </Compile>
     <None Include="app.config" />
-    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -212,6 +207,14 @@
       <Name>DrawGraph</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="DotNetBar2">
+      <Version>1.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="PdfiumViewer">
+      <Version>2.13.0</Version>
+    </PackageReference>
+  </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.
diff --git a/DrawGraphManagement/packages.config b/DrawGraphManagement/packages.config
deleted file mode 100644
index 2a819a7..0000000
--- a/DrawGraphManagement/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="PdfiumViewer" version="2.13.0.0" targetFramework="net40" />
-</packages>
\ No newline at end of file