Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4fd13f2

Browse files
committed
Updated config options and web.config and app.config bindings.
1 parentf660157 commit4fd13f2

File tree

15 files changed

+99
-145
lines changed

15 files changed

+99
-145
lines changed

‎Core/Resgrid.Model/Resgrid.Model.csproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,8 @@
7171
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
7272
</PropertyGroup>
7373
<ItemGroup>
74-
<ReferenceInclude="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
75-
<HintPath>..\..\packages\BouncyCastle.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
76-
<Private>True</Private>
74+
<ReferenceInclude="BouncyCastle.Crypto, Version=1.8.2.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
75+
<HintPath>..\..\packages\BouncyCastle.1.8.2\lib\BouncyCastle.Crypto.dll</HintPath>
7776
</Reference>
7877
<ReferenceInclude="Dapper, Version=1.50.2.0, Culture=neutral, processorArchitecture=MSIL">
7978
<HintPath>..\..\packages\Dapper.1.50.2\lib\net451\Dapper.dll</HintPath>
@@ -93,8 +92,8 @@
9392
<HintPath>..\..\packages\Microsoft.AspNet.Identity.EntityFramework6.3.0.21\lib\Microsoft.AspNet.Identity.EntityFramework6.dll</HintPath>
9493
<Private>True</Private>
9594
</Reference>
96-
<ReferenceInclude="MimeKit, Version=1.18.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
97-
<HintPath>..\..\packages\MimeKit.1.18.1\lib\net451\MimeKit.dll</HintPath>
95+
<ReferenceInclude="MimeKit, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
96+
<HintPath>..\..\packages\MimeKit.2.0.4\lib\net45\MimeKit.dll</HintPath>
9897
</Reference>
9998
<ReferenceInclude="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
10099
<HintPath>..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>

‎Core/Resgrid.Model/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<packageid="BouncyCastle"version="1.8.1"targetFramework="net461" />
3+
<packageid="BouncyCastle"version="1.8.2"targetFramework="net472" />
44
<packageid="Dapper"version="1.50.2"targetFramework="net462" />
55
<packageid="EntityFramework"version="6.1.3"targetFramework="net451" />
66
<packageid="log4net"version="2.0.8"targetFramework="net462" />
77
<packageid="Microsoft.AspNet.Identity.EntityFramework6"version="3.0.21"targetFramework="net461" />
8-
<packageid="MimeKit"version="1.18.1"targetFramework="net462" />
8+
<packageid="MimeKit"version="2.0.4"targetFramework="net472" />
99
<packageid="Newtonsoft.Json"version="12.0.3"targetFramework="net472" />
1010
<packageid="Postmark"version="4.3.0"targetFramework="net472" />
1111
<packageid="protobuf-net"version="2.3.2"targetFramework="net462" />

‎Core/Resgrid.Services/Resgrid.Services.csproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,8 @@
7070
<ReferenceInclude="Autofac, Version=4.8.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
7171
<HintPath>..\..\packages\Autofac.4.8.1\lib\net45\Autofac.dll</HintPath>
7272
</Reference>
73-
<ReferenceInclude="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
74-
<HintPath>..\..\packages\BouncyCastle.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
75-
<Private>True</Private>
73+
<ReferenceInclude="BouncyCastle.Crypto, Version=1.8.2.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
74+
<HintPath>..\..\packages\BouncyCastle.1.8.2\lib\BouncyCastle.Crypto.dll</HintPath>
7675
</Reference>
7776
<ReferenceInclude="CommonServiceLocator, Version=1.4.0.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
7877
<HintPath>..\..\packages\CommonServiceLocator.1.4.0\lib\net45\CommonServiceLocator.dll</HintPath>
@@ -96,8 +95,8 @@
9695
<HintPath>..\..\packages\Microsoft.AspNet.Identity.EntityFramework6.3.0.21\lib\Microsoft.AspNet.Identity.EntityFramework6.dll</HintPath>
9796
<Private>True</Private>
9897
</Reference>
99-
<ReferenceInclude="MimeKit, Version=1.18.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
100-
<HintPath>..\..\packages\MimeKit.1.18.1\lib\net451\MimeKit.dll</HintPath>
98+
<ReferenceInclude="MimeKit, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
99+
<HintPath>..\..\packages\MimeKit.2.0.4\lib\net45\MimeKit.dll</HintPath>
101100
</Reference>
102101
<ReferenceInclude="MoreLinq, Version=2.8.21218.0, Culture=neutral, PublicKeyToken=384d532d7e88985d, processorArchitecture=MSIL">
103102
<HintPath>..\..\packages\morelinq.2.8.0\lib\net40\MoreLinq.dll</HintPath>

