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 @@
AIMS.Program
+
+ app.manifest
+
False
DLL\DCSoft.Writer.dll
-
- False
- Extensions\DevComponents.DotNetBar.SuperGrid.dll
-
-
- False
- ..\..\..\..\..\..\..\Program Files (x86)\DotNetBar for Windows Forms\DevComponents.DotNetBar2.dll
-
@@ -80,6 +75,7 @@
Resources.resx
True
+
PreserveNewest
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
..\AIMS\Extensions\DCSoft.Writer.dll
-
- False
- ..\AIMS\Extensions\DevComponents.DotNetBar.SuperGrid.dll
-
-
- False
- ..\AIMS\Extensions\DevComponents.DotNetBar2.dll
-
False
False
@@ -1605,6 +1597,9 @@
+
+ 1.0.1
+
13.0.3
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 @@
..\AIMS\Extensions\DCSoft.Writer.dll
-
- False
- ..\AIMS\Extensions\DevComponents.DotNetBar2.dll
-
False
False
@@ -249,6 +245,11 @@
AIMSExtension
+
+
+ 1.0.1
+
+