diff --git a/src/SQLCE4Umbraco/SqlCE4Umbraco.csproj b/src/SQLCE4Umbraco/SqlCE4Umbraco.csproj index f4a39df579..615dbe5976 100644 --- a/src/SQLCE4Umbraco/SqlCE4Umbraco.csproj +++ b/src/SQLCE4Umbraco/SqlCE4Umbraco.csproj @@ -1,28 +1,13 @@  - + - Debug - AnyCPU - 8.0.30703 - 2.0 + v4.6.1 + false {5BA5425F-27A7-4677-865E-82246498AA2E} Library - Properties - SQLCE4Umbraco SQLCE4Umbraco - v4.6.1 - 512 - - - - - - - - ..\ true - true @@ -47,14 +32,6 @@ - - ..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.dll - True - - - ..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll - True - @@ -62,42 +39,19 @@ - - Properties\SolutionInfo.cs - - - - - - - - - - - - - - - Designer - - + + - {C7CB79F0-1C97-4B33-BFA7-00731B579AE2} umbraco.datalayer + + + + Properties\SolutionInfo.cs + + - - - - - \ No newline at end of file diff --git a/src/SQLCE4Umbraco/app.config b/src/SQLCE4Umbraco/app.config deleted file mode 100644 index 1ac57258d3..0000000000 --- a/src/SQLCE4Umbraco/app.config +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/SQLCE4Umbraco/packages.config b/src/SQLCE4Umbraco/packages.config deleted file mode 100644 index e2435f3e8b..0000000000 --- a/src/SQLCE4Umbraco/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs index cdbbd207ce..5327ca4fda 100644 --- a/src/SolutionInfo.cs +++ b/src/SolutionInfo.cs @@ -6,8 +6,7 @@ using System.Resources; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: NeutralResourcesLanguageAttribute("en-US")] - +[assembly: NeutralResourcesLanguage("en-US")] [assembly: AssemblyVersion("1.0.*")] diff --git a/src/Umbraco.Compat7/Umbraco.Compat7.csproj b/src/Umbraco.Compat7/Umbraco.Compat7.csproj index 9b22523a69..fb0ea827d8 100644 --- a/src/Umbraco.Compat7/Umbraco.Compat7.csproj +++ b/src/Umbraco.Compat7/Umbraco.Compat7.csproj @@ -1,17 +1,13 @@  - - + - Debug - AnyCPU + v4.6.1 + false {185E098F-5706-4B97-B404-EB974F05F633} Library - Properties - Umbraco.Compat7 Umbraco.Compat7 - v4.6.1 - 512 - + ..\ + true true @@ -44,74 +40,27 @@ - - Properties\SolutionInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - {31785bc3-256c-4613-b2f5-a1b0bdded8c1} Umbraco.Core - {651e1350-91b6-44b7-bd60-7207006d7003} Umbraco.Web - + + + Properties\SolutionInfo.cs + - + - diff --git a/src/Umbraco.Compat7/app.config b/src/Umbraco.Compat7/app.config deleted file mode 100644 index 1cd66757dc..0000000000 --- a/src/Umbraco.Compat7/app.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Compat7/project.json b/src/Umbraco.Compat7/project.json deleted file mode 100644 index d59e1f6f0a..0000000000 --- a/src/Umbraco.Compat7/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "LightInject": "4.1.3" - }, - "frameworks": { - "net461": {} - }, - "runtimes": { - "win": {}, - "win-anycpu": {} - } -} \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddRedirectUrlTable2.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddRedirectUrlTable2.cs deleted file mode 100644 index 37fb5c417d..0000000000 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddRedirectUrlTable2.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System.Linq; -using Umbraco.Core.Configuration; - -namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionEight -{ - [Migration("8.0.0", 101, GlobalSettings.UmbracoMigrationName)] - public class AddRedirectUrlTable2 : MigrationBase - { - public AddRedirectUrlTable2(IMigrationContext context) - : base(context) - { } - - public override void Up() - { - // defer, because we are making decisions based upon what's in the database - Execute.Code(MigrationCode); - } - - private string MigrationCode(UmbracoDatabase database) - { - var columns = SqlSyntax.GetColumnsInSchema(database).ToArray(); - - if (columns.Any(x => x.TableName.InvariantEquals("umbracoRedirectUrl") && x.ColumnName.InvariantEquals("contentKey"))) - return null; - - var localContext = new LocalMigrationContext(database, Logger); - - localContext.Execute.Sql("DELETE FROM umbracoRedirectUrl"); // else cannot add non-nullable field - - localContext.Delete.Column("contentId").FromTable("umbracoRedirectUrl"); - - // SQL CE does not want to alter-add non-nullable columns ;-( - // but it's OK to create as nullable then alter, go figure - //localContext.Alter.Table("umbracoRedirectUrl") - // .AddColumn("contentKey").AsGuid().NotNullable(); - localContext.Alter.Table("umbracoRedirectUrl") - .AddColumn("contentKey").AsGuid().Nullable(); - localContext.Alter.Table("umbracoRedirectUrl") - .AlterColumn("contentKey").AsGuid().NotNullable(); - - localContext.Create.ForeignKey("FK_umbracoRedirectUrl") - .FromTable("umbracoRedirectUrl").ForeignColumn("contentKey") - .ToTable("umbracoNode").PrimaryColumn("uniqueID"); - - return localContext.GetSql(); - } - - public override void Down() - { } - } -} diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddRedirectUrlTable3.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddRedirectUrlTable3.cs deleted file mode 100644 index 3d4aa05a2e..0000000000 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddRedirectUrlTable3.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System.Linq; -using Umbraco.Core.Configuration; - -namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionEight -{ - [Migration("8.0.0", 102, GlobalSettings.UmbracoMigrationName)] - public class AddRedirectUrlTable3 : MigrationBase - { - public AddRedirectUrlTable3(IMigrationContext context) - : base(context) - { } - - public override void Up() - { - // defer, because we are making decisions based upon what's in the database - Execute.Code(MigrationCode); - } - private string MigrationCode(UmbracoDatabase database) - { - var columns = SqlSyntax.GetColumnsInSchema(database).ToArray(); - - if (columns.Any(x => x.TableName.InvariantEquals("umbracoRedirectUrl") && x.ColumnName.InvariantEquals("hurl"))) - return null; - - var localContext = new LocalMigrationContext(database, Logger); - - localContext.Execute.Sql("DELETE FROM umbracoRedirectUrl"); // else cannot add non-nullable field - - localContext.Delete.Index("IX_umbracoRedirectUrl").OnTable("umbracoRedirectUrl"); - - // SQL CE does not want to alter-add non-nullable columns ;-( - // but it's OK to create as nullable then alter, go figure - //localContext.Alter.Table("umbracoRedirectUrl") - // .AddColumn("urlHash").AsString(16).NotNullable(); - localContext.Alter.Table("umbracoRedirectUrl") - .AddColumn("hurl").AsString(16).Nullable(); - localContext.Alter.Table("umbracoRedirectUrl") - .AlterColumn("hurl").AsString(16).NotNullable(); - - localContext.Create.Index("IX_umbracoRedirectUrl").OnTable("umbracoRedirectUrl") - .OnColumn("hurl") - .Ascending() - .OnColumn("contentKey") - .Ascending() - .OnColumn("createDateUtc") - .Descending() - .WithOptions().NonClustered(); - - return localContext.GetSql(); - } - - public override void Down() - { } - } -} diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddRedirectUrlTable4.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddRedirectUrlTable4.cs deleted file mode 100644 index 7bde77bdda..0000000000 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddRedirectUrlTable4.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System.Linq; -using Umbraco.Core.Configuration; - -namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionEight -{ - [Migration("8.0.0", 103, GlobalSettings.UmbracoMigrationName)] - public class AddRedirectUrlTable4 : MigrationBase - { - public AddRedirectUrlTable4(IMigrationContext context) - : base(context) - { } - - public override void Up() - { - // defer, because we are making decisions based upon what's in the database - Execute.Code(MigrationCode); - } - private string MigrationCode(UmbracoDatabase database) - { - var columns = SqlSyntax.GetColumnsInSchema(database).ToArray(); - - if (columns.Any(x => x.TableName.InvariantEquals("umbracoRedirectUrl") && x.ColumnName.InvariantEquals("urlHash"))) - return null; - - var localContext = new LocalMigrationContext(database, Logger); - - localContext.Execute.Sql("DELETE FROM umbracoRedirectUrl"); // else cannot add non-nullable field - - localContext.Delete.Index("IX_umbracoRedirectUrl").OnTable("umbracoRedirectUrl"); - - localContext.Delete.Column("hurl").FromTable("umbracoRedirectUrl"); - - // SQL CE does not want to alter-add non-nullable columns ;-( - // but it's OK to create as nullable then alter, go figure - //localContext.Alter.Table("umbracoRedirectUrl") - // .AddColumn("urlHash").AsString(16).NotNullable(); - localContext.Alter.Table("umbracoRedirectUrl") - .AddColumn("urlHash").AsString(16).Nullable(); - localContext.Alter.Table("umbracoRedirectUrl") - .AlterColumn("urlHash").AsString(16).NotNullable(); - - localContext.Create.Index("IX_umbracoRedirectUrl").OnTable("umbracoRedirectUrl") - .OnColumn("urlHash") - .Ascending() - .OnColumn("contentKey") - .Ascending() - .OnColumn("createDateUtc") - .Descending() - .WithOptions().NonClustered(); - - return localContext.GetSql(); - } - - public override void Down() - { } - } -} diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index f342a08926..9f13a99e66 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -1,20 +1,13 @@  - + - Debug - AnyCPU - 8.0.30703 - 2.0 + v4.6.1 + false {31785BC3-256C-4613-B2F5-A1B0BDDED8C1} Library - Properties - Umbraco.Core Umbraco.Core - v4.6.1 - 512 ..\ true - true @@ -51,9 +44,7 @@ - - False - + @@ -61,1444 +52,45 @@ - - Properties\SolutionInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - True - Files.resx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + Component - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Component - - - - - - - - - - - - - - - - - - - + + Properties\SolutionInfo.cs + + Constants.cs - - Constants.cs - - - Constants.cs - - - Constants.cs - - - Constants.cs - - - Constants.cs - - - Constants.cs - - - Constants.cs - - - Constants.cs - - - Constants.cs - - - Constants.cs - - - Constants.cs - - - Constants.cs - - - Constants.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ResXFileCodeGenerator - Files.Designer.cs - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Core/app.config b/src/Umbraco.Core/app.config deleted file mode 100644 index 5c65f32eba..0000000000 --- a/src/Umbraco.Core/app.config +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Umbraco.Core/project.json b/src/Umbraco.Core/project.json deleted file mode 100644 index d47446b210..0000000000 --- a/src/Umbraco.Core/project.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "dependencies": { - "AutoMapper": "4.2.1", - "HtmlAgilityPack": "1.4.9.5", - "ImageProcessor": "2.5.3", - "LightInject": "4.1.3", - "LightInject.Annotation": "1.1.0", - "LightInject.Web": "1.1.0", - "log4net": "2.0.8", - "Microsoft.AspNet.Identity.Core": "2.2.1", - "Microsoft.AspNet.Identity.Owin": "2.2.1", - "Microsoft.Owin.Security.Cookies": "3.0.1", - "Microsoft.Owin.Security.OAuth": "3.0.1", - "MiniProfiler": "3.2.0.157", - "MySql.Data": "6.9.9", - "Newtonsoft.Json": "10.0.2", - "NPoco": "3.5.1", - "NuGet.Core": "2.14.0", - "Semver": "2.0.4", - "SharpZipLib": "0.86.0", - "SqlServerCE": "4.0.0.1" - }, - "frameworks": { - "net461": {} - }, - "runtimes": { - "win": {}, - "win-anycpu": {} - } -} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 00db414bfb..eadf720d5e 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -1,434 +1,189 @@  - + + - 9.0.30729 - 2.0 - {4C4C194C-B5E4-4991-8F87-4373E24CC19F} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Debug - AnyCPU - - - - - Umbraco.Web.UI - - - JScript - Grid - IE50 - false - Library - Umbraco.Web.UI - OnBuildSuccess - - - - - - - - - - - - - - - 4.0 v4.6.1 - + false + {4C4C194C-B5E4-4991-8F87-4373E24CC19F} + Library + Umbraco.Web.UI + Umbraco.Web.UI + ..\ + true + + {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} + OnBuildSuccess + true 44319 enabled disabled false - ..\ - true - true - - - - + - bin\ - false - 285212672 - false - - - TRACE;DEBUG - - true - 4096 - false - - - false - false - false - false - 4 full + false + bin\ + TRACE;DEBUG prompt - AllRules.ruleset + 4 false + ..\bin\Debug\ true ..\Package\Umbraco.Web.UI.zip - bin\ - false - 285212672 - false - - - TRACE - bin\Umbraco.Web.UI.XML true - 4096 - false - - - true - false - false - false - 4 pdbonly + true + bin\ + TRACE prompt - AllRules.ruleset + 4 + bin\Umbraco.Web.UI.xml false + ..\bin\Release\ - - {07fbc26b-2927-4a22-8d96-d644c667fecc} - UmbracoExamine - - - ..\packages\AutoMapper.4.2.1\lib\net45\AutoMapper.dll - True - - - ..\packages\ClientDependency.1.9.2\lib\net45\ClientDependency.Core.dll - True - - - ..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll - True - - - ..\packages\Examine.2.0.0-Beta2\lib\net45\Examine.dll - - - ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - True - - - ..\packages\ImageProcessor.2.5.3\lib\net45\ImageProcessor.dll - - - ..\packages\ImageProcessor.Web.4.8.3\lib\net45\ImageProcessor.Web.dll - - - ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - True - - - ..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Analyzers.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Core.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.FastVectorHighlighter.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Highlighter.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Memory.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Queries.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Regex.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.SimpleFacetedSearch.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Snowball.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.SpellChecker.dll - True - - - ..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll - True - - - False - ..\packages\Microsoft.AspNet.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNet.Identity.Owin.dll - - - False - ..\packages\Microsoft.CodeAnalysis.Common.1.3.0\lib\net45\Microsoft.CodeAnalysis.dll - - - False - ..\packages\Microsoft.CodeAnalysis.CSharp.1.3.0\lib\net45\Microsoft.CodeAnalysis.CSharp.dll - True - - - ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - - - ..\packages\Microsoft.IO.RecyclableMemoryStream.1.2.1\lib\net45\Microsoft.IO.RecyclableMemoryStream.dll - True - - - ..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll - True - - - False - ..\packages\Microsoft.Owin.Host.SystemWeb.3.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll - - - False - ..\packages\Microsoft.Owin.Security.3.0.1\lib\net45\Microsoft.Owin.Security.dll - - - False - ..\packages\Microsoft.Owin.Security.Cookies.3.0.1\lib\net45\Microsoft.Owin.Security.Cookies.dll - - - False - ..\packages\Microsoft.Owin.Security.OAuth.3.0.1\lib\net45\Microsoft.Owin.Security.OAuth.dll - - - True - ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - ..\packages\MiniProfiler.3.2.0.157\lib\net40\MiniProfiler.dll - True - - - ..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll - - - ..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll - - - ..\packages\Owin.1.0\lib\net40\Owin.dll - True - - - System - - - ..\packages\System.AppContext.4.1.0\lib\net46\System.AppContext.dll - True - - - False - ..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - - - - - - ..\packages\System.Console.4.0.0\lib\net46\System.Console.dll - True - - - System.Data - + - - ..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.dll - True - - - ..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll - True - - - ..\packages\System.Diagnostics.FileVersionInfo.4.0.0\lib\net46\System.Diagnostics.FileVersionInfo.dll - True - - - ..\packages\System.Diagnostics.StackTrace.4.0.1\lib\net46\System.Diagnostics.StackTrace.dll - True - - - ..\packages\System.IO.FileSystem.4.0.1\lib\net46\System.IO.FileSystem.dll - True - - - ..\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll - True - - - False - False - - - False - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll - - - False - False - - - False - ..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll - - - ..\packages\System.Security.Cryptography.Algorithms.4.2.0\lib\net461\System.Security.Cryptography.Algorithms.dll - True - - - ..\packages\System.Security.Cryptography.Encoding.4.0.0\lib\net46\System.Security.Cryptography.Encoding.dll - True - - - ..\packages\System.Security.Cryptography.Primitives.4.0.0\lib\net46\System.Security.Cryptography.Primitives.dll - True - - - ..\packages\System.Security.Cryptography.X509Certificates.4.1.0\lib\net461\System.Security.Cryptography.X509Certificates.dll - True - + + + + + + - - ..\packages\System.Text.Encoding.CodePages.4.0.1\lib\net46\System.Text.Encoding.CodePages.dll - True - - - ..\packages\System.Threading.Thread.4.0.0\lib\net46\System.Threading.Thread.dll - True - - - System.Web - - - 3.5 - + + - - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True - - - False - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll - - - False - ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll - - - ..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True - - - ..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True - - - System.Web.Services - - - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True - - - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True - - - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True - - - System.XML - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + All + + + + + UmbracoExamine + - {5BA5425F-27A7-4677-865E-82246498AA2E} SqlCE4Umbraco - {31785bc3-256c-4613-b2f5-a1b0bdded8c1} Umbraco.Core - {6EDD2061-82F2-461B-BB6E-879245A832DE} umbraco.controls - {CCD75EC3-63DB-4184-B49D-51C1DD337230} umbraco.cms - {C7CB79F0-1C97-4B33-BFA7-00731B579AE2} umbraco.datalayer - {651E1350-91B6-44B7-BD60-7207006D7003} Umbraco.Web - - - ..\packages\System.Xml.XmlDocument.4.0.1\lib\net46\System.Xml.XmlDocument.dll - True - - - ..\packages\System.Xml.XPath.4.0.1\lib\net46\System.Xml.XPath.dll - True - - - ..\packages\System.Xml.XPath.XDocument.4.0.1\lib\net46\System.Xml.XPath.XDocument.dll - True - - - ..\packages\Umbraco.ModelsBuilder.8.0.0-alpha0005\lib\Umbraco.ModelsBuilder.dll - @@ -1052,6 +807,7 @@ + 11.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0 @@ -1059,6 +815,7 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0 + xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\amd64\*.* "$(TargetDir)amd64\" /Y /F /E /I /C /D @@ -1066,8 +823,10 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\" + + @@ -1086,12 +845,10 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\" + - - - - + diff --git a/src/Umbraco.Web.UI/config/log4net.config b/src/Umbraco.Web.UI/config/log4net.config index 372e5c7b88..fae14f3038 100644 --- a/src/Umbraco.Web.UI/config/log4net.config +++ b/src/Umbraco.Web.UI/config/log4net.config @@ -1,6 +1,6 @@ - + @@ -27,6 +27,6 @@ - - + + \ No newline at end of file diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config deleted file mode 100644 index efb3307a96..0000000000 --- a/src/Umbraco.Web.UI/packages.config +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 4aa04ff73f..3e6a7c26c7 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -1,117 +1,45 @@  - - + - 9.0.30729 - 2.0 - {651E1350-91B6-44B7-BD60-7207006D7003} - Debug - AnyCPU - - - - - umbraco - - - JScript - Grid - IE50 - false - Library - Umbraco.Web - OnBuildSuccess - - - - - - - - - - - - - - - 4.0 v4.6.1 - + false + false + {651E1350-91B6-44B7-BD60-7207006D7003} + Library + umbraco + Umbraco.Web ..\ true - AnyCPU - bin\Debug\ - false - 285212672 - false - - - DEBUG;TRACE - - true - 4096 - false - - - false - false - false - false - 4 full + false + bin\Debug\ + DEBUG;TRACE prompt - AllRules.ruleset + 4 false - Off - bin\Release\ - false - 285212672 - false - - - TRACE - bin\Release\umbraco.xml - true - 4096 - false - - - true - false - false - false - 4 pdbonly + true + bin\Release\ + TRACE prompt - AllRules.ruleset + 4 + bin\Release\umbraco.xml false - Off - - {07fbc26b-2927-4a22-8d96-d644c667fecc} - UmbracoExamine - - - System - + - - System.Data - + - - System.Drawing - + @@ -119,40 +47,80 @@ - - 3.5 - + - - System.Web.Services - + - - System.XML - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UmbracoExamine + - {31785BC3-256C-4613-B2F5-A1B0BDDED8C1} Umbraco.Core - {6EDD2061-82F2-461B-BB6E-879245A832DE} umbraco.controls - {CCD75EC3-63DB-4184-B49D-51C1DD337230} umbraco.cms - {C7CB79F0-1C97-4B33-BFA7-00731B579AE2} umbraco.datalayer + + Properties\SolutionInfo.cs @@ -1584,17 +1552,70 @@ - - Mvc\web.config - - - MSDiscoCodeGenerator - Reference.cs - - + + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + ResXFileCodeGenerator + Strings.Designer.cs + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + + + + + + ASPXCodeBehind + + + ASPXCodeBehind + + + + + ASPXCodeBehind + + + ASPXCodeBehind + + + ASPXCodeBehind + + + + + + + + + + ASPXCodeBehind + + + + ASPXCodeBehind + + + + Form + + + + + + @@ -1656,7 +1677,27 @@ ASPXCodeBehind - + + + + + + XmlTree.xsd + + + + + MSDiscoCodeGenerator + Reference.cs + + + Mvc\web.config + + + MSDiscoCodeGenerator + Reference.cs + + Reference.map @@ -1669,78 +1710,6 @@ Settings1.Designer.cs - - ASPXCodeBehind - - - ASPXCodeBehind - - - - - ASPXCodeBehind - - - ASPXCodeBehind - - - ASPXCodeBehind - - - - - - - - - - ASPXCodeBehind - - - - ASPXCodeBehind - - - - Form - - - - - - - - - - - - - XmlTree.xsd - - - - - MSDiscoCodeGenerator - Reference.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - ResXFileCodeGenerator - Strings.Designer.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - - - @@ -1766,25 +1735,5 @@ umbraco_org_umbraco_update_CheckForUpgrade - - - 11.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0 - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Umbraco.Web/app.config b/src/Umbraco.Web/app.config deleted file mode 100644 index cab7d970c7..0000000000 --- a/src/Umbraco.Web/app.config +++ /dev/null @@ -1,88 +0,0 @@ - - - - -
- - - - - - - - - - http://regexlib.com/WebServices.asmx - - - http://update.umbraco.org/checkforupgrade.asmx - - - Somthing - - - http://our.umbraco.org/umbraco/webservices/api/repository.asmx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Umbraco.Web/project.json b/src/Umbraco.Web/project.json deleted file mode 100644 index 088c328de9..0000000000 --- a/src/Umbraco.Web/project.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "dependencies": { - "AutoMapper": "4.2.1", - "ClientDependency": "1.9.2", - "CSharpTest.Net.Collections": "14.906.1403.1082", - "dotless": "1.5.2.0", - "Examine": "2.0.0-beta2", - "HtmlAgilityPack": "1.4.9.5", - "LightInject": "4.1.3", - "LightInject.Annotation": "1.1.0", - "LightInject.Mvc": "1.1.0", - "LightInject.Web": "1.1.0", - "LightInject.WebApi": "1.1.0", - "log4net": "2.0.8", - "Lucene.Net": "3.0.3", - "Markdown": "1.*", - "Microsoft.AspNet.Identity.Core": "2.2.1", - "Microsoft.AspNet.Identity.Owin": "2.2.1", - "Microsoft.AspNet.Mvc": "5.2.3", - "Microsoft.AspNet.Razor": "3.2.3", - "Microsoft.AspNet.SignalR.Core": "2.2.1", - "Microsoft.AspNet.WebApi": "5.2.3", - "Microsoft.AspNet.WebApi.Client": "5.2.3", - "Microsoft.AspNet.WebApi.Core": "5.2.3", - "Microsoft.AspNet.WebApi.WebHost": "5.2.3", - "Microsoft.AspNet.WebPages": "3.2.3", - "Microsoft.Owin": "3.0.1", - "Microsoft.Owin.Host.SystemWeb": "3.0.1", - "Microsoft.Owin.Security": "3.0.1", - "Microsoft.Owin.Security.Cookies": "3.0.1", - "Microsoft.Owin.Security.OAuth": "3.0.1", - "Microsoft.Web.Infrastructure": "1.0.0.0", - "MiniProfiler": "3.2.0.157", - "Newtonsoft.Json": "10.0.2", - "NPoco": "3.5.1", - "Owin": "1.0.*", - "Semver": "2.0.4", - "SharpZipLib": "0.86.0", - "System.Threading.Tasks.Dataflow": "4.6.0", - "UrlRewritingNet.UrlRewriter": "2.0.7", - "xmlrpcnet": "2.5.0" - }, - "frameworks": { - "net461": {} - }, - "runtimes": { - "win-anycpu": {}, - "win": {} - } -} \ No newline at end of file diff --git a/src/UmbracoExamine/Properties/AssemblyInfo.cs b/src/UmbracoExamine/Properties/AssemblyInfo.cs index 5a7b8f844d..6c451e8cb7 100644 --- a/src/UmbracoExamine/Properties/AssemblyInfo.cs +++ b/src/UmbracoExamine/Properties/AssemblyInfo.cs @@ -1,34 +1,9 @@ using System.Reflection; -using System.Resources; -using System.Runtime.InteropServices; using System.Runtime.CompilerServices; -using System.Security; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyCompany("umbraco")] -[assembly: AssemblyCopyright("Copyright © Umbraco 2012")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] [assembly: AssemblyTitle("UmbracoExamine")] [assembly: AssemblyDescription("Umbraco index & search providers based on the Examine model using Lucene.NET 2.9.2")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("UmbracoExamine")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("31c5b048-cfa8-49b4-8983-bdba0f99eef5")] - -[assembly: NeutralResourcesLanguage("en-US")] - -//NOTE: WE cannot make change the major version to be the same as Umbraco because of backwards compatibility, however we -// will make the minor version the same as the umbraco version -[assembly: AssemblyVersion("0.7.0.*")] -[assembly: AssemblyFileVersion("0.7.0.*")] - [assembly: InternalsVisibleTo("Umbraco.Tests")] diff --git a/src/UmbracoExamine/UmbracoExamine.csproj b/src/UmbracoExamine/UmbracoExamine.csproj index c93d1f1db6..47b3bd3c04 100644 --- a/src/UmbracoExamine/UmbracoExamine.csproj +++ b/src/UmbracoExamine/UmbracoExamine.csproj @@ -1,46 +1,11 @@  - + - Debug - AnyCPU - 9.0.21022 - 2.0 + v4.6.1 + false {07FBC26B-2927-4A22-8D96-D644C667FECC} Library - Properties - UmbracoExamine UmbracoExamine - v4.6.1 - 512 - - - - - - - - - - - - - 3.5 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - ..\ true @@ -52,12 +17,6 @@ DEBUG;TRACE prompt 4 - SecurityRules.ruleset - false - - - false - false false @@ -67,168 +26,49 @@ TRACE prompt 4 - AllRules.ruleset bin\Release\UmbracoExamine.XML - false false - - false - - - true - - - ..\Solution Items\TheFARM-Public.snk - - - ..\packages\Examine.2.0.0-Beta2\lib\net45\Examine.dll - True - - - ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - True - - - ..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Analyzers.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Core.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.FastVectorHighlighter.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Highlighter.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Memory.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Queries.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Regex.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.SimpleFacetedSearch.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.Snowball.dll - True - - - ..\packages\Lucene.Net.Contrib.3.0.3\lib\net40\Lucene.Net.Contrib.SpellChecker.dll - True - - - - ..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll - - - ..\packages\NPoco.3.5.1\lib\net45\NPoco.dll - - - 3.5 - + - - 3.5 - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - + + + + + + + - {ccd75ec3-63db-4184-b49d-51c1dd337230} umbraco.cms - {31785bc3-256c-4613-b2f5-a1b0bdded8c1} Umbraco.Core - {c7cb79f0-1c97-4b33-bfa7-00731b579ae2} umbraco.datalayer - - + + + Properties\SolutionInfo.cs + + + - \ No newline at end of file diff --git a/src/UmbracoExamine/app.config b/src/UmbracoExamine/app.config deleted file mode 100644 index 248f7af020..0000000000 --- a/src/UmbracoExamine/app.config +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/UmbracoExamine/packages.config b/src/UmbracoExamine/packages.config deleted file mode 100644 index 25cef86fc6..0000000000 --- a/src/UmbracoExamine/packages.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/umbraco.cms/app.config b/src/umbraco.cms/app.config deleted file mode 100644 index 34278f6306..0000000000 --- a/src/umbraco.cms/app.config +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/umbraco.cms/packages.config b/src/umbraco.cms/packages.config deleted file mode 100644 index ecbc074d80..0000000000 --- a/src/umbraco.cms/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/umbraco.cms/umbraco.cms.csproj b/src/umbraco.cms/umbraco.cms.csproj index 55dff20716..01b123ee28 100644 --- a/src/umbraco.cms/umbraco.cms.csproj +++ b/src/umbraco.cms/umbraco.cms.csproj @@ -1,294 +1,76 @@  - + - Local - 9.0.30729 - 2.0 - {CCD75EC3-63DB-4184-B49D-51C1DD337230} - Debug - AnyCPU - - - - - cms - - - JScript - Grid - IE50 - false - Library - umbraco.cms - OnBuildSuccess - - - - - - - - - - - - - - - 3.5 v4.6.1 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - + false + {CCD75EC3-63DB-4184-B49D-51C1DD337230} + Library + cms + umbraco.cms ..\ true - bin\Debug\ - false - 285212672 - false - - - DEBUG;TRACE - - true - 4096 - false - - - false - false - false - false - 4 full + false + bin\Debug\ + DEBUG;TRACE prompt - AllRules.ruleset + 4 false - bin\Release\ - false - 285212672 - false - - - TRACE - bin\Release\cms.xml - true - 4096 - false - - - true - false - false - false - 4 pdbonly + true + bin\Release\ + TRACE prompt - AllRules.ruleset + 4 + bin\Release\cms.xml false - - ..\packages\ClientDependency.1.9.2\lib\net45\ClientDependency.Core.dll - True - - - ..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll - True - - - False - ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - - - - ..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll - - - ..\packages\NPoco.3.5.1\lib\net45\NPoco.dll - - - System - + - - 3.5 - - - System.Data - + + - - System.Security - - - System.Web - + + - - 3.5 - + - - System.XML - + + + + + + + + + + + + + - {31785BC3-256C-4613-B2F5-A1B0BDDED8C1} Umbraco.Core - {C7CB79F0-1C97-4B33-BFA7-00731B579AE2} umbraco.datalayer - + Properties\SolutionInfo.cs - - - - - True - True - PackageFiles.resx - - - - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - - Code - - - Code - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - - - ResXFileCodeGenerator - PackageFiles.Designer.cs - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - - \ No newline at end of file diff --git a/src/umbraco.controls/app.config b/src/umbraco.controls/app.config deleted file mode 100644 index 119a28d11e..0000000000 --- a/src/umbraco.controls/app.config +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/umbraco.controls/packages.config b/src/umbraco.controls/packages.config deleted file mode 100644 index eca7107322..0000000000 --- a/src/umbraco.controls/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/umbraco.controls/umbraco.controls.csproj b/src/umbraco.controls/umbraco.controls.csproj index b3d92d49ed..657dbe4acb 100644 --- a/src/umbraco.controls/umbraco.controls.csproj +++ b/src/umbraco.controls/umbraco.controls.csproj @@ -1,45 +1,12 @@  - + - Debug - AnyCPU - 9.0.30729 - 2.0 + v4.6.1 + false {6EDD2061-82F2-461B-BB6E-879245A832DE} Library - Properties - umbraco.uicontrols controls - - - - - - - - - - - 3.5 - - - v4.6.1 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - + umbraco.uicontrols ..\ true @@ -51,9 +18,6 @@ DEBUG;TRACE prompt 4 - - - AllRules.ruleset false @@ -64,110 +28,41 @@ prompt 4 bin\Release\controls.xml - AllRules.ruleset false - - ..\packages\ClientDependency.1.9.2\lib\net45\ClientDependency.Core.dll - True - - - 3.5 - + - - 3.5 - + - - Properties\SolutionInfo.cs - - - - - - - - - True - True - BaseTreePickerScripts.resx - - - - - - - - - - - - - - - - - + + - {ccd75ec3-63db-4184-b49d-51c1dd337230} umbraco.cms - {31785bc3-256c-4613-b2f5-a1b0bdded8c1} Umbraco.Core - {C7CB79F0-1C97-4B33-BFA7-00731B579AE2} umbraco.datalayer - + + + Properties\SolutionInfo.cs + + + - - - ResXFileCodeGenerator - BaseTreePickerScripts.Designer.cs - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - - \ No newline at end of file diff --git a/src/umbraco.datalayer/app.config b/src/umbraco.datalayer/app.config deleted file mode 100644 index 3edca982bd..0000000000 --- a/src/umbraco.datalayer/app.config +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/umbraco.datalayer/packages.config b/src/umbraco.datalayer/packages.config deleted file mode 100644 index efdedcf161..0000000000 --- a/src/umbraco.datalayer/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/umbraco.datalayer/umbraco.datalayer.csproj b/src/umbraco.datalayer/umbraco.datalayer.csproj index 3a69be2b66..e1983b8f6e 100644 --- a/src/umbraco.datalayer/umbraco.datalayer.csproj +++ b/src/umbraco.datalayer/umbraco.datalayer.csproj @@ -1,45 +1,11 @@  - + - Debug - AnyCPU - 9.0.30729 - 2.0 + v4.6.1 + false {C7CB79F0-1C97-4B33-BFA7-00731B579AE2} Library - Properties - umbraco.DataLayer umbraco.DataLayer - - - - - - - - - - - 3.5 - - - v4.6.1 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - ..\ true @@ -51,9 +17,6 @@ TRACE;DEBUG;DebugDataLayer prompt 4 - - - AllRules.ruleset false @@ -64,25 +27,12 @@ prompt 4 bin\Release\umbraco.DataLayer.xml - AllRules.ruleset false - - ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - - - False - ..\packages\Microsoft.ApplicationBlocks.Data.1.0.1559.20655\lib\Microsoft.ApplicationBlocks.Data.dll - - - ..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll - - - 3.5 - + @@ -90,82 +40,21 @@ - - Properties\SolutionInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - - - - - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - + + + + - {31785bc3-256c-4613-b2f5-a1b0bdded8c1} Umbraco.Core - - + + + + Properties\SolutionInfo.cs + + + \ No newline at end of file diff --git a/src/umbraco.vssscc b/src/umbraco.vssscc deleted file mode 100644 index 794f014c92..0000000000 --- a/src/umbraco.vssscc +++ /dev/null @@ -1,10 +0,0 @@ -"" -{ -"FILE_VERSION" = "9237" -"ENLISTMENT_CHOICE" = "NEVER" -"PROJECT_FILE_RELATIVE_PATH" = "" -"NUMBER_OF_EXCLUDED_FILES" = "0" -"ORIGINAL_PROJECT_FILE_PATH" = "" -"NUMBER_OF_NESTED_PROJECTS" = "0" -"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROJECT" -}