Skip to content

Commit 363a27c

Browse files
ggkrustevggkrustev
committed
Update Scheduler custom editor demo to MVC5
1 parent f4bf240 commit 363a27c

File tree

8 files changed

+96
-68
lines changed

8 files changed

+96
-68
lines changed

‎scheduler/scheduler-custom-editor/SchedulerCustomEditor/App_Data/Sample.mdf

0 Bytes
Binary file not shown.

‎scheduler/scheduler-custom-editor/SchedulerCustomEditor/App_Data/Sample_log.ldf

0 Bytes
Binary file not shown.

‎scheduler/scheduler-custom-editor/SchedulerCustomEditor/Models/Sample.Designer.cs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scheduler/scheduler-custom-editor/SchedulerCustomEditor/Models/Sample.edmx

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<edmx:Runtime>
55
<!-- SSDL content -->
66
<edmx:StorageModels>
7-
<Schema Namespace="SampleModel.Store" Alias="Self" Provider="System.Data.SqlClient" ProviderManifestToken="2008" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
7+
<Schema Namespace="SampleModel.Store" Alias="Self" Provider="System.Data.SqlClient" ProviderManifestToken="2008" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
88
<EntityContainer Name="SampleModelStoreContainer">
99
<EntitySet Name="MeetingAttendees" EntityType="SampleModel.Store.MeetingAttendees" store:Type="Tables" Schema="dbo" />
1010
<EntitySet Name="Meetings" EntityType="SampleModel.Store.Meetings" store:Type="Tables" Schema="dbo" />
@@ -66,8 +66,7 @@
6666
</Dependent>
6767
</ReferentialConstraint>
6868
</Association>
69-
</Schema>
70-
</edmx:StorageModels>
69+
</Schema></edmx:StorageModels>
7170
<!-- CSDL content -->
7271
<edmx:ConceptualModels>
7372
<Schema Namespace="SampleModel" Alias="Self" p1:UseStrongSpatialTypes="false" xmlns:annotation="http://schemas.microsoft.com/ado/2009/02/edm/annotation" xmlns:p1="http://schemas.microsoft.com/ado/2009/02/edm/annotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm">

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

