Skip to content

Commit aca3725

Browse files
mcintyre321mcintyre321
committed
2017ified templates
1 parent 55fcced commit aca3725

File tree

9 files changed

+33
-145
lines changed

9 files changed

+33
-145
lines changed

‎Mvc.JQuery.DataTables.AspNetCore/Mvc.JQuery.DataTables.AspNetCore.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PackageProjectUrl>https://github.com/mcintyre321/mvc.jquery.datatables</PackageProjectUrl>
1414
<Copyright>Harry McIntyre</Copyright>
1515
<PackageTags>jquery datatables iqueryable razor asp mvc mvc5</PackageTags>
16-
<PackageLicenseUrl>https://github.com/mcintyre321/mvc.jquery.datatables/blob/master/License.</PackageLicenseUrl> </PropertyGroup>
16+
<PackageLicenseUrl>https://github.com/mcintyre321/mvc.jquery.datatables/blob/master/License.txt</PackageLicenseUrl> </PropertyGroup>
1717

1818
<ItemGroup>
1919
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.0" />

‎Mvc.JQuery.DataTables.Common/Mvc.JQuery.DataTables.Common.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PackageProjectUrl>https://github.com/mcintyre321/mvc.jquery.datatables</PackageProjectUrl>
1313
<Copyright>Harry McIntyre</Copyright>
1414
<PackageTags>jquery datatables iqueryable razor asp mvc mvc5</PackageTags>
15-
<PackageLicenseUrl>https://github.com/mcintyre321/mvc.jquery.datatables/blob/master/License.</PackageLicenseUrl>
15+
<PackageLicenseUrl>https://github.com/mcintyre321/mvc.jquery.datatables/blob/master/License.txt</PackageLicenseUrl>
1616
</PropertyGroup>
1717

1818
<ItemGroup>

‎Mvc.JQuery.Datatables.Templates/Mvc.JQuery.Datables.Templates.csproj.DotSettings.user‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎Mvc.JQuery.Datatables.Templates/Mvc.JQuery.Datatables.Templates.csproj‎

Lines changed: 24 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,30 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
33
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{8DA3D5E6-D714-40C3-B6CB-E88D852C5175}</ProjectGuid>
9-
<OutputType>Library</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>Mvc.JQuery.DataTables.Templates</RootNamespace>
12-
<AssemblyName>Mvc.JQuery.DataTables.Templates</AssemblyName>
13-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
14-
<FileAlignment>512</FileAlignment>
15-
<TargetFrameworkProfile />
16-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
17-
<RestorePackages>true</RestorePackages>
4+
<TargetFrameworks>netstandard1.6;net451</TargetFrameworks>
5+
<Authors>Harry McIntyre</Authors>
6+
<Company />
7+
<Product />
8+
<Description>Popular lib for using DataTables.net with IQueryable. Install this package for the css/js/cshtml files if you aren't using the EmbeddedResouces</Description>
9+
<Copyright>Harry McIntyre</Copyright>
10+
<PackageLicenseUrl>https://github.com/mcintyre321/mvc.jquery.datatables/blob/master/License.txt</PackageLicenseUrl>
11+
<PackageProjectUrl>https://github.com/mcintyre321/mvc.jquery.datatables</PackageProjectUrl>
1812
</PropertyGroup>
19-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
20-
<DebugSymbols>true</DebugSymbols>
21-
<DebugType>full</DebugType>
22-
<Optimize>false</Optimize>
23-
<OutputPath>bin\Debug\</OutputPath>
24-
<DefineConstants>DEBUG;TRACE</DefineConstants>
25-
<ErrorReport>prompt</ErrorReport>
26-
<WarningLevel>4</WarningLevel>
27-
<Prefer32Bit>false</Prefer32Bit>
28-
</PropertyGroup>
29-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
30-
<DebugType>pdbonly</DebugType>
31-
<Optimize>true</Optimize>
32-
<OutputPath>bin\Release\</OutputPath>
33-
<DefineConstants>TRACE</DefineConstants>
34-
<ErrorReport>prompt</ErrorReport>
35-
<WarningLevel>4</WarningLevel>
36-
<Prefer32Bit>false</Prefer32Bit>
37-
</PropertyGroup>
38-
<ItemGroup>
39-
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
40-
<Private>True</Private>
41-
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
42-
</Reference>
43-
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
44-
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
45-
</Reference>
13+
14+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
15+
<PackageReference Include="System.ComponentModel.Annotations" Version="4.1.0" />
16+
<PackageReference Include="System.ComponentModel.Primitives" Version="4.1.0" />
17+
<PackageReference Include="System.Reflection" Version="4.1.0" />
18+
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.1.0" />
19+
</ItemGroup>
20+
21+
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
22+
<PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.3" />
23+
<Reference Include="System.ComponentModel.DataAnnotations" />
4624
<Reference Include="System" />
47-
<Reference Include="System.Core" />
48-
<Reference Include="System.Web" />
49-
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
50-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
51-
<Private>True</Private>
52-
</Reference>
53-
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
54-
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
55-
<Private>True</Private>
56-
</Reference>
57-
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
58-
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
59-
<Private>True</Private>
60-
</Reference>
61-
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
62-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
63-
<Private>True</Private>
64-
</Reference>
65-
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
66-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
67-
<Private>True</Private>
68-
</Reference>
69-
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70-
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
71-
<Private>True</Private>
72-
</Reference>
73-
<Reference Include="System.Xml.Linq" />
74-
<Reference Include="System.Data.DataSetExtensions" />
7525
<Reference Include="Microsoft.CSharp" />
76-
<Reference Include="System.Data" />
77-
<Reference Include="System.Xml" />
78-
</ItemGroup>
79-
<ItemGroup>
80-
<Compile Include="Marker.cs" />
81-
<Compile Include="Properties\AssemblyInfo.cs" />
82-
</ItemGroup>
83-
<ItemGroup>
84-
<None Include="packages.config" />
85-
<None Include="Views\Web.config" />
8626
</ItemGroup>
27+
8728
<ItemGroup>
8829
<Content Include="timepicker-addon.css" />
8930
<Content Include="Content\jquery-datatables-column-filter\jquery-ui-timepicker-addon.css" />
@@ -130,18 +71,8 @@
13071
<Content Include="addon.css" />
13172
<Content Include="Views\Shared\DataTable.cshtml" />
13273
</ItemGroup>
74+
13375
<ItemGroup>
134-
<ProjectReference Include="..\Mvc.JQuery.DataTables\Mvc.JQuery.DataTables.csproj">
135-
<Project>{608e2574-4eb7-455c-8ab7-aaa66cb3642d}</Project>
136-
<Name>Mvc.JQuery.DataTables</Name>
137-
</ProjectReference>
76+
<Folder Include="Properties\" />
13877
</ItemGroup>
139-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
140-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
141-
Other similar extension points exist, see Microsoft.Common.targets.
142-
<Target Name="BeforeBuild">
143-
</Target>
144-
<Target Name="AfterBuild">
145-
</Target>
146-
-->
14778
</Project>

