Skip to content

Commit 32dd21e

Browse files
ronaldbarendseronaldbarendse
committed
Update TFM to 4.5.2
1 parent 012b642 commit 32dd21e

File tree

4 files changed

+328
-110
lines changed

4 files changed

+328
-110
lines changed

‎src/Umbraco.Deploy.Contrib.Connectors/Umbraco.Deploy.Contrib.Connectors.csproj

Lines changed: 90 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Umbraco.Deploy.Contrib.Connectors</RootNamespace>
1111
<AssemblyName>Umbraco.Deploy.Contrib.Connectors</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
</PropertyGroup>
1515
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,8 +39,8 @@
3939
<Reference Include="businesslogic, Version=1.0.6396.36624, Culture=neutral, processorArchitecture=MSIL">
4040
<HintPath>..\packages\UmbracoCms.Core.7.6.4\lib\net45\businesslogic.dll</HintPath>
4141
</Reference>
42-
<Reference Include="ClientDependency.Core, Version=1.9.2.0, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\packages\ClientDependency.1.9.2\lib\net45\ClientDependency.Core.dll</HintPath>
42+
<Reference Include="ClientDependency.Core, Version=1.9.9.0, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\packages\ClientDependency.1.9.9\lib\net45\ClientDependency.Core.dll</HintPath>
4444
</Reference>
4545
<Reference Include="ClientDependency.Core.Mvc, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
4646
<HintPath>..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
@@ -72,6 +72,15 @@
7272
<Reference Include="interfaces, Version=1.0.6396.36619, Culture=neutral, processorArchitecture=MSIL">
7373
<HintPath>..\packages\UmbracoCms.Core.7.6.4\lib\net45\interfaces.dll</HintPath>
7474
</Reference>
75+
<Reference Include="LightInject, Version=4.1.5.0, Culture=neutral, processorArchitecture=MSIL">
76+
<HintPath>..\packages\LightInject.4.1.5\lib\net45\LightInject.dll</HintPath>
77+
</Reference>
78+
<Reference Include="LightInject.Annotation, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
79+
<HintPath>..\packages\LightInject.Annotation.1.1.0\lib\net45\LightInject.Annotation.dll</HintPath>
80+
</Reference>
81+
<Reference Include="LightInject.Web, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
82+
<HintPath>..\packages\LightInject.Web.1.1.0\lib\net45\LightInject.Web.dll</HintPath>
83+
</Reference>
7584
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
7685
<HintPath>..\packages\UmbracoCms.Core.7.6.4\lib\net45\log4net.dll</HintPath>
7786
</Reference>
@@ -102,6 +111,9 @@
102111
<Reference Include="Microsoft.Owin, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
103112
<HintPath>..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
104113
</Reference>
114+
<Reference Include="Microsoft.Owin.Cors, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
115+
<HintPath>..\packages\Microsoft.Owin.Cors.3.0.1\lib\net45\Microsoft.Owin.Cors.dll</HintPath>
116+
</Reference>
105117
<Reference Include="Microsoft.Owin.Host.SystemWeb, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
106118
<HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.3.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
107119
</Reference>
@@ -120,8 +132,8 @@
120132
<Reference Include="MiniProfiler, Version=2.1.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
121133
<HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
122134
</Reference>
123-
<Reference Include="MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
124-
<HintPath>..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll</HintPath>
135+
<Reference Include="MySql.Data, Version=6.9.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
136+
<HintPath>..\packages\MySql.Data.6.9.12\lib\net45\MySql.Data.dll</HintPath>
125137
</Reference>
126138
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
127139
<HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -130,7 +142,7 @@
130142
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
131143
</Reference>
132144
<Reference Include="Semver, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
133-
<HintPath>..\packages\semver.1.1.2\lib\net45\Semver.dll</HintPath>
145+
<HintPath>..\packages\semver.1.1.2\lib\net451\Semver.dll</HintPath>
134146
</Reference>
135147
<Reference Include="SQLCE4Umbraco, Version=1.0.6396.36627, Culture=neutral, processorArchitecture=MSIL">
136148
<HintPath>..\packages\UmbracoCms.Core.7.6.4\lib\net45\SQLCE4Umbraco.dll</HintPath>
@@ -151,6 +163,9 @@
151163
<HintPath>..\packages\System.Threading.Tasks.Dataflow.4.7.0\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll</HintPath>
152164
</Reference>
153165
<Reference Include="System.Web" />
166+
<Reference Include="System.Web.Cors, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
167+
<HintPath>..\packages\Microsoft.AspNet.Cors.5.0.0\lib\net45\System.Web.Cors.dll</HintPath>
168+
</Reference>
154169
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
155170
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
156171
</Reference>
@@ -192,7 +207,12 @@
192207
</Reference>
193208
<Reference Include="Umbraco.Deploy, Version=1.0.17.0, Culture=neutral, processorArchitecture=MSIL">
194209
<HintPath>..\packages\UmbracoDeploy.1.0.17\lib\net45\Umbraco.Deploy.dll</HintPath>
195-
<Private>False</Private>
210+
</Reference>
211+
<Reference Include="Umbraco.Deploy.Cloud, Version=1.0.17.0, Culture=neutral, processorArchitecture=MSIL">
212+
<HintPath>..\packages\UmbracoDeploy.1.0.17\lib\net45\Umbraco.Deploy.Cloud.dll</HintPath>
213+
</Reference>
214+
<Reference Include="Umbraco.Deploy.UI, Version=1.0.17.0, Culture=neutral, processorArchitecture=MSIL">
215+
<HintPath>..\packages\UmbracoDeploy.1.0.17\lib\net45\Umbraco.Deploy.UI.dll</HintPath>
196216
</Reference>
197217
<Reference Include="umbraco.editorControls, Version=1.0.6396.36634, Culture=neutral, processorArchitecture=MSIL">
198218
<HintPath>..\packages\UmbracoCms.Core.7.6.4\lib\net45\umbraco.editorControls.dll</HintPath>
@@ -233,8 +253,71 @@
233253
<Compile Include="ValueConnectors\UrlPickerValueConnector.cs" />
234254
</ItemGroup>
235255
<ItemGroup>
256+
<None Include="app.config" />
257+
<None Include="App_Plugins\Deploy\package.manifest" />
258+
<None Include="Config\UmbracoDeploy.config" />
259+
<None Include="Config\UmbracoDeploy.Settings.config" />
236260
<None Include="packages.config" />
237261
</ItemGroup>
262+
<ItemGroup>
263+
<Content Include="App_Plugins\Deploy\assets\css\deploy.css" />
264+
<Content Include="App_Plugins\Deploy\js\deploy.components.js" />
265+
<Content Include="App_Plugins\Deploy\js\deploy.controllers.js" />
266+
<Content Include="App_Plugins\Deploy\js\deploy.decorators.js" />
267+
<Content Include="App_Plugins\Deploy\js\deploy.filters.js" />
268+
<Content Include="App_Plugins\Deploy\js\deploy.modules.js" />
269+
<Content Include="App_Plugins\Deploy\js\deploy.resources.js" />
270+
<Content Include="App_Plugins\Deploy\js\deploy.services.js" />
271+
<Content Include="App_Plugins\Deploy\js\nonodes.bootstrap.js" />
272+
<Content Include="App_Plugins\Deploy\js\nonodes.modules.js" />
273+
<Content Include="App_Plugins\Deploy\lang\cs-CZ.xml" />
274+
<Content Include="App_Plugins\Deploy\lang\da-DK.xml" />
275+
<Content Include="App_Plugins\Deploy\lang\de-DE.xml" />
276+
<Content Include="App_Plugins\Deploy\lang\en-GB.xml" />
277+
<Content Include="App_Plugins\Deploy\lang\en-US.xml" />
278+
<Content Include="App_Plugins\Deploy\lang\es-ES.xml" />
279+
<Content Include="App_Plugins\Deploy\lang\fr-FR.xml" />
280+
<Content Include="App_Plugins\Deploy\lang\he-IL.xml" />
281+
<Content Include="App_Plugins\Deploy\lang\it-IT.xml" />
282+
<Content Include="App_Plugins\Deploy\lang\ja-JP.xml" />
283+
<Content Include="App_Plugins\Deploy\lang\ko-KR.xml" />
284+
<Content Include="App_Plugins\Deploy\lang\nb-NO.xml" />
285+
<Content Include="App_Plugins\Deploy\lang\nl-NL.xml" />
286+
<Content Include="App_Plugins\Deploy\lang\pl-PL.xml" />
287+
<Content Include="App_Plugins\Deploy\lang\pt-BR.xml" />
288+
<Content Include="App_Plugins\Deploy\lang\ru-RU.xml" />
289+
<Content Include="App_Plugins\Deploy\lang\sv-SE.xml" />
290+
<Content Include="App_Plugins\Deploy\lang\zh-CN.xml" />
291+
<Content Include="App_Plugins\Deploy\lib\signalr\jquery.signalR.min.js" />
292+
<Content Include="App_Plugins\Deploy\views\components\deploy\uddeploycomplete\uddeploycomplete.html" />
293+
<Content Include="App_Plugins\Deploy\views\components\deploy\uddeployprogress\uddeployprogress.html" />
294+
<Content Include="App_Plugins\Deploy\views\components\deploy\uddeployqueue\uddeployqueue.html" />
295+
<Content Include="App_Plugins\Deploy\views\components\errors\udcollisionerror\udcollisionerror.html" />
296+
<Content Include="App_Plugins\Deploy\views\components\errors\uddeployschemamismatcherror\uddeployschemamismatcherror.html" />
297+
<Content Include="App_Plugins\Deploy\views\components\errors\udrestoreschemamismatcherror\udrestoreschemamismatcherror.html" />
298+
<Content Include="App_Plugins\Deploy\views\components\restore\udrestorecomplete\udrestorecomplete.html" />
299+
<Content Include="App_Plugins\Deploy\views\components\restore\udrestoreprogress\udrestoreprogress.html" />
300+
<Content Include="App_Plugins\Deploy\views\components\udconnectlocal\udconnectlocal.html" />
301+
<Content Include="App_Plugins\Deploy\views\components\udcontentflow\udcontentflow.html" />
302+
<Content Include="App_Plugins\Deploy\views\components\uderror\uderror.html" />
303+
<Content Include="App_Plugins\Deploy\views\components\udinfobox\udinfobox.html" />
304+
<Content Include="App_Plugins\Deploy\views\components\udstarterkitselector\udstarterkitselector.html" />
305+
<Content Include="App_Plugins\Deploy\views\components\workspace\udworkspaceadd\udworkspaceadd.html" />
306+
<Content Include="App_Plugins\Deploy\views\components\workspace\udworkspaceinfo\udworkspaceinfo.html" />
307+
<Content Include="App_Plugins\Deploy\views\components\workspace\udworkspace\udworkspace.html" />
308+
<Content Include="App_Plugins\Deploy\views\dashboards\dashboard.html" />
309+
<Content Include="App_Plugins\Deploy\views\dialogs\addtoqueue.html" />
310+
<Content Include="App_Plugins\Deploy\views\dialogs\deploy.html" />
311+
<Content Include="App_Plugins\Deploy\views\dialogs\partial-restore.html" />
312+
<Content Include="App_Plugins\Deploy\views\dialogs\restore.html" />
313+
<Content Include="App_Plugins\Deploy\views\partials\add-workspace.html" />
314+
<Content Include="App_Plugins\Deploy\views\partials\done-deploy.html" />
315+
<Content Include="App_Plugins\Deploy\views\partials\flow.html" />
316+
<Content Include="App_Plugins\Deploy\views\partials\progress.html" />
317+
<Content Include="App_Plugins\Deploy\views\partials\queue.html" />
318+
<Content Include="App_Plugins\Deploy\views\partials\workspace-info.html" />
319+
<Content Include="Config\splashes\noNodes.aspx" />
320+
</ItemGroup>
238321
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
239322
<Import Project="..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.3.1\tools\AutoMapper.targets')" />
240323
</Project>