+53-15
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
</ProductVersion>
99
<SchemaVersion>2.0</SchemaVersion>
1010
<ProjectGuid>{E3EF35D5-D0CE-49CC-B254-852C734EDEDE}</ProjectGuid>
11-
<ProjectTypeGuids>{E53F8FEA-EAE0-44A6-8774-FFD645390401};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
11+
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
1212
<OutputType>Library</OutputType>
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
1414
<RootNamespace>SchedulerCustomEditor</RootNamespace>
1515
<AssemblyName>SchedulerCustomEditor</AssemblyName>
16-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1717
<MvcBuildViews>false</MvcBuildViews>
1818
<FileUpgradeFlags>
1919
</FileUpgradeFlags>
@@ -26,6 +26,8 @@
2626
<UpgradeBackupLocation />
2727
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
2828
<RestorePackages>true</RestorePackages>
29+
<TargetFrameworkProfile />
30+
<WebGreaseLibPath>..\packages\WebGrease.1.5.2\lib</WebGreaseLibPath>
2931
</PropertyGroup>
3032
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3133
<DebugSymbols>true</DebugSymbols>
@@ -45,39 +47,75 @@
4547
<WarningLevel>4</WarningLevel>
4648
</PropertyGroup>
4749
<ItemGroup>
48-
<Reference Include="EntityFramework">
50+
<Reference Include="Antlr3.Runtime, Version=3.4.1.9004, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
51+
<SpecificVersion>False</SpecificVersion>
52+
<HintPath>..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
53+
</Reference>
54+
<Reference Include="EntityFramework, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
55+
<SpecificVersion>False</SpecificVersion>
4956
<HintPath>..\packages\EntityFramework.5.0.0\lib\net45\EntityFramework.dll</HintPath>
5057
</Reference>
5158
<Reference Include="Kendo.Mvc, Version=2015.3.930.340, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
5259
<SpecificVersion>False</SpecificVersion>
53-
<HintPath>..\..\..\..\..\Program Files (x86)\Telerik\UI for ASP.NET MVC Q3 2015\wrappers\aspnetmvc\Binaries\Mvc3\Kendo.Mvc.dll</HintPath>
54-
<Private>True</Private>
60+
<HintPath>..\..\..\..\..\Program Files (x86)\Telerik\UI for ASP.NET MVC Q3 2015\wrappers\aspnetmvc\Binaries\Mvc5\Kendo.Mvc.dll</HintPath>
5561
</Reference>
5662
<Reference Include="Microsoft.CSharp" />
63+
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64+
<Private>True</Private>
65+
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
66+
</Reference>
67+
<Reference Include="System.Data.DataSetExtensions" />
5768
<Reference Include="System.Data.Entity" />
5869
<Reference Include="System.Runtime.Serialization" />
5970
<Reference Include="System.Security" />
60-
<Reference Include="System.Web.WebPages, Version=1.0.0.0,&#xD;&#xA;Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL " />
61-
<Reference Include="System.Web.Helpers, Version=1.0.0.0,&#xD;&#xA;Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
71+
<Reference Include="System.Web.Extensions" />
6272
<Reference Include="System" />
6373
<Reference Include="System.Data" />
6474
<Reference Include="System.Drawing" />
6575
<Reference Include="System.Web.DynamicData" />
6676
<Reference Include="System.Web.Entity" />
6777
<Reference Include="System.Web.ApplicationServices" />
6878
<Reference Include="System.ComponentModel.DataAnnotations" />
69-
<Reference Include="System.Core" />
70-
<Reference Include="System.Data.DataSetExtensions" />
71-
<Reference Include="System.Xml.Linq" />
7279
<Reference Include="System.Web" />
73-
<Reference Include="System.Web.Extensions" />
7480
<Reference Include="System.Web.Abstractions" />
81+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
82+
<SpecificVersion>False</SpecificVersion>
83+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
84+
</Reference>
85+
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
86+
<SpecificVersion>False</SpecificVersion>
87+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
88+
</Reference>
89+
<Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
90+
<SpecificVersion>False</SpecificVersion>
91+
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
92+
</Reference>
93+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
94+
<SpecificVersion>False</SpecificVersion>
95+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
96+
</Reference>
7597
<Reference Include="System.Web.Routing" />
98+
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
99+
<SpecificVersion>False</SpecificVersion>
100+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
101+
</Reference>
102+
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
103+
<SpecificVersion>False</SpecificVersion>
104+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
105+
</Reference>
106+
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
107+
<SpecificVersion>False</SpecificVersion>
108+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
109+
</Reference>
76110
<Reference Include="System.Xml" />
77111
<Reference Include="System.Configuration" />
78112
<Reference Include="System.Web.Services" />
79113
<Reference Include="System.EnterpriseServices" />
80-
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
114+
<Reference Include="System.Xml.Linq" />
115+
<Reference Include="WebGrease, Version=1.5.2.14234, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
116+
<SpecificVersion>False</SpecificVersion>
117+
<HintPath>..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
118+
</Reference>
81119
</ItemGroup>
82120
<ItemGroup>
83121
<Compile Include="Controllers\HomeController.cs" />
@@ -177,9 +215,6 @@
177215
<ItemGroup>
178216
<Content Include="Views\Shared\EditorTemplates\Url.cshtml" />
179217
</ItemGroup>
180-
<ItemGroup>
181-
<Content Include="packages.config" />
182-
</ItemGroup>
183218
<ItemGroup>
184219
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
185220
</ItemGroup>
@@ -207,6 +242,9 @@
207242
<LastGenOutput>Sample.cs</LastGenOutput>
208243
</Content>
209244
</ItemGroup>
245+
<ItemGroup>
246+
<Content Include="packages.config" />
247+
</ItemGroup>
210248
<PropertyGroup>
211249
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
212250
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

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

+7-26
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,23 @@
22

33
<configuration>
44
<configSections>
5-
<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
6-
<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
7-
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
5+
<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
6+
<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
7+
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
88
</sectionGroup>
99
</configSections>
1010

1111
<system.web.webPages.razor>
12-
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
12+
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
1313
<pages pageBaseType="System.Web.Mvc.WebViewPage">
1414
<namespaces>
1515
<add namespace="System.Web.Mvc" />
1616
<add namespace="System.Web.Mvc.Ajax" />
1717
<add namespace="System.Web.Mvc.Html" />
18+
<add namespace="System.Web.Optimization" />
1819
<add namespace="System.Web.Routing" />
19-
<add namespace="Kendo.Mvc.UI" />
20+
<add namespace="SchedulerCustomEditor" />
21+
<add namespace="Kendo.Mvc.UI" />
2022
</namespaces>
2123
</pages>
2224
</system.web.webPages.razor>
@@ -25,28 +27,7 @@
2527
<add key="webpages:Enabled" value="false" />
2628
</appSettings>
2729

