Skip to content

Commit 16e98a8

Browse files
mcintyre321Brent McSharry
mcintyre321
authored and
Brent McSharry
committed
Moved test project to 4.0, removed packages
1 parent 1a33585 commit 16e98a8

File tree

8 files changed

+173
-5
lines changed

8 files changed

+173
-5
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ LPRun.5.1.ReSharper.user
1717
LPRun.5.1.ReSharper.user
1818
LPRun.suo
1919
LPRun.5.1.ReSharper.user
20+
packages/*

‎.nuget/NuGet.Config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<solution>
4+
<add key="disableSourceControlIntegration" value="true" />
5+
</solution>
6+
</configuration>

‎.nuget/NuGet.exe‎

636 KB
Binary file not shown.

‎.nuget/NuGet.targets‎

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
5+
6+
<!-- Enable the restore command to run before builds -->
7+
<RestorePackages Condition=" '$(RestorePackages)' == '' ">false</RestorePackages>
8+
9+
<!-- Property that enables building a package from a project -->
10+
<BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
11+
12+
<!-- Determines if package restore consent is required to restore packages -->
13+
<RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
14+
15+
<!-- Download NuGet.exe if it does not already exist -->
16+
<DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
17+
</PropertyGroup>
18+
19+
<ItemGroup Condition=" '$(PackageSources)' == '' ">
20+
<!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
21+
<!-- The official NuGet package source (https://nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
22+
<!--
23+
<PackageSource Include="https://nuget.org/api/v2/" />
24+
<PackageSource Include="https://my-nuget-source/nuget/" />
25+
-->
26+
</ItemGroup>
27+
28+
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
29+
<!-- Windows specific commands -->
30+
<NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
31+
<PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
32+
</PropertyGroup>
33+
34+
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
35+
<!-- We need to launch nuget.exe with the mono command if we're not on windows -->
36+
<NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
37+
<PackagesConfig>packages.config</PackagesConfig>
38+
</PropertyGroup>
39+
40+
<PropertyGroup>
41+
<!-- NuGet command -->
42+
<NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\nuget.exe</NuGetExePath>
43+
<PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
44+
45+
<NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
46+
<NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
47+
48+
<PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
49+
50+
<RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
51+
<!-- Commands -->
52+
<RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(RequireConsentSwitch) -solutionDir "$(SolutionDir) "</RestoreCommand>
53+
<BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols</BuildCommand>
54+
55+
<!-- We need to ensure packages are restored prior to assembly resolve -->
56+
<BuildDependsOn Condition="$(RestorePackages) == 'true'">
57+
RestorePackages;
58+
$(BuildDependsOn);
59+
</BuildDependsOn>
60+
61+
<!-- Make the build depend on restore packages -->
62+
<BuildDependsOn Condition="$(BuildPackage) == 'true'">
63+
$(BuildDependsOn);
64+
BuildPackage;
65+
</BuildDependsOn>
66+
</PropertyGroup>
67+
68+
<Target Name="CheckPrerequisites">
69+
<!-- Raise an error if we're unable to locate nuget.exe -->
70+
<Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
71+
<SetEnvironmentVariable EnvKey="VisualStudioVersion" EnvValue="$(VisualStudioVersion)" Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' " />
72+
<!--
73+
Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
74+
This effectively acts as a lock that makes sure that the download operation will only happen once and all
75+
parallel builds will have to wait for it to complete.
76+
-->
77+
<MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT" />
78+
</Target>
79+
80+
<Target Name="_DownloadNuGet">
81+
<DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
82+
</Target>
83+
84+
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
85+
<Exec Command="$(RestoreCommand)"
86+
Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
87+
88+
<Exec Command="$(RestoreCommand)"
89+
LogStandardErrorAsError="true"
90+
Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
91+
</Target>
92+
93+
<Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
94+
<Exec Command="$(BuildCommand)"
95+
Condition=" '$(OS)' != 'Windows_NT' " />
96+
97+
<Exec Command="$(BuildCommand)"
98+
LogStandardErrorAsError="true"
99+
Condition=" '$(OS)' == 'Windows_NT' " />
100+
</Target>
101+
102+
<UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
103+
<ParameterGroup>
104+
<OutputFilename ParameterType="System.String" Required="true" />
105+
</ParameterGroup>
106+
<Task>
107+
<Reference Include="System.Core" />
108+
<Using Namespace="System" />
109+
<Using Namespace="System.IO" />
110+
<Using Namespace="System.Net" />
111+
<Using Namespace="Microsoft.Build.Framework" />
112+
<Using Namespace="Microsoft.Build.Utilities" />
113+
<Code Type="Fragment" Language="cs">
114+
<![CDATA[
115+
try {
116+
OutputFilename = Path.GetFullPath(OutputFilename);
117+
118+
Log.LogMessage("Downloading latest version of NuGet.exe...");
119+
WebClient webClient = new WebClient();
120+
webClient.DownloadFile("https://nuget.org/nuget.exe", OutputFilename);
121+
122+
return true;
123+
}
124+
catch (Exception ex) {
125+
Log.LogErrorFromException(ex);
126+
return false;
127+
}
128+
]]>
129+
</Code>
130+
</Task>
131+
</UsingTask>
132+
133+
<UsingTask TaskName="SetEnvironmentVariable" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
134+
<ParameterGroup>
135+
<EnvKey ParameterType="System.String" Required="true" />
136+
<EnvValue ParameterType="System.String" Required="true" />
137+
</ParameterGroup>
138+
<Task>
139+
<Using Namespace="System" />
140+
<Code Type="Fragment" Language="cs">
141+
<![CDATA[
142+
try {
143+
Environment.SetEnvironmentVariable(EnvKey, EnvValue, System.EnvironmentVariableTarget.Process);
144+
}
145+
catch {
146+
}
147+
]]>
148+
</Code>
149+
</Task>
150+
</UsingTask>
151+
</Project>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
<IISExpressAnonymousAuthentication />
2626
<IISExpressWindowsAuthentication />
2727
<IISExpressUseClassicPipelineMode />
28+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
29+
<RestorePackages>true</RestorePackages>
2830
</PropertyGroup>
2931
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3032
<DebugSymbols>true</DebugSymbols>
@@ -279,4 +281,5 @@
279281
</FlavorProperties>
280282
</VisualStudio>
281283
</ProjectExtensions>
284+
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
282285
</Project>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
<AssemblyName>Mvc.JQuery.Datatables</AssemblyName>
1313
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
15+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
16+
<RestorePackages>true</RestorePackages>
1517
</PropertyGroup>
1618
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1719
<DebugSymbols>true</DebugSymbols>
@@ -202,6 +204,7 @@
202204
</EmbeddedResource>
203205
</ItemGroup>
204206
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
207+
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
205208
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
206209
Other similar extension points exist, see Microsoft.Common.targets.
207210
<Target Name="BeforeBuild">

‎Mvc.Jquery.DataTables.Tests/App.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0"?>
22
<configuration>
33
<configSections>
44
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
5-
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
5+
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
66
</configSections>
77
<entityFramework>
8-
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
8+
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework"/>
99
</entityFramework>
10-
</configuration>
10+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

‎Mvc.Jquery.DataTables.Tests/Mvc.JQuery.DataTables.Tests.csproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Mvc.JQuery.DataTables.Tests</RootNamespace>
1111
<AssemblyName>Mvc.JQuery.DataTables.Tests</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<TargetFrameworkProfile />
15+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
16+
<RestorePackages>true</RestorePackages>
1417
</PropertyGroup>
1518
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1619
<DebugSymbols>true</DebugSymbols>
@@ -66,6 +69,7 @@
6669
</ItemGroup>
6770
<ItemGroup />
6871
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
72+
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
6973
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
7074
Other similar extension points exist, see Microsoft.Common.targets.
7175
<Target Name="BeforeBuild">

0 commit comments

Comments
 (0)