Skip to content

Commit

Permalink
.net framework 4.6.1 改为 4.7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
DigitalPlatform committed Mar 13, 2021
1 parent 013cb6a commit 2152503
Show file tree
Hide file tree
Showing 263 changed files with 28,154 additions and 14,160 deletions.
2 changes: 1 addition & 1 deletion ChordInstaller/ChordInstaller.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ChordInstaller</RootNamespace>
<AssemblyName>ChordInstaller</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<IsWebBootstrapper>true</IsWebBootstrapper>
Expand Down
6 changes: 3 additions & 3 deletions ChordInstaller/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ChordInstaller/Properties/Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions ChordInstaller/app.config
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
2 changes: 1 addition & 1 deletion DigitalPlatform.Drawing/DigitalPlatform.Drawing.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DigitalPlatform.Drawing</RootNamespace>
<AssemblyName>DigitalPlatform.Drawing</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion DigitalPlatform.Forms/DigitalPlatform.Forms.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DigitalPlatform.Forms</RootNamespace>
<AssemblyName>DigitalPlatform.Forms</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion DigitalPlatform.HTTP/DigitalPlatform.HTTP.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DigitalPlatform.HTTP</RootNamespace>
<AssemblyName>DigitalPlatform.HTTP</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion DigitalPlatform.IO/DigitalPlatform.IO.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DigitalPlatform.Interfaces</RootNamespace>
<AssemblyName>DigitalPlatform.Interfaces</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DigitalPlatform.LibraryClient</RootNamespace>
<AssemblyName>DigitalPlatform.LibraryClient</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down
34 changes: 12 additions & 22 deletions DigitalPlatform.LibraryClient/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,53 +3,43 @@
<system.serviceModel>
<bindings>
<basicHttpBinding>
<binding name="BasicHttpBinding_dp2libraryREST" />
<binding name="BasicHttpBinding_dp2libraryREST"/>
</basicHttpBinding>
<netNamedPipeBinding>
<binding name="NetNamedPipeBinding_dp2library">
<security mode="None" />
<security mode="None"/>
</binding>
</netNamedPipeBinding>
<netTcpBinding>
<binding name="NetTcpBinding_dp2library">
<security mode="None">
<transport sslProtocols="Tls, Tls11, Tls12" />
<transport sslProtocols="Tls, Tls11, Tls12"/>
</security>
</binding>
<binding name="NetTcpBinding_dp2library1">
<security mode="None">
<transport sslProtocols="None" />
<transport sslProtocols="None"/>
</security>
</binding>
</netTcpBinding>
<wsHttpBinding>
<binding name="WSHttpBinding_dp2library" messageEncoding="Mtom">
<security>
<message clientCredentialType="None" />
<message clientCredentialType="None"/>
</security>
</binding>
</wsHttpBinding>
</bindings>
<client>
<endpoint address="net.tcp://localhost:8002/dp2library/" binding="netTcpBinding"
bindingConfiguration="NetTcpBinding_dp2library" contract="localhost.dp2library"
name="NetTcpBinding_dp2library" />
<endpoint address="net.tcp://localhost:8002/dp2library/" binding="netTcpBinding"
bindingConfiguration="NetTcpBinding_dp2library1" contract="localhost.dp2library"
name="NetTcpBinding_dp2library1" />
<endpoint address="net.pipe://localhost/dp2library/" binding="netNamedPipeBinding"
bindingConfiguration="NetNamedPipeBinding_dp2library" contract="localhost.dp2library"
name="NetNamedPipeBinding_dp2library" />
<endpoint address="http://localhost:8001/dp2library/" binding="wsHttpBinding"
bindingConfiguration="WSHttpBinding_dp2library" contract="localhost.dp2library"
name="WSHttpBinding_dp2library">
<endpoint address="net.tcp://localhost:8002/dp2library/" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_dp2library" contract="localhost.dp2library" name="NetTcpBinding_dp2library"/>
<endpoint address="net.tcp://localhost:8002/dp2library/" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_dp2library1" contract="localhost.dp2library" name="NetTcpBinding_dp2library1"/>
<endpoint address="net.pipe://localhost/dp2library/" binding="netNamedPipeBinding" bindingConfiguration="NetNamedPipeBinding_dp2library" contract="localhost.dp2library" name="NetNamedPipeBinding_dp2library"/>
<endpoint address="http://localhost:8001/dp2library/" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_dp2library" contract="localhost.dp2library" name="WSHttpBinding_dp2library">
<identity>
<certificate encodedValue="AwAAAAEAAAAUAAAAihwImE/6TvAh7vtULDTbLlf2c/sgAAAAAQAAAAQCAAAwggIAMIIBbaADAgECAhC71mKXZt4Eh05pcgkIz9GnMAkGBSsOAwIdBQAwGjEYMBYGA1UEAxMPRGlnaXRhbFBsYXRmb3JtMB4XDTExMDMxMzEyMDIyMVoXDTM5MTIzMTIzNTk1OVowGjEYMBYGA1UEAxMPRGlnaXRhbFBsYXRmb3JtMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDB6AADKWZ/VAYko4SA22xhT1KrF3OsrDF7fNna+ceexPdAYkRF8tO1BjP979AdMy7y85ye/GDBzfIV+PFtE01w5TSQosdYZMxl6imGmdizTumDmgFa4tiqPx8Als4RxDybF9BZQCwzp0hFXLdaPwA9nm3o9gkkHJQK7PGxAHrVRQIDAQABo08wTTBLBgNVHQEERDBCgBDx0s6U6fIO57Egb5OtNI0noRwwGjEYMBYGA1UEAxMPRGlnaXRhbFBsYXRmb3JtghC71mKXZt4Eh05pcgkIz9GnMAkGBSsOAwIdBQADgYEASJ042AXnZT1aCujxrK1y+vS6/uC7E5Ux/5Jw6RNo1hbjoP/Pcm5Jc/P441gPDiKCr2Bf+iO8SLn1KcH1BKGdldXj2qx4H/f5TRfwFTVz0+lDcYV3Lrr5ZC2rxefJOvzEfOSe8HMplPwQ+xFXyrFvp5oI2EnuUnIfnhrizpkGTrY=" />
<certificate encodedValue="AwAAAAEAAAAUAAAAihwImE/6TvAh7vtULDTbLlf2c/sgAAAAAQAAAAQCAAAwggIAMIIBbaADAgECAhC71mKXZt4Eh05pcgkIz9GnMAkGBSsOAwIdBQAwGjEYMBYGA1UEAxMPRGlnaXRhbFBsYXRmb3JtMB4XDTExMDMxMzEyMDIyMVoXDTM5MTIzMTIzNTk1OVowGjEYMBYGA1UEAxMPRGlnaXRhbFBsYXRmb3JtMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDB6AADKWZ/VAYko4SA22xhT1KrF3OsrDF7fNna+ceexPdAYkRF8tO1BjP979AdMy7y85ye/GDBzfIV+PFtE01w5TSQosdYZMxl6imGmdizTumDmgFa4tiqPx8Als4RxDybF9BZQCwzp0hFXLdaPwA9nm3o9gkkHJQK7PGxAHrVRQIDAQABo08wTTBLBgNVHQEERDBCgBDx0s6U6fIO57Egb5OtNI0noRwwGjEYMBYGA1UEAxMPRGlnaXRhbFBsYXRmb3JtghC71mKXZt4Eh05pcgkIz9GnMAkGBSsOAwIdBQADgYEASJ042AXnZT1aCujxrK1y+vS6/uC7E5Ux/5Jw6RNo1hbjoP/Pcm5Jc/P441gPDiKCr2Bf+iO8SLn1KcH1BKGdldXj2qx4H/f5TRfwFTVz0+lDcYV3Lrr5ZC2rxefJOvzEfOSe8HMplPwQ+xFXyrFvp5oI2EnuUnIfnhrizpkGTrY="/>
</identity>
</endpoint>
<endpoint address="http://localhost:8001/dp2library/basic/" binding="basicHttpBinding"
bindingConfiguration="BasicHttpBinding_dp2libraryREST" contract="localhost.dp2libraryREST"
name="BasicHttpBinding_dp2libraryREST" />
<endpoint address="http://localhost:8001/dp2library/basic/" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_dp2libraryREST" contract="localhost.dp2libraryREST" name="BasicHttpBinding_dp2libraryREST"/>
</client>
</system.serviceModel>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
Expand Down
2 changes: 1 addition & 1 deletion DigitalPlatform.Message/DigitalPlatform.Message.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DigitalPlatform.Message</RootNamespace>
<AssemblyName>DigitalPlatform.Message</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down
37 changes: 28 additions & 9 deletions DigitalPlatform.MessageClient/DigitalPlatform.MessageClient.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DigitalPlatform.MessageClient</RootNamespace>
<AssemblyName>DigitalPlatform.MessageClient</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<NuGetPackageImportStamp>
Expand Down Expand Up @@ -38,8 +38,8 @@
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.AspNet.SignalR.Client, Version=2.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.SignalR.Client.2.3.0\lib\net45\Microsoft.AspNet.SignalR.Client.dll</HintPath>
<Reference Include="Microsoft.AspNet.SignalR.Client, Version=2.4.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.SignalR.Client.2.4.1\lib\net45\Microsoft.AspNet.SignalR.Client.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
Expand All @@ -53,19 +53,38 @@
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Nito.AsyncEx, Version=4.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Nito.AsyncEx.4.0.1\lib\net45\Nito.AsyncEx.dll</HintPath>
<Reference Include="Nito.AsyncEx.Context, Version=5.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Nito.AsyncEx.Context.5.1.0\lib\netstandard2.0\Nito.AsyncEx.Context.dll</HintPath>
</Reference>
<Reference Include="Nito.AsyncEx.Concurrent, Version=4.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Nito.AsyncEx.4.0.1\lib\net45\Nito.AsyncEx.Concurrent.dll</HintPath>
<Reference Include="Nito.AsyncEx.Coordination, Version=5.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Nito.AsyncEx.Coordination.5.1.0\lib\netstandard2.0\Nito.AsyncEx.Coordination.dll</HintPath>
</Reference>
<Reference Include="Nito.AsyncEx.Enlightenment, Version=4.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Nito.AsyncEx.4.0.1\lib\net45\Nito.AsyncEx.Enlightenment.dll</HintPath>
<Reference Include="Nito.AsyncEx.Interop.WaitHandles, Version=5.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Nito.AsyncEx.Interop.WaitHandles.5.1.0\lib\netstandard2.0\Nito.AsyncEx.Interop.WaitHandles.dll</HintPath>
</Reference>
<Reference Include="Nito.AsyncEx.Oop, Version=5.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Nito.AsyncEx.Oop.5.1.0\lib\netstandard2.0\Nito.AsyncEx.Oop.dll</HintPath>
</Reference>
<Reference Include="Nito.AsyncEx.Tasks, Version=5.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Nito.AsyncEx.Tasks.5.1.0\lib\netstandard2.0\Nito.AsyncEx.Tasks.dll</HintPath>
</Reference>
<Reference Include="Nito.Cancellation, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Nito.Cancellation.1.1.0\lib\netstandard2.0\Nito.Cancellation.dll</HintPath>
</Reference>
<Reference Include="Nito.Collections.Deque, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Nito.Collections.Deque.1.1.0\lib\netstandard2.0\Nito.Collections.Deque.dll</HintPath>
</Reference>
<Reference Include="Nito.Disposables, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Nito.Disposables.2.2.0\lib\net461\Nito.Disposables.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Collections.Immutable, Version=1.2.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Collections.Immutable.1.4.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.Core" />
<Reference Include="System.Net" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
Expand Down
13 changes: 7 additions & 6 deletions DigitalPlatform.MessageClient/MessageConnection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2894,15 +2894,16 @@ public async Task<MessageResult> SetUsersAsyncLite(
Task<MessageResult> task = HubProxy.Invoke<MessageResult>("SetUsers",
action,
users);

List<Task> tasks = new List<Task>() { };
if (task == await Task.WhenAny(task, Task.Delay(timeout), token.AsTask()).ConfigureAwait(false))
// if (task == await Task.WhenAny(task, Task.Delay(timeout), token.AsTask()).ConfigureAwait(false))
// https://stackoverflow.com/questions/18670111/task-from-cancellation-token
if (task == await Task.WhenAny(task, Task.Delay(timeout), Task.Delay(Timeout.Infinite, token)).ConfigureAwait(false))
return task.Result;

throw new TimeoutException("已超时 " + timeout.ToString());
}


#endregion

#region Echo() API
Expand Down Expand Up @@ -3539,7 +3540,7 @@ public bool TryResponseSearch(
Debug.Assert(rest.Count == 0, "");
Debug.Assert(current.Count == 0, "");
return true;
ERROR1:
ERROR1:
// 报错
TryResponseSearch(
new SearchResponse(
Expand Down Expand Up @@ -3662,7 +3663,7 @@ public bool TryResponseGetRes(
Debug.Assert(rest.Count == 0, "");
Debug.Assert(current.Count == 0, "");
return true;
ERROR1:
ERROR1:
// 报错
{
MessageResult result = HubProxy.Invoke<MessageResult>("ResponseGetRes",
Expand Down Expand Up @@ -3707,7 +3708,7 @@ public async void TryResponseSearch(
{
// TODO: 等待执行完成。如果有异常要当时处理。比如减小尺寸重发。
int nRedoCount = 0;
REDO:
REDO:
try
{
MessageResult result = await HubProxy.Invoke<MessageResult>("ResponseSearch",
Expand Down
8 changes: 4 additions & 4 deletions DigitalPlatform.MessageClient/app.config
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
Loading

0 comments on commit 2152503

Please sign in to comment.