diff --git a/CrazyCoder/CrazyCoder.csproj b/CrazyCoder/CrazyCoder.csproj
index 3bb5db4..fbe74b0 100644
--- a/CrazyCoder/CrazyCoder.csproj
+++ b/CrazyCoder/CrazyCoder.csproj
@@ -117,13 +117,13 @@
<Version>5.4.1.1</Version>
</PackageReference>
<PackageReference Include="NewLife.Core">
- <Version>8.10.2021.327-rc1</Version>
+ <Version>8.10.2021.420-beta2</Version>
</PackageReference>
<PackageReference Include="NewLife.Stardust">
- <Version>1.4.2021.320-beta3</Version>
+ <Version>1.5.2021.408</Version>
</PackageReference>
<PackageReference Include="NewLife.XCode">
- <Version>10.1.2021.327-rc1</Version>
+ <Version>10.1.2021.420-beta2</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
diff --git a/XCoder/Program.cs b/XCoder/Program.cs
index 6a6d6bb..8ae66f1 100644
--- a/XCoder/Program.cs
+++ b/XCoder/Program.cs
@@ -9,8 +9,10 @@ using NewLife.Log;
using NewLife.Net;
using NewLife.Threading;
using NewLife.Xml;
-using Stardust;
using XCode.DataAccessLayer;
+#if !NET4
+using Stardust;
+#endif
namespace XCoder
{
@@ -27,7 +29,9 @@ namespace XCoder
XTrace.UseWinForm();
#endif
+#if !NET4
StartClient();
+#endif
StringHelper.EnableSpeechTip = XConfig.Current.SpeechTip;
@@ -38,6 +42,7 @@ namespace XCoder
Application.Run(new FrmMDI());
}
+#if !NET4
static TimerX _timer;
static StarClient _Client;
//static ServiceManager _Manager;
@@ -116,5 +121,6 @@ namespace XCoder
}
}
}
+#endif
}
}
\ No newline at end of file
diff --git a/XCoder/Tools/FrmSecurity.cs b/XCoder/Tools/FrmSecurity.cs
index afb96dd..4672b40 100644
--- a/XCoder/Tools/FrmSecurity.cs
+++ b/XCoder/Tools/FrmSecurity.cs
@@ -269,7 +269,7 @@ namespace XCoder.Tools
}
else
{
- SetResult(vs.Select(e => e.ToBase64().ToStr()).ToArray());
+ SetResult(vs.Select(e2 => e2.ToBase64().ToStr()).ToArray());
}
}
@@ -607,7 +607,7 @@ namespace XCoder.Tools
}
else
{
- SetResult(vs.Select(e => e.ToBase64().ToStr()).ToArray());
+ SetResult(vs.Select(e2 => e2.ToBase64().ToStr()).ToArray());
}
}
#endregion
diff --git a/XCoder/XCoder.csproj b/XCoder/XCoder.csproj
index 9c4bb72..28ff276 100644
--- a/XCoder/XCoder.csproj
+++ b/XCoder/XCoder.csproj
@@ -310,16 +310,16 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Core">
- <Version>8.10.2021.327-rc1</Version>
+ <Version>8.10.2021.420-beta2</Version>
</PackageReference>
<PackageReference Include="NewLife.Net">
<Version>3.6.2020.1002</Version>
</PackageReference>
<PackageReference Include="NewLife.Stardust">
- <Version>1.4.2021.320-beta3</Version>
+ <Version>1.5.2021.408</Version>
</PackageReference>
<PackageReference Include="NewLife.XCode">
- <Version>10.1.2021.327-rc1</Version>
+ <Version>10.1.2021.420-beta2</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
diff --git a/XCoder40/App.config b/XCoder40/App.config
index 0190b92..9eb98e1 100644
--- a/XCoder40/App.config
+++ b/XCoder40/App.config
@@ -18,4 +18,4 @@
<add name="Access" connectionString="Provider=Microsoft.Jet.OLEDB.4.0; Data Source=~\App_Data\Test.mdb;Persist Security Info=False;OLE DB Services=-1" providerName="Access"/>
<add name="SqlCe" connectionString="Data Source=test.sdf;" providerName="SqlCe"/>
</connectionStrings>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/XCoder40/XCoder40.csproj b/XCoder40/XCoder40.csproj
index c1369f4..6f15cfb 100644
--- a/XCoder40/XCoder40.csproj
+++ b/XCoder40/XCoder40.csproj
@@ -11,7 +11,7 @@
<RootNamespace>XCoder</RootNamespace>
<AssemblyName>XCoder</AssemblyName>
<ApplicationIcon>..\XCoder\leaf.ico</ApplicationIcon>
- <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<BaseIntermediateOutputPath>obj4\</BaseIntermediateOutputPath>
<TargetFrameworkProfile />
</PropertyGroup>
@@ -387,20 +387,14 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.Bcl.Async">
- <Version>1.0.168</Version>
- </PackageReference>
<PackageReference Include="NewLife.Core">
- <Version>8.9.2020.802</Version>
+ <Version>8.10.2021.420-beta2</Version>
</PackageReference>
<PackageReference Include="NewLife.Net">
- <Version>3.6.2020.802</Version>
- </PackageReference>
- <PackageReference Include="NewLife.Stardust">
- <Version>1.1.2020.802</Version>
+ <Version>3.6.2020.1002</Version>
</PackageReference>
<PackageReference Include="NewLife.XCode">
- <Version>9.19.2020.802</Version>
+ <Version>10.1.2021.420-beta2</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/XCoderLinux/XCoderLinux.csproj b/XCoderLinux/XCoderLinux.csproj
index 3b11a9a..3196818 100644
--- a/XCoderLinux/XCoderLinux.csproj
+++ b/XCoderLinux/XCoderLinux.csproj
@@ -48,8 +48,8 @@
<ItemGroup>
<PackageReference Include="GtkSharp" Version="3.24.24.4" />
- <PackageReference Include="NewLife.Core" Version="8.10.2021.327-rc1" />
- <PackageReference Include="NewLife.XCode" Version="10.1.2021.327-rc1" />
+ <PackageReference Include="NewLife.Core" Version="8.10.2021.420-beta2" />
+ <PackageReference Include="NewLife.XCode" Version="10.1.2021.420-beta2" />
<PackageReference Include="System.IO.Ports" Version="5.0.1" />
<PackageReference Include="System.Management" Version="5.0.0" />
</ItemGroup>
diff --git a/XCoderWpf/XCoderWpf.csproj b/XCoderWpf/XCoderWpf.csproj
index 820eeb2..a6a828b 100644
--- a/XCoderWpf/XCoderWpf.csproj
+++ b/XCoderWpf/XCoderWpf.csproj
@@ -31,7 +31,7 @@
<ItemGroup>
<PackageReference Include="HandyControls" Version="3.2.0" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.2" />
- <PackageReference Include="NewLife.XCode" Version="10.1.2021.327-rc1" />
+ <PackageReference Include="NewLife.XCode" Version="10.1.2021.420-beta2" />
<PackageReference Include="Prism.DryIoc" Version="8.0.0.1909" />
</ItemGroup>
diff --git "a/\347\240\201\347\245\236\345\267\245\345\205\267.sln" "b/\347\240\201\347\245\236\345\267\245\345\205\267.sln"
index 0103d64..2ef2e56 100644
--- "a/\347\240\201\347\245\236\345\267\245\345\205\267.sln"
+++ "b/\347\240\201\347\245\236\345\267\245\345\205\267.sln"
@@ -18,6 +18,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CrazyCoder", "CrazyCoder\Cr
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XCoderWpf", "XCoderWpf\XCoderWpf.csproj", "{405D4D22-FF61-4796-A3F2-222CFDA326D2}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XCoder40", "XCoder40\XCoder40.csproj", "{A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -130,6 +132,30 @@ Global
{405D4D22-FF61-4796-A3F2-222CFDA326D2}.Release|x64.Build.0 = Release|Any CPU
{405D4D22-FF61-4796-A3F2-222CFDA326D2}.Release|x86.ActiveCfg = Release|Any CPU
{405D4D22-FF61-4796-A3F2-222CFDA326D2}.Release|x86.Build.0 = Release|Any CPU
+ {A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Debug|ARM.Build.0 = Debug|Any CPU
+ {A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+ {A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Debug|iPhone.Build.0 = Debug|Any CPU
+ {A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Debug|x64.Build.0 = Debug|Any CPU
+ {A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Debug|x86.Build.0 = Debug|Any CPU
+ {A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Release|ARM.ActiveCfg = Release|Any CPU
+ {A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Release|ARM.Build.0 = Release|Any CPU
+ {A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Release|iPhone.ActiveCfg = Release|Any CPU
+ {A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Release|iPhone.Build.0 = Release|Any CPU
+ {A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+ {A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Release|x64.ActiveCfg = Release|Any CPU
+ {A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Release|x64.Build.0 = Release|Any CPU
+ {A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Release|x86.ActiveCfg = Release|Any CPU
+ {A4A7E1BD-9E53-4D60-A0E0-122E5441DDBF}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE