Fix for UI issue in Visual Studio 2013 with SsisUnitSource and Destin…

…ation
johnwelch · Jun 9, 2014 · cb497df · cb497df
1 parent ead2b60
commit cb497df
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 100 deletions.
diff --git a/SSISUnit_SQL2014.sln b/SSISUnit_SQL2014.sln
@@ -1,6 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2013
+VisualStudioVersion = 12.0.30501.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSISUnit.2014", "SSISUnit\SSISUnit.2014.csproj", "{8C839F0E-0AFD-4D9A-8DEE-5C7963E3E6C7}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SsisUnit.TestComponents.2014", "SsisUnit.TestComponents\SsisUnit.TestComponents.2014.csproj", "{6C8078E0-99DD-40D0-94DA-E17B3FC50679}"

diff --git a/SsisUnit.TestComponents/SsisSource.ico b/SsisUnit.TestComponents/SsisSource.ico
diff --git a/SsisUnit.TestComponents/SsisUnit.TestComponents.2014.csproj b/SsisUnit.TestComponents/SsisUnit.TestComponents.2014.csproj
@@ -81,6 +81,9 @@
   <ItemGroup>
     <None Include="SsisUnit.snk" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SsisSource.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>copy "$(TargetPath)" "C:\Program Files (x86)\Microsoft SQL Server\120\DTS\PipelineComponents"

diff --git a/SsisUnit.TestComponents/SsisUnitDestination.cs b/SsisUnit.TestComponents/SsisUnitDestination.cs
@@ -23,7 +23,8 @@ namespace SsisUnit.TestComponents
         ComponentType = ComponentType.DestinationAdapter,
         DisplayName = "SsisUnit Destination",
         CurrentVersion = 0,
