Skip to content

Commit ca66f13

Browse files
author
Johannes Brunner
committed
adapt projects to solution
add nuget package
1 parent 07b4607 commit ca66f13

17 files changed

+15
-20
lines changed

Diff for: ‎Datatables.Mvc.Test/DataTables.Mvc.Test.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<Compile Include="DataTableResultTest.cs" />
5858
</ItemGroup>
5959
<ItemGroup>
60-
<ProjectReference Include="..\jquery.dataTables\Datatables.Mvc.csproj">
60+
<ProjectReference Include="..\Datatables.Mvc\Datatables.Mvc.csproj">
6161
<Project>{CFCB100E-9779-488C-8F24-ACAAF3B59D60}</Project>
6262
<Name>Datatables.Mvc</Name>
6363
</ProjectReference>

Diff for: ‎Datatables.Mvc/DataTables-ASP.NET-MVC.0.9.0.nupkg

9.22 KB
Binary file not shown.

Diff for: ‎Datatables.Mvc/Datatables.Mvc.csproj

-6
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,9 @@
3232
</PropertyGroup>
3333
<ItemGroup>
3434
<Reference Include="System" />
35-
<Reference Include="System.Core" />
3635
<Reference Include="System.Runtime.Serialization" />
3736
<Reference Include="System.Web" />
3837
<Reference Include="System.Web.Abstractions" />
39-
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
40-
<Reference Include="System.Xml.Linq" />
41-
<Reference Include="System.Data.DataSetExtensions" />
42-
<Reference Include="Microsoft.CSharp" />
43-
<Reference Include="System.Data" />
4438
<Reference Include="System.Xml" />
4539
</ItemGroup>
4640
<ItemGroup>

Diff for: ‎Datatables.Mvc/bin/Debug/Datatables.Mvc.dll

0 Bytes
Binary file not shown.

Diff for: ‎Datatables.Mvc/bin/Debug/Datatables.Mvc.pdb

4 KB
Binary file not shown.

Diff for: ‎Datatables.Mvc/bin/Release/Datatables.Mvc.dll

0 Bytes
Binary file not shown.

Diff for: ‎Datatables.Mvc/bin/Release/Datatables.Mvc.pdb

0 Bytes
Binary file not shown.

Diff for: ‎Mvc3Application.AppSpike/Mvc3Application.AppSpike.csproj

+7-6
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<AssemblyName>Mvc3Application.AppSpike</AssemblyName>
1515
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1616
<MvcBuildViews>false</MvcBuildViews>
17+
<UseIISExpress>false</UseIISExpress>
1718
</PropertyGroup>
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1920
<DebugSymbols>true</DebugSymbols>
@@ -224,12 +225,6 @@
224225
<ItemGroup>
225226
<Content Include="packages.config" />
226227
</ItemGroup>
227-
<ItemGroup>
228-
<ProjectReference Include="..\jquery.dataTables\Datatables.Mvc.csproj">
229-
<Project>{CFCB100E-9779-488C-8F24-ACAAF3B59D60}</Project>
230-
<Name>Datatables.Mvc</Name>
231-
</ProjectReference>
232-
</ItemGroup>
233228
<ItemGroup>
234229
<Content Include="Views\Home\Index2.cshtml" />
235230
</ItemGroup>
@@ -249,6 +244,12 @@
249244
<None Include="Scripts\DataTables-1.8.2\extras\TableTools\media\js\TableTools.min.js.gz" />
250245
<None Include="Scripts\DataTables-1.8.2\media\js\jquery.dataTables.min.js.gz" />
251246
</ItemGroup>
247+
<ItemGroup>
248+
<ProjectReference Include="..\Datatables.Mvc\Datatables.Mvc.csproj">
249+
<Project>{CFCB100E-9779-488C-8F24-ACAAF3B59D60}</Project>
250+
<Name>Datatables.Mvc</Name>
251+
</ProjectReference>
252+
</ItemGroup>
252253
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
253254
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
254255
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

Diff for: ‎Mvc3Application.AppSpike/bin/Datatables.Mvc.dll