28-
<system.web>
29-
<httpHandlers>
30-
<add path="*" verb="*" type="System.Web.HttpNotFoundHandler" />
31-
</httpHandlers>
32-
33-
<!--
34-
Enabling request validation in view pages would cause validation to occur
35-
after the input has already been processed by the controller. By default
36-
MVC performs request validation before a controller processes the input.
37-
To change this behavior apply the ValidateInputAttribute to a
38-
controller or action.
39-
-->
40-
<pages validateRequest="false" pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
41-
<controls>
42-
<add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
43-
</controls>
44-
</pages>
45-
</system.web>
46-
4730
<system.webServer>
48-
<validation validateIntegratedModeConfiguration="false" />
49-
5031
<handlers>
5132
<remove name="BlockViewHandler" />
5233
<add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />

‎scheduler/scheduler-custom-editor/SchedulerCustomEditor/packages.config

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="EntityFramework" version="5.0.0" targetFramework="net45" />
3+
<package id="Antlr" version="3.4.1.9004" targetFramework="net452" />
4+
<package id="EntityFramework" version="5.0.0" targetFramework="net452" />
5+
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net452" />
6+
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net452" />
7+
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net452" />
8+
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net452" />
9+
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
10+
<package id="WebGrease" version="1.5.2" targetFramework="net452" />
411
</packages>

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

+25-22
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,58 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!--
3-
For more information on how to configure your ASP.NET application, please visit
4-
http://go.microsoft.com/fwlink/?LinkId=152368
5-
-->
3+
For more information on how to configure your ASP.NET application, please visit
4+
http://go.microsoft.com/fwlink/?LinkId=301880
5+
-->
66
<configuration>
77
<configSections>
8-
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
98
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
9+
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
1010
</configSections>
1111
<appSettings>
12-
<add key="webpages:Version" value="1.0.0.0" />
12+
<add key="webpages:Version" value="3.0.0.0" />
13+
<add key="webpages:Enabled" value="false" />
1314
<add key="ClientValidationEnabled" value="true" />
1415
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
1516
</appSettings>
1617
<system.web>
1718
<compilation debug="true" targetFramework="4.5">
1819
<assemblies>
19-
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
20-
<add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
21-
<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
22-
<add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
23-
<add assembly="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
2420
<add assembly="System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
2521
</assemblies>
2622
</compilation>
23+
<httpRuntime targetFramework="4.5" />
2724
<pages>
2825
<namespaces>
29-
<add namespace="System.Web.Helpers" />
30-
<add namespace="System.Web.Mvc" />
31-
<add namespace="System.Web.Mvc.Ajax" />
32-
<add namespace="System.Web.Mvc.Html" />
33-
<add namespace="System.Web.Routing" />
34-
<add namespace="System.Web.WebPages" />
3526
<add namespace="Kendo.Mvc.UI" />
3627
</namespaces>
3728
</pages>
3829
</system.web>
39-
<system.webServer>
40-
<validation validateIntegratedModeConfiguration="false" />
41-
<modules runAllManagedModulesForAllRequests="true" />
42-
</system.webServer>
4330
<runtime>
4431
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
32+
<dependentAssembly>
33+
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
34+
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
35+
</dependentAssembly>
36+
<dependentAssembly>
37+
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
38+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
39+
</dependentAssembly>
40+
<dependentAssembly>
41+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
42+
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
43+
</dependentAssembly>
4544
<dependentAssembly>
4645
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
47-
<bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="3.0.0.0" />
46+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
4847
</dependentAssembly>
4948
</assemblyBinding>
5049
</runtime>
5150
<entityFramework>
52-
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
51+
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
52+
<parameters>
53+
<parameter value="v12.0" />
54+
</parameters>
55+
</defaultConnectionFactory>
5356
</entityFramework>
5457
<connectionStrings>
5558
<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)\v11.0;attachdbfilename=|DataDirectory|\Sample.mdf;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />

0 commit comments

Comments
 (0)