version 2.1.1.0 fixed issue with config files

leedouglas · Jun 26, 2019 · 7c62a70 · 7c62a70
1 parent 52731de
commit 7c62a70
Show file tree

Hide file tree

Showing 66 changed files with 33 additions and 58,680 deletions.
diff --git a/EAAddinManager/EAAddinManager.csproj b/EAAddinManager/EAAddinManager.csproj
@@ -89,7 +89,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="EAAddinManager.dll.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

diff --git a/EAAddinManager/app.config b/EAAddinManager/app.config
diff --git a/EAAddinRegisterer/App.config b/EAAddinRegisterer/App.config
diff --git a/EAAddinRegisterer/EAAddinRegisterer.csproj b/EAAddinRegisterer/EAAddinRegisterer.csproj
@@ -10,7 +10,7 @@
     <AssemblyName>EAAddinRegisterer</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -76,9 +76,6 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Enterprise-Architect-Add-in-Framework\EAAddinFramework\EAAddinFramework.csproj">
       <Project>{4161dd26-375f-4744-ba96-b70366e19a78}</Project>

diff --git a/EADatabaseTransformer/EADatabaseTransformer.csproj b/EADatabaseTransformer/EADatabaseTransformer.csproj
@@ -133,7 +133,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="EADatabaseTransformer.dll.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

diff --git a/EADatabaseTransformer/Properties/AssemblyInfo.cs b/EADatabaseTransformer/Properties/AssemblyInfo.cs
@@ -28,4 +28,4 @@
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.0.*")]
+[assembly: AssemblyVersion("2.1.1.*")]
diff --git a/EADatabaseTransformer/app.config b/EADatabaseTransformer/app.config
diff --git a/EADoorsNGConnector/EADoorsNGConnector.csproj b/EADoorsNGConnector/EADoorsNGConnector.csproj
@@ -117,7 +117,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="EADoorsNGConnector.dll.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

diff --git a/EADoorsNGConnector/Properties/AssemblyInfo.cs b/EADoorsNGConnector/Properties/AssemblyInfo.cs
@@ -31,4 +31,4 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.0.*")]
+[assembly: AssemblyVersion("2.1.1.*")]
diff --git a/EADoorsNGConnector/app.config b/EADoorsNGConnector/app.config
diff --git a/EAImvertor/EAImvertor.csproj b/EAImvertor/EAImvertor.csproj
@@ -122,7 +122,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="EAImvertor.dll.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

diff --git a/EAImvertor/Properties/AssemblyInfo.cs b/EAImvertor/Properties/AssemblyInfo.cs
@@ -24,4 +24,4 @@
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.0.*")]
+[assembly: AssemblyVersion("2.1.1.*")]
diff --git a/EAImvertor/app.config b/EAImvertor/app.config
diff --git a/EAJSON/EAJSON.csproj b/EAJSON/EAJSON.csproj
@@ -80,7 +80,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/EAJSON/Properties/AssemblyInfo.cs b/EAJSON/Properties/AssemblyInfo.cs
@@ -30,4 +30,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0.*")]
+[assembly: AssemblyVersion("2.1.1.*")]
diff --git a/EAJSON/app.config b/EAJSON/app.config
diff --git a/EAMapping/EAMapping.csproj b/EAMapping/EAMapping.csproj
@@ -166,9 +166,8 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="EAMapping.dll.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <SubType>Designer</SubType>
     </None>
     <None Include="packages.config" />

diff --git a/EAMapping/Properties/AssemblyInfo.cs b/EAMapping/Properties/AssemblyInfo.cs
@@ -28,4 +28,4 @@
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.0.*")]
+[assembly: AssemblyVersion("2.1.1.*")]
diff --git a/EAMapping/app.config b/EAMapping/app.config
diff --git a/EAMappingApp/EAMappingApp.csproj b/EAMappingApp/EAMappingApp.csproj
@@ -10,7 +10,7 @@
     <AssemblyName>EAMappingApp</AssemblyName>
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -81,9 +81,6 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Enterprise-Architect-Add-in-Framework\EAAddinFramework\EAAddinFramework.csproj">
       <Project>{4161dd26-375f-4744-ba96-b70366e19a78}</Project>

diff --git a/EANavigator/EANavigator.csproj b/EANavigator/EANavigator.csproj
@@ -192,7 +192,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="EANavigator.dll.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

diff --git a/EANavigator/EANavigator.dll.config b/EANavigator/EANavigator.dll.config
@@ -17,7 +17,7 @@
 		<add key="defaultAction" value="ProjectBrowser"/>
 		<add key="toolbarVisible" value="true"/>
 		<add key="contextMenu" value="false"/>
