Skip to content

Commit dc64052

Browse files
RobertTheGreyRobertTheGrey
committed
Updated primary ref binaries to MVC 5
1 parent d0a931b commit dc64052

File tree

9 files changed

+208
-25
lines changed

9 files changed

+208
-25
lines changed

‎.gitignore

+8
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,11 @@ src/Tools/SparkLanguagePackage/*_i.c
3838
src/Tools/SparkLanguagePackage/*_i.h
3939
src/Tools/SparkLanguagePackage/*_p.c
4040
src/Tools/SparkLanguagePackage/PackageLoadKey.h
41+
42+
#NuGet
43+
packages/
44+
*.nupkg
45+
46+
#ncrunch
47+
*ncrunch*
48+
*crunch*.local.xml

‎src/Spark.Web.Mvc.Pdf.Tests/Spark.Web.Mvc.Pdf.Tests.csproj

+27-4
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@
5555
<Prefer32Bit>false</Prefer32Bit>
5656
</PropertyGroup>
5757
<ItemGroup>
58+
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59+
<Private>True</Private>
60+
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
61+
</Reference>
5862
<Reference Include="nunit.framework, Version=2.4.3.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
5963
<SpecificVersion>False</SpecificVersion>
6064
<HintPath>..\..\bin\nunit\nunit.framework.dll</HintPath>
@@ -68,12 +72,30 @@
6872
<RequiredTargetFramework>3.5</RequiredTargetFramework>
6973
</Reference>
7074
<Reference Include="System.Web" />
71-
<Reference Include="System.Web.Abstractions" />
72-
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
76+
<SpecificVersion>False</SpecificVersion>
77+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll</HintPath>
78+
</Reference>
79+
<Reference Include="System.Web.Mvc, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80+
<SpecificVersion>False</SpecificVersion>
81+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll</HintPath>
82+
</Reference>
83+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
84+
<SpecificVersion>False</SpecificVersion>
85+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll</HintPath>
86+
</Reference>
87+
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
88+
<SpecificVersion>False</SpecificVersion>
89+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll</HintPath>
90+
</Reference>
91+
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
92+
<SpecificVersion>False</SpecificVersion>
93+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
94+
</Reference>
95+
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7396
<SpecificVersion>False</SpecificVersion>
74-
<HintPath>..\..\bin\aspnetmvc\System.Web.Mvc.dll</HintPath>
97+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
7598
</Reference>
76-
<Reference Include="System.Web.Routing" />
7799
<Reference Include="System.Xml.Linq">
78100
<RequiredTargetFramework>3.5</RequiredTargetFramework>
79101
</Reference>
@@ -107,6 +129,7 @@
107129
</ItemGroup>
108130
<ItemGroup>
109131
<None Include="App.config" />
132+
<None Include="packages.config" />
110133
</ItemGroup>
111134
<ItemGroup>
112135
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">

‎src/Spark.Web.Mvc.Pdf/Spark.Web.Mvc.Pdf.csproj

+27-4
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,39 @@
6161
<SpecificVersion>False</SpecificVersion>
6262
<HintPath>..\..\bin\itextsharp\itextsharp.dll</HintPath>
6363
</Reference>
64+
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
65+
<Private>True</Private>
66+
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
67+
</Reference>
6468
<Reference Include="System" />
6569
<Reference Include="System.Core">
6670
<RequiredTargetFramework>3.5</RequiredTargetFramework>
6771
</Reference>
6872
<Reference Include="System.Web" />
69-
<Reference Include="System.Web.Abstractions" />
70-
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
73+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74+
<SpecificVersion>False</SpecificVersion>
75+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll</HintPath>
76+
</Reference>
77+
<Reference Include="System.Web.Mvc, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
78+
<SpecificVersion>False</SpecificVersion>
79+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll</HintPath>
80+
</Reference>
81+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
82+
<SpecificVersion>False</SpecificVersion>
83+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll</HintPath>
84+
</Reference>
85+
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
86+
<SpecificVersion>False</SpecificVersion>
87+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll</HintPath>
88+
</Reference>
89+
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
90+
<SpecificVersion>False</SpecificVersion>
91+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
92+
</Reference>
93+
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7194
<SpecificVersion>False</SpecificVersion>
72-
<HintPath>..\..\bin\aspnetmvc\System.Web.Mvc.dll</HintPath>
95+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
7396
</Reference>
74-
<Reference Include="System.Web.Routing" />
7597
<Reference Include="System.Xml.Linq">
7698
<RequiredTargetFramework>3.5</RequiredTargetFramework>
7799
</Reference>
@@ -99,6 +121,7 @@
99121
<None Include="..\SparkKey.snk">
100122
<Link>SparkKey.snk</Link>
101123
</None>
124+
<None Include="packages.config" />
102125
</ItemGroup>
103126
<ItemGroup>
104127
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">

‎src/Spark.Web.Mvc.Python/Spark.Web.Mvc.Python.csproj

+29-2
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,37 @@
5959
<SpecificVersion>False</SpecificVersion>
6060
<HintPath>..\..\bin\ironpython\Microsoft.Scripting.dll</HintPath>
6161
</Reference>
62+
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63+
<Private>True</Private>
64+
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
65+
</Reference>
6266
<Reference Include="System" />
6367
<Reference Include="System.Core">
6468
<RequiredTargetFramework>3.5</RequiredTargetFramework>
6569
</Reference>
66-
<Reference Include="System.Web.Mvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71+
<SpecificVersion>False</SpecificVersion>
72+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll</HintPath>
73+
</Reference>
74+
<Reference Include="System.Web.Mvc, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75+
<SpecificVersion>False</SpecificVersion>
76+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll</HintPath>
77+
</Reference>
78+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
79+
<SpecificVersion>False</SpecificVersion>
80+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll</HintPath>
81+
</Reference>
82+
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6783
<SpecificVersion>False</SpecificVersion>
68-
<HintPath>..\..\bin\AspNetMvc\System.Web.Mvc.dll</HintPath>
84+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll</HintPath>
85+
</Reference>
86+
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
87+
<SpecificVersion>False</SpecificVersion>
88+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
89+
</Reference>
90+
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
91+
<SpecificVersion>False</SpecificVersion>
92+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
6993
</Reference>
7094
<Reference Include="System.Xml.Linq">
7195
<RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -115,6 +139,9 @@
115139
<Install>true</Install>
116140
</BootstrapperPackage>
117141
</ItemGroup>
142+
<ItemGroup>
143+
<None Include="packages.config" />
144+
</ItemGroup>
118145
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
119146
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
120147
Other similar extension points exist, see Microsoft.Common.targets.

‎src/Spark.Web.Mvc.Ruby.Tests/Spark.Web.Mvc.Ruby.Tests.csproj

+27-4
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@
5959
<SpecificVersion>False</SpecificVersion>
6060
<HintPath>..\..\bin\ironruby\IronRuby.Libraries.dll</HintPath>
6161
</Reference>
62+
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63+
<Private>True</Private>
64+
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
65+
</Reference>
6266
<Reference Include="nunit.framework, Version=2.4.3.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
6367
<SpecificVersion>False</SpecificVersion>
6468
<HintPath>..\..\bin\nunit\nunit.framework.dll</HintPath>
@@ -68,12 +72,30 @@
6872
<RequiredTargetFramework>3.5</RequiredTargetFramework>
6973
</Reference>
7074
<Reference Include="System.Web" />
71-
<Reference Include="System.Web.Abstractions" />
72-
<Reference Include="System.Web.Mvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
76+
<SpecificVersion>False</SpecificVersion>
77+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll</HintPath>
78+
</Reference>
79+
<Reference Include="System.Web.Mvc, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80+
<SpecificVersion>False</SpecificVersion>
81+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll</HintPath>
82+
</Reference>
83+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
84+
<SpecificVersion>False</SpecificVersion>
85+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll</HintPath>
86+
</Reference>
87+
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
88+
<SpecificVersion>False</SpecificVersion>
89+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll</HintPath>
90+
</Reference>
91+
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
92+
<SpecificVersion>False</SpecificVersion>
93+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
94+
</Reference>
95+
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7396
<SpecificVersion>False</SpecificVersion>
74-
<HintPath>..\..\bin\AspNetMvc\System.Web.Mvc.dll</HintPath>
97+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
7598
</Reference>
76-
<Reference Include="System.Web.Routing" />
7799
<Reference Include="System.Xml.Linq">
78100
<RequiredTargetFramework>3.5</RequiredTargetFramework>
79101
</Reference>
@@ -103,6 +125,7 @@
103125
</ItemGroup>
104126
<ItemGroup>
105127
<None Include="App.config" />
128+
<None Include="packages.config" />
106129
</ItemGroup>
107130
<ItemGroup>
108131
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">

‎src/Spark.Web.Mvc.Ruby/Spark.Web.Mvc.Ruby.csproj

+29-2
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@
5959
<SpecificVersion>False</SpecificVersion>
6060
<HintPath>..\..\bin\ironruby\IronRuby.dll</HintPath>
6161
</Reference>
62+
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63+
<Private>True</Private>
64+
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
65+
</Reference>
6266
<Reference Include="NonStandard.Microsoft.Scripting, Version=1.0.0.5000, Culture=neutral, processorArchitecture=MSIL">
6367
<SpecificVersion>False</SpecificVersion>
6468
<HintPath>..\..\bin\ironruby\NonStandard.Microsoft.Scripting.dll</HintPath>
@@ -67,9 +71,29 @@
6771
<Reference Include="System.Core">
6872
<RequiredTargetFramework>3.5</RequiredTargetFramework>
6973
</Reference>
70-
<Reference Include="System.Web.Mvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75+
<SpecificVersion>False</SpecificVersion>
76+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll</HintPath>
77+
</Reference>
78+
<Reference Include="System.Web.Mvc, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
79+
<SpecificVersion>False</SpecificVersion>
80+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll</HintPath>
81+
</Reference>
82+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
83+
<SpecificVersion>False</SpecificVersion>
84+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll</HintPath>
85+
</Reference>
86+
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7187
<SpecificVersion>False</SpecificVersion>
72-
<HintPath>..\..\bin\AspNetMvc\System.Web.Mvc.dll</HintPath>
88+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll</HintPath>
89+
</Reference>
90+
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
91+
<SpecificVersion>False</SpecificVersion>
92+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
93+
</Reference>
94+
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
95+
<SpecificVersion>False</SpecificVersion>
96+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
7397
</Reference>
7498
<Reference Include="System.Xml.Linq">
7599
<RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -119,6 +143,9 @@
119143
<Install>true</Install>
120144
</BootstrapperPackage>
121145
</ItemGroup>
146+
<ItemGroup>
147+
<None Include="packages.config" />
148+
</ItemGroup>
122149
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
123150
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
124151
Other similar extension points exist, see Microsoft.Common.targets.

0 commit comments

Comments
 (0)