Skip to content
This repository has been archived by the owner on Jan 4, 2022. It is now read-only.

Commit

Permalink
fix: nuget pkg restore, mvc 5.2.x, ef 6.x, missing dependencies with …
Browse files Browse the repository at this point in the history
…some versions of windows server
  • Loading branch information
StephenRedd committed Apr 23, 2015
1 parent e62e2fa commit 822f052
Show file tree
Hide file tree
Showing 14 changed files with 122 additions and 223 deletions.
23 changes: 20 additions & 3 deletions TicketDesk-2/TicketDesk.Domain/App.Config
Original file line number Diff line number Diff line change
@@ -1,6 +1,23 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</configSections>
<connectionStrings>
<add name="TicketDeskEntities" connectionString="metadata=res://*/Models.TicketDeskEntities.csdl|res://*/Models.TicketDeskEntities.ssdl|res://*/Models.TicketDeskEntities.msl;provider=System.Data.SqlClient;provider connection string=&quot;Data Source=.\SQLEXPRESS;AttachDbFilename=..\TicketDesk.Web.Client\App_Data\TicketDesk.mdf;Integrated Security=True;Connect Timeout=30;User Instance=True;MultipleActiveResultSets=True&quot;" providerName="System.Data.EntityClient"/>
<add name="TicketDeskEntities" connectionString="metadata=res://*/Models.TicketDeskEntities.csdl|res://*/Models.TicketDeskEntities.ssdl|res://*/Models.TicketDeskEntities.msl;provider=System.Data.SqlClient;provider connection string=&quot;Data Source=.\SQLEXPRESS;AttachDbFilename=..\TicketDesk.Web.Client\App_Data\TicketDesk.mdf;Integrated Security=True;Connect Timeout=30;User Instance=True;MultipleActiveResultSets=True&quot;" providerName="System.Data.EntityClient" />
</connectionStrings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<entityFramework>
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
<parameters>
<parameter value="mssqllocaldb" />
</parameters>
</defaultConnectionFactory>
<providers>
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
</providers>
</entityFramework>
</configuration>
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
using System.Linq;
using System.Text;
using System.ComponentModel;
using System.Data.Objects.DataClasses;
using System.Data.Entity.Core.Objects.DataClasses;

namespace TicketDesk.Domain.Models.DataAnnotations
{
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
using TicketDesk.Domain.Services;
using TicketDesk.Domain.Models;
using System.ComponentModel.Composition;
using System.Data.Entity;

namespace TicketDesk.Domain.Repositories
{
Expand Down Expand Up @@ -88,7 +89,7 @@ public bool SaveSettings(IEnumerable<Setting> settingsToSave)
{
foreach (var s in settingsToSave)
{
if (s.EntityState == System.Data.EntityState.Detached)
if (s.EntityState == EntityState.Detached)
{
ctx.Settings.AddObject(s);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
using System.Linq;
using System.Text;
using TicketDesk.Domain.Models;
using System.Data.Objects;
using TicketDesk.Domain.Services;
using System.ComponentModel.Composition;
using System.Data.Entity.Core.EntityClient;
using System.Data.SqlClient;
using System.Data.EntityClient;

namespace TicketDesk.Domain.Repositories
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
using System.Linq;
using System.Text;
using System.ComponentModel.Composition;
using System.Data.Entity.Core.Objects;
using TicketDesk.Domain.Models;

namespace TicketDesk.Domain.Repositories
Expand Down Expand Up @@ -45,7 +46,7 @@ public bool UpdateNotifications(IEnumerable<TicketEventNotification> notificatio
{
//In the L2S implementation we don't have to save the notes passed in, we just commit the context.
// other implemenations may need to do it differently.
ctx.SaveChanges(System.Data.Objects.SaveOptions.AcceptAllChangesAfterSave);
ctx.SaveChanges(SaveOptions.AcceptAllChangesAfterSave);

return true;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.Data.Entity.Core.Objects;
using System.Linq;
using System.Reflection;
using TicketDesk.Domain.Utilities.Pagination;
using TicketDesk.Domain.Models;
using System.Data.Objects;

namespace TicketDesk.Domain.Repositories
{
Expand Down
19 changes: 15 additions & 4 deletions TicketDesk-2/TicketDesk.Domain/TicketDesk.Domain.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFrameworkProfile />
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -53,6 +53,12 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="EntityFramework">
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.SqlServer">
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="Lucene.Net, Version=2.9.2.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Lucene.2.9.2.2\lib\Lucene.Net.dll</HintPath>
</Reference>
Expand All @@ -61,7 +67,6 @@
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Data.Entity" />
<Reference Include="System.DirectoryServices" />
<Reference Include="System.DirectoryServices.AccountManagement" />
<Reference Include="System.Runtime.Caching" />
Expand Down Expand Up @@ -185,8 +190,14 @@
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
Expand Down
1 change: 1 addition & 0 deletions TicketDesk-2/TicketDesk.Domain/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EntityFramework" version="6.1.3" targetFramework="net45" />
<package id="Lucene" version="2.9.2.2" />
</packages>
157 changes: 0 additions & 157 deletions TicketDesk-2/TicketDesk.Web.Client/SqlWeb.config

This file was deleted.

Loading

0 comments on commit 822f052

Please sign in to comment.