Skip to content

Commit d155564

Browse files
daisukenishino2daisukenishino2
committed
調整
1 parent 3ca0349 commit d155564

17 files changed

Lines changed: 5279 additions & 5691 deletions

File tree

‎root/programs/CS/Frameworks/Infrastructure/Business/app.config‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<runtime>
4-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5-
<dependentAssembly>
6-
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="4.0.4.1" />
8-
</dependentAssembly>
9-
</assemblyBinding>
10-
</runtime>
113
</configuration>

‎root/programs/CS/Frameworks/Infrastructure/CustomControl/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</dependentAssembly>
99
<dependentAssembly>
1010
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
11+
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
1212
</dependentAssembly>
1313
</assemblyBinding>
1414
</runtime>

‎root/programs/CS/Frameworks/Infrastructure/Framework/Framework_net48.csproj‎

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -64,42 +64,14 @@
6464
<Prefer32Bit>false</Prefer32Bit>
6565
</PropertyGroup>
6666
<ItemGroup>
67-
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68-
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
69-
<Private>True</Private>
70-
</Reference>
71-
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
72-
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
73-
<Private>True</Private>
74-
</Reference>
7567
<Reference Include="System" />
7668
<Reference Include="System.Data" />
7769
<Reference Include="System.Net.Http" />
7870
<Reference Include="System.Net.Http.WebRequest" />
7971
<Reference Include="System.ServiceModel" />
8072
<Reference Include="System.Web" />
8173
<Reference Include="System.Web.Extensions" />
82-
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
83-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.Helpers.dll</HintPath>
84-
<Private>True</Private>
85-
</Reference>
86-
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
87-
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.6\lib\net45\System.Web.Razor.dll</HintPath>
88-
<Private>True</Private>
89-
</Reference>
9074
<Reference Include="System.Web.Services" />
91-
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
92-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.dll</HintPath>
93-
<Private>True</Private>
94-
</Reference>
95-
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
96-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
97-
<Private>True</Private>
98-
</Reference>
99-
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
100-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
101-
<Private>True</Private>
102-
</Reference>
10375
<Reference Include="System.Xml" />
10476
</ItemGroup>
10577
<ItemGroup>
@@ -202,6 +174,9 @@
202174
<Version>13.0.3</Version>
203175
</PackageReference>
204176
</ItemGroup>
177+
<ItemGroup>
178+
<None Include="app.config" />
179+
</ItemGroup>
205180
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
206181
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
207182
Other similar extension points exist, see Microsoft.Common.targets.

‎root/programs/CS/Frameworks/Infrastructure/Framework/app.config‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<runtime>
4-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5-
<dependentAssembly>
6-
<assemblyIdentity name="Microsoft.Win32.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
8-
</dependentAssembly>
9-
<dependentAssembly>
10-
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
12-
</dependentAssembly>
13-
<dependentAssembly>
14-
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
15-
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
16-
</dependentAssembly>
17-
</assemblyBinding>
18-
</runtime>
193
</configuration>

‎root/programs/CS/Frameworks/Infrastructure/Public/Db/DamManagedOdp/DamManagedOdp_netstd20.csproj‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎root/programs/CS/Frameworks/Infrastructure/Public/Db/DamMySQL/DamMySQL_netstd20.csproj‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎root/programs/CS/Frameworks/Infrastructure/Public/Db/DamMySQL/app.config‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@
22
<configuration>
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5-
<dependentAssembly>
6-
<assemblyIdentity name="Microsoft.Win32.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
8-
</dependentAssembly>
95
<dependentAssembly>
106
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
7+
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
128
</dependentAssembly>
139
<dependentAssembly>
1410
<assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />

‎root/programs/CS/Frameworks/Infrastructure/Public/app.config‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<runtime>
4-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5-
<dependentAssembly>
6-
<assemblyIdentity name="Microsoft.Win32.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
8-
</dependentAssembly>
9-
<dependentAssembly>
10-
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
12-
</dependentAssembly>
13-
</assemblyBinding>
14-
</runtime>
153
</configuration>

‎root/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/App.config‎

