Skip to content

Commit 78022c6

Browse files
zuzannakwiatkowskazuzannakwiatkowska
committed
Updated to TX31
1 parent 524ae33 commit 78022c6

File tree

3 files changed

+85
-24
lines changed

3 files changed

+85
-24
lines changed

‎tx_blockchain/Web.config‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,16 @@
1111
<add key="ClientValidationEnabled" value="true" />
1212
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
1313
</appSettings>
14+
<!--
15+
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
16+
17+
The following attributes can be set on the <httpRuntime> tag.
18+
<system.Web>
19+
<httpRuntime targetFramework="4.8.1" />
20+
</system.Web>
21+
-->
1422
<system.web>
15-
<compilation debug="true" targetFramework="4.7.2" />
23+
<compilation debug="true" targetFramework="4.8.1" />
1624
<httpRuntime targetFramework="4.7.2" />
1725
<pages>
1826
<namespaces>
@@ -22,7 +30,7 @@
2230
<add namespace="System.Web.Mvc.Html" />
2331
<add namespace="System.Web.Routing" />
2432
<add namespace="System.Web.WebPages" />
25-
</namespaces>
33+
</namespaces>
2634
</pages>
2735
</system.web>
2836
<system.webServer>
@@ -38,7 +46,7 @@
3846
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
3947
<dependentAssembly>
4048
<assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
41-
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
49+
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
4250
</dependentAssembly>
4351
<dependentAssembly>
4452
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
@@ -60,6 +68,14 @@
6068
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
6169
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
6270
</dependentAssembly>
71+
<dependentAssembly>
72+
<assemblyIdentity name="TXTextControl" publicKeyToken="6b83fe9a75cfb638" culture="neutral" />
73+
<bindingRedirect oldVersion="0.0.0.0-27.0.2000.500" newVersion="27.0.2000.500" />
74+
</dependentAssembly>
75+
<dependentAssembly>
76+
<assemblyIdentity name="TXTextControl.Server" publicKeyToken="6b83fe9a75cfb638" culture="neutral" />
77+
<bindingRedirect oldVersion="0.0.0.0-27.0.1200.500" newVersion="27.0.1200.500" />
78+
</dependentAssembly>
6379
</assemblyBinding>
6480
</runtime>
6581
<system.codedom>

‎tx_blockchain/packages.config‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="BuildBundlerMinifier" version="3.2.449" targetFramework="net481" />
34
<package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net472" />
45
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net472" />
56
<package id="Microsoft.AspNet.WebApi" version="5.2.7" targetFramework="net472" />
@@ -8,9 +9,16 @@
89
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net472" />
910
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
1011
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net472" />
11-
<package id="Microsoft.IdentityModel.Logging" version="6.5.0" targetFramework="net472" />
12-
<package id="Microsoft.IdentityModel.Tokens" version="6.5.0" targetFramework="net472" />
12+
<package id="Microsoft.IdentityModel.Logging" version="6.16.0" targetFramework="net481" />
13+
<package id="Microsoft.IdentityModel.Tokens" version="6.16.0" targetFramework="net481" />
1314
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net472" />
14-
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
15-
<package id="TXTextControl.Web.DocumentViewer" version="28.0.203.500" targetFramework="net472" />
15+
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net481" />
16+
<package id="System.IO" version="4.3.0" targetFramework="net481" />
17+
<package id="System.Net.Http" version="4.3.4" targetFramework="net481" />
18+
<package id="System.Runtime" version="4.3.0" targetFramework="net481" />
19+
<package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net481" />
20+
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net481" />
21+
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net481" />
22+
<package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net481" />
23+
<package id="TXTextControl.Web.DocumentViewer" version="31.0.1" targetFramework="net481" />
1624
</packages>

‎tx_blockchain/tx_blockchain.csproj‎