‎Core/Resgrid.Services/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
<packages>
33
<packageid="AsyncEnumerator"version="2.2.2"targetFramework="net462" />
44
<packageid="Autofac"version="4.8.1"targetFramework="net472" />
5-
<packageid="BouncyCastle"version="1.8.1"targetFramework="net461" />
5+
<packageid="BouncyCastle"version="1.8.2"targetFramework="net472" />
66
<packageid="CommonServiceLocator"version="1.4.0"targetFramework="net462"requireReinstallation="true" />
77
<packageid="CompareNETObjects"version="3.09.0.0"targetFramework="net462" />
88
<packageid="EntityFramework"version="6.1.3"targetFramework="net462" />
99
<packageid="jose-jwt"version="2.4.0"targetFramework="net462" />
1010
<packageid="log4net"version="2.0.8"targetFramework="net462" />
1111
<packageid="Microsoft.AspNet.Identity.EntityFramework6"version="3.0.21"targetFramework="net461" />
12-
<packageid="MimeKit"version="1.18.1"targetFramework="net462" />
12+
<packageid="MimeKit"version="2.0.4"targetFramework="net472" />
1313
<packageid="morelinq"version="2.8.0"targetFramework="net462" />
1414
<packageid="Newtonsoft.Json"version="12.0.3"targetFramework="net472" />
1515
<packageid="Postmark"version="4.3.0"targetFramework="net472" />

‎Providers/Resgrid.Providers.EmailProvider/Resgrid.Providers.EmailProvider.csproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,11 @@
7373
<ReferenceInclude="AWSSDK.SimpleEmail, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
7474
<HintPath>..\..\packages\AWSSDK.SimpleEmail.3.3.1.15\lib\net45\AWSSDK.SimpleEmail.dll</HintPath>
7575
</Reference>
76-
<ReferenceInclude="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
77-
<HintPath>..\..\packages\BouncyCastle.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
78-
<Private>True</Private>
76+
<ReferenceInclude="BouncyCastle.Crypto, Version=1.8.2.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
77+
<HintPath>..\..\packages\BouncyCastle.1.8.2\lib\BouncyCastle.Crypto.dll</HintPath>
7978
</Reference>
80-
<ReferenceInclude="MimeKit, Version=1.18.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
81-
<HintPath>..\..\packages\MimeKit.1.18.1\lib\net451\MimeKit.dll</HintPath>
79+
<ReferenceInclude="MimeKit, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
80+
<HintPath>..\..\packages\MimeKit.2.0.4\lib\net45\MimeKit.dll</HintPath>
8281
</Reference>
8382
<ReferenceInclude="Mustachio, Version=1.0.26.0, Culture=neutral, processorArchitecture=MSIL">
8483
<HintPath>..\..\packages\Mustachio.1.1.26\lib\net45\Mustachio.dll</HintPath>

