Skip to content

Commit 1795efb

Browse files
VladimirDimovVladimirDimov
committed
build fixed and Nutit Test Adapter nuget installed
1 parent 198a157 commit 1795efb

File tree

22 files changed

+156
-272
lines changed

22 files changed

+156
-272
lines changed

‎src/Examples/Examples.Data/Examples.Data.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,15 @@
4545
</PropertyGroup>
4646
<ItemGroup>
4747
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
48-
<HintPath>..\..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.dll</HintPath>
48+
<HintPath>..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
4949
</Reference>
5050
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
51-
<HintPath>..\..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
51+
<HintPath>..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
5252
</Reference>
5353
<Reference Include="System" />
5454
<Reference Include="System.ComponentModel.DataAnnotations" />
5555
<Reference Include="System.Core" />
56+
<Reference Include="System.Data.Entity" />
5657
<Reference Include="System.Runtime.Serialization" />
5758
<Reference Include="System.Security" />
5859
<Reference Include="System.Xml.Linq" />

‎src/Examples/Examples.Data/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="EntityFramework" version="6.0.0" targetFramework="net461" />
3+
<package id="EntityFramework" version="6.2.0" targetFramework="net461" />
44
</packages>

‎src/Examples/Examples.Mvc/Examples.Mvc.csproj

Lines changed: 21 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@
5050
<HintPath>..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
5151
</Reference>
5252
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
53-
<HintPath>..\..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.dll</HintPath>
53+
<HintPath>..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
5454
</Reference>
5555
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
56-
<HintPath>..\..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
56+
<HintPath>..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
5757
</Reference>
5858
<Reference Include="Microsoft.AI.Agent.Intercept, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5959
<HintPath>..\..\packages\Microsoft.ApplicationInsights.Agent.Intercept.2.4.0\lib\net45\Microsoft.AI.Agent.Intercept.dll</HintPath>
@@ -102,6 +102,24 @@
102102
<Reference Include="System.ComponentModel.DataAnnotations" />
103103
<Reference Include="System.Core" />
104104
<Reference Include="System.Data.DataSetExtensions" />
105+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
106+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.Helpers.dll</HintPath>
107+
</Reference>
108+
<Reference Include="System.Web.Mvc, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
109+
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.6\lib\net45\System.Web.Mvc.dll</HintPath>
110+
</Reference>
111+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
112+
<HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.6\lib\net45\System.Web.Razor.dll</HintPath>
113+
</Reference>
114+
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
115+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.dll</HintPath>
116+
</Reference>
117+
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
118+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
119+
</Reference>
120+
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
121+
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
122+
</Reference>
105123
<Reference Include="System.Xml.Linq" />
106124
<Reference Include="System.Web" />
107125
<Reference Include="System.Web.Extensions" />
@@ -119,33 +137,9 @@
119137
</Reference>
120138
<Reference Include="System.Net.Http.WebRequest">
121139
</Reference>
122-
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
123-
<Private>True</Private>
124-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
125-
</Reference>
126-
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
127-
<Private>True</Private>
128-
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
129-
</Reference>
130140
<Reference Include="System.Web.Optimization">
131141
<HintPath>..\..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
132142
</Reference>
133-
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
134-
<Private>True</Private>
135-
<HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
136-
</Reference>
137-
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
138-
<Private>True</Private>
139-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
140-
</Reference>
141-
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
142-
<Private>True</Private>
143-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
144-
</Reference>
145-
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
146-
<Private>True</Private>
147-
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
148-
</Reference>
149143
<Reference Include="WebGrease, Version=1.6.5135.21930, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
150144
<HintPath>..\..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
151145
</Reference>
@@ -170,7 +164,6 @@
170164
<DependentUpon>Global.asax</DependentUpon>
171165
</Compile>
172166
<Compile Include="Properties\AssemblyInfo.cs" />
173-
<Compile Include="SqlServerTypes\Loader.cs" />
174167
</ItemGroup>
175168
<ItemGroup>
176169
<Content Include="Content\bootstrap-theme.css" />
@@ -238,19 +231,6 @@
238231
<Content Include="Scripts\respond.matchmedia.addListener.js" />
239232
<Content Include="Scripts\respond.matchmedia.addListener.min.js" />
240233
<Content Include="Scripts\respond.min.js" />
241-
<Content Include="SqlServerTypes\readme.htm" />
242-
<Content Include="SqlServerTypes\x64\msvcr120.dll">
243-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
244-
</Content>
245-
<Content Include="SqlServerTypes\x64\SqlServerSpatial140.dll">
246-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
247-
</Content>
248-
<Content Include="SqlServerTypes\x86\msvcr120.dll">
249-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
250-
</Content>
251-
<Content Include="SqlServerTypes\x86\SqlServerSpatial140.dll">
252-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
253-
</Content>
254234
<Content Include="Web.config" />
255235
<Content Include="Web.Debug.config">
256236
<DependentUpon>Web.config</DependentUpon>
@@ -283,7 +263,7 @@
283263
<Name>JQDT.MVC</Name>
284264
</ProjectReference>
285265
<ProjectReference Include="..\..\JQDT\JQDT.csproj">
286-
<Project>{C82E4675-88AB-4B78-8475-F1521BDAE330}</Project>
266+
<Project>{c82e4675-88ab-4b78-8475-f1521bdae330}</Project>
287267
<Name>JQDT</Name>
288268
</ProjectReference>
289269
<ProjectReference Include="..\Examples.Data\Examples.Data.csproj">

