Skip to content

Commit db284c6

Browse files
committed
chore: Updating Scheduler-custom-editor demo to 2019.3.1023
1 parent 2f18c5b commit db284c6

File tree

54 files changed

+93076
-71522
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+93076
-71522
lines changed
Binary file not shown.
Binary file not shown.

scheduler/scheduler-custom-editor/SchedulerCustomEditor/SchedulerCustomEditor.csproj

+23-19
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\EntityFramework.6.3.0\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.3.0\build\EntityFramework.props')" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -30,6 +31,8 @@
3031
<MvcProjectUpgradeChecked>true</MvcProjectUpgradeChecked>
3132
<UseGlobalApplicationHostFile />
3233
<Use64BitIISExpress />
34+
<NuGetPackageImportStamp>
35+
</NuGetPackageImportStamp>
3336
</PropertyGroup>
3437
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3538
<DebugSymbols>true</DebugSymbols>
@@ -49,11 +52,15 @@
4952
<WarningLevel>4</WarningLevel>
5053
</PropertyGroup>
5154
<ItemGroup>
52-
<Reference Include="EntityFramework">
53-
<HintPath>..\packages\EntityFramework.5.0.0\lib\net45\EntityFramework.dll</HintPath>
55+
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
56+
<HintPath>..\packages\EntityFramework.6.3.0\lib\net45\EntityFramework.dll</HintPath>
5457
</Reference>
55-
<Reference Include="Kendo.Mvc">
56-
<HintPath>..\lib\KENDOUIMVC\2017.1.223.545\Kendo.Mvc.dll</HintPath>
58+
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
59+
<HintPath>..\packages\EntityFramework.6.3.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
60+
</Reference>
61+
<Reference Include="Kendo.Mvc, Version=2017.1.223.545, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
62+
<SpecificVersion>False</SpecificVersion>
63+
<HintPath>..\lib\KENDOUIMVC\2019.3.1023\Kendo.Mvc.dll</HintPath>
5764
</Reference>
5865
<Reference Include="Microsoft.CSharp" />
5966
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -63,10 +70,6 @@
6370
<Reference Include="System.Data.Entity" />
6471
<Reference Include="System.Runtime.Serialization" />
6572
<Reference Include="System.Security" />
66-
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
68-
<Private>True</Private>
69-
</Reference>
7073
<Reference Include="System" />
7174
<Reference Include="System.Data" />
7275
<Reference Include="System.Drawing" />
@@ -76,25 +79,23 @@
7679
<Reference Include="System.ComponentModel.DataAnnotations" />
7780
<Reference Include="System.Core" />
7881
<Reference Include="System.Data.DataSetExtensions" />
79-
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80-
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
81-
<Private>True</Private>
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.7\lib\net45\System.Web.Helpers.dll</HintPath>
84+
</Reference>
85+
<Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
86+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
8287
</Reference>
8388
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
84-
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
85-
<Private>True</Private>
89+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
8690
</Reference>
8791
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
88-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
89-
<Private>True</Private>
92+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
9093
</Reference>
9194
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
92-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
93-
<Private>True</Private>
95+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
9496
</Reference>
9597
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
96-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
97-
<Private>True</Private>
98+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
9899
</Reference>
99100
<Reference Include="System.Xml.Linq" />
100101
<Reference Include="System.Web" />
@@ -274,5 +275,8 @@
274275
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
275276
</PropertyGroup>
276277
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
278+
<Error Condition="!Exists('..\packages\EntityFramework.6.3.0\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.3.0\build\EntityFramework.props'))" />
279+
<Error Condition="!Exists('..\packages\EntityFramework.6.3.0\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.3.0\build\EntityFramework.targets'))" />
277280
</Target>
281+
<Import Project="..\packages\EntityFramework.6.3.0\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.3.0\build\EntityFramework.targets')" />
278282
</Project>

scheduler/scheduler-custom-editor/SchedulerCustomEditor/Views/Shared/_Layout.cshtml

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<head>
44
<title>@ViewBag.Title</title>
55
<link href="@Url.Content("~/Content/Site.css")" rel="stylesheet" type="text/css" />
6-
<link href="http://cdn.kendostatic.com/2017.1.223/styles/kendo.common.min.css" rel="stylesheet" type="text/css" />
7-
<link href="http://cdn.kendostatic.com/2017.1.223/styles/kendo.default.min.css" rel="stylesheet" type="text/css" />
8-
<script src="http://cdn.kendostatic.com/2017.1.223/js/jquery.min.js"></script>
9-
<script src="http://cdn.kendostatic.com/2017.1.223/js/kendo.all.min.js"></script>
10-
<script src="http://cdn.kendostatic.com/2017.1.223/js/kendo.aspnetmvc.min.js"></script>
11-
<script src="http://cdn.kendostatic.com/2017.1.223/js/kendo.timezones.min.js"></script>
6+
<link href="https://kendo.cdn.telerik.com/2019.3.1023/styles/kendo.common.min.css" rel="stylesheet" type="text/css" />
7+
<link href="https://kendo.cdn.telerik.com/2019.3.1023/styles/kendo.default.min.css" rel="stylesheet" type="text/css" />
8+
<script src="https://kendo.cdn.telerik.com/2019.3.1023/js/jquery.min.js"></script>
9+
<script src="https://kendo.cdn.telerik.com/2019.3.1023/js/kendo.all.min.js"></script>
10+
<script src="https://kendo.cdn.telerik.com/2019.3.1023/js/kendo.aspnetmvc.min.js"></script>
11+
<script src="https://kendo.cdn.telerik.com/2019.3.1023/js/kendo.timezones.min.js"></script>
1212
</head>
1313

