Skip to content

Commit 5b3ddb0

Browse files
committed
Targetting wrong .Net framework, change the web site to target version 4 not 4.5.
1 parent cd0fa1e commit 5b3ddb0

File tree

112 files changed

+512
-485
lines changed

Some content is hidden

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

112 files changed

+512
-485
lines changed
+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<SolutionConfiguration>
2+
<FileVersion>0</FileVersion>
3+
<AutoEnableOnStartup>Default</AutoEnableOnStartup>
4+
<AllowParallelTestExecution>false</AllowParallelTestExecution>
5+
<FrameworkUtilisationTypeForNUnit>UseDynamicAnalysis</FrameworkUtilisationTypeForNUnit>
6+
<FrameworkUtilisationTypeForGallio>UseStaticAnalysis</FrameworkUtilisationTypeForGallio>
7+
<FrameworkUtilisationTypeForMSpec>UseStaticAnalysis</FrameworkUtilisationTypeForMSpec>
8+
<FrameworkUtilisationTypeForMSTest>UseStaticAnalysis</FrameworkUtilisationTypeForMSTest>
9+
<EngineModes>Run all tests automatically:BFRydWU=;Run all tests manually:BUZhbHNl;Run impacted tests automatically, others manually (experimental!):CklzSW1wYWN0ZWQ=;Run pinned tests automatically, others manually:CElzUGlubmVk</EngineModes>
10+
<MetricsExclusionList>
11+
</MetricsExclusionList>
12+
</SolutionConfiguration>

Diff for: WebApiContrib.Formatting.RazorViewEngine.sln

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApiContrib.Formatting.Ht
1515
EndProject
1616
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApiContrib.Formatting.Razor", "src\WebApiContrib.Formatting.Razor\WebApiContrib.Formatting.Razor.csproj", "{8C15B0D3-9108-4EA3-AE19-3C9571266C47}"
1717
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcApplication1", "src\MvcApplication1\MvcApplication1.csproj", "{1D68BCF9-98E0-4501-ACFB-20AEEC021085}"
18+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcWebApiSiteTest", "src\MvcWebApiSiteTest\MvcWebApiSiteTest.csproj", "{5D90E626-1C40-4B23-887A-DC2527D696CB}"
1919
EndProject
2020
Global
2121
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,10 +39,10 @@ Global
3939
{8C15B0D3-9108-4EA3-AE19-3C9571266C47}.Debug|Any CPU.Build.0 = Debug|Any CPU
4040
{8C15B0D3-9108-4EA3-AE19-3C9571266C47}.Release|Any CPU.ActiveCfg = Release|Any CPU
4141
{8C15B0D3-9108-4EA3-AE19-3C9571266C47}.Release|Any CPU.Build.0 = Release|Any CPU
42-
{1D68BCF9-98E0-4501-ACFB-20AEEC021085}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43-
{1D68BCF9-98E0-4501-ACFB-20AEEC021085}.Debug|Any CPU.Build.0 = Debug|Any CPU
44-
{1D68BCF9-98E0-4501-ACFB-20AEEC021085}.Release|Any CPU.ActiveCfg = Release|Any CPU
45-
{1D68BCF9-98E0-4501-ACFB-20AEEC021085}.Release|Any CPU.Build.0 = Release|Any CPU
42+
{5D90E626-1C40-4B23-887A-DC2527D696CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43+
{5D90E626-1C40-4B23-887A-DC2527D696CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
44+
{5D90E626-1C40-4B23-887A-DC2527D696CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
45+
{5D90E626-1C40-4B23-887A-DC2527D696CB}.Release|Any CPU.Build.0 = Release|Any CPU
4646
EndGlobalSection
4747
GlobalSection(SolutionProperties) = preSolution
4848
HideSolutionNode = FALSE

Diff for: src/MvcApplication1/Global.asax

-1
This file was deleted.

Diff for: src/MvcApplication1/App_Start/BundleConfig.cs renamed to src/MvcWebApiSiteTest/App_Start/BundleConfig.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Web;
22
using System.Web.Optimization;
33

4-
namespace MvcApplication1
4+
namespace MvcWebApiSiteTest
55
{
66
public class BundleConfig
77
{

Diff for: src/MvcApplication1/App_Start/FilterConfig.cs renamed to src/MvcWebApiSiteTest/App_Start/FilterConfig.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Web;
22
using System.Web.Mvc;
33

4-
namespace MvcApplication1
4+
namespace MvcWebApiSiteTest
55
{
66
public class FilterConfig
77
{

Diff for: src/MvcApplication1/App_Start/RouteConfig.cs renamed to src/MvcWebApiSiteTest/App_Start/RouteConfig.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Web.Mvc;
66
using System.Web.Routing;
77

8-
namespace MvcApplication1
8+
namespace MvcWebApiSiteTest
99
{
1010
public class RouteConfig
1111
{

Diff for: src/MvcApplication1/App_Start/ViewConfig.cs renamed to src/MvcWebApiSiteTest/App_Start/ViewConfig.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
using System;
22
using System.Collections.Generic;
3-
using MvcApplication1.Controllers;
43

5-
namespace MvcApplication1
4+
namespace MvcWebApiSiteTest.App_Start
65
{
76
public class ViewConfig
87
{

Diff for: src/MvcApplication1/App_Start/WebApiConfig.cs renamed to src/MvcWebApiSiteTest/App_Start/WebApiConfig.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Linq;
44
using System.Web.Http;
55

6-
namespace MvcApplication1
6+
namespace MvcWebApiSiteTest
77
{
88
public static class WebApiConfig
99
{
File renamed without changes.

Diff for: src/MvcApplication1/Controllers/CustomerController.cs renamed to src/MvcWebApiSiteTest/Controllers/CustomerController.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
using System;
2-
using System.Web.Http;
1+
using System.Web.Http;
32

4-
namespace MvcApplication1.Controllers
3+
namespace MvcWebApiSiteTest.Controllers
54
{
65
public class CustomerController : ApiController
76
{

Diff for: src/MvcWebApiSiteTest/Global.asax

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<%@ Application Codebehind="Global.asax.cs" Inherits="MvcWebApiSiteTest.WebApiApplication" Language="C#" %>

Diff for: src/MvcApplication1/Global.asax.cs renamed to src/MvcWebApiSiteTest/Global.asax.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using WebApiContrib.Formatting.Html.Formatters;
1111
using WebApiContrib.Formatting.Razor;
1212

13-
namespace MvcApplication1
13+
namespace MvcWebApiSiteTest
1414
{
1515
// Note: For instructions on enabling IIS6 or IIS7 classic mode,
1616
// visit http://go.microsoft.com/?LinkId=9394801
@@ -26,7 +26,6 @@ protected void Application_Start()
2626
GlobalViews.DefaultViewParser = new RazorViewParser();
2727
GlobalViews.DefaultViewLocator = new RazorViewLocator();
2828

29-
ViewConfig.RegisterViews(GlobalViews.Views);
3029
WebApiConfig.Register(GlobalConfiguration.Configuration);
3130
FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);
3231
RouteConfig.RegisterRoutes(RouteTable.Routes);
File renamed without changes.
File renamed without changes.

Diff for: src/MvcApplication1/MvcApplication1.csproj renamed to src/MvcWebApiSiteTest/MvcWebApiSiteTest.csproj

+24-23
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@
77
<ProductVersion>
88
</ProductVersion>
99
<SchemaVersion>2.0</SchemaVersion>
10-
<ProjectGuid>{1D68BCF9-98E0-4501-ACFB-20AEEC021085}</ProjectGuid>
10+
<ProjectGuid>{5D90E626-1C40-4B23-887A-DC2527D696CB}</ProjectGuid>
1111
<ProjectTypeGuids>{E3E379DF-F4C6-4180-9B81-6769533ABE47};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
1212
<OutputType>Library</OutputType>
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
14-
<RootNamespace>MvcApplication1</RootNamespace>
15-
<AssemblyName>MvcApplication1</AssemblyName>
14+
<RootNamespace>MvcWebApiSiteTest</RootNamespace>
15+
<AssemblyName>MvcWebApiSiteTest</AssemblyName>
1616
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1717
<MvcBuildViews>false</MvcBuildViews>
1818
<UseIISExpress>true</UseIISExpress>
1919
<IISExpressSSLPort />
2020
<IISExpressAnonymousAuthentication />
2121
<IISExpressWindowsAuthentication />
2222
<IISExpressUseClassicPipelineMode />
23-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
23+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
2424
<RestorePackages>true</RestorePackages>
2525
</PropertyGroup>
2626
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -58,69 +58,69 @@
5858
<Reference Include="System.Xml" />
5959
<Reference Include="System.Configuration" />
6060
<Reference Include="EntityFramework">
61-
<HintPath>..\packages\EntityFramework.5.0.0\lib\net40\EntityFramework.dll</HintPath>
61+
<HintPath>..\..\packages\EntityFramework.5.0.0\lib\net40\EntityFramework.dll</HintPath>
6262
</Reference>
6363
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6464
<Private>True</Private>
65-
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
65+
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
6666
</Reference>
6767
<Reference Include="Newtonsoft.Json">
68-
<HintPath>..\packages\Newtonsoft.Json.4.5.6\lib\net40\Newtonsoft.Json.dll</HintPath>
68+
<HintPath>..\..\packages\Newtonsoft.Json.4.5.6\lib\net40\Newtonsoft.Json.dll</HintPath>
6969
</Reference>
7070
<Reference Include="System.Net.Http">
7171
<Private>True</Private>
72-
<HintPath>..\packages\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.dll</HintPath>
72+
<HintPath>..\..\packages\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.dll</HintPath>
7373
</Reference>
7474
<Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75-
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.4.0.20710.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
75+
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.4.0.20710.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
7676
</Reference>
7777
<Reference Include="System.Net.Http.WebRequest">
7878
<Private>True</Private>
79-
<HintPath>..\packages\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.WebRequest.dll</HintPath>
79+
<HintPath>..\..\packages\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.WebRequest.dll</HintPath>
8080
</Reference>
8181
<Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8282
<Private>True</Private>
83-
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll</HintPath>
83+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll</HintPath>
8484
</Reference>
8585
<Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
86-
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.4.0.20710.0\lib\net40\System.Web.Http.dll</HintPath>
86+
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.4.0.20710.0\lib\net40\System.Web.Http.dll</HintPath>
8787
</Reference>
8888
<Reference Include="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
89-
<HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.20710.0\lib\net40\System.Web.Http.WebHost.dll</HintPath>
89+
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.20710.0\lib\net40\System.Web.Http.WebHost.dll</HintPath>
9090
</Reference>
9191
<Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9292
<Private>True</Private>
93-
<HintPath>..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll</HintPath>
93+
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll</HintPath>
9494
</Reference>
9595
<Reference Include="System.Web.Optimization">
96-
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.0.0\lib\net40\System.Web.Optimization.dll</HintPath>
96+
<HintPath>..\..\packages\Microsoft.AspNet.Web.Optimization.1.0.0\lib\net40\System.Web.Optimization.dll</HintPath>
9797
</Reference>
9898
<Reference Include="System.Web.Providers">
99-
<HintPath>..\packages\Microsoft.AspNet.Providers.Core.1.1\lib\net40\System.Web.Providers.dll</HintPath>
99+
<HintPath>..\..\packages\Microsoft.AspNet.Providers.Core.1.1\lib\net40\System.Web.Providers.dll</HintPath>
100100
</Reference>
101101
<Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
102102
<Private>True</Private>
103-
<HintPath>..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll</HintPath>
103+
<HintPath>..\..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll</HintPath>
104104
</Reference>
105105
<Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
106106
<Private>True</Private>
107-
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll</HintPath>
107+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll</HintPath>
108108
</Reference>
109109
<Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
110110
<Private>True</Private>
111-
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
111+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
112112
</Reference>
113113
<Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
114114
<Private>True</Private>
115-
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
115+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
116116
</Reference>
117117
<Reference Include="WebGrease">
118118
<Private>True</Private>
119-
<HintPath>..\packages\WebGrease.1.1.0\lib\WebGrease.dll</HintPath>
119+
<HintPath>..\..\packages\WebGrease.1.1.0\lib\WebGrease.dll</HintPath>
120120
</Reference>
121121
<Reference Include="Antlr3.Runtime">
122122
<Private>True</Private>
123-
<HintPath>..\packages\WebGrease.1.1.0\lib\Antlr3.Runtime.dll</HintPath>
123+
<HintPath>..\..\packages\WebGrease.1.1.0\lib\Antlr3.Runtime.dll</HintPath>
124124
</Reference>
125125
</ItemGroup>
126126
<ItemGroup>
@@ -230,6 +230,7 @@
230230
<Content Include="Images\orderedList9.png" />
231231
<Content Include="Scripts\_references.js" />
232232
<Content Include="Views\Web.config" />
233+
<Content Include="Views\_ViewStart.cshtml" />
233234
<Content Include="Views\Shared\Error.cshtml" />
234235
<Content Include="Views\Shared\_Layout.cshtml" />
235236
<Content Include="Views\Customer.cshtml" />
@@ -272,7 +273,7 @@
272273
<AutoAssignPort>True</AutoAssignPort>
273274
<DevelopmentServerPort>0</DevelopmentServerPort>
274275
<DevelopmentServerVPath>/</DevelopmentServerVPath>
275-
<IISUrl>http://localhost:5730/</IISUrl>
276+
<IISUrl>http://localhost:24652/</IISUrl>
276277
<NTLMAuthentication>False</NTLMAuthentication>
277278
<UseCustomServer>False</UseCustomServer>
278279
<CustomServerUrl>

Diff for: src/MvcApplication1/Properties/AssemblyInfo.cs renamed to src/MvcWebApiSiteTest/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
// General Information about an assembly is controlled through the following
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
8-
[assembly: AssemblyTitle("MvcApplication1")]
8+
[assembly: AssemblyTitle("MvcWebApiSiteTest")]
99
[assembly: AssemblyDescription("")]
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
12-
[assembly: AssemblyProduct("MvcApplication1")]
12+
[assembly: AssemblyProduct("MvcWebApiSiteTest")]
1313
[assembly: AssemblyCopyright("Copyright © 2012")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
@@ -20,7 +20,7 @@
2020
[assembly: ComVisible(false)]
2121

2222
// The following GUID is for the ID of the typelib if this project is exposed to COM
23-
[assembly: Guid("657870b2-d38b-47e2-a5f8-fe49503e838f")]
23+
[assembly: Guid("728545be-2304-49ac-81d1-2a0fe7779674")]
2424

2525
// Version information for an assembly consists of the following four values:
2626
//
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
1-
@{
2-
_Layout = "~/Views/Shared/_Layout.cshtml";
3-
}
4-
<script src="http://ajax.aspnetcdn.com/ajax/jquery/jquery-1.5.1.min.js" type="text/javascript"></script>
5-
6-
<div id="body">
7-
<section>
8-
9-
<div>
10-
<hgroup>
11-
<h1>Welcome '@Model.Name' to ASP.NET Web API Razor Formatter! Locate view by convention (the type of the model to render)</h1>
12-
</hgroup>
13-
</div>
14-
<p>
15-
Using the same URL "api/values" but using AJAX: <button>Press to show content!</button>
16-
</p>
17-
<p>
18-
19-
</p>
20-
21-
</section>
22-
</div>
23-
24-
<script type="text/javascript">
25-
26-
$("button").click(function () {
27-
28-
$.ajax({
29-
url: '/api/customer',
30-
type: "GET",
31-
contentType: "application/json; charset=utf-8",
32-
success: function(data, status, xhr)
33-
{
34-
alert(data.Name);
35-
},
36-
error: function(xhr, status, error)
37-
{
38-
alert(error);
39-
}});
40-
});
41-
</script>
1+
@{
2+
_Layout = "~/Views/Shared/_Layout.cshtml";
3+
}
4+
<script src="http://ajax.aspnetcdn.com/ajax/jquery/jquery-1.5.1.min.js" type="text/javascript"></script>
5+
6+
<div id="body">
7+
<section>
8+
9+
<div>
10+
<hgroup>
11+
<h1>Welcome '@Model.Name' to ASP.NET Web API Razor Formatter! Locate view by convention (the type of the model to render)</h1>
12+
</hgroup>
13+
</div>
14+
<p>
15+
Using the same URL "api/values" but using AJAX: <button>Press to show content!</button>
16+
</p>
17+
<p>
18+
19+
</p>
20+
21+
</section>
22+
</div>
23+
24+
<script type="text/javascript">
25+
26+
$("button").click(function () {
27+
28+
$.ajax({
29+
url: '/api/customer',
30+
type: "GET",
31+
contentType: "application/json; charset=utf-8",
32+
success: function(data, status, xhr)
33+
{
34+
alert(data.Name);
35+
},
36+
error: function(xhr, status, error)
37+
{
38+
alert(error);
39+
}});
40+
});
41+
</script>

0 commit comments

Comments
 (0)