Skip to content

Commit 7f7a25c

Browse files
author
Mihail Parvanov
committed
Update project to MVC5
1 parent 4b915fe commit 7f7a25c

32 files changed

+71607
-68629
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2012
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.25420.1
5+
MinimumVisualStudioVersion = 10.0.40219.1
46
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SchedulerCustomEditor", "SchedulerCustomEditor\SchedulerCustomEditor.csproj", "{E3EF35D5-D0CE-49CC-B254-852C734EDEDE}"
57
EndProject
68
Global

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

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 83 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
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>
14-
<RootNamespace>SchedulerCustomEditor</RootNamespace>
14+
<RootNamespace>SchedulerCustomViewDemo</RootNamespace>
1515
<AssemblyName>SchedulerCustomEditor</AssemblyName>
1616
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1717
<MvcBuildViews>false</MvcBuildViews>
@@ -23,7 +23,27 @@
2323
<IISExpressAnonymousAuthentication />
2424
<IISExpressWindowsAuthentication />
2525
<IISExpressUseClassicPipelineMode />
26-
<UpgradeBackupLocation />
26+
<UpgradeBackupLocation>
27+
</UpgradeBackupLocation>
28+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
29+
<RestorePackages>true</RestorePackages>
30+
<MvcProjectUpgradeChecked>true</MvcProjectUpgradeChecked>
31+
<UseGlobalApplicationHostFile />
32+
33+
34+
35+
36+
37+
38+
39+
40+
41+
42+
43+
44+
45+
46+
2747
</PropertyGroup>
2848
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2949
<DebugSymbols>true</DebugSymbols>
@@ -47,14 +67,22 @@
4767
<HintPath>..\packages\EntityFramework.5.0.0\lib\net45\EntityFramework.dll</HintPath>
4868
</Reference>
4969
<Reference Include="Kendo.Mvc">
50-
<HintPath>..\lib\KENDOUIMVC\2013.3.1119.340\Kendo.Mvc.dll</HintPath>
70+
71+
<HintPath>..\lib\KENDOUIMVC\2017.1.223.545\Kendo.Mvc.dll</HintPath>
5172
</Reference>
5273
<Reference Include="Microsoft.CSharp" />
74+
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75+
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
76+
<Private>True</Private>
77+
</Reference>
5378
<Reference Include="System.Data.Entity" />
5479
<Reference Include="System.Runtime.Serialization" />
5580
<Reference Include="System.Security" />
56-
<Reference Include="System.Web.WebPages, Version=1.0.0.0,&#xD;&#xA;Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL " />
57-
<Reference Include="System.Web.Helpers, Version=1.0.0.0,&#xD;&#xA;Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
81+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
82+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
83+
<Private>True</Private>
84+
</Reference>
85+
5886
<Reference Include="System" />
5987
<Reference Include="System.Data" />
6088
<Reference Include="System.Drawing" />
@@ -64,6 +92,26 @@
6492
<Reference Include="System.ComponentModel.DataAnnotations" />
6593
<Reference Include="System.Core" />
6694
<Reference Include="System.Data.DataSetExtensions" />
95+
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
96+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
97+
<Private>True</Private>
98+
</Reference>
99+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
100+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
101+
<Private>True</Private>
102+
</Reference>
103+
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
104+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
105+
<Private>True</Private>
106+
</Reference>
107+
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
108+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
109+
<Private>True</Private>
110+
</Reference>
111+
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
112+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
113+
<Private>True</Private>
114+
</Reference>
67115
<Reference Include="System.Xml.Linq" />
68116
<Reference Include="System.Web" />
69117
<Reference Include="System.Web.Extensions" />
@@ -73,7 +121,6 @@
73121
<Reference Include="System.Configuration" />
74122
<Reference Include="System.Web.Services" />
75123
<Reference Include="System.EnterpriseServices" />
76-
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
77124
</ItemGroup>
78125
<ItemGroup>
79126
<Compile Include="Controllers\HomeController.cs" />
@@ -111,7 +158,9 @@
111158
<Content Include="App_Data\Sample_log.ldf">
112159
<DependentUpon>Sample.mdf</DependentUpon>
113160
</Content>
161+
<Content Include="Content\toDoViewStyles.css" />
114162
<Content Include="Global.asax" />
163+
<Content Include="Scripts\toDoView.js" />
115164
<Content Include="Web.config" />
116165
<Content Include="Web.Debug.config">
117166
<DependentUpon>Web.config</DependentUpon>
@@ -123,9 +172,9 @@
123172
<Content Include="Views\Web.config" />
124173
</ItemGroup>
125174
<ItemGroup>
126-
<Content Include="Views\Home\EditorTemplates\CustomEditorTemplate.cshtml" />
127-
</ItemGroup>
128-
<ItemGroup>
175+
176+
177+
129178
<Content Include="Views\Home\About.cshtml" />
130179
</ItemGroup>
131180
<ItemGroup>
@@ -179,10 +228,11 @@
179228
<ItemGroup>
180229
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
181230
</ItemGroup>
231+
<ItemGroup />
182232
<ItemGroup>
183-
<Folder Include="Scripts\" />
184-
</ItemGroup>
185-
<ItemGroup>
233+
234+
235+
186236
<EntityDeploy Include="Models\Sample.edmx">
187237
<Generator>EntityModelCodeGenerator</Generator>
188238
<LastGenOutput>Sample.Designer.cs</LastGenOutput>
@@ -203,6 +253,18 @@
203253
<LastGenOutput>Sample.cs</LastGenOutput>
204254
</Content>
205255
</ItemGroup>
256+
257+
258+
259+
260+
261+
262+
263+
264+
265+
266+
267+
206268
<PropertyGroup>
207269
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
208270
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -225,7 +287,7 @@
225287
<WebProjectProperties>
226288
<UseIIS>False</UseIIS>
227289
<AutoAssignPort>True</AutoAssignPort>
228-
<DevelopmentServerPort>20568</DevelopmentServerPort>
290+
<DevelopmentServerPort>24738</DevelopmentServerPort>
229291
<DevelopmentServerVPath>/</DevelopmentServerVPath>
230292
<IISUrl>http://localhost:42167/</IISUrl>
231293
<NTLMAuthentication>False</NTLMAuthentication>
@@ -238,4 +300,11 @@
238300
<UserProperties UseCdnSupport="True" />
239301
</VisualStudio>
240302
</ProjectExtensions>
303+
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
304+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
305+
<PropertyGroup>
306+
<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>
307+
</PropertyGroup>
308+
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
309+
</Target>
241310
</Project>

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

Lines changed: 6 additions & 6 deletions
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/2013.3.1119/styles/kendo.common.min.css" rel="stylesheet" type="text/css" />
7-
<link href="http://cdn.kendostatic.com/2013.3.1119/styles/kendo.default.min.css" rel="stylesheet" type="text/css" />
8-
<script src="http://cdn.kendostatic.com/2013.3.1119/js/jquery.min.js"></script>
9-
<script src="http://cdn.kendostatic.com/2013.3.1119/js/kendo.all.min.js"></script>
10-
<script src="http://cdn.kendostatic.com/2013.3.1119/js/kendo.aspnetmvc.min.js"></script>
11-
<script src="http://cdn.kendostatic.com/2013.3.1119/js/kendo.timezones.min.js"></script>
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>
1212
</head>
1313

1414
<body>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
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

@@ -16,7 +16,7 @@
1616
<add namespace="System.Web.Mvc.Ajax" />
1717
<add namespace="System.Web.Mvc.Html" />
1818
<add namespace="System.Web.Routing" />
19-
<add namespace="Kendo.Mvc.UI" />
19+
<add namespace="Kendo.Mvc.UI" />
2020
</namespaces>
2121
</pages>
2222
</system.web.webPages.razor>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<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" />
7+
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
48
</packages>

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

Lines changed: 36 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,52 +6,65 @@
66
<configuration>
77
<configSections>
88
<!-- 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=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
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"/>
1012
</configSections>
1113
<appSettings>
12-
<add key="webpages:Version" value="1.0.0.0" />
13-
<add key="ClientValidationEnabled" value="true" />
14-
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
14+
<add key="webpages:Version" value="3.0.0.0"/>
15+
<add key="webpages:Enabled" value="false" />
16+
<add key="ClientValidationEnabled" value="true"/>
17+
<add key="UnobtrusiveJavaScriptEnabled" value="true"/>
1518
</appSettings>
1619
<system.web>
1720
<compilation debug="true" targetFramework="4.5">
1821
<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" />
24-
<add assembly="System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
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"/>
2528
</assemblies>
2629
</compilation>
2730
<pages>
2831
<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" />
35-
<add namespace="Kendo.Mvc.UI" />
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"/>
3639
</namespaces>
3740
</pages>
3841
</system.web>
3942
<system.webServer>
40-
<validation validateIntegratedModeConfiguration="false" />
41-
<modules runAllManagedModulesForAllRequests="true" />
43+
<validation validateIntegratedModeConfiguration="false"/>
44+
<modules runAllManagedModulesForAllRequests="true"/>
4245
</system.webServer>
4346
<runtime>
4447
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
4548
<dependentAssembly>
46-
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
47-
<bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="3.0.0.0" />
49+
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
50+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
51+
</dependentAssembly>
52+
<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"/>
55+
</dependentAssembly>
56+
<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"/>
4859
</dependentAssembly>
4960
</assemblyBinding>
5061
</runtime>
5162
<entityFramework>
52-
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
63+
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework"/>
5364
</entityFramework>
5465
<connectionStrings>
55-
<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" />
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"/>
5669
</connectionStrings>
5770
</configuration>

‎scheduler/scheduler-custom-editor/lib/KENDOUIMVC/2016.3.1028/Kendo.Mvc.dll‎

-1.93 MB
Binary file not shown.

‎scheduler/scheduler-custom-editor/lib/KENDOUIMVC/2016.3.1028/cs-CZ/Kendo.Mvc.resources.dll‎

-21 KB
Binary file not shown.

‎scheduler/scheduler-custom-editor/lib/KENDOUIMVC/2017.1.223.545/Kendo.Mvc.dll‎

1.97 MB
Binary file not shown.

0 commit comments

Comments
 (0)