1414
<body>
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="EntityFramework" version="5.0.0" targetFramework="net45" />
4-
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
5-
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
6-
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
3+
<package id="EntityFramework" version="6.3.0" targetFramework="net45" />
4+
<package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net45" />
5+
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net45" />
6+
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net45" />
77
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
88
</packages>

scheduler/scheduler-custom-editor/SchedulerCustomEditor/web.config

+31-32
Original file line numberDiff line numberDiff line change
@@ -5,66 +5,65 @@
55
-->
66
<configuration>
77
<configSections>
8-
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
9-
<section name="entityFramework"
10-
type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
11-
requirePermission="false"/>
8+
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
9+
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
1210
</configSections>
1311
<appSettings>
14-
<add key="webpages:Version" value="3.0.0.0"/>
12+
<add key="webpages:Version" value="3.0.0.0" />
1513
<add key="webpages:Enabled" value="false" />
16-
<add key="ClientValidationEnabled" value="true"/>
17-
<add key="UnobtrusiveJavaScriptEnabled" value="true"/>
14+
<add key="ClientValidationEnabled" value="true" />
15+
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
1816
</appSettings>
1917
<system.web>
2018
<compilation debug="true" targetFramework="4.5">
2119
<assemblies>
22-
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
23-
<add assembly="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
24-
<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
25-
<add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
26-
<add assembly="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
27-
<add assembly="System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
20+
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
21+
<add assembly="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
22+
<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
23+
<add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
24+
<add assembly="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
25+
<add assembly="System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
2826
</assemblies>
2927
</compilation>
3028
<pages>
3129
<namespaces>
32-
<add namespace="System.Web.Helpers"/>
33-
<add namespace="System.Web.Mvc"/>
34-
<add namespace="System.Web.Mvc.Ajax"/>
35-
<add namespace="System.Web.Mvc.Html"/>
36-
<add namespace="System.Web.Routing"/>
37-
<add namespace="System.Web.WebPages"/>
38-
<add namespace="Kendo.Mvc.UI"/>
30+
<add namespace="System.Web.Helpers" />
31+
<add namespace="System.Web.Mvc" />
32+
<add namespace="System.Web.Mvc.Ajax" />
33+
<add namespace="System.Web.Mvc.Html" />
34+
<add namespace="System.Web.Routing" />
35+
<add namespace="System.Web.WebPages" />
36+
<add namespace="Kendo.Mvc.UI" />
3937
</namespaces>
4038
</pages>
4139
</system.web>
4240
<system.webServer>
43-
<validation validateIntegratedModeConfiguration="false"/>
44-
<modules runAllManagedModulesForAllRequests="true"/>
41+
<validation validateIntegratedModeConfiguration="false" />
42+
<modules runAllManagedModulesForAllRequests="true" />
4543
</system.webServer>
4644
<runtime>
4745
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
4846
<dependentAssembly>
49-
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
50-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
47+
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
48+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
5149
</dependentAssembly>
5250
<dependentAssembly>
53-
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
54-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
51+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
52+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
5553
</dependentAssembly>
5654
<dependentAssembly>
57-
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
58-
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
55+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
56+
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
5957
</dependentAssembly>
6058
</assemblyBinding>
6159
</runtime>
6260
<entityFramework>
63-
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework"/>
61+
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
62+
<providers>
63+
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
64+
</providers>
6465
</entityFramework>
6566
<connectionStrings>
66-
<add name="SampleEntities"
67-
connectionString="metadata=res://*/Models.Sample.csdl|res://*/Models.Sample.ssdl|res://*/Models.Sample.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=(LocalDB)\v11.0;attachdbfilename=|DataDirectory|\Sample.mdf;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework&quot;"
68-
providerName="System.Data.EntityClient"/>
67+
<add name="SampleEntities" connectionString="metadata=res://*/Models.Sample.csdl|res://*/Models.Sample.ssdl|res://*/Models.Sample.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=(localdb)\MSSQLLocalDB;attachdbfilename=|DataDirectory|\Sample.mdf;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
6968
</connectionStrings>
7069
</configuration>
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)