From ba5eabcc1d68bf9369df9e68fb3ead167effbedf Mon Sep 17 00:00:00 2001
From: xietao <xietao@dp2003.com>
Date: Wed, 6 Jul 2022 15:25:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...gitalPlatform.LibraryServer.Install.csproj |   4 +-
 .../app.config                                |   4 +
 .../packages.config                           |   2 +-
 .../DigitalPlatform.LibraryServer.csproj      |  20 +-
 DigitalPlatform.LibraryServer/packages.config |   6 +-
 .../AppConvertXmlToHtml.cs                    |   2 +-
 DigitalPlatform.OPAC.Server/packages.config   |   1 -
 DigitalPlatform.rms.db/SqlDatabase.cs         |  60 +++-
 .../DigitalPlatform.rms.csproj                |  20 +-
 DigitalPlatform.rms/packages.config           |   6 +-
 DigitalPlatform/4.0/DigitalPlatform.csproj    |  20 +-
 DigitalPlatform/4.0/packages.config           |   6 +-
 TestRoslyn/TestRoslyn.csproj                  |  28 +-
 TestRoslyn/packages.config                    |  12 +-
 UpdateAssemblyBinding/App.config              |   6 +
 UpdateAssemblyBinding/Program.cs              |  95 ++++++
 .../Properties/AssemblyInfo.cs                |  36 +++
 .../UpdateAssemblyBinding.csproj              |  67 ++++
 dp2-net40.sln                                 |  22 ++
 dp2Circulation/dp2Circulation.csproj          |  20 +-
 dp2Circulation/packages.config                |   6 +-
 dp2Installer/dp2Installer.csproj              |   2 +-
 dp2KernelApiTester/TestCase/TestRecord.cs     | 306 +++++++++++++++++-
 dp2LibraryXE/dp2LibraryXE.csproj              |   5 +-
 dp2LibraryXE/web.config                       |  28 +-
 dp2SSL/dp2SSL.csproj                          |  10 +-
 dp2SSL/packages.config                        |   2 +-
 27 files changed, 683 insertions(+), 113 deletions(-)
 create mode 100644 UpdateAssemblyBinding/App.config
 create mode 100644 UpdateAssemblyBinding/Program.cs
 create mode 100644 UpdateAssemblyBinding/Properties/AssemblyInfo.cs
 create mode 100644 UpdateAssemblyBinding/UpdateAssemblyBinding.csproj

diff --git a/DigitalPlatform.LibraryServer.Install/DigitalPlatform.LibraryServer.Install.csproj b/DigitalPlatform.LibraryServer.Install/DigitalPlatform.LibraryServer.Install.csproj
index 51782b28f..1d6dba1a0 100644
--- a/DigitalPlatform.LibraryServer.Install/DigitalPlatform.LibraryServer.Install.csproj
+++ b/DigitalPlatform.LibraryServer.Install/DigitalPlatform.LibraryServer.Install.csproj
@@ -60,8 +60,8 @@
     </Reference>
     <Reference Include="System.Net" />
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
diff --git a/DigitalPlatform.LibraryServer.Install/app.config b/DigitalPlatform.LibraryServer.Install/app.config
index f164fd596..9ca49ad53 100644
--- a/DigitalPlatform.LibraryServer.Install/app.config
+++ b/DigitalPlatform.LibraryServer.Install/app.config
@@ -42,6 +42,10 @@
         <assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup></configuration>
diff --git a/DigitalPlatform.LibraryServer.Install/packages.config b/DigitalPlatform.LibraryServer.Install/packages.config
index 367f163e8..595033dac 100644
--- a/DigitalPlatform.LibraryServer.Install/packages.config
+++ b/DigitalPlatform.LibraryServer.Install/packages.config
@@ -4,7 +4,7 @@
   <package id="MySqlConnector" version="1.3.14" targetFramework="net472" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
   <package id="System.Memory" version="4.5.0" targetFramework="net472" />
-  <package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net472" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
 </packages>
\ No newline at end of file
diff --git a/DigitalPlatform.LibraryServer/DigitalPlatform.LibraryServer.csproj b/DigitalPlatform.LibraryServer/DigitalPlatform.LibraryServer.csproj
index 303aef058..c30522058 100644
--- a/DigitalPlatform.LibraryServer/DigitalPlatform.LibraryServer.csproj
+++ b/DigitalPlatform.LibraryServer/DigitalPlatform.LibraryServer.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
-  <Import Project="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props')" />
+  <Import Project="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -101,11 +101,11 @@
     <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.4.0.1\lib\netstandard2.0\Microsoft.CodeAnalysis.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis, Version=4.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.4.2.0\lib\netstandard2.0\Microsoft.CodeAnalysis.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.4.0.1\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=4.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.4.2.0\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.DotNet.PlatformAbstractions, Version=3.1.5.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
@@ -467,8 +467,8 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
-    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
@@ -478,11 +478,11 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
     <Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.0.0\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.0.0\build\MongoDB.Libmongocrypt.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.targets'))" />
   </Target>
   <Import Project="..\packages\MongoDB.Libmongocrypt.1.0.0\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.0.0\build\MongoDB.Libmongocrypt.targets')" />
-  <Import Project="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets" Condition="Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets')" />
+  <Import Project="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.targets" Condition="Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.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.
   <Target Name="BeforeBuild">
diff --git a/DigitalPlatform.LibraryServer/packages.config b/DigitalPlatform.LibraryServer/packages.config
index 2d25b02ec..904624b6a 100644
--- a/DigitalPlatform.LibraryServer/packages.config
+++ b/DigitalPlatform.LibraryServer/packages.config
@@ -8,9 +8,9 @@
   <package id="Jurassic" version="3.0.0" targetFramework="net47" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net472" />
   <package id="Microsoft.Bcl.HashCode" version="1.1.1" targetFramework="net472" />
-  <package id="Microsoft.CodeAnalysis.Analyzers" version="3.3.2" targetFramework="net472" developmentDependency="true" />
-  <package id="Microsoft.CodeAnalysis.Common" version="4.0.1" targetFramework="net472" />
-  <package id="Microsoft.CodeAnalysis.CSharp" version="4.0.1" targetFramework="net472" />
+  <package id="Microsoft.CodeAnalysis.Analyzers" version="3.3.3" targetFramework="net472" developmentDependency="true" />
+  <package id="Microsoft.CodeAnalysis.Common" version="4.2.0" targetFramework="net472" />
+  <package id="Microsoft.CodeAnalysis.CSharp" version="4.2.0" targetFramework="net472" />
   <package id="Microsoft.DotNet.PlatformAbstractions" version="3.1.5" targetFramework="net472" />
   <package id="Microsoft.Extensions.Caching.Abstractions" version="3.1.5" targetFramework="net472" />
   <package id="Microsoft.Extensions.Caching.Memory" version="3.1.5" targetFramework="net472" />
