Skip to content

Commit 09445b4

Browse files
rajendranr-5483rajendranr-5483
authored
Merge pull request #11 from PrasanthMadhaiyan/master
feature(EJ2-66059): Updated the Loan Calculator sample package versions to the latest versions.
2 parents d60637b + 727695e commit 09445b4

File tree

3 files changed

+92
-58
lines changed

3 files changed

+92
-58
lines changed

‎Loan_Calculator.csproj

Lines changed: 41 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
1414
<RootNamespace>EJ2MVCSampleBrowser</RootNamespace>
1515
<AssemblyName>EJ2MVCSampleBrowser</AssemblyName>
16-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1717
<MvcBuildViews>false</MvcBuildViews>
1818
<UseIISExpress>true</UseIISExpress>
1919
<IISExpressSSLPort />
@@ -24,6 +24,7 @@
2424
<NuGetPackageImportStamp>
2525
</NuGetPackageImportStamp>
2626
<Use64BitIISExpress />
27+
<TargetFrameworkProfile />
2728
</PropertyGroup>
2829
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2930
<DebugSymbols>true</DebugSymbols>
@@ -44,28 +45,26 @@
4445
</PropertyGroup>
4546
<ItemGroup>
4647
<Reference Include="Microsoft.CSharp" />
47-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
48-
<HintPath>packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
48+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
49+
<HintPath>packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
4950
</Reference>
50-
<Reference Include="Syncfusion.EJ2, Version=19.4500.0.38, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
51-
<HintPath>packages\Syncfusion.EJ2.MVC5.19.4.0.38\lib\net45\Syncfusion.EJ2.dll</HintPath>
51+
<Reference Include="Syncfusion.EJ2, Version=20.4500.0.38, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
52+
<HintPath>packages\Syncfusion.EJ2.MVC5.20.4.0.38\lib\net45\Syncfusion.EJ2.dll</HintPath>
5253
</Reference>
53-
<Reference Include="Syncfusion.Licensing, Version=19.4460.0.38, Culture=neutral, PublicKeyToken=632609b4d040f6b4, processorArchitecture=MSIL">
54-
<HintPath>packages\Syncfusion.Licensing.19.4.0.38\lib\net46\Syncfusion.Licensing.dll</HintPath>
54+
<Reference Include="Syncfusion.Licensing, Version=20.4460.0.38, Culture=neutral, PublicKeyToken=632609b4d040f6b4, processorArchitecture=MSIL">
55+
<HintPath>packages\Syncfusion.Licensing.20.4.0.38\lib\net46\Syncfusion.Licensing.dll</HintPath>
5556
</Reference>
5657
<Reference Include="System" />
5758
<Reference Include="System.Data" />
59+
<Reference Include="System.Data.DataSetExtensions" />
5860
<Reference Include="System.Data.Linq" />
5961
<Reference Include="System.Drawing" />
6062
<Reference Include="System.Web.DynamicData" />
6163
<Reference Include="System.Web.Entity" />
6264
<Reference Include="System.Web.ApplicationServices" />
6365
<Reference Include="System.ComponentModel.DataAnnotations" />
64-
<Reference Include="System.Core" />
65-
<Reference Include="System.Data.DataSetExtensions" />
66-
<Reference Include="System.Xml.Linq" />
67-
<Reference Include="System.Web" />
6866
<Reference Include="System.Web.Extensions" />
67+
<Reference Include="System.Web" />
6968
<Reference Include="System.Web.Abstractions" />
7069
<Reference Include="System.Web.Routing" />
7170
<Reference Include="System.Xml" />
@@ -107,6 +106,7 @@
107106
<Private>True</Private>
108107
<HintPath>packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
109108
</Reference>
109+
<Reference Include="System.Xml.Linq" />
110110
<Reference Include="WebGrease">
111111
<Private>True</Private>
112112
<HintPath>packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
@@ -133,6 +133,25 @@
133133
<EmbeddedResource Include="favicon.ico">
134134
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
135135
</EmbeddedResource>
136+
<Content Include="Content\ej2\bootstrap-dark.css" />
137+
<Content Include="Content\ej2\bootstrap.css" />
138+
<Content Include="Content\ej2\bootstrap4.css" />
139+
<Content Include="Content\ej2\bootstrap5-dark.css" />
140+
<Content Include="Content\ej2\bootstrap5.css" />
141+
<Content Include="Content\ej2\compatibility\bootstrap.css" />
142+
<Content Include="Content\ej2\compatibility\bootstrap4.css" />
143+
<Content Include="Content\ej2\compatibility\fabric.css" />
144+
<Content Include="Content\ej2\compatibility\highcontrast.css" />
145+
<Content Include="Content\ej2\compatibility\material.css" />
146+
<Content Include="Content\ej2\fabric-dark.css" />
147+
<Content Include="Content\ej2\fabric.css" />
148+
<Content Include="Content\ej2\fluent-dark.css" />
149+
<Content Include="Content\ej2\fluent.css" />
150+
<Content Include="Content\ej2\highcontrast.css" />
151+
<Content Include="Content\ej2\material-dark.css" />
152+
<Content Include="Content\ej2\material.css" />
153+
<Content Include="Content\ej2\tailwind-dark.css" />
154+
<Content Include="Content\ej2\tailwind.css" />
136155
<Content Include="Content\index.css" />
137156
<Content Include="Content\styles.css" />
138157
<Content Include="Content\Style\bootstrap.css" />
@@ -153,6 +172,7 @@
153172
</Content>
154173
<Content Include="Scripts\crossroads.js" />
155174
<Content Include="Scripts\ej2.min.js" />
175+
<Content Include="Scripts\ej2\ej2.min.js" />
156176
<Content Include="Scripts\fuse.min.js" />
157177
<Content Include="Scripts\hasher.min.js" />
158178
<Content Include="Scripts\index.js" />
@@ -175,17 +195,26 @@
175195
<Content Include="fonts\glyphicons-halflings-regular.ttf" />
176196
<Content Include="fonts\glyphicons-halflings-regular.eot" />
177197
<Content Include="packages.config" />
198+
<Content Include="Content\ej2\compatibility\material.scss" />
199+
<Content Include="Content\ej2\compatibility\highcontrast.scss" />
200+
<Content Include="Content\ej2\compatibility\fabric.scss" />
201+
<Content Include="Content\ej2\compatibility\bootstrap4.scss" />
202+
<Content Include="Content\ej2\compatibility\bootstrap.scss" />
178203
<None Include="Project_Readme.html" />
179204
<Content Include="Views\Home\Index.cshtml" />
180205
<Content Include="Scripts\ej2.min.js.map" />
181206
</ItemGroup>
182207
<ItemGroup>
183208
<Service Include="{3259AA49-8AA1-44D3-9025-A0B520596A8C}" />
209+
<Service Include="{4A0DDDB5-7A95-4FBF-97CC-616D07737A77}" />
184210
</ItemGroup>
185211
<ItemGroup>
186212
<Folder Include="App_Data\" />
187213
<Folder Include="Models\" />
188214
</ItemGroup>
215+
<ItemGroup>
216+
<TypeScriptCompile Include="Scripts\ej2\ej2.d.ts" />
217+
</ItemGroup>
189218
<PropertyGroup>
190219
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
191220
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -204,7 +233,7 @@
204233
<AutoAssignPort>True</AutoAssignPort>
205234
<DevelopmentServerPort>54079</DevelopmentServerPort>
206235
<DevelopmentServerVPath>/</DevelopmentServerVPath>
207-
<IISUrl>http://localhost:54079/</IISUrl>
236+
<IISUrl>http://localhost:54097/</IISUrl>
208237
<NTLMAuthentication>False</NTLMAuthentication>
209238
<UseCustomServer>False</UseCustomServer>
210239
<CustomServerUrl>

