OpenFx 8.3,GUI 1.1.5:现在,AutumnBox.OpenFx也是一个.net std应用程序了

LFYG · Sep 19, 2018 · 07ed048 · 07ed048
1 parent ed3891b
commit 07ed048
Show file tree

Hide file tree

Showing 19 changed files with 74 additions and 250 deletions.
diff --git a/AutumnBox.CoreModules/AutumnBox.CoreModules.csproj b/AutumnBox.CoreModules/AutumnBox.CoreModules.csproj
@@ -31,14 +31,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="MaterialDesignColors, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MaterialDesignColors.1.1.2\lib\net45\MaterialDesignColors.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="MaterialDesignThemes.Wpf, Version=2.4.1.1101, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MaterialDesignThemes.2.4.1.1101\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Windows.Forms" />
@@ -65,6 +57,7 @@
     <Compile Include="Extensions\Poweron\NoRoot\EGCM.cs" />
     <Compile Include="FasterVisualExtension.Kit.cs" />
     <Compile Include="FasterVisualExtension.Main.cs" />
+    <Compile Include="LanguageManager.cs" />
     <Compile Include="Lib\DpmSetterExtension.cs" />
     <Compile Include="Extensions\Poweron\NoRoot\DpmSetter\EIceBox.cs" />
     <Compile Include="Extensions\Poweron\NoRoot\DpmSetter\EStopApp.cs" />
@@ -99,7 +92,6 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -113,12 +105,12 @@
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\AutumnBox.GUI\AutumnBox.GUI.csproj">
-      <Project>{55081483-1689-4E52-A4F1-22AB75FF8900}</Project>
+      <Project>{55081483-1689-4e52-a4f1-22ab75ff8900}</Project>
       <Name>AutumnBox.GUI</Name>
       <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\AutumnBox.OpenFramework\AutumnBox.OpenFramework.csproj">
-      <Project>{6516890C-86B6-40A0-8FD0-14FFDD62E1FE}</Project>
+      <Project>{6516890c-86b6-40a0-8fd0-14ffdd62e1fe}</Project>
       <Name>AutumnBox.OpenFramework</Name>
       <Private>False</Private>
     </ProjectReference>

diff --git a/AutumnBox.CoreModules/CoreLib.cs b/AutumnBox.CoreModules/CoreLib.cs
@@ -5,8 +5,6 @@
 *************************************************/
 using AutumnBox.OpenFramework.Content;
 using AutumnBox.OpenFramework.ExtLibrary;
-using AutumnBox.OpenFramework.Open.Impl;
-using AutumnBox.OpenFramework.Open.Util;
 using AutumnBox.OpenFramework.Wrapper;
 using System;
 using System.Windows;

diff --git a/...penFramework/Open/Util/LanguageManager.cs → AutumnBox.CoreModules/LanguageManager.cs b/...penFramework/Open/Util/LanguageManager.cs → AutumnBox.CoreModules/LanguageManager.cs
@@ -1,6 +1,6 @@
 /*************************************************
 ** auth： [email protected]
-** date:  2018/9/12 17:30:20 (UTC +8:00)
+** date:  2018/9/19 17:14:28 (UTC +8:00)
 ** desc： ...
 *************************************************/
 using AutumnBox.OpenFramework.Content;