‎src/Examples/Examples.Mvc/SqlServerTypes/Loader.cs

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

‎src/Examples/Examples.Mvc/SqlServerTypes/readme.htm

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

‎src/Examples/Examples.Mvc/Web.config

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
-->
66
<configuration>
77
<configSections>
8-
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
8+
99
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
10-
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
11-
</configSections>
10+
11+
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
1212
<connectionStrings>
1313
<add name="AdventureWorks" connectionString="data source=.;initial catalog=AdventureWorks2014;integrated security=True;MultipleActiveResultSets=true;" providerName="System.Data.SqlClient" />
1414
</connectionStrings>
@@ -39,6 +39,10 @@
3939
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
4040
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
4141
</dependentAssembly>
42+
<dependentAssembly>
43+
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
44+
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
45+
</dependentAssembly>
4246
<dependentAssembly>
4347
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
4448
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
@@ -49,11 +53,7 @@
4953
</dependentAssembly>
5054
<dependentAssembly>
5155
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
52-
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
53-
</dependentAssembly>
54-
<dependentAssembly>
55-
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
56-
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
56+
<bindingRedirect oldVersion="1.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
5757
</dependentAssembly>
5858
</assemblyBinding>
5959
</runtime>

‎src/Examples/Examples.Mvc/packages.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="Antlr" version="3.5.0.2" targetFramework="net461" />
44
<package id="bootstrap" version="3.3.7" targetFramework="net461" />
5-
<package id="EntityFramework" version="6.0.0" targetFramework="net461" />
5+
<package id="EntityFramework" version="6.2.0" targetFramework="net461" />
66
<package id="jQuery" version="3.2.1" targetFramework="net461" />
77
<package id="jQuery.Validation" version="1.16.0" targetFramework="net461" />
88
<package id="Microsoft.ApplicationInsights" version="2.4.0" targetFramework="net461" />
@@ -12,11 +12,11 @@
1212
<package id="Microsoft.ApplicationInsights.Web" version="2.4.1" targetFramework="net461" />
1313
<package id="Microsoft.ApplicationInsights.WindowsServer" version="2.4.1" targetFramework="net461" />
1414
<package id="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" version="2.4.0" targetFramework="net461" />
15-
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net461" />
16-
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net461" />
15+
<package id="Microsoft.AspNet.Mvc" version="5.2.6" targetFramework="net461" />
16+
<package id="Microsoft.AspNet.Razor" version="3.2.6" targetFramework="net461" />
1717
<package id="Microsoft.AspNet.TelemetryCorrelation" version="1.0.0" targetFramework="net461" />
1818
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net461" />
19-
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net461" />
19+
<package id="Microsoft.AspNet.WebPages" version="3.2.6" targetFramework="net461" />
2020
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.8" targetFramework="net461" />
2121
<package id="Microsoft.jQuery.Unobtrusive.Validation" version="3.2.3" targetFramework="net461" />
2222
<package id="Microsoft.Net.Compilers" version="2.4.0" targetFramework="net461" developmentDependency="true" />

0 commit comments

Comments
 (0)