‎Web.config

Lines changed: 47 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,81 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0"?>
22
<!--
33
For more information on how to configure your ASP.NET application, please visit
44
http://go.microsoft.com/fwlink/?LinkId=301880
55
-->
66
<configuration>
7-
<appSettings>
8-
<add key="webpages:Version" value="3.0.0.0" />
9-
<add key="webpages:Enabled" value="true" />
10-
<add key="ClientValidationEnabled" value="true" />
11-
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
7+
<appSettings>
8+
<add key="webpages:Version" value="3.0.0.0"/>
9+
<add key="webpages:Enabled" value="true"/>
10+
<add key="ClientValidationEnabled" value="true"/>
11+
<add key="UnobtrusiveJavaScriptEnabled" value="true"/>
1212
</appSettings>
13+
<!--
14+
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
15+
16+
The following attributes can be set on the <httpRuntime> tag.
17+
<system.Web>
18+
<httpRuntime targetFramework="4.8" />
19+
</system.Web>
20+
-->
1321
<system.web>
14-
<compilation debug="true" targetFramework="4.6" />
15-
<customErrors mode="Off" />
16-
<httpRuntime targetFramework="4.6" />
17-
<httpModules>
18-
</httpModules>
22+
<compilation debug="true" targetFramework="4.8"/>
23+
<customErrors mode="Off"/>
24+
<httpRuntime targetFramework="4.6"/>
25+
<httpModules/>
1926
</system.web>
2027
<runtime>
2128
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
2229
<dependentAssembly>
23-
<assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
24-
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
30+
<assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed"/>
31+
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
2532
</dependentAssembly>
2633
<dependentAssembly>
27-
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
28-
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
34+
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35"/>
35+
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0"/>
2936
</dependentAssembly>
3037
<dependentAssembly>
31-
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
32-
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
38+
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35"/>
39+
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234"/>
3340
</dependentAssembly>
3441
<dependentAssembly>
35-
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
36-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
42+
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
43+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
3744
</dependentAssembly>
3845
<dependentAssembly>
39-
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
40-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
46+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
47+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
4148
</dependentAssembly>
4249
<dependentAssembly>
43-
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
44-
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
50+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
51+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
4552
</dependentAssembly>
4653
<dependentAssembly>
47-
<assemblyIdentity name="Syncfusion.Licensing" publicKeyToken="632609b4d040f6b4" culture="neutral" />
48-
<bindingRedirect oldVersion="0.0.0.0-19.2460.0.44" newVersion="19.2460.0.44" />
54+
<assemblyIdentity name="Syncfusion.Licensing" publicKeyToken="632609b4d040f6b4" culture="neutral"/>
55+
<bindingRedirect oldVersion="0.0.0.0-20.4460.0.38" newVersion="20.4460.0.38"/>
4956
</dependentAssembly>
5057
</assemblyBinding>
5158
</runtime>
5259
<system.webServer>
53-
<validation validateIntegratedModeConfiguration="false" />
54-
<modules>
55-
</modules>
56-
<security>
60+
<validation validateIntegratedModeConfiguration="false"/>
61+
<modules/>
62+
<security>
5763
<requestFiltering>
5864
<fileExtensions allowUnlisted="true">
59-
<remove fileExtension="." />
60-
<add fileExtension="." allowed="true" />
61-
<remove fileExtension=".cs" />
62-
<add fileExtension=".cs" allowed="true" />
63-
<remove fileExtension=".cshtml" />
64-
<add fileExtension=".cshtml" allowed="true" />
65+
<remove fileExtension="."/>
66+
<add fileExtension="." allowed="true"/>
67+
<remove fileExtension=".cs"/>
68+
<add fileExtension=".cs" allowed="true"/>
69+
<remove fileExtension=".cshtml"/>
70+
<add fileExtension=".cshtml" allowed="true"/>
6571
</fileExtensions>
6672
</requestFiltering>
6773
</security>
68-
<staticContent>
69-
<remove fileExtension=".cs" />
70-
<mimeMap fileExtension=".cs" mimeType="text/plain" />
71-
<remove fileExtension=".cshtml" />
72-
<mimeMap fileExtension=".cshtml" mimeType="text/html" />
74+
<staticContent>
75+
<remove fileExtension=".cs"/>
76+
<mimeMap fileExtension=".cs" mimeType="text/plain"/>
77+
<remove fileExtension=".cshtml"/>
78+
<mimeMap fileExtension=".cshtml" mimeType="text/html"/>
7379
</staticContent>
74-
7580
</system.webServer>
76-
</configuration>
81+
</configuration>

‎packages.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net46" />
1010
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
1111
<package id="Modernizr" version="2.6.2" targetFramework="net46" />
12-
<package id="Newtonsoft.Json" version="10.0.1" targetFramework="net46" />
12+
<package id="Newtonsoft.Json" version="13.0.2" targetFramework="net46" />
1313
<package id="Respond" version="1.2.0" targetFramework="net46" />
14-
<package id="Syncfusion.EJ2.JavaScript" version="19.3.0.43" targetFramework="net46" />
15-
<package id="Syncfusion.EJ2.MVC5" version="19.3.0.43" targetFramework="net46" />
16-
<package id="Syncfusion.Licensing" version="19.3.0.43" targetFramework="net46" />
14+
<package id="Syncfusion.EJ2.JavaScript" version="20.4.0.38" targetFramework="net46" />
15+
<package id="Syncfusion.EJ2.MVC5" version="20.4.0.38" targetFramework="net46" />
16+
<package id="Syncfusion.Licensing" version="20.4.0.38" targetFramework="net46" />
1717
<package id="WebGrease" version="1.5.2" targetFramework="net46" />
1818
</packages>

0 commit comments

Comments
 (0)