@@ -11,7 +11,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 
-namespace AutumnBox.OpenFramework.Open.Util
+namespace AutumnBox.CoreModules
 {
     /// <summary>
     /// 语言管理器实现

diff --git a/AutumnBox.CoreModules/Properties/AssemblyInfo.cs b/AutumnBox.CoreModules/Properties/AssemblyInfo.cs
@@ -12,7 +12,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("AutumnBox.CoreModules")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyCopyright("Copyright ©zsh2401  2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/AutumnBox.CoreModules/packages.config b/AutumnBox.CoreModules/packages.config
diff --git a/AutumnBox.GUI/App.config b/AutumnBox.GUI/App.config
@@ -32,9 +32,6 @@
             <setting name="NotifyOnFinish" serializeAs="String">
                 <value>True</value>
             </setting>
-            <setting name="ShowDetailOnDoubleClick" serializeAs="String">
-                <value>True</value>
-            </setting>
         </AutumnBox.GUI.Properties.Settings>
     </userSettings> 
 </configuration>
diff --git a/AutumnBox.GUI/AutumnBox.GUI.csproj b/AutumnBox.GUI/AutumnBox.GUI.csproj
@@ -558,7 +558,7 @@
       <Name>AutumnBox.Basic</Name>
     </ProjectReference>
     <ProjectReference Include="..\AutumnBox.OpenFramework\AutumnBox.OpenFramework.csproj">
-      <Project>{6516890c-86b6-40a0-8fd0-14ffdd62e1fe}</Project>
+      <Project>{6516890C-86B6-40A0-8FD0-14FFDD62E1FE}</Project>
       <Name>AutumnBox.OpenFramework</Name>
     </ProjectReference>
   </ItemGroup>

diff --git a/AutumnBox.GUI/Properties/AssemblyInfo.cs b/AutumnBox.GUI/Properties/AssemblyInfo.cs
@@ -65,6 +65,6 @@
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.1.5.0")]
+[assembly: AssemblyFileVersion("1.1.5.0")]
 [assembly: NeutralResourcesLanguage("zh-CN")]
diff --git a/AutumnBox.GUI/Properties/Settings.Designer.cs b/AutumnBox.GUI/Properties/Settings.Designer.cs
diff --git a/AutumnBox.GUI/Properties/Settings.settings b/AutumnBox.GUI/Properties/Settings.settings
@@ -20,8 +20,5 @@
     <Setting Name="NotifyOnFinish" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="ShowDetailOnDoubleClick" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">True</Value>
-    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/AutumnBox.GUI/Util/OpenFxManagement/AutumnBox_GUI_Calller.cs b/AutumnBox.GUI/Util/OpenFxManagement/AutumnBox_GUI_Calller.cs
@@ -24,12 +24,14 @@ public Version Version
             }
         }
 
-        public Window CreateDebugWindow()
+        public bool IsRunAsAdmin => Self.HaveAdminPermission;
+
+        public dynamic CreateDebugWindow()
         {
             return new LogWindow();
         }
 
-        public Window CreateMessageWindow(string title, string msg)
+        public dynamic CreateMessageWindow(string title, string msg)
         {
             return new MessageWindow()
             {
@@ -44,7 +46,7 @@ public string GetCurrentLanguageCode()
             return App.Current.Resources["LanguageCode"].ToString();
         }
 
-        public Window GetMainWindow()
+        public dynamic GetMainWindow()
         {
             return App.Current.MainWindow;
         }
@@ -75,7 +77,7 @@ public void RunOnUIThread(Action act)
             App.Current.Dispatcher.Invoke(act);
         }
 
