diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index f6a14611df..f4da17e45a 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -12,4 +12,4 @@ using System.Resources;
[assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyFileVersion("7.6.0")]
-[assembly: AssemblyInformationalVersion("7.6.0-alpha032")]
\ No newline at end of file
+[assembly: AssemblyInformationalVersion("7.6.0-alpha033")]
\ No newline at end of file
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index 9d2bf7ddae..fe45c0117d 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -24,7 +24,7 @@ namespace Umbraco.Core.Configuration
/// Gets the version comment (like beta or RC).
///
/// The version comment.
- public static string CurrentComment { get { return "alpha032"; } }
+ public static string CurrentComment { get { return "alpha033"; } }
// Get the version of the umbraco.dll by looking at a class in that dll
// Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx
diff --git a/src/Umbraco.Core/Models/Rdbms/UmbracoDeployChecksumDto.cs b/src/Umbraco.Core/Models/Rdbms/UmbracoDeployChecksumDto.cs
deleted file mode 100644
index 06d904ee88..0000000000
--- a/src/Umbraco.Core/Models/Rdbms/UmbracoDeployChecksumDto.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.DatabaseAnnotations;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-
-namespace Umbraco.Core.Models.Rdbms
-{
- [TableName("umbracoDeployChecksum")]
- [PrimaryKey("id")]
- [ExplicitColumns]
- internal class UmbracoDeployChecksumDto
- {
- [Column("id")]
- [PrimaryKeyColumn(Name = "PK_umbracoDeployChecksum")]
- public int Id { get; set; }
-
- [Column("entityType")]
- [Length(32)]
- [NullSetting(NullSetting = NullSettings.NotNull)]
- [Index(IndexTypes.UniqueNonClustered, Name = "IX_umbracoDeployChecksum", ForColumns = "entityType,entityGuid,entityPath")]
- public string EntityType { get; set; }
-
- [Column("entityGuid")]
- [NullSetting(NullSetting = NullSettings.Null)]
- public Guid EntityGuid { get; set; }
-
- [Column("entityPath")]
- [Length(256)]
- [NullSetting(NullSetting = NullSettings.Null)]
- public string EntityPath { get; set; }
-
- [Column("localChecksum")]
- [NullSetting(NullSetting = NullSettings.NotNull)]
- [Length(32)]
- public string LocalChecksum { get; set; }
-
- [Column("compositeChecksum")]
- [NullSetting(NullSetting = NullSettings.Null)]
- [Length(32)]
- public string CompositeChecksum { get; set; }
- }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/Rdbms/UmbracoDeployDependencyDto.cs b/src/Umbraco.Core/Models/Rdbms/UmbracoDeployDependencyDto.cs
deleted file mode 100644
index 765a32c929..0000000000
--- a/src/Umbraco.Core/Models/Rdbms/UmbracoDeployDependencyDto.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.DatabaseAnnotations;
-
-namespace Umbraco.Core.Models.Rdbms
-{
- [TableName("umbracoDeployDependency")]
- [ExplicitColumns]
- internal class UmbracoDeployDependencyDto
- {
- [Column("sourceId")]
- [PrimaryKeyColumn(AutoIncrement = false, Clustered = true, Name = "PK_umbracoDeployDependency", OnColumns = "sourceId, targetId")]
- [ForeignKey(typeof(UmbracoDeployChecksumDto), Name = "FK_umbracoDeployDependency_umbracoDeployChecksum_id1")]
- [NullSetting(NullSetting = NullSettings.NotNull)]
- public int SourceId { get; set; }
-
- [Column("targetId")]
- [ForeignKey(typeof(UmbracoDeployChecksumDto), Name = "FK_umbracoDeployDependency_umbracoDeployChecksum_id2")]
- [NullSetting(NullSetting = NullSettings.NotNull)]
- public int TargetId { get; set; }
-
- [Column("mode")]
- [NullSetting(NullSetting = NullSettings.NotNull)]
- public int Mode { get; set; }
-
- }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaCreation.cs b/src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaCreation.cs
index ff81c94951..d00e82bf71 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaCreation.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaCreation.cs
@@ -82,8 +82,8 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
{43, typeof (CacheInstructionDto)},
{44, typeof (ExternalLoginDto)},
{45, typeof (MigrationDto)},
- {46, typeof (UmbracoDeployChecksumDto)},
- {47, typeof (UmbracoDeployDependencyDto)},
+ //46, removed: UmbracoDeployChecksumDto
+ //47, removed: UmbracoDeployDependencyDto
{48, typeof (RedirectUrlDto) },
{49, typeof (LockDto) }
};
diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSixZero/RemoveUmbracoDeployTables.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSixZero/RemoveUmbracoDeployTables.cs
new file mode 100644
index 0000000000..ab227ebb01
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSixZero/RemoveUmbracoDeployTables.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence.SqlSyntax;
+
+namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenSixZero
+{
+ [Migration("7.6.0", 0, GlobalSettings.UmbracoMigrationName)]
+ public class RemoveUmbracoDeployTables : MigrationBase
+ {
+ public RemoveUmbracoDeployTables(ISqlSyntaxProvider sqlSyntax, ILogger logger)
+ : base(sqlSyntax, logger)
+ { }
+
+ public override void Up()
+ {
+ var tables = SqlSyntax.GetTablesInSchema(Context.Database).ToArray();
+
+ // there are two versions of umbracoDeployDependency,
+ // 1. one created by 7.4 and never used, we need to remove it (has a sourceId column)
+ // 2. one created by Deploy itself, we need to keep it (has a sourceUdi column)
+ if (tables.InvariantContains("umbracoDeployDependency"))
+ {
+ var columns = SqlSyntax.GetColumnsInSchema(Context.Database).ToArray();
+ if (columns.Any(x => x.TableName.InvariantEquals("umbracoDeployDependency") && x.ColumnName.InvariantEquals("sourceId")))
+ Delete.Table("umbracoDeployDependency");
+ }
+
+ // always remove umbracoDeployChecksum
+ if (tables.InvariantContains("umbracoDeployChecksum"))
+ Delete.Table("umbracoDeployChecksum");
+ }
+
+ public override void Down()
+ {
+ throw new NotImplementedException();
+ }
+ }
+}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 11f113ab1e..12e3c336da 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -419,8 +419,6 @@
-
-
@@ -456,6 +454,7 @@
+
diff --git a/src/Umbraco.Tests/Persistence/BaseTableByTableTest.cs b/src/Umbraco.Tests/Persistence/BaseTableByTableTest.cs
index bed5582609..3322507c49 100644
--- a/src/Umbraco.Tests/Persistence/BaseTableByTableTest.cs
+++ b/src/Umbraco.Tests/Persistence/BaseTableByTableTest.cs
@@ -580,31 +580,6 @@ namespace Umbraco.Tests.Persistence
}
}
- [Test]
- public void Can_Create_umbracoDeployDependency_Table()
- {
-
- using (Transaction transaction = Database.GetTransaction())
- {
- DatabaseSchemaHelper.CreateTable();
- DatabaseSchemaHelper.CreateTable();
-
- //transaction.Complete();
- }
- }
-
- [Test]
- public void Can_Create_umbracoDeployChecksum_Table()
- {
-
- using (Transaction transaction = Database.GetTransaction())
- {
- DatabaseSchemaHelper.CreateTable();
-
- //transaction.Complete();
- }
- }
-
[Test]
public void Can_Create_umbracoUser_Table()
{