diff --git a/appveyor.yml b/appveyor.yml index 522e5af..7c686b0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,8 +33,6 @@ skip_tags: true artifacts: - path: build\Release\**\*.nupkg name: nuget -- path: build\Release\**\*.msi - name: msi notifications: - provider: Slack diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props index 44a042c..9b7a1bb 100644 --- a/src/Cpp.Build.props +++ b/src/Cpp.Build.props @@ -70,12 +70,6 @@ MultiThreadedDebug - - - - MultiThreadedDebugDll - - MinSpace @@ -89,16 +83,4 @@ true - - - - MultiThreadedDll - - - - - $(LinkKeyFile) - $(LinkDelaySign) - - diff --git a/src/wixext/DependencyTableDefinitions.cs b/src/wixext/DependencyTableDefinitions.cs index bc3e880..d563208 100644 --- a/src/wixext/DependencyTableDefinitions.cs +++ b/src/wixext/DependencyTableDefinitions.cs @@ -9,6 +9,7 @@ public static class DependencyTableDefinitions { public static readonly TableDefinition WixDependencyProvider = new TableDefinition( "WixDependencyProvider", + TupleDefinitions.WixDependencyProvider, new[] { new ColumnDefinition("WixDependencyProvider", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The non-localized primary key for the table.", modularizeType: ColumnModularizeType.Column), @@ -18,12 +19,12 @@ public static class DependencyTableDefinitions new ColumnDefinition("DisplayName", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "The display name of the package."), new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "A 32-bit word that specifies the attribute flags to be applied."), }, - tupleDefinitionName: TupleDefinitions.WixDependencyProvider.Name, tupleIdIsPrimaryKey: true ); public static readonly TableDefinition WixDependency = new TableDefinition( "WixDependency", + DependencyTupleDefinitions.WixDependency, new[] { new ColumnDefinition("WixDependency", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The non-localized primary key for the table.", modularizeType: ColumnModularizeType.Column), @@ -32,18 +33,17 @@ public static class DependencyTableDefinitions new ColumnDefinition("MaxVersion", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Version, description: "The maximum version of the provider supported."), new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "A 32-bit word that specifies the attribute flags to be applied."), }, - tupleDefinitionName: DependencyTupleDefinitions.WixDependency.Name, tupleIdIsPrimaryKey: true ); public static readonly TableDefinition WixDependencyRef = new TableDefinition( "WixDependencyRef", + DependencyTupleDefinitions.WixDependencyRef, new[] { new ColumnDefinition("WixDependencyProvider_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "WixDependencyProvider", keyColumn: 1, description: "Foreign key into the Component table.", modularizeType: ColumnModularizeType.Column), new ColumnDefinition("WixDependency_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "WixDependency", keyColumn: 1, description: "Foreign key into the WixDependency table.", modularizeType: ColumnModularizeType.Column), }, - tupleDefinitionName: DependencyTupleDefinitions.WixDependencyRef.Name, tupleIdIsPrimaryKey: false ); diff --git a/src/wixlib/dependency.wixproj b/src/wixlib/dependency.wixproj index 72be9c1..5c704f3 100644 --- a/src/wixlib/dependency.wixproj +++ b/src/wixlib/dependency.wixproj @@ -1,7 +1,7 @@ - + {58ED0EC8-73F8-4EE1-8664-A53486D38EC8} @@ -37,7 +37,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index e1b601f..1e5a985 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file