Skip to content

Commit f80c432

Browse files
keif888keif888
committed
Remove validation of contactURL, which was breaking execution of older DTSX packages, which had NOT been edited using newer component.
1 parent 8fa8862 commit f80c432

File tree

5 files changed

+51
-49
lines changed

5 files changed

+51
-49
lines changed

‎TextFileSplitter.sln‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ Global
5050
GlobalSection(ProjectConfigurationPlatforms) = postSolution
5151
{EB8633FF-CEED-40EE-8D1A-CA1BF5678C42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5252
{EB8633FF-CEED-40EE-8D1A-CA1BF5678C42}.Debug|Any CPU.Build.0 = Debug|Any CPU
53-
{EB8633FF-CEED-40EE-8D1A-CA1BF5678C42}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
54-
{EB8633FF-CEED-40EE-8D1A-CA1BF5678C42}.Debug|Mixed Platforms.Build.0 = Release|Any CPU
53+
{EB8633FF-CEED-40EE-8D1A-CA1BF5678C42}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
54+
{EB8633FF-CEED-40EE-8D1A-CA1BF5678C42}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
5555
{EB8633FF-CEED-40EE-8D1A-CA1BF5678C42}.Debug|x64.ActiveCfg = Debug|Any CPU
5656
{EB8633FF-CEED-40EE-8D1A-CA1BF5678C42}.Debug|x64.Build.0 = Debug|Any CPU
5757
{EB8633FF-CEED-40EE-8D1A-CA1BF5678C42}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -70,8 +70,8 @@ Global
7070
{EB8633FF-CEED-40EE-8D1A-CA1BF5678C42}.UnitTest|x86.ActiveCfg = Release|Any CPU
7171
{51B00B6A-F94A-4C7E-860A-487C9893FC9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7272
{51B00B6A-F94A-4C7E-860A-487C9893FC9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
73-
{51B00B6A-F94A-4C7E-860A-487C9893FC9A}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
74-
{51B00B6A-F94A-4C7E-860A-487C9893FC9A}.Debug|Mixed Platforms.Build.0 = Release|Any CPU
73+
{51B00B6A-F94A-4C7E-860A-487C9893FC9A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
74+
{51B00B6A-F94A-4C7E-860A-487C9893FC9A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
7575
{51B00B6A-F94A-4C7E-860A-487C9893FC9A}.Debug|x64.ActiveCfg = Debug|Any CPU
7676
{51B00B6A-F94A-4C7E-860A-487C9893FC9A}.Debug|x64.Build.0 = Debug|Any CPU
7777
{51B00B6A-F94A-4C7E-860A-487C9893FC9A}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -90,8 +90,8 @@ Global
9090
{51B00B6A-F94A-4C7E-860A-487C9893FC9A}.UnitTest|x86.ActiveCfg = UnitTest|Any CPU
9191
{92EF89AC-2E05-4208-AE92-5EC67437713F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
9292
{92EF89AC-2E05-4208-AE92-5EC67437713F}.Debug|Any CPU.Build.0 = Debug|Any CPU
93-
{92EF89AC-2E05-4208-AE92-5EC67437713F}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
94-
{92EF89AC-2E05-4208-AE92-5EC67437713F}.Debug|Mixed Platforms.Build.0 = Release|Any CPU
93+
{92EF89AC-2E05-4208-AE92-5EC67437713F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
94+
{92EF89AC-2E05-4208-AE92-5EC67437713F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
9595
{92EF89AC-2E05-4208-AE92-5EC67437713F}.Debug|x64.ActiveCfg = Debug|Any CPU
9696
{92EF89AC-2E05-4208-AE92-5EC67437713F}.Debug|x64.Build.0 = Debug|Any CPU
9797
{92EF89AC-2E05-4208-AE92-5EC67437713F}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -110,8 +110,8 @@ Global
110110
{92EF89AC-2E05-4208-AE92-5EC67437713F}.UnitTest|x86.ActiveCfg = Release|Any CPU
111111
{92EF89AD-2E05-4208-AE92-5EC67437713F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
112112
{92EF89AD-2E05-4208-AE92-5EC67437713F}.Debug|Any CPU.Build.0 = Debug|Any CPU
113-
{92EF89AD-2E05-4208-AE92-5EC67437713F}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
114-
{92EF89AD-2E05-4208-AE92-5EC67437713F}.Debug|Mixed Platforms.Build.0 = Release|Any CPU
113+
{92EF89AD-2E05-4208-AE92-5EC67437713F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
114+
{92EF89AD-2E05-4208-AE92-5EC67437713F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
115115
{92EF89AD-2E05-4208-AE92-5EC67437713F}.Debug|x64.ActiveCfg = Debug|Any CPU
116116
{92EF89AD-2E05-4208-AE92-5EC67437713F}.Debug|x64.Build.0 = Debug|Any CPU
117117
{92EF89AD-2E05-4208-AE92-5EC67437713F}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -134,8 +134,8 @@ Global
134134
{92EF89AD-2E05-4208-AE92-5EC67437713F}.UnitTest|x86.Build.0 = Release|Any CPU
135135
{3F6DB102-213E-4B0A-83D8-3E309197B8B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
136136
{3F6DB102-213E-4B0A-83D8-3E309197B8B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
137-
{3F6DB102-213E-4B0A-83D8-3E309197B8B8}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
138-
{3F6DB102-213E-4B0A-83D8-3E309197B8B8}.Debug|Mixed Platforms.Build.0 = Release|Any CPU
137+
{3F6DB102-213E-4B0A-83D8-3E309197B8B8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
138+
{3F6DB102-213E-4B0A-83D8-3E309197B8B8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
139139
{3F6DB102-213E-4B0A-83D8-3E309197B8B8}.Debug|x64.ActiveCfg = Debug|Any CPU
140140
{3F6DB102-213E-4B0A-83D8-3E309197B8B8}.Debug|x64.Build.0 = Debug|Any CPU
141141
{3F6DB102-213E-4B0A-83D8-3E309197B8B8}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -158,8 +158,8 @@ Global
158158
{3F6DB102-213E-4B0A-83D8-3E309197B8B8}.UnitTest|x86.Build.0 = Release|Any CPU
159159
{879C134E-D64B-436E-841B-C69689506AF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
160160
{879C134E-D64B-436E-841B-C69689506AF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
161-
{879C134E-D64B-436E-841B-C69689506AF7}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
162-
{879C134E-D64B-436E-841B-C69689506AF7}.Debug|Mixed Platforms.Build.0 = Release|Any CPU
161+
{879C134E-D64B-436E-841B-C69689506AF7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
162+
{879C134E-D64B-436E-841B-C69689506AF7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
163163
{879C134E-D64B-436E-841B-C69689506AF7}.Debug|x64.ActiveCfg = Debug|Any CPU
164164
{879C134E-D64B-436E-841B-C69689506AF7}.Debug|x64.Build.0 = Debug|Any CPU
165165
{879C134E-D64B-436E-841B-C69689506AF7}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -180,6 +180,30 @@ Global
180180
{879C134E-D64B-436E-841B-C69689506AF7}.UnitTest|x64.Build.0 = Release|Any CPU
181181
{879C134E-D64B-436E-841B-C69689506AF7}.UnitTest|x86.ActiveCfg = Release|Any CPU
182182
{879C134E-D64B-436E-841B-C69689506AF7}.UnitTest|x86.Build.0 = Release|Any CPU
183+
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
184+
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Debug|Any CPU.Build.0 = Debug|Any CPU
185+
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
186+
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
187+
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Debug|x64.ActiveCfg = Debug|Any CPU
188+
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Debug|x64.Build.0 = Debug|Any CPU
189+
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Debug|x86.ActiveCfg = Debug|Any CPU
190+
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Debug|x86.Build.0 = Debug|Any CPU
191+
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Release|Any CPU.ActiveCfg = Release|Any CPU
192+
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Release|Any CPU.Build.0 = Release|Any CPU
193+
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
194+
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
195+
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Release|x64.ActiveCfg = Release|Any CPU
196+
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Release|x64.Build.0 = Release|Any CPU
197+
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Release|x86.ActiveCfg = Release|Any CPU
198+
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Release|x86.Build.0 = Release|Any CPU
199+
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.UnitTest|Any CPU.ActiveCfg = Release|Any CPU
200+
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.UnitTest|Any CPU.Build.0 = Release|Any CPU
201+
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.UnitTest|Mixed Platforms.ActiveCfg = Release|Any CPU
202+
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.UnitTest|Mixed Platforms.Build.0 = Release|Any CPU
203+
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.UnitTest|x64.ActiveCfg = Release|Any CPU
204+
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.UnitTest|x64.Build.0 = Release|Any CPU
205+
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.UnitTest|x86.ActiveCfg = Release|Any CPU
206+
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.UnitTest|x86.Build.0 = Release|Any CPU
183207
{7995D5C2-ED1A-42E4-8CCD-CA0276A50311}.Debug|Any CPU.ActiveCfg = Debug|x86
184208
{7995D5C2-ED1A-42E4-8CCD-CA0276A50311}.Debug|Mixed Platforms.ActiveCfg = Release|x86
185209
{7995D5C2-ED1A-42E4-8CCD-CA0276A50311}.Debug|x64.ActiveCfg = Debug|x86
@@ -216,7 +240,7 @@ Global
216240
{36B4B188-EAC8-477B-9596-B762F4920494}.UnitTest|x86.Build.0 = Release|x86
217241
{6910816A-8EB5-4E8F-84CF-FA15FEBDB467}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
218242
{6910816A-8EB5-4E8F-84CF-FA15FEBDB467}.Debug|Any CPU.Build.0 = Debug|Any CPU
219-
{6910816A-8EB5-4E8F-84CF-FA15FEBDB467}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
243+
{6910816A-8EB5-4E8F-84CF-FA15FEBDB467}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
220244
{6910816A-8EB5-4E8F-84CF-FA15FEBDB467}.Debug|x64.ActiveCfg = Debug|Any CPU
221245
{6910816A-8EB5-4E8F-84CF-FA15FEBDB467}.Debug|x86.ActiveCfg = Debug|Any CPU
222246
{6910816A-8EB5-4E8F-84CF-FA15FEBDB467}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -229,30 +253,6 @@ Global
229253
{6910816A-8EB5-4E8F-84CF-FA15FEBDB467}.UnitTest|Mixed Platforms.ActiveCfg = Release|Any CPU
230254
{6910816A-8EB5-4E8F-84CF-FA15FEBDB467}.UnitTest|x64.ActiveCfg = Release|Any CPU
231255
{6910816A-8EB5-4E8F-84CF-FA15FEBDB467}.UnitTest|x86.ActiveCfg = Release|Any CPU
232-
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
233-
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Debug|Any CPU.Build.0 = Debug|Any CPU
234-
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
235-
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
236-
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Debug|x64.ActiveCfg = Debug|Any CPU
237-
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Debug|x64.Build.0 = Debug|Any CPU
238-
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Debug|x86.ActiveCfg = Debug|Any CPU
239-
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Debug|x86.Build.0 = Debug|Any CPU
240-
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Release|Any CPU.ActiveCfg = Release|Any CPU
241-
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Release|Any CPU.Build.0 = Release|Any CPU
242-
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
243-
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
244-
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Release|x64.ActiveCfg = Release|Any CPU
245-
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Release|x64.Build.0 = Release|Any CPU
246-
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Release|x86.ActiveCfg = Release|Any CPU
247-
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.Release|x86.Build.0 = Release|Any CPU
248-
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.UnitTest|Any CPU.ActiveCfg = Release|Any CPU
249-
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.UnitTest|Any CPU.Build.0 = Release|Any CPU
250-
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.UnitTest|Mixed Platforms.ActiveCfg = Release|Any CPU
251-
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.UnitTest|Mixed Platforms.Build.0 = Release|Any CPU
252-
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.UnitTest|x64.ActiveCfg = Release|Any CPU
253-
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.UnitTest|x64.Build.0 = Release|Any CPU
254-
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.UnitTest|x86.ActiveCfg = Release|Any CPU
255-
{D00E68A2-D14A-450D-B54A-AFC5ADE9709C}.UnitTest|x86.Build.0 = Release|Any CPU
256256
EndGlobalSection
257257
GlobalSection(SolutionProperties) = preSolution
258258
HideSolutionNode = FALSE

‎TextFileSplitter2012/TextFileSplitter.cs‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public class TextFileSplitter : PipelineComponent
4848
private String fileName = String.Empty;
4949
private int codePage = 1252;
5050
private string columnDelimter = string.Empty;
51+
private string contactURL = "https://github.com/keif888/TextFileSplitter/";
5152
object ffConnection = null;
5253

5354
public TextFileSplitter()
@@ -66,7 +67,7 @@ public override void ProvideComponentProperties()
6667
this.RemoveAllInputsOutputsAndCustomProperties();
6768
this.ComponentMetaData.Version = 5; // NB. Always keep this in sync with the CurrentVersion!!!
6869
this.ComponentMetaData.UsesDispositions = true;
69-
this.ComponentMetaData.ContactInfo = "https://github.com/keif888/TextFileSplitter/";
70+
this.ComponentMetaData.ContactInfo = contactURL;
7071
ManageProperties.AddComponentProperties(this.ComponentMetaData.CustomPropertyCollection);
7172

7273
// PassThrough Record Output
@@ -123,9 +124,9 @@ public override void PerformUpgrade(int pipelineVersion)
123124
// Get the attributes for the SSIS Package
124125
int metadataVersion = ComponentMetaData.Version;
125126

126-
if (this.ComponentMetaData.ContactInfo != "https://github.com/keif888/TextFileSplitter/")
127+
if (this.ComponentMetaData.ContactInfo != contactURL)
127128
{
128-
this.ComponentMetaData.ContactInfo = "https://github.com/keif888/TextFileSplitter/";
129+
this.ComponentMetaData.ContactInfo = contactURL;
129130
}
130131

131132
if (binaryVersion > metadataVersion)
@@ -330,10 +331,11 @@ public override void PerformUpgrade(int pipelineVersion)
330331
public override DTSValidationStatus Validate()
331332
{
332333
DTSValidationStatus status = DTSValidationStatus.VS_ISVALID;
333-
if (this.ComponentMetaData.ContactInfo != "https://github.com/keif888/TextFileSplitter/")
334-
{
335-
status = DTSValidationStatus.VS_NEEDSNEWMETADATA;
336-
}
334+
// The following breaks the component on execution, if using a DTSX created with a version that preceded github.
335+
//if (this.ComponentMetaData.ContactInfo != contactURL)
336+
//{
337+
// status = DTSValidationStatus.VS_NEEDSNEWMETADATA;
338+
//}
337339
status = ValidateComponentProperties(status);
338340
status = ValidateOutputs(status);
339341
return status;
@@ -859,9 +861,9 @@ public override void ReinitializeMetaData()
859861
IDTSOutput100 passThroughOutput = this.ComponentMetaData.OutputCollection[0];
860862
IDTSOutput100 errorOutput = this.ComponentMetaData.OutputCollection[1];
861863

862-
if (this.ComponentMetaData.ContactInfo != "https://github.com/keif888/TextFileSplitter/")
864+
if (this.ComponentMetaData.ContactInfo != contactURL)
863865
{
864-
this.ComponentMetaData.ContactInfo = "https://github.com/keif888/TextFileSplitter/";
866+
this.ComponentMetaData.ContactInfo = contactURL;
865867
}
866868

867869
if (passThroughOutput.OutputColumnCollection.Count == 0)

‎TextFileSplitterInstallx64/Product.wxs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3-
<?define ProductVersion = "1.0.20.0"?>
3+
<?define ProductVersion = "1.0.21.0"?>
44
<?define UpgradeCode = "A9EE6818-88C5-4E7F-A2E4-C7BC52E7FF8D"?>
55
<?define Manufacturer = "Keith Martin"?>
66
<?define PackageCode = "*"?>

‎TextFileSplitterInstallx86/Product.wxs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3-
<?define ProductVersion = "1.0.20.0"?>
3+
<?define ProductVersion = "1.0.21.0"?>
44
<?define UpgradeCode = "944FC76C-F623-480F-A10D-A1994713BF87"?>
55
<?define Manufacturer = "Keith Martin"?>
66
<?define PackageCode = "*"?>

‎UnitTestTextFileSplitter/TestTextFileSplitter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void TestProvideComponentProperties()
3232

3333
Assert.AreEqual(5, textFileSplitter.Version);
3434
Assert.AreEqual(true, textFileSplitter.UsesDispositions);
35-
Assert.AreEqual("http://TextFileSplitter.codeplex.com/", textFileSplitter.ContactInfo);
35+
Assert.AreEqual("https://github.com/keif888/TextFileSplitter/", textFileSplitter.ContactInfo);
3636
Assert.AreEqual(true, (Boolean)textFileSplitter.CustomPropertyCollection[ManageProperties.isTextDelmited].Value);
3737
Assert.AreEqual("\"", (String)textFileSplitter.CustomPropertyCollection[ManageProperties.textDelmiter].Value);
3838
Assert.AreEqual(",", (String)textFileSplitter.CustomPropertyCollection[ManageProperties.columnDelimiter].Value);

0 commit comments

Comments
 (0)