‎Providers/Resgrid.Providers.EmailProvider/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<packageid="Autofac"version="4.8.1"targetFramework="net472" />
44
<packageid="AWSSDK.Core"version="3.3.14"targetFramework="net462" />
55
<packageid="AWSSDK.SimpleEmail"version="3.3.1.15"targetFramework="net462" />
6-
<packageid="BouncyCastle"version="1.8.1"targetFramework="net461" />
6+
<packageid="BouncyCastle"version="1.8.2"targetFramework="net472" />
77
<packageid="Microsoft.AspNet.Razor"version="3.2.3"targetFramework="net451" />
8-
<packageid="MimeKit"version="1.18.1"targetFramework="net462" />
8+
<packageid="MimeKit"version="2.0.4"targetFramework="net472" />
99
<packageid="Mustachio"version="1.1.26"targetFramework="net462" />
1010
<packageid="Newtonsoft.Json"version="12.0.3"targetFramework="net472" />
1111
<packageid="Postmark"version="4.3.0"targetFramework="net472" />

‎Tools/Resgrid.Console/Resgrid.Console.csproj‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,21 @@
1313
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1414
<Deterministic>true</Deterministic>
1515
<TargetFrameworkProfile />
16+
<PublishUrl>publish\</PublishUrl>
17+
<Install>true</Install>
18+
<InstallFrom>Disk</InstallFrom>
19+
<UpdateEnabled>false</UpdateEnabled>
20+
<UpdateMode>Foreground</UpdateMode>
21+
<UpdateInterval>7</UpdateInterval>
22+
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
23+
<UpdatePeriodically>false</UpdatePeriodically>
24+
<UpdateRequired>false</UpdateRequired>
25+
<MapFileExtensions>true</MapFileExtensions>
26+
<ApplicationRevision>0</ApplicationRevision>
27+
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
28+
<IsWebBootstrapper>false</IsWebBootstrapper>
29+
<UseApplicationTrust>false</UseApplicationTrust>
30+
<BootstrapperEnabled>true</BootstrapperEnabled>
1631
</PropertyGroup>
1732
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
1833
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -186,5 +201,17 @@
186201
<Name>Resgrid.Workers.Framework</Name>
187202
</ProjectReference>
188203
</ItemGroup>
204+
<ItemGroup>
205+
<BootstrapperPackageInclude=".NETFramework,Version=v4.7.2">
206+
<Visible>False</Visible>
207+
<ProductName>Microsoft .NET Framework 4.7.2 %28x86 and x64%29</ProductName>
208+
<Install>true</Install>
209+
</BootstrapperPackage>
210+
<BootstrapperPackageInclude="Microsoft.Net.Framework.3.5.SP1">
211+
<Visible>False</Visible>
212+
<ProductName>.NET Framework 3.5 SP1</ProductName>
213+
<Install>false</Install>
214+
</BootstrapperPackage>
215+
</ItemGroup>
189216
<ImportProject="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
190217
</Project>

‎Tools/Resgrid.EmailProcessor/Resgrid.EmailProcessor.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
<ReferenceInclude="Autofac, Version=4.8.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
3838
<HintPath>..\..\packages\Autofac.4.8.1\lib\net45\Autofac.dll</HintPath>
3939
</Reference>
40-
<ReferenceInclude="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
41-
<HintPath>..\..\packages\BouncyCastle.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
40+
<ReferenceInclude="BouncyCastle.Crypto, Version=1.8.2.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
41+
<HintPath>..\..\packages\BouncyCastle.1.8.2\lib\BouncyCastle.Crypto.dll</HintPath>
4242
</Reference>
4343
<ReferenceInclude="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
4444
<HintPath>..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
@@ -52,8 +52,8 @@
5252
<ReferenceInclude="Microsoft.AspNet.Identity.EntityFramework6, Version=3.0.21.0, Culture=neutral, processorArchitecture=MSIL">
5353
<HintPath>..\..\packages\Microsoft.AspNet.Identity.EntityFramework6.3.0.21\lib\Microsoft.AspNet.Identity.EntityFramework6.dll</HintPath>
5454
</Reference>
55-
<ReferenceInclude="MimeKit, Version=1.18.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
56-
<HintPath>..\..\packages\MimeKit.1.18.1\lib\net451\MimeKit.dll</HintPath>
55+
<ReferenceInclude="MimeKit, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
56+
<HintPath>..\..\packages\MimeKit.2.0.4\lib\net45\MimeKit.dll</HintPath>
5757
</Reference>
5858
<ReferenceInclude="SmtpServer, Version=6.2.0.0, Culture=neutral, processorArchitecture=MSIL">
5959
<HintPath>..\..\packages\SmtpServer.6.2.0\lib\netstandard2.0\SmtpServer.dll</HintPath>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<packageid="Autofac"version="4.8.1"targetFramework="net472" />
4-
<packageid="BouncyCastle"version="1.8.1"targetFramework="net462" />
4+
<packageid="BouncyCastle"version="1.8.2"targetFramework="net472" />
55
<packageid="EntityFramework"version="6.1.3"targetFramework="net462" />
66
<packageid="log4net"version="1.2.10"targetFramework="net462" />
77
<packageid="Microsoft.AspNet.Identity.EntityFramework6"version="3.0.21"targetFramework="net462" />
8-
<packageid="MimeKit"version="1.18.1"targetFramework="net462" />
8+
<packageid="MimeKit"version="2.0.4"targetFramework="net472" />
99
<packageid="SmtpServer"version="6.2.0"targetFramework="net462" />
1010
</packages>