diff --git a/DigitalPlatform.OPAC.Server/AppConvertXmlToHtml.cs b/DigitalPlatform.OPAC.Server/AppConvertXmlToHtml.cs
index ebc62993b..103bf64c7 100644
--- a/DigitalPlatform.OPAC.Server/AppConvertXmlToHtml.cs
+++ b/DigitalPlatform.OPAC.Server/AppConvertXmlToHtml.cs
@@ -373,11 +373,11 @@ public int PrepareMarcFilter(
                     () =>
                     {
                         string[] saAddRef1 = {
+                                         this.BinDir + "\\digitalplatform.dll",
                                          this.BinDir + "\\digitalplatform.core.dll",
                                          this.BinDir + "\\digitalplatform.marcdom.dll",
                                          this.BinDir + "\\digitalplatform.marckernel.dll",
                                          this.BinDir + "\\digitalplatform.OPAC.Server.dll",
-                                         this.BinDir + "\\digitalplatform.dll",
                                          this.BinDir + "\\digitalplatform.Text.dll",
                                          this.BinDir + "\\digitalplatform.IO.dll",
                                          this.BinDir + "\\digitalplatform.Xml.dll",
diff --git a/DigitalPlatform.OPAC.Server/packages.config b/DigitalPlatform.OPAC.Server/packages.config
index c5354bbd0..0622b056a 100644
--- a/DigitalPlatform.OPAC.Server/packages.config
+++ b/DigitalPlatform.OPAC.Server/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="mongocsharpdriver" version="1.10.1" targetFramework="net40" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
 </packages>
\ No newline at end of file
diff --git a/DigitalPlatform.rms.db/SqlDatabase.cs b/DigitalPlatform.rms.db/SqlDatabase.cs
index 1609e1471..d321a53b7 100644
--- a/DigitalPlatform.rms.db/SqlDatabase.cs
+++ b/DigitalPlatform.rms.db/SqlDatabase.cs
@@ -24,6 +24,9 @@
 
 using Oracle.ManagedDataAccess.Client;
 using Oracle.ManagedDataAccess.Types;
+using MySqlConnector;
+using Dapper;
+using Npgsql;
 
 using Ghostscript.NET.Rasterizer;
 
@@ -32,9 +35,6 @@
 using DigitalPlatform.Xml;
 using DigitalPlatform.IO;
 using DigitalPlatform.Core;
-using MySqlConnector;
-using Dapper;
-using Npgsql;
 
 namespace DigitalPlatform.rms
 {
@@ -6859,7 +6859,8 @@ int GetObjectFile(Connection connection,
                             strDataFieldName,
                             textPtr,
                             lTotalLength);
-                        else */ if (connection.IsPgsql() || connection.IsMsSqlServer())
+                        else */
+                        if (connection.IsPgsql() || connection.IsMsSqlServer())
                             source = new SqlImageStream(connection,
                             db_prefix,
                             strDataFieldName,
@@ -14145,7 +14146,6 @@ private int WriteSqlRecord(Connection connection,
                 // 检查时间戳
                 if (StringUtil.IsInList("ignorechecktimestamp", strStyle) == false)
                 {
-
                     if (baExistTimestamp != null
                         && ByteArray.Compare(baInputTimestamp,
                             baExistTimestamp) != 0)
@@ -14390,7 +14390,9 @@ private int WriteSqlRecord(Connection connection,
             byte[] textptr = row_info.newdata_textptr;  // 数据指针
             long lCurrentLength = row_info.newdata_length;  // 数据体积长度
             string strCompleteTimestamp = row_info.TimestampString; // 上次完整写入时的时间戳
+            // string strCompleteTimestamp = row_info.GetCompleteTimestamp(); // 上次完整写入时的时间戳
             string strCurrentTimestamp = row_info.NewTimestampString; // 本次的时间戳
+            bool mix_mode = false;  // 是否为混合模式? 2022/7/5
 
             // Pgsql 坚持用 data 字段存储 bytea 数据。这样可以把 newfilename 和 newdptimestamp 让出来给对象文件，构成混合模式
             if (IsPgsql())
@@ -14418,10 +14420,12 @@ private int WriteSqlRecord(Connection connection,
                 && String.IsNullOrEmpty(strCurrentRange) == false
                 && strCurrentRange[0] == '#')
             {
+                // # 表示对象文件模式。FileName 恒为完成了的数据，NewFileName 恒为没有完成的数据
                 bObjectFile = true;
                 strCurrentRange = strCurrentRange.Substring(1);
 
                 lCurrentLength = GetObjectFileLength(strID, true);
+                mix_mode = true;    // 表示本次希望用混合模式写入
             }
             else if (this.m_lObjectStartSize != -1 && lTotalLength >= this.m_lObjectStartSize
 #if !XML_WRITE_TO_FILE
@@ -14474,9 +14478,17 @@ private int WriteSqlRecord(Connection connection,
                 strCurrentTimestamp = row_info.NewTimestampString;
             }
 
+            // 2022/7/5
+            if (IsPgsql() && mix_mode)
+            {
+                // bObjectFile = true;
+                strCompleteTimestamp = row_info.NewTimestampString;  // 前次完成的时间戳在 new 一侧
+            }
+
             // 当strStyle存在 ignorechecktimestamp时，不判断时间戳
             if (StringUtil.IsInList("ignorechecktimestamp", strStyle) == false)
             {
+                /*
                 // 如果临时区有内容，则要把临时时间戳用来比较。否则就比较完成区的时间戳
                 if (string.IsNullOrEmpty(strCurrentRange) == false)
                 {
@@ -14486,6 +14498,43 @@ private int WriteSqlRecord(Connection connection,
                 {
                     strCurrentTimestamp = strCompleteTimestamp;
                 }
+                */
+                string comp_timestamp = strCurrentTimestamp;
+
+                if (bFirst == true)
+                    comp_timestamp = strCompleteTimestamp;
+
+                if (string.IsNullOrEmpty(comp_timestamp) == false)
+                {
+                    byte[] baExistTimestamp = ByteArray.GetTimeStampByteArray(comp_timestamp);
+                    if (ByteArray.Compare(baInputTimestamp,
+                        baExistTimestamp) != 0)
+                    {
+                        strError = "时间戳不匹配";
+                        baOutputTimestamp = baExistTimestamp;   // 返回给前端，让前端能够得知当前的时间戳
+                        return -2;
+                    }
+                }
+            }
+
+#if OLD
+            // 当strStyle存在 ignorechecktimestamp时，不判断时间戳
+            if (StringUtil.IsInList("ignorechecktimestamp", strStyle) == false)
+            {
+                /*
+                // 如果临时区有内容，则要把临时时间戳用来比较。否则就比较完成区的时间戳
+                if (string.IsNullOrEmpty(strCurrentRange) == false)
+                {
+                    // strCurrentTimestamp = strCurrentTimestamp;
+                }
+                else
+                {
+                    strCurrentTimestamp = strCompleteTimestamp;
+                }
+                */
+                // 2022/7/6
+                if (string.IsNullOrEmpty(strCurrentRange) == false)
+                    strCurrentTimestamp = strCompleteTimestamp;
 
                 if (string.IsNullOrEmpty(strCurrentTimestamp) == false)
                 {
@@ -14500,6 +14549,7 @@ private int WriteSqlRecord(Connection connection,
                 }
             }
 
+#endif
             // 对象 bytes 是否最后 WriteLine() 一次性写入 SQL row。null 表示不等到最后 WriteLine() 就提前写入
             byte[] direct_write_data = null;
 
diff --git a/DigitalPlatform.rms/DigitalPlatform.rms.csproj b/DigitalPlatform.rms/DigitalPlatform.rms.csproj
index 9d831372e..eb5a76fe7 100644
--- a/DigitalPlatform.rms/DigitalPlatform.rms.csproj
+++ b/DigitalPlatform.rms/DigitalPlatform.rms.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
-  <Import Project="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props')" />
+  <Import Project="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.props')" />
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
@@ -128,11 +128,11 @@
     <Reference Include="K4os.Hash.xxHash, Version=1.0.6.0, Culture=neutral, PublicKeyToken=32cd54395057cec3, processorArchitecture=MSIL">
       <HintPath>..\packages\K4os.Hash.xxHash.1.0.6\lib\net46\K4os.Hash.xxHash.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.4.0.1\lib\netstandard2.0\Microsoft.CodeAnalysis.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis, Version=4.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.4.2.0\lib\netstandard2.0\Microsoft.CodeAnalysis.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.4.0.1\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=4.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.4.2.0\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Oracle.ManagedDataAccess, Version=4.122.18.3, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
@@ -255,8 +255,8 @@
     <Content Include="deleted.txt" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
-    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
@@ -271,8 +271,8 @@
       <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。启用“NuGet 程序包还原”可下载这些程序包。有关详细信息，请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.targets'))" />
   </Target>
-  <Import Project="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets" Condition="Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets')" />
+  <Import Project="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.targets" Condition="Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.targets')" />
 </Project>
\ No newline at end of file
diff --git a/DigitalPlatform.rms/packages.config b/DigitalPlatform.rms/packages.config
index 10be9c409..1892a2cba 100644
--- a/DigitalPlatform.rms/packages.config
+++ b/DigitalPlatform.rms/packages.config
@@ -6,9 +6,9 @@
   <package id="K4os.Compression.LZ4" version="1.1.11" targetFramework="net472" />
   <package id="K4os.Compression.LZ4.Streams" version="1.1.11" targetFramework="net472" />
   <package id="K4os.Hash.xxHash" version="1.0.6" targetFramework="net472" />
-  <package id="Microsoft.CodeAnalysis.Analyzers" version="3.3.2" targetFramework="net472" developmentDependency="true" />
-  <package id="Microsoft.CodeAnalysis.Common" version="4.0.1" targetFramework="net472" />
-  <package id="Microsoft.CodeAnalysis.CSharp" version="4.0.1" targetFramework="net472" />
+  <package id="Microsoft.CodeAnalysis.Analyzers" version="3.3.3" targetFramework="net472" developmentDependency="true" />
+  <package id="Microsoft.CodeAnalysis.Common" version="4.2.0" targetFramework="net472" />
+  <package id="Microsoft.CodeAnalysis.CSharp" version="4.2.0" targetFramework="net472" />
   <package id="Oracle.ManagedDataAccess" version="18.6.0" targetFramework="net47" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
   <package id="System.Collections.Immutable" version="6.0.0" targetFramework="net472" />
diff --git a/DigitalPlatform/4.0/DigitalPlatform.csproj b/DigitalPlatform/4.0/DigitalPlatform.csproj
index 46c0547e3..90269cedd 100644
--- a/DigitalPlatform/4.0/DigitalPlatform.csproj
+++ b/DigitalPlatform/4.0/DigitalPlatform.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
-  <Import Project="..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props" Condition="Exists('..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props')" />
+  <Import Project="..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.props" Condition="Exists('..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.props')" />
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
@@ -145,11 +145,11 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.CodeAnalysis, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.CodeAnalysis.Common.4.0.1\lib\netstandard2.0\Microsoft.CodeAnalysis.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis, Version=4.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.CodeAnalysis.Common.4.2.0\lib\netstandard2.0\Microsoft.CodeAnalysis.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.CodeAnalysis.CSharp.4.0.1\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=4.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.CodeAnalysis.CSharp.4.2.0\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -384,8 +384,8 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
-    <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
@@ -398,8 +398,8 @@
     <PropertyGroup>
       <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.targets'))" />
   </Target>
-  <Import Project="..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets" Condition="Exists('..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets')" />
+  <Import Project="..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.targets" Condition="Exists('..\..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.targets')" />
 </Project>
\ No newline at end of file
diff --git a/DigitalPlatform/4.0/packages.config b/DigitalPlatform/4.0/packages.config
index 8eb9c2165..ea9a6e62b 100644
--- a/DigitalPlatform/4.0/packages.config
+++ b/DigitalPlatform/4.0/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.CodeAnalysis.Analyzers" version="3.3.2" targetFramework="net472" developmentDependency="true" />
-  <package id="Microsoft.CodeAnalysis.Common" version="4.0.1" targetFramework="net472" />
-  <package id="Microsoft.CodeAnalysis.CSharp" version="4.0.1" targetFramework="net472" />
+  <package id="Microsoft.CodeAnalysis.Analyzers" version="3.3.3" targetFramework="net472" developmentDependency="true" />
+  <package id="Microsoft.CodeAnalysis.Common" version="4.2.0" targetFramework="net472" />
+  <package id="Microsoft.CodeAnalysis.CSharp" version="4.2.0" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
   <package id="System.Collections.Immutable" version="6.0.0" targetFramework="net472" />
diff --git a/TestRoslyn/TestRoslyn.csproj b/TestRoslyn/TestRoslyn.csproj
index 792f81292..17d78088a 100644
--- a/TestRoslyn/TestRoslyn.csproj
+++ b/TestRoslyn/TestRoslyn.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props')" />
+  <Import Project="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -36,17 +36,17 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.CodeAnalysis, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.4.0.1\lib\netstandard2.0\Microsoft.CodeAnalysis.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis, Version=4.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.4.2.0\lib\netstandard2.0\Microsoft.CodeAnalysis.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.4.0.1\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=4.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.4.2.0\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.CSharp.Scripting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Scripting.4.0.1\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.Scripting.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Scripting, Version=4.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Scripting.4.2.0\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.Scripting.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.Scripting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.Scripting.Common.4.0.1\lib\netstandard2.0\Microsoft.CodeAnalysis.Scripting.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.Scripting, Version=4.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Scripting.Common.4.2.0\lib\netstandard2.0\Microsoft.CodeAnalysis.Scripting.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -121,16 +121,16 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
-    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.targets'))" />
   </Target>
-  <Import Project="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets" Condition="Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets')" />
+  <Import Project="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.targets" Condition="Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.targets')" />
 </Project>
\ No newline at end of file
diff --git a/TestRoslyn/packages.config b/TestRoslyn/packages.config
index bd8ceb020..e3c0a8d9e 100644
--- a/TestRoslyn/packages.config
+++ b/TestRoslyn/packages.config
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.CodeAnalysis.Analyzers" version="3.3.2" targetFramework="net472" developmentDependency="true" />
-  <package id="Microsoft.CodeAnalysis.Common" version="4.0.1" targetFramework="net472" />
-  <package id="Microsoft.CodeAnalysis.CSharp" version="4.0.1" targetFramework="net472" />
-  <package id="Microsoft.CodeAnalysis.CSharp.Scripting" version="4.0.1" targetFramework="net472" />
-  <package id="Microsoft.CodeAnalysis.Scripting.Common" version="4.0.1" targetFramework="net472" />
-  <package id="Microsoft.CSharp" version="4.3.0" targetFramework="net472" />
+  <package id="Microsoft.CodeAnalysis.Analyzers" version="3.3.3" targetFramework="net472" developmentDependency="true" />
+  <package id="Microsoft.CodeAnalysis.Common" version="4.2.0" targetFramework="net472" />
+  <package id="Microsoft.CodeAnalysis.CSharp" version="4.2.0" targetFramework="net472" />
+  <package id="Microsoft.CodeAnalysis.CSharp.Scripting" version="4.2.0" targetFramework="net472" />
+  <package id="Microsoft.CodeAnalysis.Scripting.Common" version="4.2.0" targetFramework="net472" />
+  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net472" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
   <package id="System.Collections.Immutable" version="6.0.0" targetFramework="net472" />
   <package id="System.Memory" version="4.5.4" targetFramework="net472" />
diff --git a/UpdateAssemblyBinding/App.config b/UpdateAssemblyBinding/App.config
new file mode 100644
index 000000000..56efbc7b5
--- /dev/null
+++ b/UpdateAssemblyBinding/App.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+    </startup>
+</configuration>
\ No newline at end of file
diff --git a/UpdateAssemblyBinding/Program.cs b/UpdateAssemblyBinding/Program.cs
new file mode 100644
index 000000000..b4c31a0b7
--- /dev/null
+++ b/UpdateAssemblyBinding/Program.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using DigitalPlatform.Install;
+using DigitalPlatform.Text;
+
+// 更新 XML 文件中的 assemblyBinding
+
+namespace UpdateAssemblyBinding
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            Console.WriteLine($"正在执行 updateAssemblyBinding. args='{string.Join(" ", args)}'");
+
+            var table = BuildParamTable(args);
+
+            string sourceFileName = table["source"] as string;
+            string targetFileName = table["target"] as string;
+            // string projectDir = table["projectDir"] as string;
+
+            if (string.IsNullOrEmpty(sourceFileName))
+            {
+                Console.WriteLine("缺乏 source 参数");
+                return;
+            }
+
+            if (string.IsNullOrEmpty(targetFileName))
+            {
+                Console.WriteLine("缺乏 target 参数");
+                return;
+            }
+
+            /*
+            if (string.IsNullOrEmpty(projectDir))
+            {
+                Console.WriteLine("缺乏 projectDir 参数");
+                return;
+            }
+            */
+
+            //sourceFileName = Path.Combine(projectDir, sourceFileName);
+            //targetFileName = Path.Combine(projectDir, targetFileName);
+
+            if (File.Exists(sourceFileName) == false)
+            {
+                Console.Write($"文件 {sourceFileName} 不存在");
+                return;
+            }
+
+            if (File.Exists(targetFileName) == false)
+            {
+                Console.Write($"文件 {targetFileName} 不存在");
+                return;
+            }
+
+            int nRet = InstallHelper.RefreshDependentAssembly(sourceFileName,
+targetFileName,
+out string strError);
+            if (nRet == -1)
+            {
+                Console.WriteLine($"updateAssemblyBinding 出错: {strError}");
+                return;
+            }
+
+            if (nRet == 0)
+            {
+                Console.WriteLine($"目标文件 {targetFileName} 没有变化");
+            }
+            else if (nRet == 1)
+            {
+                Console.WriteLine($"目标文件 {targetFileName} 发生了局部更新");
+            }
+            Console.WriteLine($"updateAssemblyBinding 结束");
+        }
+
+        static Hashtable BuildParamTable(string[] args)
+        {
+            Hashtable result = new Hashtable();
+            foreach (var arg in args)
+            {
+                var parts = StringUtil.ParseTwoPart(arg, ":");
+                result[parts[0]] = parts[1];
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/UpdateAssemblyBinding/Properties/AssemblyInfo.cs b/UpdateAssemblyBinding/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..82b05715e
--- /dev/null
+++ b/UpdateAssemblyBinding/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("UpdateAssemblyBinding")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("UpdateAssemblyBinding")]
+[assembly: AssemblyCopyright("Copyright ©  2022")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
+[assembly: Guid("3a99bf16-f41c-44b1-83fe-57bc26444cb2")]
+
+// 程序集的版本信息由下列四个值组成: 
+//
+//      主版本
+//      次版本
+//      生成号
+//      修订号
+//
+//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
+//通过使用 "*"，如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/UpdateAssemblyBinding/UpdateAssemblyBinding.csproj b/UpdateAssemblyBinding/UpdateAssemblyBinding.csproj
new file mode 100644
index 000000000..3b2b261a9
--- /dev/null
+++ b/UpdateAssemblyBinding/UpdateAssemblyBinding.csproj
@@ -0,0 +1,67 @@
+<?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')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{3A99BF16-F41C-44B1-83FE-57BC26444CB2}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>UpdateAssemblyBinding</RootNamespace>
+    <AssemblyName>UpdateAssemblyBinding</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <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" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\DigitalPlatform.Install\DigitalPlatform.Install.csproj">
+      <Project>{fbb88810-6d4a-44fe-b220-cac22e4dbdcd}</Project>
+      <Name>DigitalPlatform.Install</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\DigitalPlatform.Text\DigitalPlatform.Text.csproj">
+      <Project>{26f96cc3-a4a9-4bc4-a10a-bc7e25581ff6}</Project>
+      <Name>DigitalPlatform.Text</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\dp-library\DigitalPlatform.Core\DigitalPlatform.Core.csproj">
+      <Project>{C5B517C1-7344-45A5-89DC-06A9B130AE36}</Project>
+      <Name>DigitalPlatform.Core</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/dp2-net40.sln b/dp2-net40.sln
index 46ae791ad..26d3a0023 100644
--- a/dp2-net40.sln
+++ b/dp2-net40.sln
@@ -26,6 +26,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dp2Installer", "dp2Installe
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dp2LibraryXE", "dp2LibraryXE\dp2LibraryXE.csproj", "{102C775A-B4B1-4A3A-842C-13A68DCCB77D}"
 	ProjectSection(ProjectDependencies) = postProject
+		{3A99BF16-F41C-44B1-83FE-57BC26444CB2} = {3A99BF16-F41C-44B1-83FE-57BC26444CB2}
 		{D91C6B98-886B-4181-9361-5214FFC992A9} = {D91C6B98-886B-4181-9361-5214FFC992A9}
 		{47E73ADC-0C75-4018-A42F-C8CA68679F25} = {47E73ADC-0C75-4018-A42F-C8CA68679F25}
 	EndProjectSection
@@ -318,6 +319,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleMessageClient", "Samp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sipApiTester", "sipApiTester\sipApiTester.csproj", "{69F9D0C8-E1EB-4023-991B-B80136F4BAC1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UpdateAssemblyBinding", "UpdateAssemblyBinding\UpdateAssemblyBinding.csproj", "{3A99BF16-F41C-44B1-83FE-57BC26444CB2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -2725,6 +2728,24 @@ Global
 		{69F9D0C8-E1EB-4023-991B-B80136F4BAC1}.Test|Mixed Platforms.Build.0 = Debug|Any CPU
 		{69F9D0C8-E1EB-4023-991B-B80136F4BAC1}.Test|x86.ActiveCfg = Debug|Any CPU
 		{69F9D0C8-E1EB-4023-991B-B80136F4BAC1}.Test|x86.Build.0 = Debug|Any CPU
+		{3A99BF16-F41C-44B1-83FE-57BC26444CB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A99BF16-F41C-44B1-83FE-57BC26444CB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A99BF16-F41C-44B1-83FE-57BC26444CB2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3A99BF16-F41C-44B1-83FE-57BC26444CB2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3A99BF16-F41C-44B1-83FE-57BC26444CB2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3A99BF16-F41C-44B1-83FE-57BC26444CB2}.Debug|x86.Build.0 = Debug|Any CPU
+		{3A99BF16-F41C-44B1-83FE-57BC26444CB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A99BF16-F41C-44B1-83FE-57BC26444CB2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A99BF16-F41C-44B1-83FE-57BC26444CB2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3A99BF16-F41C-44B1-83FE-57BC26444CB2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3A99BF16-F41C-44B1-83FE-57BC26444CB2}.Release|x86.ActiveCfg = Release|Any CPU
+		{3A99BF16-F41C-44B1-83FE-57BC26444CB2}.Release|x86.Build.0 = Release|Any CPU
+		{3A99BF16-F41C-44B1-83FE-57BC26444CB2}.Test|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A99BF16-F41C-44B1-83FE-57BC26444CB2}.Test|Any CPU.Build.0 = Debug|Any CPU
+		{3A99BF16-F41C-44B1-83FE-57BC26444CB2}.Test|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3A99BF16-F41C-44B1-83FE-57BC26444CB2}.Test|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3A99BF16-F41C-44B1-83FE-57BC26444CB2}.Test|x86.ActiveCfg = Debug|Any CPU
+		{3A99BF16-F41C-44B1-83FE-57BC26444CB2}.Test|x86.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2732,6 +2753,7 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{7039CBBC-B76E-48FE-B9A2-192EB1D78C16} = {0C476599-346C-441B-8C91-79D2BD90766C}
 		{45DF0FBE-B056-441C-BD09-B64EA3205C6B} = {0C476599-346C-441B-8C91-79D2BD90766C}
+		{3A99BF16-F41C-44B1-83FE-57BC26444CB2} = {0C476599-346C-441B-8C91-79D2BD90766C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {CAB3713A-151C-4E57-A451-DBB0D68E8B43}
diff --git a/dp2Circulation/dp2Circulation.csproj b/dp2Circulation/dp2Circulation.csproj
index 90a2c59ae..da1309839 100644
--- a/dp2Circulation/dp2Circulation.csproj
+++ b/dp2Circulation/dp2Circulation.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
-  <Import Project="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props')" />
+  <Import Project="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.props')" />
   <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -148,11 +148,11 @@
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.4.0.1\lib\netstandard2.0\Microsoft.CodeAnalysis.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis, Version=4.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.4.2.0\lib\netstandard2.0\Microsoft.CodeAnalysis.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.4.0.1\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=4.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.4.2.0\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
@@ -4470,8 +4470,8 @@
     <WCFMetadata Include="Connected Services\" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
-    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
     <Analyzer Include="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.8.55\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes.dll" />
     <Analyzer Include="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.8.55\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.CSharp.dll" />
     <Analyzer Include="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.8.55\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.dll" />
@@ -4499,9 +4499,9 @@ xcopy $(TargetDir)x64 x64 /Y</PostBuildEvent>
     <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.8.55\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.8.55\build\Microsoft.VisualStudio.Threading.Analyzers.targets'))" />
     <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
     <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets'))" />
     <Error Condition="!Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.targets'))" />
   </Target>
   <PropertyGroup>
     <PreBuildEvent>CD /D $(ProjectDir)
@@ -4511,8 +4511,8 @@ CALL copyinterop.bat</PreBuildEvent>
   <Import Project="..\packages\Accord.3.8.0\build\Accord.targets" Condition="Exists('..\packages\Accord.3.8.0\build\Accord.targets')" />
   <Import Project="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.8.55\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.8.55\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" />
   <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-  <Import Project="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets" Condition="Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets')" />
   <Import Project="..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
+  <Import Project="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.targets" Condition="Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.3\build\Microsoft.CodeAnalysis.Analyzers.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.
   <Target Name="BeforeBuild">
diff --git a/dp2Circulation/packages.config b/dp2Circulation/packages.config
index c91cb29de..319b9ffcb 100644
--- a/dp2Circulation/packages.config
+++ b/dp2Circulation/packages.config
@@ -12,9 +12,9 @@
   <package id="Jurassic" version="3.0.0" targetFramework="net47" />
   <package id="log4net" version="2.0.12" targetFramework="net472" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net472" />
-  <package id="Microsoft.CodeAnalysis.Analyzers" version="3.3.2" targetFramework="net472" developmentDependency="true" />
-  <package id="Microsoft.CodeAnalysis.Common" version="4.0.1" targetFramework="net472" />
-  <package id="Microsoft.CodeAnalysis.CSharp" version="4.0.1" targetFramework="net472" />
+  <package id="Microsoft.CodeAnalysis.Analyzers" version="3.3.3" targetFramework="net472" developmentDependency="true" />
+  <package id="Microsoft.CodeAnalysis.Common" version="4.2.0" targetFramework="net472" />
+  <package id="Microsoft.CodeAnalysis.CSharp" version="4.2.0" targetFramework="net472" />
   <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net472" />
   <package id="Microsoft.NETCore.Platforms" version="2.2.0" targetFramework="net47" />
   <package id="Microsoft.VisualStudio.Threading" version="16.8.55" targetFramework="net472" />
diff --git a/dp2Installer/dp2Installer.csproj b/dp2Installer/dp2Installer.csproj
index 4949785f0..38678237e 100644
--- a/dp2Installer/dp2Installer.csproj
+++ b/dp2Installer/dp2Installer.csproj
@@ -36,7 +36,7 @@
     <SuiteName>dp2 V3</SuiteName>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
-    <ApplicationRevision>310</ApplicationRevision>
+    <ApplicationRevision>311</ApplicationRevision>
     <ApplicationVersion>3.2.2.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/dp2KernelApiTester/TestCase/TestRecord.cs b/dp2KernelApiTester/TestCase/TestRecord.cs
index 0411e4d4a..60719e9e7 100644
--- a/dp2KernelApiTester/TestCase/TestRecord.cs
+++ b/dp2KernelApiTester/TestCase/TestRecord.cs
@@ -105,6 +105,20 @@ public static NormalResult LargeObjectTest(int count)
                     return result;
             }
 
+            // 测试交替上载覆盖小于 100K 和大于 100K 的对象
+            {
+                var create_result = UploadSmallLargObject(1);
+                if (create_result.Value == -1)
+                    return create_result;
+
+                var result = DeleteRecords(create_result.CreatedPaths,
+    create_result.AccessPoints,
+    "");
+                if (result.Value == -1)
+                    return result;
+            }
+
+            /*
             {
                 var create_result = UploadLargObject(count);
                 if (create_result.Value == -1)
@@ -116,6 +130,7 @@ public static NormalResult LargeObjectTest(int count)
                 if (result.Value == -1)
                     return result;
             }
+            */
 
             {
                 var result = Finish();
@@ -134,6 +149,25 @@ public static NormalResult TestAll(string style = null)
                     return result;
             }
 
+            // 临时测试
+            // 碎片方式创建记录，overlap 风格
+            {
+                var create_result = CreateRecords(1, false);
+                if (create_result.Value == -1)
+                    return create_result;
+
+                var result = FragmentOverwriteRecords(create_result.CreatedPaths, 1, "overlap");
+                if (result.Value == -1)
+                    return result;
+
+                var result1 = DeleteRecords(create_result.CreatedPaths,
+    null,
+    "");
+                if (result1.Value == -1)
+                    return result1;
+            }
+
+            ////
             {
                 var create_result = CreateRecords(2, true);
                 if (create_result.Value == -1)
@@ -165,7 +199,7 @@ public static NormalResult TestAll(string style = null)
 
             // 碎片方式创建记录，overlap 风格
             {
-                var create_result = FragmentCreateRecords(1,1,"overlap");
+                var create_result = FragmentCreateRecords(1, 1, "overlap");
                 if (create_result.Value == -1)
                     return create_result;
 
@@ -1332,7 +1366,7 @@ public static CreateResult FragmentCreateRecords(int count,
 
                     if (end > bytes.Length - 1)
                     {
-                        end = chunk_length - 1;
+                        end = bytes.Length - 1; // chunk_length
                         chunk_length = (int)(end - start + 1);
                     }
 
@@ -1343,16 +1377,16 @@ public static CreateResult FragmentCreateRecords(int count,
                     {
                         delta = -10;
                         if (start + delta < 0)
-                            delta = -1*start;
+                            delta = -1 * start;
                     }
 
                     byte[] fragment = new byte[end - (start + delta) + 1];
                     Array.Copy(bytes, (start + delta), fragment, 0, fragment.Length);
 
-                    DataModel.ShowProgressMessage(progress_id, $"正在用 Fragment 方式{style}创建记录 {current_path} {start+delta}-{end} {StringUtil.GetPercentText(end+1, bytes.Length)}...");
+                    DataModel.ShowProgressMessage(progress_id, $"正在用 Fragment 方式{style}创建记录 {current_path} {start + delta}-{end} {StringUtil.GetPercentText(end + 1, bytes.Length)}...");
 
                     var ret = channel.WriteRes(current_path,
-                        $"{start+delta}-{end}",
+                        $"{start + delta}-{end}",
                         bytes.Length,
                         fragment,
                         "", // strMetadata
@@ -1444,10 +1478,10 @@ public static CreateResult FragmentCreateRecords(int count,
                                 delta = -1 * start_offs;
                         }
 
-                        byte[] chunk_contents = new byte[end_offs - (start_offs + delta)+ 1];
+                        byte[] chunk_contents = new byte[end_offs - (start_offs + delta) + 1];
                         Array.Copy(contents, (start_offs + delta), chunk_contents, 0, chunk_contents.Length);
                         var ret = channel.WriteRes(object_path,
-                            $"{start_offs+delta}-{end_offs}",
+                            $"{start_offs + delta}-{end_offs}",
                             length,
                             chunk_contents,
                             "",
@@ -1616,17 +1650,22 @@ public static NormalResult FragmentOverwriteRecords(IEnumerable<string> paths,
                     }
 
                     byte[] fragment = new byte[end - (start + delta) + 1];
-                    Array.Copy(bytes, start+delta, fragment, 0, fragment.Length);
+                    Array.Copy(bytes, start + delta, fragment, 0, fragment.Length);
+
+                    DataModel.ShowProgressMessage(progress_id, $"正在用 Fragment 方式{style}覆盖记录 {path} {start + delta}-{end} {StringUtil.GetPercentText(end + 1, bytes.Length)}...");
 
-                    DataModel.ShowProgressMessage(progress_id, $"正在用 Fragment 方式{style}覆盖记录 {path} {start+delta}-{end} {StringUtil.GetPercentText(end+1, bytes.Length)}...");
+                    byte[] timestamp_param = timestamp;
+                    // 如果是从头覆盖，则需要使用读出时的完成时间戳
+                    if (start + delta == 0)
+                        timestamp_param = origin_timestamp;
 
                     var ret = channel.WriteRes(path,
-                        $"{start+delta}-{end}",
+                        $"{start + delta}-{end}",
                         bytes.Length,
                         fragment,
                         "", // strMetadata
                         "", // strStyle,
-                        timestamp,
+                        timestamp_param,
                         out string output_path,
                         out byte[] output_timestamp,
                         out string strError);
@@ -1828,6 +1867,7 @@ public static NormalResult FragmentReadRecords(IEnumerable<string> paths,
             return new NormalResult();
         }
 
+        // 测试上载大对象
         public static CreateResult UploadLargObject(int count)
         {
             var channel = DataModel.GetChannel();
@@ -1891,7 +1931,7 @@ public static CreateResult UploadLargObject(int count)
                         for (int j = 0; j < Math.Min(10, count); j++)
                         {
                             long object_size = object_size_unit * (j + 1);
-                            string fileName = Path.Combine(Environment.CurrentDirectory, $"temp_object_{j+1}");
+                            string fileName = Path.Combine(Environment.CurrentDirectory, $"temp_object_{j + 1}");
                             File.Delete(fileName);
                             DataModel.SetMessage($"正在创建大文件 {fileName} size={object_size} ...");
                             CreateObjectFile(fileName, object_size);
@@ -1915,7 +1955,7 @@ public static CreateResult UploadLargObject(int count)
                                     if (read_length == 0)
                                         break;
 
-                                    DataModel.ShowProgressMessage(progress_id, $"正在上传大文件 {object_path} {start}-{start + read_length - 1} {StringUtil.GetPercentText(start+read_length, file.Length)}...");
+                                    DataModel.ShowProgressMessage(progress_id, $"正在上传大文件 {object_path} {start}-{start + read_length - 1} {StringUtil.GetPercentText(start + read_length, file.Length)}...");
 
                                     ret = channel.WriteRes(object_path,
                                         $"{start}-{start + read_length - 1}",
@@ -1953,7 +1993,7 @@ public static CreateResult UploadLargObject(int count)
                     {
                         string object_path = $"{output_path}/object/{j + 1}";
                         string fileName = filenames[j];
-                        string output_fileName = Path.Combine(Environment.CurrentDirectory, $"output_{j+1}");
+                        string output_fileName = Path.Combine(Environment.CurrentDirectory, $"output_{j + 1}");
                         File.Delete(output_fileName);
                         try
                         {
@@ -2103,5 +2143,243 @@ static NormalResult CreateObjectFile(string fileName, long object_size)
             return new NormalResult();
         }
 
+        // 测试交替上载覆盖大小对象
+        public static CreateResult UploadSmallLargObject(int count)
+        {
+            var channel = DataModel.GetChannel();
+
+            List<string> created_paths = new List<string>();
+            List<AccessPoint> created_accesspoints = new List<AccessPoint>();
+
+            for (int i = 0; i < 1; i++)
+            {
+                string path = $"{strDatabaseName}/?";
+                string current_barcode = (i + 1).ToString().PadLeft(10, '0');
+
+                string xml = @"<root xmlns:dprms='http://dp2003.com/dprms'>
+<barcode>{barcode}</barcode>
+<dprms:file id='1' />
+<dprms:file id='2' />
+<dprms:file id='3' />
+<dprms:file id='4' />
+<dprms:file id='5' />
+<dprms:file id='6' />
+<dprms:file id='7' />
+<dprms:file id='8' />
+<dprms:file id='9' />
+<dprms:file id='10' />
+</root>".Replace("{barcode}", current_barcode);
+                // var bytes = Encoding.UTF8.GetBytes(xml);
+
+                var ret = channel.DoSaveTextRes(path,
+                    xml, // strMetadata,
+                    false,
+                    "",
+                    null,
+                    out byte[] output_timestamp,
+                    out string output_path,
+                    out string strError);
+                if (ret == -1)
+                    return new CreateResult
+                    {
+                        Value = -1,
+                        ErrorInfo = strError,
+                        CreatedPaths = created_paths,
+                        AccessPoints = created_accesspoints,
+                    };
+
+                created_paths.Add(output_path);
+                created_accesspoints.Add(new AccessPoint
+                {
+                    Key = current_barcode,
+                    From = "册条码号",
+                    Path = output_path,
+                });
+
+                List<string> filenames = new List<string>();
+
+                try
+                {
+                    long[] size_list = new long[] {
+                        5433, 2279569,
+                        4096, 100*1024,
+                        5555, 200*1024,
+                    };
+                    {
+                        byte[] timestamp = null;
+
+                        // 上载对象
+                        for (int j = 0; j < size_list.Length; j++)
+                        {
+                            long object_size = size_list[j];
+                            string fileName = Path.Combine(Environment.CurrentDirectory, $"temp_object_{j + 1}");
+                            File.Delete(fileName);
+                            DataModel.SetMessage($"正在创建文件 {fileName} size={object_size} ...");
+                            CreateObjectFile(fileName, object_size);
+
+                            filenames.Add(fileName);
+
+                            string object_path = $"{output_path}/object/1";
+
+                            string progress_id = DataModel.NewProgressID();
+                            DataModel.ShowProgressMessage(progress_id, $"正在上传大文件 {object_path} ...");
+
+                            long start = 0;
+                            using (var file = File.OpenRead(fileName))
+                            {
+                                while (true)
+                                {
+                                    long rest_length = file.Length - start;
+                                    byte[] bytes = new byte[Math.Min((long)(300 * 1024), rest_length)];
+                                    int read_length = file.Read(bytes, 0, bytes.Length);
+                                    if (read_length == 0)
+                                        break;
+
+                                    DataModel.ShowProgressMessage(progress_id, $"正在上传大文件 {object_path} {start}-{start + read_length - 1} {StringUtil.GetPercentText(start + read_length, file.Length)}...");
+
+                                    // TODO: 在覆盖已有对象内容的时候，要故意使用一次错误的时间戳写入，要报错才对
+
+                                    ret = channel.WriteRes(object_path,
+                                        $"{start}-{start + read_length - 1}",
+                                        file.Length,
+                                        bytes,
+                                        "",
+                                        "content,data",
+                                        timestamp,
+                                        out string output_object_path,
+                                        out byte[] output_object_timestamp,
+                                        out strError);
+                                    if (ret == -1)
+                                        return new CreateResult
+                                        {
+                                            Value = -1,
+                                            ErrorInfo = strError,
+                                            CreatedPaths = created_paths,
+                                            AccessPoints = created_accesspoints,
+                                        };
+                                    timestamp = output_object_timestamp;
+                                    // testing
+                                    // timestamp = null;
+                                    start += read_length;
+                                    if (read_length < bytes.Length
+                                        || start >= file.Length)
+                                        break;
+                                }
+                            }
+
+                            DataModel.ShowProgressMessage(progress_id, $"文件 {object_path} 上传完成");
+
+                            var compare_result = DownloadAndCompare(
+        channel,
+        object_path,
+        fileName,
+        timestamp);
+                            if (compare_result.Value != 0)
+                                return new CreateResult
+                                {
+                                    Value = -1,
+                                    ErrorInfo = compare_result.ErrorInfo
+                                };
+
+                            File.Delete(fileName);
+                        }
+                    }
+
+                    DataModel.SetMessage($"上传大、小对象 {output_path} 成功");
+                }
+                finally
+                {
+                    foreach (var fileName in filenames)
+                    {
+                        if (File.Exists(fileName))
+                            File.Delete(fileName);
+                    }
+                }
+            }
+
+            return new CreateResult
+            {
+                CreatedPaths = created_paths,
+                AccessPoints = created_accesspoints,
+            };
+        }
+
+        // 下载，比较
+        // TODO: 注意比较 timestamp
+        static NormalResult DownloadAndCompare(
+            RmsChannel channel,
+            string object_path,
+            string fileName,
+            byte[] timestamp)
+        {
+
+            string output_fileName = Path.Combine(Environment.CurrentDirectory, $"output_temp");
+            File.Delete(output_fileName);
+            try
+            {
+                string progress_id = DataModel.NewProgressID();
+                DataModel.ShowProgressMessage(progress_id, $"正在下载大文件 {object_path} ...");
+
+                var stop = new Stop();
+                stop.OnProgressChanged += (o, e) =>
+                {
+                    DataModel.ShowProgressMessage(progress_id, e.Message);
+                };
+                stop.BeginLoop();
+                try
+                {
+                    var lRet = channel.GetRes(object_path,
+    output_fileName,
+    stop,
+    out string strMetaData,
+    out byte[] baOutputTimeStamp,
+    out string strOutputPath,
+    out string strError);
+                    if (lRet == -1)
+                        return new NormalResult
+                        {
+                            Value = -1,
+                            ErrorInfo = strError,
+                        };
+
+                    if (ByteArray.Compare(baOutputTimeStamp, timestamp) != 0)
+                        return new NormalResult
+                        {
+                            Value = -1,
+                            ErrorInfo = $"记录 {object_path} 的时间戳({ByteArray.GetHexTimeStampString(baOutputTimeStamp)})期望的时间戳({ByteArray.GetHexTimeStampString(timestamp)}) 不一致"
+                        };
+                }
+                finally
+                {
+                    stop.EndLoop();
+                }
+                DataModel.ShowProgressMessage(progress_id, $"文件 {object_path} 下载完成");
+
+                // compare
+                progress_id = DataModel.NewProgressID();
+                string compare_error = CompareFiles(fileName,
+                    output_fileName,
+                    (offset, total_length) =>
+                    {
+                        DataModel.ShowProgressMessage(progress_id, $"正在比较文件 {fileName} {output_fileName} {StringUtil.GetPercentText(offset, total_length)}...");
+                    });
+                if (compare_error != null)
+                    return new NormalResult
+                    {
+                        Value = -1,
+                        ErrorInfo = $"原始文件和下载文件比较发现不同: {compare_error}",
+                    };
+
+                DataModel.ShowProgressMessage(progress_id, $"文件 {fileName} {output_fileName} 比较完成");
+
+                return new NormalResult();
+            }
+            finally
+            {
+                if (File.Exists(output_fileName))
+                    File.Delete(output_fileName);
+            }
+        }
+
     }
 }
diff --git a/dp2LibraryXE/dp2LibraryXE.csproj b/dp2LibraryXE/dp2LibraryXE.csproj
index 7cf65b964..48384262d 100644
--- a/dp2LibraryXE/dp2LibraryXE.csproj
+++ b/dp2LibraryXE/dp2LibraryXE.csproj
@@ -38,7 +38,7 @@
     <SuiteName>dp2 V3</SuiteName>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
-    <ApplicationRevision>260</ApplicationRevision>
+    <ApplicationRevision>261</ApplicationRevision>
     <ApplicationVersion>3.1.2.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -492,6 +492,9 @@
   </Target>
   <PropertyGroup>
     <PreBuildEvent>CD /D $(ProjectDir)
+
+$(ProjectDir)..\updateAssemblyBinding\bin\debug\updateAssemblyBinding.exe source:$(ProjectDir)..\dp2opac\web.config target:$(ProjectDir)web.config
+
 CALL copyopac.bat
 CALL copydata.bat
 
diff --git a/dp2LibraryXE/web.config b/dp2LibraryXE/web.config
index c1b629deb..b274452e8 100644
--- a/dp2LibraryXE/web.config
+++ b/dp2LibraryXE/web.config
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <system.webServer>
+  <system.webServer>
     <modules runAllManagedModulesForAllRequests="true" />
     <handlers>
       <remove name="ChartImageHandler" />
       <add name="ChartImageHandler" preCondition="integratedMode" verb="GET,HEAD,POST" path="ChartImg.axd" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
     </handlers>
-        <defaultDocument enabled="true">
-            <files>
-                <add value="searchbiblio.aspx" />
-            </files>
-        </defaultDocument>
-    </system.webServer>
+    <defaultDocument enabled="true">
+      <files>
+        <add value="searchbiblio.aspx" />
+      </files>
+    </defaultDocument>
+  </system.webServer>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
@@ -44,8 +44,16 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>
\ No newline at end of file
diff --git a/dp2SSL/dp2SSL.csproj b/dp2SSL/dp2SSL.csproj
index e533c842f..d5d71c48b 100644
--- a/dp2SSL/dp2SSL.csproj
+++ b/dp2SSL/dp2SSL.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.3\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.3\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.props')" />
   <Import Project="..\packages\Microsoft.EntityFrameworkCore.Design.3.1.21\build\net461\Microsoft.EntityFrameworkCore.Design.props" Condition="Exists('..\packages\Microsoft.EntityFrameworkCore.Design.3.1.21\build\net461\Microsoft.EntityFrameworkCore.Design.props')" />
-  <Import Project="..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.2.9.8\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.2.9.8\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -876,8 +876,8 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.2.9.8\analyzers\dotnet\cs\Microsoft.CodeAnalysis.BannedApiAnalyzers.dll" />
-    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.2.9.8\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.BannedApiAnalyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.3\analyzers\dotnet\cs\Microsoft.CodeAnalysis.BannedApiAnalyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.3\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.BannedApiAnalyzers.dll" />
     <Analyzer Include="..\packages\Microsoft.VisualStudio.SDK.Analyzers.16.5.5\analyzers\cs\Microsoft.VisualStudio.SDK.Analyzers.CodeFixes.dll" />
     <Analyzer Include="..\packages\Microsoft.VisualStudio.SDK.Analyzers.16.5.5\analyzers\cs\Microsoft.VisualStudio.SDK.Analyzers.dll" />
     <Analyzer Include="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.8.55\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes.dll" />
@@ -916,13 +916,14 @@
       <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\MaterialDesignThemes.3.1.0\build\MaterialDesignThemes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MaterialDesignThemes.3.1.0\build\MaterialDesignThemes.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.2.9.8\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.2.9.8\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.30\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.30\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.SDK.Analyzers.16.5.5\build\Microsoft.VisualStudio.SDK.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.SDK.Analyzers.16.5.5\build\Microsoft.VisualStudio.SDK.Analyzers.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.8.55\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.8.55\build\Microsoft.VisualStudio.Threading.Analyzers.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.EntityFrameworkCore.Design.3.1.21\build\net461\Microsoft.EntityFrameworkCore.Design.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.EntityFrameworkCore.Design.3.1.21\build\net461\Microsoft.EntityFrameworkCore.Design.props'))" />
     <Error Condition="!Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets'))" />
     <Error Condition="!Exists('..\packages\System.Text.Json.6.0.5\build\System.Text.Json.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Text.Json.6.0.5\build\System.Text.Json.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.3\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.3\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.3\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.3\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.targets'))" />
   </Target>
   <Import Project="..\packages\MaterialDesignThemes.3.1.0\build\MaterialDesignThemes.targets" Condition="Exists('..\packages\MaterialDesignThemes.3.1.0\build\MaterialDesignThemes.targets')" />
   <Import Project="..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.30\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.30\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets')" />
@@ -930,4 +931,5 @@
   <Import Project="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.8.55\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.8.55\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" />
   <Import Project="..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.2.0.4\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" />
   <Import Project="..\packages\System.Text.Json.6.0.5\build\System.Text.Json.targets" Condition="Exists('..\packages\System.Text.Json.6.0.5\build\System.Text.Json.targets')" />
+  <Import Project="..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.3\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.targets" Condition="Exists('..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.3\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.targets')" />
 </Project>
\ No newline at end of file
diff --git a/dp2SSL/packages.config b/dp2SSL/packages.config
index a74fd26ec..bb6a03127 100644
--- a/dp2SSL/packages.config
+++ b/dp2SSL/packages.config
@@ -22,7 +22,7 @@
   <package id="Microsoft.AspNetCore.SignalR.Protocols.Json" version="3.1.3" targetFramework="net472" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net472" />
   <package id="Microsoft.Bcl.HashCode" version="1.1.1" targetFramework="net472" />
-  <package id="Microsoft.CodeAnalysis.BannedApiAnalyzers" version="2.9.8" targetFramework="net472" developmentDependency="true" />
+  <package id="Microsoft.CodeAnalysis.BannedApiAnalyzers" version="3.3.3" targetFramework="net472" developmentDependency="true" />
   <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net472" />
   <package id="Microsoft.Data.Sqlite.Core" version="3.1.21" targetFramework="net472" />
   <package id="Microsoft.DotNet.PlatformAbstractions" version="3.1.6" targetFramework="net472" />