‎Mvc.JQuery.Datatables.Templates/Mvc.JQuery.Datatables.Templates.csproj.DotSettings.user‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎Mvc.JQuery.Datatables.Templates/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎Mvc.JQuery.Datatables.Templates/packages.config‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎Mvc.JQuery.Datatables.sln‎

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

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26228.4
4+
VisualStudioVersion = 15.0.26228.10
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvc.JQuery.DataTables.Common", "Mvc.JQuery.DataTables.Common\Mvc.JQuery.DataTables.Common.csproj", "{BFD9EA5A-FE3A-4CE2-9C09-B9E78CE208EE}"
77
EndProject
@@ -17,6 +17,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvc.JQuery.DataTables", "Mv
1717
EndProject
1818
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mvc.JQuery.Datatables.Templates", "Mvc.JQuery.Datatables.Templates\Mvc.JQuery.Datatables.Templates.csproj", "{8DA3D5E6-D714-40C3-B6CB-E88D852C5175}"
1919
EndProject
20+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CAB6B030-6006-4546-9A32-8F06AC054E1E}"
21+
ProjectSection(SolutionItems) = preProject
22+
README.md = README.md
23+
EndProjectSection
24+
EndProject
2025
Global
2126
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2227
Debug|Any CPU = Debug|Any CPU

‎Mvc.JQuery.Datatables/Mvc.JQuery.Datatables.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PackageProjectUrl>https://github.com/mcintyre321/mvc.jquery.datatables</PackageProjectUrl>
1414
<Copyright>Harry McIntyre</Copyright>
1515
<PackageTags>jquery datatables iqueryable razor asp mvc mvc5</PackageTags>
16-
<PackageLicenseUrl>https://github.com/mcintyre321/mvc.jquery.datatables/blob/master/License.</PackageLicenseUrl>
16+
<PackageLicenseUrl>https://github.com/mcintyre321/mvc.jquery.datatables/blob/master/License.txt</PackageLicenseUrl>
1717
</PropertyGroup>
1818

1919
<ItemGroup>

0 commit comments

Comments
 (0)