‎src/Umbraco.Deploy.Contrib.Connectors/packages.config

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AutoMapper" version="3.3.1" targetFramework="net45" />
4-
<package id="ClientDependency" version="1.9.2" targetFramework="net45" />
5-
<package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net45" />
6-
<package id="Examine" version="0.1.83" targetFramework="net45" />
7-
<package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net45" />
8-
<package id="ImageProcessor" version="2.5.3" targetFramework="net45" />
9-
<package id="ImageProcessor.Web" version="4.8.3" targetFramework="net45" />
10-
<package id="LightInject" version="4.1.5" targetFramework="net45" />
11-
<package id="LightInject.Annotation" version="1.1.0" targetFramework="net45" />
12-
<package id="LightInject.Web" version="1.1.0" targetFramework="net45" />
13-
<package id="log4net" version="2.0.8" targetFramework="net45" />
14-
<package id="Log4Net.Async" version="2.0.4" targetFramework="net45" />
15-
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
16-
<package id="Markdown" version="1.14.7" targetFramework="net45" />
17-
<package id="Microsoft.AspNet.Cors" version="5.0.0" targetFramework="net45" />
18-
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />
19-
<package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net45" />
20-
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
21-
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
22-
<package id="Microsoft.AspNet.SignalR.Core" version="2.2.1" targetFramework="net45" />
23-
<package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net45" />
24-
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
25-
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
26-
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net45" />
27-
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
28-
<package id="Microsoft.IO.RecyclableMemoryStream" version="1.2.1" targetFramework="net45" />
29-
<package id="Microsoft.Owin" version="3.0.1" targetFramework="net45" />
30-
<package id="Microsoft.Owin.Cors" version="3.0.1" targetFramework="net45" />
31-
<package id="Microsoft.Owin.Host.SystemWeb" version="3.0.1" targetFramework="net45" />
32-
<package id="Microsoft.Owin.Security" version="3.0.1" targetFramework="net45" />
33-
<package id="Microsoft.Owin.Security.Cookies" version="3.0.1" targetFramework="net45" />
34-
<package id="Microsoft.Owin.Security.OAuth" version="3.0.1" targetFramework="net45" />
35-
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
36-
<package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
37-
<package id="MySql.Data" version="6.9.9" targetFramework="net45" />
38-
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
39-
<package id="Owin" version="1.0" targetFramework="net45" />
40-
<package id="semver" version="1.1.2" targetFramework="net45" />
41-
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
42-
<package id="System.Threading.Tasks.Dataflow" version="4.7.0" targetFramework="net45" />
43-
<package id="UmbracoCms.Core" version="7.6.4" targetFramework="net45" />
44-
<package id="UmbracoDeploy" version="1.0.17" targetFramework="net45" />
45-
<package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
3+
<package id="AutoMapper" version="3.3.1" targetFramework="net452" />
4+
<package id="ClientDependency" version="1.9.9" targetFramework="net452" />
5+
<package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net452" />
6+
<package id="Examine" version="0.1.83" targetFramework="net452" />
7+
<package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net452" />
8+
<package id="ImageProcessor" version="2.5.3" targetFramework="net452" />
9+
<package id="ImageProcessor.Web" version="4.8.3" targetFramework="net452" />
10+
<package id="LightInject" version="4.1.5" targetFramework="net452" />
11+
<package id="LightInject.Annotation" version="1.1.0" targetFramework="net452" />
12+
<package id="LightInject.Web" version="1.1.0" targetFramework="net452" />
13+
<package id="log4net" version="2.0.8" targetFramework="net452" />
14+
<package id="Log4Net.Async" version="2.0.4" targetFramework="net452" />
15+
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net452" />
16+
<package id="Markdown" version="1.14.7" targetFramework="net452" />
17+
<package id="Microsoft.AspNet.Cors" version="5.0.0" targetFramework="net452" />
18+
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net452" />
19+
<package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net452" />
20+
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net452" />
21+
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net452" />
22+
<package id="Microsoft.AspNet.SignalR.Core" version="2.2.1" targetFramework="net452" />
23+
<package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net452" />
24+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
25+
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
26+
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net452" />
27+
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net452" />
28+
<package id="Microsoft.IO.RecyclableMemoryStream" version="1.2.1" targetFramework="net452" />
29+
<package id="Microsoft.Owin" version="3.0.1" targetFramework="net452" />
30+
<package id="Microsoft.Owin.Cors" version="3.0.1" targetFramework="net452" />
31+
<package id="Microsoft.Owin.Host.SystemWeb" version="3.0.1" targetFramework="net452" />
32+
<package id="Microsoft.Owin.Security" version="3.0.1" targetFramework="net452" />
33+
<package id="Microsoft.Owin.Security.Cookies" version="3.0.1" targetFramework="net452" />
34+
<package id="Microsoft.Owin.Security.OAuth" version="3.0.1" targetFramework="net452" />
35+
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
36+
<package id="MiniProfiler" version="2.1.0" targetFramework="net452" />
37+
<package id="MySql.Data" version="6.9.12" targetFramework="net452" />
38+
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net452" />
39+
<package id="Owin" version="1.0" targetFramework="net452" />
40+
<package id="semver" version="1.1.2" targetFramework="net452" />
41+
<package id="SharpZipLib" version="0.86.0" targetFramework="net452" />
42+
<package id="System.Threading.Tasks.Dataflow" version="4.7.0" targetFramework="net452" />
43+
<package id="UmbracoCms.Core" version="7.6.4" targetFramework="net452" />
44+
<package id="UmbracoDeploy" version="1.0.17" targetFramework="net452" />
45+
<package id="xmlrpcnet" version="2.5.0" targetFramework="net452" />
4646
</packages>

0 commit comments

Comments
 (0)