-        Description = "Destination used with SsisUnit tests to retrieve data from the data flow.")]
+        Description = "Destination used with SsisUnit tests to retrieve data from the data flow.",
+        IconResource = "SsisUnit.TestComponents.SsisSource.ico")]
     public class SsisUnitDestination : PipelineComponent
     {
         private const string DataTablePropertyName = "DataTableXml";

diff --git a/SsisUnit.TestComponents/SsisUnitSource.cs b/SsisUnit.TestComponents/SsisUnitSource.cs
@@ -20,7 +20,8 @@ namespace SsisUnit.TestComponents
         ComponentType = ComponentType.SourceAdapter,
         DisplayName = "SsisUnit Source",
         CurrentVersion = 0,
-        Description = "Source used with SsisUnit tests to provide static data to the data flow.")]
+        Description = "Source used with SsisUnit tests to provide static data to the data flow.",
+        IconResource = "SsisUnit.TestComponents.SsisSource.ico")]
     public class SsisUnitSource : PipelineComponent
     {
         private const string StartingDataSet =

diff --git a/SsisUnit.Tests/Commands/DataCompareCommandTest.cs b/SsisUnit.Tests/Commands/DataCompareCommandTest.cs
@@ -33,7 +33,7 @@ public void DataCompareCommandConstructorTest()
         public void RunDataCompareCommandSetTest()
         {
                         var ts = new SsisTestSuite();
-            var connRef = new ConnectionRef("TestConn", "Data Source=localhost;Initial Catalog=AdventureWorks2012;Integrated Security=SSPI", ConnectionRef.ConnectionTypeEnum.AdoNet, "System.Data.SqlClient");
+            var connRef = new ConnectionRef("TestConn", "Data Source=DEV-QA-SQL2012;Initial Catalog=AdventureWorks;Integrated Security=SSPI", ConnectionRef.ConnectionTypeEnum.AdoNet, "System.Data.SqlClient");
             ts.ConnectionRefs.Add(connRef.ReferenceName, connRef);
             var dataset = new Dataset(
                 ts,
@@ -55,7 +55,7 @@ public void RunDataCompareCommandSetTest()
         public void RunDataCompareCommandSetWithOtherTestTest()
         {
             var ts = new SsisTestSuite();
-            var connRef = new ConnectionRef("TestConn", "Data Source=localhost;Initial Catalog=AdventureWorks2012;Integrated Security=SSPI", ConnectionRef.ConnectionTypeEnum.AdoNet, "System.Data.SqlClient");
+            var connRef = new ConnectionRef("TestConn", "Data Source=DEV-QA-SQL2012;Initial Catalog=AdventureWorks;Integrated Security=SSPI", ConnectionRef.ConnectionTypeEnum.AdoNet, "System.Data.SqlClient");
             var pkgRef = new PackageRef("pkg", _dtsxFilePath, PackageStorageType.FileSystem);
             ts.ConnectionRefs.Add(connRef.ReferenceName, connRef);
             ts.PackageRefs.Add(pkgRef.Name, pkgRef);

diff --git a/SsisUnit.Tests/Commands/PropertyCommandTest.cs b/SsisUnit.Tests/Commands/PropertyCommandTest.cs
@@ -106,7 +106,7 @@ private SsisAssert AddNewAssert(SsisTestSuite ts, Test test, string assertName,
         }
 
         [TestMethod]
-        public void TestSetConnectionSrtring()
+        public void TestSetConnectionString()
         {
             string packageFilepath;
 #if SQL2005

diff --git a/SsisUnit.Tests/TestPackages/DataFlowComponent.dtsx b/SsisUnit.Tests/TestPackages/DataFlowComponent.dtsx
@@ -2,19 +2,19 @@
 <DTS:Executable xmlns:DTS="www.microsoft.com/SqlServer/Dts"
   DTS:refId="Package"
   DTS:CreationDate="8/20/2013 9:31:54 AM"
-  DTS:CreationName="SSIS.Package.3"
+  DTS:CreationName="Microsoft.Package"
   DTS:CreatorComputerName="FL-WS-DEV-JW04"
   DTS:CreatorName="PWCORP\jwelch"
   DTS:DTSID="{57C8B1C0-D7A1-46D7-BA9D-44BCA91D13C6}"
-  DTS:ExecutableType="SSIS.Package.3"
-  DTS:LastModifiedProductVersion="11.0.3360.12"
+  DTS:ExecutableType="Microsoft.Package"
+  DTS:LastModifiedProductVersion="12.0.2344.23"
   DTS:LocaleID="1033"
   DTS:ObjectName="DataFlowComponent"
   DTS:PackageType="5"
-  DTS:VersionBuild="2"
-  DTS:VersionGUID="{859AD708-0C93-4D27-94B9-68926654833B}">
+  DTS:VersionBuild="3"
+  DTS:VersionGUID="{D049DD3B-568E-4AE2-A876-F9F063DB012D}">
   <DTS:Property
-    DTS:Name="PackageFormatVersion">6</DTS:Property>
+    DTS:Name="PackageFormatVersion">8</DTS:Property>
   <DTS:ConnectionManagers>
     <DTS:ConnectionManager
       DTS:refId="Package.ConnectionManagers[localhost.AdventureWorks2012]"
@@ -31,10 +31,10 @@
   <DTS:Executables>
     <DTS:Executable
       DTS:refId="Package\Data Flow Task"
-      DTS:CreationName="{5918251B-2970-45A4-AB5F-01C3C588FE5A}"
+      DTS:CreationName="Microsoft.Pipeline"
       DTS:Description="Data Flow Task"
       DTS:DTSID="{A4787BE8-0527-42FB-BD4A-BDD5C703B42A}"
-      DTS:ExecutableType="{5918251B-2970-45A4-AB5F-01C3C588FE5A}"
+      DTS:ExecutableType="Microsoft.Pipeline"
       DTS:LocaleID="-1"
       DTS:ObjectName="Data Flow Task">
       <DTS:Variables />
@@ -44,7 +44,7 @@
           <components>
             <component
               refId="Package\Data Flow Task\Derived Column"
-              componentClassID="{49928E82-9C4E-49F0-AABE-3812B82707EC}"
+              componentClassID="Microsoft.DerivedColumn"
               contactInfo="Derived Column;Microsoft Corporation; Microsoft SQL Server; (C) Microsoft Corporation; All Rights Reserved; http://www.microsoft.com/sql/support;0"
               description="Creates new column values by applying expressions to transformation input columns. Create new columns or overwrite existing ones. For example, concatenate the values from the 'first name' and 'last name' column to make a 'full name' column."
               name="Derived Column"
@@ -131,7 +131,7 @@
             </component>
             <component
               refId="Package\Data Flow Task\OLE DB Source"
-              componentClassID="{165A526D-D5DE-47FF-96A6-F8274C19826B}"
+              componentClassID="Microsoft.OLEDBSource"
               contactInfo="OLE DB Source;Microsoft Corporation; Microsoft SQL Server; (C) Microsoft Corporation; All Rights Reserved; http://www.microsoft.com/sql/support;7"
               description="OLE DB Source"
               name="OLE DB Source"
@@ -154,7 +154,7 @@
                   dataType="System.String"
                   description="The SQL command to be executed."
                   name="SqlCommand"
-                  UITypeEditor="Microsoft.DataTransformationServices.Controls.ModalMultilineStringEditor, Microsoft.DataTransformationServices.Controls, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91">
+                  UITypeEditor="Microsoft.DataTransformationServices.Controls.ModalMultilineStringEditor">
                   SELECT
                   CAST(1 AS INT) AS ColInt,
                   CAST('Test' AS VARCHAR(50)) AS ColVarChar,
@@ -306,7 +306,7 @@
             </component>
             <component
               refId="Package\Data Flow Task\Union All"
-              componentClassID="{B594E9A8-4351-4939-891C-CFE1AB93E925}"
+              componentClassID="Microsoft.UnionAll"
               contactInfo="Union All;Microsoft Corporation; Microsoft SQL Server; (C) Microsoft Corporation; All Rights Reserved; http://www.microsoft.com/sql/support;1"
               description="Combines rows from multiple data flows without sorting. For example, add rows back to a data flow after correction of errors. If sorting is important, we recommend using the Merge transformation."
               name="Union All"
@@ -432,13 +432,12 @@
       </DTS:ObjectData>
     </DTS:Executable>
   </DTS:Executables>
-  <DTS:DesignTimeProperties>
-    <![CDATA[<?xml version="1.0"?>
+  <DTS:DesignTimeProperties><![CDATA[<?xml version="1.0"?>
 <!--This CDATA section contains the layout information of the package. The section includes information such as (x,y) coordinates, width, and height.-->
 <!--If you manually edit this section and make a mistake, you can delete it. -->
 <!--The package will still be able to load normally but the previous layout information will be lost and the designer will automatically re-arrange the elements on the design surface.-->
 <Objects
-  Version="sql11">
+  Version="sql12">
   <!--Each node below will contain properties that do not affect runtime behavior.-->
   <Package
     design-time-name="Package">
@@ -452,83 +451,5 @@
       </GraphLayout>
     </LayoutInfo>
   </Package>
-  <TaskHost
-    design-time-name="Package\Data Flow Task">
-    <LayoutInfo>
-      <GraphLayout
-        Capacity="8" xmlns="clr-namespace:Microsoft.SqlServer.IntegrationServices.Designer.Model.Serialization;assembly=Microsoft.SqlServer.IntegrationServices.Graph" xmlns:mssgle="clr-namespace:Microsoft.SqlServer.Graph.LayoutEngine;assembly=Microsoft.SqlServer.Graph" xmlns:assembly="http://schemas.microsoft.com/winfx/2006/xaml">
-        <NodeLayout
-          Size="150,42"
-          Id="Package\Data Flow Task\OLE DB Source"
-          TopLeft="357,82" />
-        <NodeLayout
-          Size="154,42"
-          Id="Package\Data Flow Task\Derived Column"
-          TopLeft="360,166" />
-        <EdgeLayout
-          Id="Package\Data Flow Task.Paths[OLE DB Source Output]"
-          TopLeft="434.5,124">
-          <EdgeLayout.Curve>
-            <mssgle:Curve
-              StartConnector="{assembly:Null}"
-              EndConnector="0,42"
-              Start="0,0"
-              End="0,34.5">
-              <mssgle:Curve.Segments>
-                <mssgle:SegmentCollection
-                  Capacity="5">
-                  <mssgle:LineSegment
-                    End="0,34.5" />
-                </mssgle:SegmentCollection>
-              </mssgle:Curve.Segments>
-            </mssgle:Curve>
-          </EdgeLayout.Curve>
-          <EdgeLayout.Labels>
-            <EdgeLabelCollection />
-          </EdgeLayout.Labels>
-        </EdgeLayout>
-        <NodeLayout
-          Size="121,42"
-          Id="Package\Data Flow Task\Union All"
-          TopLeft="373,257" />
-        <EdgeLayout
-          Id="Package\Data Flow Task.Paths[Derived Column Output]"
-          TopLeft="435.25,208">
-          <EdgeLayout.Curve>
-            <mssgle:Curve
-              StartConnector="{assembly:Null}"
-              EndConnector="0,49"
-              Start="0,0"
-              End="0,41.5">
-              <mssgle:Curve.Segments>
-                <mssgle:SegmentCollection
-                  Capacity="5">
-                  <mssgle:LineSegment
-                    End="0,41.5" />
-                </mssgle:SegmentCollection>
-              </mssgle:Curve.Segments>
-            </mssgle:Curve>
-          </EdgeLayout.Curve>
-          <EdgeLayout.Labels>
-            <EdgeLabelCollection />
-          </EdgeLayout.Labels>
-        </EdgeLayout>
-      </GraphLayout>
-    </LayoutInfo>
-  </TaskHost>
-  <PipelineComponentMetadata
-    design-time-name="Package\Data Flow Task\OLE DB Source">
-    <Properties>
-      <Property>
-        <Name>DataSourceViewID</Name>
-      </Property>
-      <Property>
-        <Name>TableInfoObjectType</Name>
-        <Value
-          type="q2:string">Table</Value>
-      </Property>
-    </Properties>
-  </PipelineComponentMetadata>
-</Objects>]]>
-  </DTS:DesignTimeProperties>
+</Objects>]]></DTS:DesignTimeProperties>
 </DTS:Executable>