-        public Window CreateChoiceWindow(string msg, string btnLeft = null, string btnRight = null, string btnCancel = null)
+        public dynamic CreateChoiceWindow(string msg, string btnLeft = null, string btnRight = null, string btnCancel = null)
         {
             var window = new ChoiceWindow()
             {
@@ -93,7 +95,7 @@ public void Shutdown()
             App.Current.Shutdown();
         }
 
-        public Window CreateLoadingWindow()
+        public dynamic CreateLoadingWindow()
         {
             return new LoadingWindow()
             {

diff --git a/AutumnBox.OpenFramework/AutumnBox.OpenFramework.csproj b/AutumnBox.OpenFramework/AutumnBox.OpenFramework.csproj
@@ -1,158 +1,40 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{6516890C-86B6-40A0-8FD0-14FFDD62E1FE}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>AutumnBox.OpenFramework</RootNamespace>
-    <AssemblyName>AutumnBox.OpenFramework</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\AutumnBox.OpenFramework.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\AutumnBox.OpenFramework.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'SDK|AnyCPU'">
-    <OutputPath>bin\Sdk\</OutputPath>
-    <DefineConstants>TRACE;SDK</DefineConstants>
-    <DocumentationFile>bin\Sdk\AutumnBox.OpenFramework.xml</DocumentationFile>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Configurations>Debug;Release;SDK</Configurations>
+    <Version>8.3</Version>
+    <Authors>zsh2401</Authors>
+    <Company>zsh2401</Company>
+    <Copyright>Copyright © 2017 - 2018 zsh2401,All Rights Reserved</Copyright>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WindowsBase" />
+    <Folder Include="Properties\" />
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="Content\ContextPermissionAttribute.cs" />
-    <Compile Include="Content\CtxPer.cs" />
-    <Compile Include="Exceptions\LibrarianAlreadyCreatedOnceException.cs" />
-    <Compile Include="Exceptions\WrapperAlreadyCreatedOnceException.cs" />
-    <Compile Include="Extension\AtmbVisualExtension.cs" />
-    <Compile Include="Extension\AutumnBoxExtension.Constants.cs" />
-    <Compile Include="Extension\ExtAppPropertyAttribute.cs" />
-    <Compile Include="Extension\ExtBeforeCreateAspectAttribute.cs" />
-    <Compile Include="Extension\ExtInfoAttribute.cs" />
-    <Compile Include="Extension\ExtIconAttribute.cs" />
-    <Compile Include="Extension\ExtInfoI18NAttribute.cs" />
-    <Compile Include="Extension\ExtMinApiAttribute.cs" />
-    <Compile Include="Extension\ExtRegionAttribute.cs" />
-    <Compile Include="Extension\ExtRequireRootAttribute.cs" />
-    <Compile Include="Extension\ExtRunAsAdminAttribute.cs" />
-    <Compile Include="Extension\ExtTargetApiAttribute.cs" />
-    <Compile Include="Extension\ExtMainAsceptAttribute.cs" />
-    <Compile Include="Extension\ExtMinAndroidVersionAttribute.cs" />
-    <Compile Include="Extension\ExtOfficialAttribute.cs" />
-    <Compile Include="Management\AutumnBoxGuiApi.cs" />
-    <Compile Include="Management\Filters\CurrentRegionFilter.cs" />
-    <Compile Include="Management\Filters\DeviceStateFilter.cs" />
-    <Compile Include="Management\IWrapperFilter.cs" />
-    <Compile Include="Management\IAutumnBox_GUI.cs" />
-    <Compile Include="Open\LoggerExtension.cs" />
-    <Compile Include="Open\Util\LanguageManager.cs" />
-    <Compile Include="Open\Impl\SoundImpl.cs" />
-    <Compile Include="Open\Impl\UxImpl.cs" />
-    <Compile Include="Open\ISoundPlayer.cs" />
-    <Compile Include="Open\IUx.cs" />
-    <Compile Include="Management\IExtensionUIController.cs" />
-    <Compile Include="Open\IFrameworkManager.cs" />
-    <Compile Include="Open\Impl\FxImpl.cs" />
-    <Compile Include="Wrapper\ClassExtensionInfoGetter.cs" />
-    <Compile Include="Management\IInternalManager.cs" />
-    <Compile Include="Management\IRunningManager.cs" />
-    <Compile Include="Management\Manager.cs" />
-    <Compile Include="Management\Impl\RunningManagerImpl.cs" />
-    <Compile Include="Open\ChoiceResult.cs" />
-    <Compile Include="Open\Factory.cs" />
-    <Compile Include="Open\ICompApi.cs" />
-    <Compile Include="Open\IMd5.cs" />
-    <Compile Include="Open\Impl\AppManagerImpl.cs" />
-    <Compile Include="Open\Impl\CompImpl.cs" />
-    <Compile Include="Open\Impl\LoggerImpl.cs" />
-    <Compile Include="Open\Impl\Md5Impl.cs" />
-    <Compile Include="Open\Impl\OSApiImpl.cs" />
-    <Compile Include="Open\Impl\EmbeddedFileManagerImpl.cs" />
-    <Compile Include="Open\Impl\TemporaryFloderImpl.cs" />
-    <Compile Include="Open\IOSApi.cs" />
-    <Compile Include="Open\IEmbeddedFileManager.cs" />
-    <Compile Include="Open\ITemporaryFloder.cs" />
-    <Compile Include="Content\ContextApiProvider.cs" />
-    <Compile Include="ExtLibrary\DefaultLibrarian.cs" />
-    <Compile Include="ExtLibrary\ExtensionLibrarin.cs" />
-    <Compile Include="Management\Impl\InternalManagerImpl.cs" />
-    <Compile Include="Extension\ExtRequiredDeviceStatesAttribute.cs" />
-    <Compile Include="Extension\ExtVersionAttribute.cs" />
-    <Compile Include="Extension\AutumnBoxExtension.LifeCycle.cs" />
-    <Compile Include="Content\Context.cs" />
-    <Compile Include="ExtLibrary\AssemblyBasedLibrarian.cs" />
-    <Compile Include="Extension\ExtAuthAttribute.cs" />
-    <Compile Include="Extension\ExtDescAttribute.cs" />
-    <Compile Include="Extension\ExtNameAttribute.cs" />
-    <Compile Include="Extension\ForerunCheckResult.cs" />
-    <Compile Include="Wrapper\ClassExtensionWrapper.cs" />
-    <Compile Include="Wrapper\ExtensionWarpperState.cs" />
-    <Compile Include="Wrapper\IExtInfoGetter.cs" />
-    <Compile Include="Wrapper\IExtensionWrapper.cs" />
-    <Compile Include="ExtLibrary\ILibrarian.cs" />
-    <Compile Include="Open\IAppManager.cs" />
-    <Compile Include="Open\ILogger.cs" />
-    <Compile Include="Exceptions\AccessDeniedException.cs" />
-    <Compile Include="BuildInfo.cs" />
-    <Compile Include="Exceptions\UserDeniedException.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
   </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\AutumnBox.Basic\AutumnBox.Basic.csproj">
-      <Project>{84044fb2-bd38-4283-8065-b639270ece0f}</Project>
-      <Name>AutumnBox.Basic</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\AutumnBox.Basic\AutumnBox.Basic.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="AutumnBox.OpenFramework.nuspec" />
-    <Compile Include="Extension\AutumnBoxExtension.Useful.cs" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>if $(ConfigurationName) == SDK (
-rd /S /Q  google
-del /S AutumnBox.Support.*
-del /S Newtonsoft.Json.*
-del /S CSScriptLibrary.*
-)</PostBuildEvent>
+
+  <!-- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='SDK|AnyCPU'">
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <WarningLevel>0</WarningLevel>
+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+    <DocumentationFile>bin\SDK\netstandard2.0\AutumnBox.Basic.xml</DocumentationFile>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DocumentationFile>bin\Debug\netstandard2.0\AutumnBox.Basic.xml</DocumentationFile>
   </PropertyGroup>
-</Project>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DocumentationFile>bin\Release\netstandard2.0\AutumnBox.Basic.xml</DocumentationFile>
+  </PropertyGroup> -->
+
+</Project>
diff --git a/AutumnBox.OpenFramework/Extension/ExtRunAsAdminAttribute.cs b/AutumnBox.OpenFramework/Extension/ExtRunAsAdminAttribute.cs
@@ -30,7 +30,7 @@ public ExtRunAsAdminAttribute() : base(true)
         /// <param name="args"></param>
         public override void Before(ExtBeforeCreateArgs args)
         {
-            if (!args.Context.App.IsRunAsAdmin && (bool)Value)
+            if ((bool)Value && !args.Context.App.IsRunAsAdmin)
             {
                 args.Context.App.RunOnUIThread(() =>
                 {