1 KB
Binary file not shown.

Diff for: ‎Mvc3Application.AppSpike/bin/Datatables.Mvc.pdb

4 KB
Binary file not shown.

Diff for: ‎Mvc3Application.AppSpike/bin/Mvc3Application.AppSpike.dll

1 KB
Binary file not shown.

Diff for: ‎Mvc3Application.AppSpike/bin/Mvc3Application.AppSpike.pdb

4 KB
Binary file not shown.

Diff for: ‎Mvc3Application.AppSpike/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

-3 Bytes
Binary file not shown.

Diff for: ‎Mvc3Application.AppSpike/obj/Debug/Mvc3Application.AppSpike.dll

0 Bytes
Binary file not shown.

Diff for: ‎Mvc3Application.AppSpike/obj/Debug/Mvc3Application.AppSpike.pdb

0 Bytes
Binary file not shown.

Diff for: ‎Mvc3Application.AppSpike/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache

-109 Bytes
Binary file not shown.

Diff for: ‎datatables.mvc.sln

+7-7
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
99
TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
1010
EndProjectSection
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Datatables.Mvc", "jquery.dataTables\Datatables.Mvc.csproj", "{CFCB100E-9779-488C-8F24-ACAAF3B59D60}"
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mvc3Application.AppSpike", "Mvc3Application.AppSpike\Mvc3Application.AppSpike.csproj", "{C14FDA57-187A-41EE-9931-93140DEC8D1E}"
1313
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataTables.Mvc.Test", "jquery.dataTables.Test\DataTables.Mvc.Test.csproj", "{B15691DD-FA32-48BB-8E9F-358382BE4A2D}"
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Datatables.Mvc", "Datatables.Mvc\Datatables.Mvc.csproj", "{CFCB100E-9779-488C-8F24-ACAAF3B59D60}"
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mvc3Application.AppSpike", "Mvc3Application.AppSpike\Mvc3Application.AppSpike.csproj", "{C14FDA57-187A-41EE-9931-93140DEC8D1E}"
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataTables.Mvc.Test", "Datatables.Mvc.Test\DataTables.Mvc.Test.csproj", "{B15691DD-FA32-48BB-8E9F-358382BE4A2D}"
1717
EndProject
1818
Global
1919
GlobalSection(TestCaseManagementSettings) = postSolution
@@ -24,6 +24,10 @@ Global
2424
Release|Any CPU = Release|Any CPU
2525
EndGlobalSection
2626
GlobalSection(ProjectConfigurationPlatforms) = postSolution
27+
{C14FDA57-187A-41EE-9931-93140DEC8D1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
28+
{C14FDA57-187A-41EE-9931-93140DEC8D1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
29+
{C14FDA57-187A-41EE-9931-93140DEC8D1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
30+
{C14FDA57-187A-41EE-9931-93140DEC8D1E}.Release|Any CPU.Build.0 = Release|Any CPU
2731
{CFCB100E-9779-488C-8F24-ACAAF3B59D60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2832
{CFCB100E-9779-488C-8F24-ACAAF3B59D60}.Debug|Any CPU.Build.0 = Debug|Any CPU
2933
{CFCB100E-9779-488C-8F24-ACAAF3B59D60}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -32,10 +36,6 @@ Global
3236
{B15691DD-FA32-48BB-8E9F-358382BE4A2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
3337
{B15691DD-FA32-48BB-8E9F-358382BE4A2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
3438
{B15691DD-FA32-48BB-8E9F-358382BE4A2D}.Release|Any CPU.Build.0 = Release|Any CPU
35-
{C14FDA57-187A-41EE-9931-93140DEC8D1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
36-
{C14FDA57-187A-41EE-9931-93140DEC8D1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
37-
{C14FDA57-187A-41EE-9931-93140DEC8D1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
38-
{C14FDA57-187A-41EE-9931-93140DEC8D1E}.Release|Any CPU.Build.0 = Release|Any CPU
3939
EndGlobalSection
4040
GlobalSection(SolutionProperties) = preSolution
4141
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)