‎Web/Resgrid.Services/Resgrid.Web.Services.csproj‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,8 @@
6666
<ReferenceInclude="Autofac.Integration.WebApi, Version=4.1.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
6767
<HintPath>..\..\packages\Autofac.WebApi2.4.1.0\lib\net45\Autofac.Integration.WebApi.dll</HintPath>
6868
</Reference>
69-
<ReferenceInclude="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
70-
<HintPath>..\..\packages\BouncyCastle.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
71-
<Private>True</Private>
69+
<ReferenceInclude="BouncyCastle.Crypto, Version=1.8.2.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
70+
<HintPath>..\..\packages\BouncyCastle.1.8.2\lib\BouncyCastle.Crypto.dll</HintPath>
7271
</Reference>
7372
<ReferenceInclude="CommonServiceLocator, Version=1.4.0.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
7473
<HintPath>..\..\packages\CommonServiceLocator.1.4.0\lib\net45\CommonServiceLocator.dll</HintPath>
@@ -182,8 +181,8 @@
182181
<ReferenceInclude="Microsoft.WindowsAzure.ServiceRuntime, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
183182
<Private>False</Private>
184183
</Reference>
185-
<ReferenceInclude="MimeKit, Version=1.18.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
186-
<HintPath>..\..\packages\MimeKit.1.18.1\lib\net451\MimeKit.dll</HintPath>
184+
<ReferenceInclude="MimeKit, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
185+
<HintPath>..\..\packages\MimeKit.2.0.4\lib\net45\MimeKit.dll</HintPath>
187186
</Reference>
188187
<ReferenceInclude="NewRelic.Api.Agent, Version=6.16.178.0, Culture=neutral, PublicKeyToken=06552fced0b33d87, processorArchitecture=MSIL">
189188
<HintPath>..\..\packages\NewRelicWindowsAzure.6.16.178.0\lib\NewRelic.Api.Agent.dll</HintPath>
@@ -469,8 +468,8 @@
469468
<CompileInclude="Controllers\Version3\Models\Calls\CallNoteResult.cs" />
470469
<CompileInclude="Controllers\Version3\Models\Calls\CallPriorityDataResult.cs" />
471470
<CompileInclude="Controllers\Version3\Models\Calls\CallProtocolResult.cs" />
472-
<CompileInclude="Controllers\Version3\Models\Calls\CallResult.cs" />
473471
<CompileInclude="Controllers\Version3\Models\Calls\CallResultEx.cs" />
472+
<CompileInclude="Controllers\Version3\Models\Calls\CallResult.cs" />
474473
<CompileInclude="Controllers\Version3\Models\Calls\CallTypeResult.cs" />
475474
<CompileInclude="Controllers\Version3\Models\Calls\CloseCallInput.cs" />
476475
<CompileInclude="Controllers\Version3\Models\Calls\DepartmentCallDispatchGroupResult.cs" />

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp