Skip to content

Spark no longer depends on System.Web #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 29, 2022
Merged

Spark no longer depends on System.Web #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d15ad85
SparkServiceContainer no longer depending on System.Web.Hosting
bounav Sep 27, 2022
cba9464
Minor code syntax tweaks
bounav Sep 27, 2022
9cc83d7
System.Web is no longer a dependency on the Spark project
bounav Sep 28, 2022
42725f2
Moved XML configuration element code to Spark.Web
bounav Sep 29, 2022
d27db5c
Merge branch 'master' into cache
bounav Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions spark.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
<in>
<items>
<include name="${build.dir}/Spark.Tests.dll" />
<include name="${build.dir}/Spark.Web.Tests.dll" />
<include name="${build.dir}/Spark.Python.Tests.dll" />
<include name="${build.dir}/Spark.Web.Mvc.Tests.dll" />
<include name="${build.dir}/Castle.MonoRail.Views.Spark.Tests.dll" />
Expand Down
2 changes: 1 addition & 1 deletion src/Castle.MonoRail.Views.Spark/Castle.MonoRail.Views.Spark.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Spark\Spark.csproj" />
<ProjectReference Include="..\Spark.Web\Spark.Web.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\license.txt">
Expand Down
2 changes: 1 addition & 1 deletion src/Spark.JsTests/Spark.JsTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<ProjectCapability Include="SupportsSystemWeb" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Spark\Spark.csproj" />
<ProjectReference Include="..\Spark.Web\Spark.Web.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Web" />
Expand Down
2 changes: 1 addition & 1 deletion src/Spark.Python.Tests/Spark.Python.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Spark.Python\Spark.Python.csproj" />
<ProjectReference Include="..\Spark.Tests\Spark.Tests.csproj" />
<ProjectReference Include="..\Spark.Web.Tests\Spark.Web.Tests.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Spark.Ruby.Tests/Spark.Ruby.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Spark.Ruby\Spark.Ruby.csproj" />
<ProjectReference Include="..\Spark.Tests\Spark.Tests.csproj" />
<ProjectReference Include="..\Spark.Web.Tests\Spark.Web.Tests.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Spark.Web.Mvc/Spark.Web.Mvc.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Spark\Spark.csproj" />
<ProjectReference Include="..\Spark.Web\Spark.Web.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\license.txt">
Expand Down
66 changes: 33 additions & 33 deletions src/Spark.Tests/App.config → src/Spark.Web.Tests/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
<?xml version="1.0"?>
<configuration>
<configSections>
<section name="spark" type="Spark.Configuration.SparkSectionHandler, Spark"/>
</configSections>
<spark>
<compilation debug="true" nullBehaviour="Strict">
<assemblies>
<add assembly="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
</assemblies>
</compilation>
<pages pageBaseType="Spark.Tests.Stubs.StubSparkView" automaticEncoding="false">
<namespaces>
<add namespace="System"/>
</namespaces>
</pages>
</spark>
<system.codedom>
<compilers>
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" warningLevel="4" type="Microsoft.VisualBasic.VBCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<providerOption name="CompilerVersion" value="v4.0"/>
<providerOption name="OptionInfer" value="true"/>
<providerOption name="WarnAsError" value="false"/>
</compiler>
</compilers>
<!--<compilers>
<compiler language="c#;cs;csharp" extension=".cs" warningLevel="0" type="Microsoft.CSharp.CSharpCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<providerOption name="CompilerVersion" value="v4.0"/>
<providerOption name="WarnAsError" value="false"/>
</compiler>
</compilers>-->
</system.codedom>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
<?xml version="1.0"?>
<configuration>
<configSections>
<section name="spark" type="Spark.Configuration.SparkSectionHandler, Spark.Web"/>
</configSections>
<spark>
<compilation debug="true" nullBehaviour="Strict">
<assemblies>
<add assembly="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
</assemblies>
</compilation>
<pages pageBaseType="Spark.Tests.Stubs.StubSparkView" automaticEncoding="false">
<namespaces>
<add namespace="System"/>
</namespaces>
</pages>
</spark>
<system.codedom>
<compilers>
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" warningLevel="4" type="Microsoft.VisualBasic.VBCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<providerOption name="CompilerVersion" value="v4.0"/>
<providerOption name="OptionInfer" value="true"/>
<providerOption name="WarnAsError" value="false"/>
</compiler>
</compilers>
<!--<compilers>
<compiler language="c#;cs;csharp" extension=".cs" warningLevel="0" type="Microsoft.CSharp.CSharpCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<providerOption name="CompilerVersion" value="v4.0"/>
<providerOption name="WarnAsError" value="false"/>
</compiler>
</compilers>-->
</system.codedom>
</configuration>
Loading