Lines changed: 0 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -75,124 +75,4 @@
7575
</serviceBehaviors>
7676
</behaviors>
7777
</system.serviceModel>
78-
<runtime>
79-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
80-
<dependentAssembly>
81-
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
82-
<bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
83-
</dependentAssembly>
84-
<dependentAssembly>
85-
<assemblyIdentity name="Microsoft.IdentityModel.Abstractions" publicKeyToken="31bf3856ad364e35" culture="neutral" />
86-
<bindingRedirect oldVersion="0.0.0.0-8.12.0.0" newVersion="8.12.0.0" />
87-
</dependentAssembly>
88-
<dependentAssembly>
89-
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
90-
<bindingRedirect oldVersion="0.0.0.0-9.0.0.6" newVersion="9.0.0.6" />
91-
</dependentAssembly>
92-
<dependentAssembly>
93-
<assemblyIdentity name="System.Security.Cryptography.ProtectedData" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
94-
<bindingRedirect oldVersion="0.0.0.0-9.0.0.6" newVersion="9.0.0.6" />
95-
</dependentAssembly>
96-
<dependentAssembly>
97-
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
98-
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
99-
</dependentAssembly>
100-
<dependentAssembly>
101-
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
102-
<bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
103-
</dependentAssembly>
104-
<dependentAssembly>
105-
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
106-
<bindingRedirect oldVersion="0.0.0.0-9.0.0.6" newVersion="9.0.0.6" />
107-
</dependentAssembly>
108-
<dependentAssembly>
109-
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
110-
<bindingRedirect oldVersion="0.0.0.0-9.0.0.6" newVersion="9.0.0.6" />
111-
</dependentAssembly>
112-
<dependentAssembly>
113-
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
114-
<bindingRedirect oldVersion="0.0.0.0-9.0.0.6" newVersion="9.0.0.6" />
115-
</dependentAssembly>
116-
<dependentAssembly>
117-
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
118-
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
119-
</dependentAssembly>
120-
<dependentAssembly>
121-
<assemblyIdentity name="Microsoft.Identity.Client" publicKeyToken="0a613f4dd989e8ae" culture="neutral" />
122-
<bindingRedirect oldVersion="0.0.0.0-4.72.1.0" newVersion="4.72.1.0" />
123-
</dependentAssembly>
124-
<dependentAssembly>
125-
<assemblyIdentity name="Microsoft.Extensions.Caching.Memory" publicKeyToken="adb9793829ddae60" culture="neutral" />
126-
<bindingRedirect oldVersion="0.0.0.0-9.0.0.6" newVersion="9.0.0.6" />
127-
</dependentAssembly>
128-
<dependentAssembly>
129-
<assemblyIdentity name="Azure.Core" publicKeyToken="92742159e12e44c8" culture="neutral" />
130-
<bindingRedirect oldVersion="0.0.0.0-1.46.2.0" newVersion="1.46.2.0" />
131-
</dependentAssembly>
132-
<dependentAssembly>
133-
<assemblyIdentity name="Azure.Identity" publicKeyToken="92742159e12e44c8" culture="neutral" />
134-
<bindingRedirect oldVersion="0.0.0.0-1.14.0.0" newVersion="1.14.0.0" />
135-
</dependentAssembly>
136-
<dependentAssembly>
137-
<assemblyIdentity name="Microsoft.Extensions.Caching.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
138-
<bindingRedirect oldVersion="0.0.0.0-9.0.0.6" newVersion="9.0.0.6" />
139-
</dependentAssembly>
140-
<dependentAssembly>
141-
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
142-
<bindingRedirect oldVersion="0.0.0.0-4.2.4.0" newVersion="4.2.4.0" />
143-
</dependentAssembly>
144-
<dependentAssembly>
145-
<assemblyIdentity name="Microsoft.IdentityModel.Protocols.OpenIdConnect" publicKeyToken="31bf3856ad364e35" culture="neutral" />
146-
<bindingRedirect oldVersion="0.0.0.0-8.12.0.0" newVersion="8.12.0.0" />
147-
</dependentAssembly>
148-
<dependentAssembly>
149-
<assemblyIdentity name="Microsoft.IdentityModel.Protocols" publicKeyToken="31bf3856ad364e35" culture="neutral" />
150-
<bindingRedirect oldVersion="0.0.0.0-8.12.0.0" newVersion="8.12.0.0" />
151-
</dependentAssembly>
152-
<dependentAssembly>
153-
<assemblyIdentity name="Microsoft.IdentityModel.Tokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
154-
<bindingRedirect oldVersion="0.0.0.0-8.12.0.0" newVersion="8.12.0.0" />
155-
</dependentAssembly>
156-
<dependentAssembly>
157-
<assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
158-
<bindingRedirect oldVersion="0.0.0.0-8.12.0.0" newVersion="8.12.0.0" />
159-
</dependentAssembly>
160-
<dependentAssembly>
161-
<assemblyIdentity name="Microsoft.IdentityModel.JsonWebTokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
162-
<bindingRedirect oldVersion="0.0.0.0-8.12.0.0" newVersion="8.12.0.0" />
163-
</dependentAssembly>
164-
<dependentAssembly>
165-
<assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
166-
<bindingRedirect oldVersion="0.0.0.0-9.0.0.6" newVersion="9.0.0.6" />
167-
</dependentAssembly>
168-
<dependentAssembly>
169-
<assemblyIdentity name="Microsoft.IdentityModel.Logging" publicKeyToken="31bf3856ad364e35" culture="neutral" />
170-
<bindingRedirect oldVersion="0.0.0.0-8.12.0.0" newVersion="8.12.0.0" />
171-
</dependentAssembly>
172-
<dependentAssembly>
173-
<assemblyIdentity name="System.Security.AccessControl" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
174-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" />
175-
</dependentAssembly>
176-
<dependentAssembly>
177-
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
178-
<bindingRedirect oldVersion="0.0.0.0-4.1.6.0" newVersion="4.1.6.0" />
179-
</dependentAssembly>
180-
<dependentAssembly>
181-
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
182-
<bindingRedirect oldVersion="0.0.0.0-9.0.0.6" newVersion="9.0.0.6" />
183-
</dependentAssembly>
184-
<dependentAssembly>
185-
<assemblyIdentity name="System.Memory.Data" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
186-
<bindingRedirect oldVersion="0.0.0.0-9.0.0.6" newVersion="9.0.0.6" />
187-
</dependentAssembly>
188-
<dependentAssembly>
189-
<assemblyIdentity name="Microsoft.Identity.Client.Extensions.Msal" publicKeyToken="0a613f4dd989e8ae" culture="neutral" />
190-
<bindingRedirect oldVersion="0.0.0.0-4.72.1.0" newVersion="4.72.1.0" />
191-
</dependentAssembly>
192-
<dependentAssembly>
193-
<assemblyIdentity name="Microsoft.Bcl.TimeProvider" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
194-
<bindingRedirect oldVersion="0.0.0.0-9.0.0.6" newVersion="9.0.0.6" />
195-
</dependentAssembly>
196-
</assemblyBinding>
197-
</runtime>
19878
</configuration>

0 commit comments

Comments
 (0)