-		<add key="trackSelectedElement" value="True" />
+		<add key="trackSelectedElement" value="true" />	
 		<add key="quickSearchElements" value="true"/>
 		<add key="quickSearchOperations" value="true"/>
 		<add key="quickSearchAttributes" value="true"/>

diff --git a/EANavigator/Properties/AssemblyInfo.cs b/EANavigator/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0.*")]
+[assembly: AssemblyVersion("2.1.1.*")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/EANavigator/app.config b/EANavigator/app.config
diff --git a/EAScriptAddin/EAScriptAddin.csproj b/EAScriptAddin/EAScriptAddin.csproj
@@ -101,7 +101,6 @@
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="Files\license.rtf" />
     <None Include="Files\ScriptAddinIcon.ico" />
     <None Include="Files\ScriptAddinIcon16.png" />

diff --git a/EAScriptAddin/Properties/AssemblyInfo.cs b/EAScriptAddin/Properties/AssemblyInfo.cs
@@ -28,4 +28,4 @@
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.0.*")]
+[assembly: AssemblyVersion("2.1.1.*")]
diff --git a/EAScriptAddin/app.config b/EAScriptAddin/app.config
diff --git a/EATFSConnector/EATFSConnector.csproj b/EATFSConnector/EATFSConnector.csproj
@@ -50,8 +50,8 @@
     <Reference Include="Microsoft.CSharp">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -143,8 +143,6 @@
       <DependentUpon>TFSConnectorSettingsForm.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Files" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/EATFSConnector/Properties/AssemblyInfo.cs b/EATFSConnector/Properties/AssemblyInfo.cs
@@ -28,4 +28,4 @@
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.0.*")]
+[assembly: AssemblyVersion("2.1.1.*")]
diff --git a/EATFSConnector/packages.config b/EATFSConnector/packages.config
@@ -4,5 +4,5 @@
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net451" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net451" />
   <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net451" />
-  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net451" />
+  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net451" />
 </packages>
diff --git a/EAToolPack_Setup/Setup.wxs b/EAToolPack_Setup/Setup.wxs
@@ -3,10 +3,10 @@
   <Product Id="*"
 		Name="Bellekens EA Toolpack"
 		Language="1033"
-		Version="2.1.0.0"
+		Version="2.1.1.0"
 		UpgradeCode="38FA9DDF-F162-4EB2-A836-0A66A78F5EC6"
 		Manufacturer="Bellekens">
-    <Package Description="Installs the Bellekens EA Toolpack v2.1.0.0 on this computer"
+    <Package Description="Installs the Bellekens EA Toolpack v2.1.1.0 on this computer"
 			Comments="Contains EA Navigator, EA-Matic, EA Message Composer EA Database Transformer, EA Imvertor, EA TFS connector, Enterprise Data Dictionary and EA Validator " 
     InstallerVersion="200"
     Compressed="yes"
@@ -19,14 +19,14 @@
     <Media Id="1" Cabinet="contents.cab" EmbedCab="yes" CompressionLevel="high"/>
 
     <Upgrade Id="38FA9DDF-F162-4EB2-A836-0A66A78F5EC6">
-      <UpgradeVersion Minimum="2.1.0.0"
+      <UpgradeVersion Minimum="2.1.1.0"
                     IncludeMinimum="no"
                     OnlyDetect="yes"
                     Language="1033"
                     Property="NEWPRODUCTFOUND" />
       <UpgradeVersion Minimum="0.1.0.0"
                       IncludeMinimum="yes"
-                      Maximum="2.1.0.0"
+                      Maximum="2.1.1.0"
                       IncludeMaximum="no"
                       Language="1033"
                       Property="UPGRADEFOUND" />

diff --git a/EAValidationFramework/App.config b/EAValidationFramework/App.config
@@ -9,12 +9,4 @@
 		-->
 
    </appSettings>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
 </configuration>
diff --git a/EAValidationFramework/Properties/AssemblyInfo.cs b/EAValidationFramework/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0.*")]
+[assembly: AssemblyVersion("2.1.1.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/EAValidator/EAValidator.csproj b/EAValidator/EAValidator.csproj
@@ -111,7 +111,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="EAValidator.dll.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

diff --git a/EAValidator/Properties/AssemblyInfo.cs b/EAValidator/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0.*")]
+[assembly: AssemblyVersion("2.1.1.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/EAValidator/app.config b/EAValidator/app.config
diff --git a/EAWorksetSharing/EAWorksetSharing.csproj b/EAWorksetSharing/EAWorksetSharing.csproj
@@ -98,7 +98,6 @@
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>
-    <None Include="app.config" />
     <None Include="Files\EAWorkingSetSharingIcon.ico" />
     <None Include="Files\EAWorkingSetSharingIcon.pdn" />
     <None Include="Files\Thumbs.db" />