Lines changed: 54 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
1414
<RootNamespace>tx_blockchain</RootNamespace>
1515
<AssemblyName>tx_blockchain</AssemblyName>
16-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
1717
<UseIISExpress>true</UseIISExpress>
1818
<Use64BitIISExpress />
1919
<IISExpressSSLPort />
@@ -23,6 +23,7 @@
2323
<UseGlobalApplicationHostFile />
2424
<NuGetPackageImportStamp>
2525
</NuGetPackageImportStamp>
26+
<TargetFrameworkProfile />
2627
</PropertyGroup>
2728
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2829
<DebugSymbols>true</DebugSymbols>
@@ -47,43 +48,77 @@
4748
<HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
4849
</Reference>
4950
<Reference Include="Microsoft.CSharp" />
50-
<Reference Include="Microsoft.IdentityModel.Logging, Version=6.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51-
<HintPath>..\packages\Microsoft.IdentityModel.Logging.6.5.0\lib\net461\Microsoft.IdentityModel.Logging.dll</HintPath>
51+
<Reference Include="Microsoft.IdentityModel.Logging, Version=6.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52+
<HintPath>..\packages\Microsoft.IdentityModel.Logging.6.16.0\lib\net472\Microsoft.IdentityModel.Logging.dll</HintPath>
5253
</Reference>
53-
<Reference Include="Microsoft.IdentityModel.Tokens, Version=6.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
54-
<HintPath>..\packages\Microsoft.IdentityModel.Tokens.6.5.0\lib\net461\Microsoft.IdentityModel.Tokens.dll</HintPath>
54+
<Reference Include="Microsoft.IdentityModel.Tokens, Version=6.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
55+
<HintPath>..\packages\Microsoft.IdentityModel.Tokens.6.16.0\lib\net472\Microsoft.IdentityModel.Tokens.dll</HintPath>
5556
</Reference>
56-
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
57-
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
57+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
58+
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
59+
</Reference>
60+
<Reference Include="System.ComponentModel.Composition" />
61+
<Reference Include="System.Data.DataSetExtensions" />
62+
<Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
63+
<HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
64+
<Private>True</Private>
65+
<Private>True</Private>
5866
</Reference>
5967
<Reference Include="System.Net" />
60-
<Reference Include="System.Net.Http" />
68+
<Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
69+
<HintPath>..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
70+
<Private>True</Private>
71+
<Private>True</Private>
72+
</Reference>
73+
<Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
74+
<HintPath>..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
75+
<Private>True</Private>
76+
<Private>True</Private>
77+
</Reference>
78+
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
79+
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
80+
<Private>True</Private>
81+
<Private>True</Private>
82+
</Reference>
83+
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
84+
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
85+
<Private>True</Private>
86+
<Private>True</Private>
87+
</Reference>
88+
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
89+
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
90+
<Private>True</Private>
91+
<Private>True</Private>
92+
</Reference>
93+
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
94+
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
95+
<Private>True</Private>
96+
<Private>True</Private>
97+
</Reference>
6198
<Reference Include="System.Web.DynamicData" />
6299
<Reference Include="System.Web.Entity" />
63100
<Reference Include="System.Web.ApplicationServices" />
64101
<Reference Include="System.ComponentModel.DataAnnotations" />
65102
<Reference Include="System" />
66103
<Reference Include="System.Data" />
67-
<Reference Include="System.Core" />
68-
<Reference Include="System.Data.DataSetExtensions" />
69104
<Reference Include="System.Web.Extensions" />
70-
<Reference Include="System.Xml.Linq" />
71105
<Reference Include="System.Drawing" />
72106
<Reference Include="System.Web" />
73107
<Reference Include="System.Xml" />
74108
<Reference Include="System.Configuration" />
75109
<Reference Include="System.Web.Services" />
76110
<Reference Include="System.EnterpriseServices" />
77-
<Reference Include="TXTextControl, Version=27.0.2000.500, Culture=neutral, PublicKeyToken=6b83fe9a75cfb638, processorArchitecture=MSIL">
111+
<Reference Include="System.Xml.Linq" />
112+
<Reference Include="TXTextControl, Version=31.0.2400.500, Culture=neutral, PublicKeyToken=6b83fe9a75cfb638, processorArchitecture=MSIL">
78113
<SpecificVersion>False</SpecificVersion>
79-
<HintPath>..\..\..\..\..\..\Program Files\Text Control GmbH\TX Text Control 27.0.NET Server for ASP.NET\Assembly\TXTextControl.dll</HintPath>
114+
<HintPath>..\..\..\..\..\..\Program Files\Text Control GmbH\TX Text Control 31.0.NET Server for ASP.NET\Assembly\TXTextControl.dll</HintPath>
80115
</Reference>
81-
<Reference Include="TXTextControl.Server, Version=27.0.1200.500, Culture=neutral, PublicKeyToken=6b83fe9a75cfb638, processorArchitecture=MSIL">
116+
<Reference Include="TXTextControl.Server, Version=31.0.1600.500, Culture=neutral, PublicKeyToken=6b83fe9a75cfb638, processorArchitecture=MSIL">
82117
<SpecificVersion>False</SpecificVersion>
83-
<HintPath>..\..\..\..\..\..\Program Files\Text Control GmbH\TX Text Control 27.0.NET Server for ASP.NET\Assembly\TXTextControl.Server.dll</HintPath>
118+
<HintPath>..\..\..\..\..\..\Program Files\Text Control GmbH\TX Text Control 31.0.NET Server for ASP.NET\Assembly\TXTextControl.Server.dll</HintPath>
84119
</Reference>
85-
<Reference Include="TXTextControl.Web.MVC.DocumentViewer, Version=28.0.201.500, Culture=neutral, processorArchitecture=MSIL">
86-
<HintPath>..\packages\TXTextControl.Web.DocumentViewer.28.0.203.500\lib\net45\TXTextControl.Web.MVC.DocumentViewer.dll</HintPath>
120+
<Reference Include="TXTextControl.Web.MVC.DocumentViewer, Version=31.0.406.500, Culture=neutral, PublicKeyToken=6b83fe9a75cfb638, processorArchitecture=MSIL">
121+
<HintPath>..\packages\TXTextControl.Web.DocumentViewer.31.0.1\lib\net45\TXTextControl.Web.MVC.DocumentViewer.dll</HintPath>
87122
</Reference>
88123
</ItemGroup>
89124
<ItemGroup>
@@ -287,7 +322,9 @@
287322
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
288323
</PropertyGroup>
289324
<Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
325+
<Error Condition="!Exists('..\packages\BuildBundlerMinifier.3.2.449\build\BuildBundlerMinifier.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\BuildBundlerMinifier.3.2.449\build\BuildBundlerMinifier.targets'))" />
290326
</Target>
327+
<Import Project="..\packages\BuildBundlerMinifier.3.2.449\build\BuildBundlerMinifier.targets" Condition="Exists('..\packages\BuildBundlerMinifier.3.2.449\build\BuildBundlerMinifier.targets')" />
291328
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
292329
Other similar extension points exist, see Microsoft.Common.targets.
293330
<Target Name="BeforeBuild">

0 commit comments

Comments
 (0)