Merge pull request #11 from RoelantVos/Development-branch-v1.5.1

Development branch v1.5.1
data-solution-automation-engine · Jul 14, 2018 · 0f2bff2 · 0f2bff2
2 parents 3653dc4 + f14b0bb
commit 0f2bff2
Show file tree

Hide file tree

Showing 22 changed files with 2,839,780 additions and 17 deletions.
diff --git a/TEAM.sln b/TEAM.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 15.0.27703.2018
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TEAM", "TEAM\TEAM.csproj", "{73971441-2782-43CF-862C-1F636528858A}"
 EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "TEAM_Installation_Setup", "TEAM_Installation_Setup\TEAM_Installation_Setup.vdproj", "{1852EE88-A5AB-4241-AF6E-085ADE61C74A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,8 @@ Global
 		{73971441-2782-43CF-862C-1F636528858A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{73971441-2782-43CF-862C-1F636528858A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{73971441-2782-43CF-862C-1F636528858A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1852EE88-A5AB-4241-AF6E-085ADE61C74A}.Debug|Any CPU.ActiveCfg = Debug
+		{1852EE88-A5AB-4241-AF6E-085ADE61C74A}.Release|Any CPU.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/TEAM/App.config b/TEAM/App.config
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
     <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="TEAM.Properties.User_Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-      <section name="TEAM.Virtual_Enterprise_Data_Warehouse" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="TEAM.Properties.User_Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+      <section name="TEAM.Virtual_Enterprise_Data_Warehouse" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
     </sectionGroup>
   <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
   <startup useLegacyV2RuntimeActivationPolicy="true">
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
   </startup>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
       <parameters>
-        <parameter value="mssqllocaldb" />
+        <parameter value="mssqllocaldb"/>
       </parameters>
     </defaultConnectionFactory>
     <providers>
-      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
     </providers>
   </entityFramework>
   <userSettings>
@@ -37,6 +37,6 @@
     </TEAM.Virtual_Enterprise_Data_Warehouse>
   </userSettings>
   <connectionStrings>
-    <add name="DataVaultFrameworkEntities" connectionString="metadata=res://*/DataVault.csdl|res://*/DataVault.ssdl|res://*/DataVault.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=BISERVER\BISERVER_SANDBOX;initial catalog=EDW_900_OMD_Framework;user id=sa;password=K3kobus2;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
+    <add name="DataVaultFrameworkEntities" connectionString="metadata=res://*/DataVault.csdl|res://*/DataVault.ssdl|res://*/DataVault.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=BISERVER\BISERVER_SANDBOX;initial catalog=EDW_900_OMD_Framework;user id=sa;password=K3kobus2;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient"/>
   </connectionStrings>
-</configuration>
+</configuration>