整理代码

DigitalPlatform · Mar 15, 2021 · 637e281 · 637e281
1 parent f354112
commit 637e281
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 49 deletions.
diff --git a/TestZ3950/App.config b/TestZ3950/App.config
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="TestZ3950.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="TestZ3950.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
         </sectionGroup>
     </configSections>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
     </startup>
     <userSettings>
         <TestZ3950.Properties.Settings>
             <setting name="serverAddr" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="serverPort" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="databaseNames" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="userName" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="password" serializeAs="String">
-                <value />
+                <value/>
             </setting>
         </TestZ3950.Properties.Settings>
     </userSettings>
-</configuration>
+</configuration>
diff --git a/TestZ3950/Properties/Resources.Designer.cs b/TestZ3950/Properties/Resources.Designer.cs
diff --git a/TestZ3950/Properties/Settings.Designer.cs b/TestZ3950/Properties/Settings.Designer.cs
diff --git a/TestZ3950/TestZ3950.csproj b/TestZ3950/TestZ3950.csproj
@@ -8,9 +8,10 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>TestZ3950</RootNamespace>
     <AssemblyName>TestZ3950</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -64,6 +65,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>

diff --git a/WebMarcEditor/WebMarcEditor.csproj b/WebMarcEditor/WebMarcEditor.csproj
@@ -5,11 +5,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.2.8" />
+    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.4" />
   </ItemGroup>
 
   <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.8" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
   </ItemGroup>
 
 </Project>
diff --git a/WebZ/WebZ.csproj b/WebZ/WebZ.csproj
@@ -26,6 +26,7 @@
 
   <ItemGroup>
     <PackageReference Include="BundlerMinifier.Core" Version="3.2.449" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" />
   </ItemGroup>
 

diff --git a/dp-library b/dp-library
diff --git a/dp2weixinP2P/dp2weixinWeb.csproj b/dp2weixinP2P/dp2weixinWeb.csproj
@@ -118,6 +118,7 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.EnterpriseServices" />
+    <Reference Include="System.Xml.Linq" />
     <Reference Include="WebGrease, Version=1.6.5135.21930, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
+0 −14		DigitalPlatform.Core/ConfigSetting.cs
+1 −1		DigitalPlatform.Core/DigitalPlatform.Core.csproj
+1 −1		DigitalPlatform.SIP/DigitalPlatform.SIP.csproj
+4 −77		DigitalPlatform.SIP/Request/ItemStatusUpdate_19.cs
+1 −5		DigitalPlatform.SIP/Response/LoginResponse_94.cs
+2 −2		DigitalPlatform.Z3950/DigitalPlatform.Z3950.csproj
+2 −15		DigitalPlatform.Z3950/ZClient.cs
+4 −7		UnitTestMarcQuery/UnitTestMarcQuery.csproj
+4 −7		UnitTestSIP/UnitTestSIP.csproj