adds shared assembly and fixes newtonsoft version

codingadventures · Dec 21, 2018 · 3b42158 · 3b42158
1 parent 2f61a3d
commit 3b42158
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 127 deletions.
diff --git a/Src/BridgeVs.AsyncVsPackage/BridgeVs.VisualStudio.AsyncExtension.csproj b/Src/BridgeVs.AsyncVsPackage/BridgeVs.VisualStudio.AsyncExtension.csproj
@@ -64,6 +64,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="..\BridgeVs.Shared\Properties\SharedAssemblyProperties.cs">
+      <Link>Properties\SharedAssemblyProperties.cs</Link>
+    </Compile>
     <Compile Include="BridgeVsExtension.cs" />
     <Compile Include="Command\BridgeCommand.cs" />
     <Compile Include="Configuration\MsBuildVersionHelper.cs" />
@@ -83,7 +86,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\packages\Newtonsoft.Json.11.0.1\lib\net40\Newtonsoft.Json.dll">
+    <Content Include="..\packages\Newtonsoft.Json.11.0.2\lib\net40\Newtonsoft.Json.dll">
       <IncludeInVSIX>true</IncludeInVSIX>
       <Link>Libs\Newtonsoft.Json.dll</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -237,8 +240,8 @@
     <Reference Include="Microsoft.VisualStudio.Validation, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.VisualStudio.Validation.15.3.58\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />

diff --git a/Src/BridgeVs.AsyncVsPackage/Properties/AssemblyInfo.cs b/Src/BridgeVs.AsyncVsPackage/Properties/AssemblyInfo.cs
@@ -28,32 +28,9 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
 [assembly: AssemblyTitle("BridgeVs.AsyncVsPackage")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")] 
-[assembly: AssemblyCompany("Coding Adventures")]
 [assembly: AssemblyProduct("BridgeVs.VisualStudio.AsyncExtension")]
-[assembly: AssemblyCopyright("Copyright © Coding Adventures 2013 - 2018")]
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// 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: Guid("2016fd5d-79e9-4823-b927-cb796f7b411a")]
-[assembly: AssemblyVersion("2.0.*")]
 #if TEST
 [assembly: InternalsVisibleTo("BridgeVs.UnitTest, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f575ceee4c0b7992660f21a6c2a09c93eac56d9dad2f20caa2d48bf5d904c9b2af5800ba01cae7b37299bff9486a8b97047959c3fbe16de730cf3397f4bafaefc745dba1ce34cedf27698f2dc96159eaa27eef4093f6c35236f30239a4841b864ea734ed3582478cc4214d76497ceb974ac920f35043de0913a149d1107bd3a1")]
 #endif
diff --git a/Src/BridgeVs.AsyncVsPackage/app.config b/Src/BridgeVs.AsyncVsPackage/app.config
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.VisualStudio.Threading" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-15.8.0.0" newVersion="15.8.0.0"/>
+        <assemblyIdentity name="Microsoft.VisualStudio.Threading" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.8.0.0" newVersion="15.8.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" /></startup></configuration>
diff --git a/Src/BridgeVs.AsyncVsPackage/packages.config b/Src/BridgeVs.AsyncVsPackage/packages.config
@@ -26,7 +26,7 @@
   <package id="Microsoft.VisualStudio.Utilities" version="15.8.28010" targetFramework="net461" />
   <package id="Microsoft.VisualStudio.Validation" version="15.3.58" targetFramework="net461" />
   <package id="Microsoft.VSSDK.BuildTools" version="16.0.85" targetFramework="net461" developmentDependency="true" />
-  <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net471" />
   <package id="StreamJsonRpc" version="1.3.23" targetFramework="net461" />
   <package id="System.ValueTuple" version="4.3.0" targetFramework="net461" />
   <package id="VSSDK.DTE" version="7.0.4" targetFramework="net461" />

diff --git a/Src/BridgeVs.Build/BridgeVs.Build.csproj b/Src/BridgeVs.Build/BridgeVs.Build.csproj
@@ -44,6 +44,9 @@
     <AssemblyOriginatorKeyFile>..\BridgeVs.AsyncVsPackage\Key.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="..\BridgeVs.Shared\Properties\SharedAssemblyProperties.cs">
+      <Link>Properties\SharedAssemblyProperties.cs</Link>
+    </Compile>
     <Compile Include="SInjection.cs" />
     <Compile Include="Tasks\CleanBuildTask.cs" />
     <Compile Include="Tasks\MapperBuildTask.cs" />

diff --git a/Src/BridgeVs.Build/Properties/AssemblyInfo.cs b/Src/BridgeVs.Build/Properties/AssemblyInfo.cs
@@ -25,43 +25,12 @@
 
 using System.Reflection;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
-[assembly: AssemblyTitle("BridgeVs.Build")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Coding Adventures")]
-[assembly: AssemblyProduct("BridgeVs.Build")]
-[assembly: AssemblyCopyright("Copyright © Coding Adventures 2013 - 2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-
-[assembly: Guid("2340df47-cde3-46a8-a03c-c3aca2579395")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// 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: AssemblyTitle("BridgeVs.Build")] 
+
 #if TEST
 [assembly: InternalsVisibleTo("BridgeVs.UnitTest, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f575ceee4c0b7992660f21a6c2a09c93eac56d9dad2f20caa2d48bf5d904c9b2af5800ba01cae7b37299bff9486a8b97047959c3fbe16de730cf3397f4bafaefc745dba1ce34cedf27698f2dc96159eaa27eef4093f6c35236f30239a4841b864ea734ed3582478cc4214d76497ceb974ac920f35043de0913a149d1107bd3a1")]
-#endif
-
-[assembly: AssemblyVersion("1.4.7.*")]
+#endif 
diff --git a/Src/BridgeVs.DynamicVisualizers/BridgeVs.DynamicVisualizers.csproj b/Src/BridgeVs.DynamicVisualizers/BridgeVs.DynamicVisualizers.csproj
@@ -79,6 +79,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\BridgeVs.Shared\Properties\SharedAssemblyProperties.cs">
+      <Link>Properties\SharedAssemblyProperties.cs</Link>
+    </Compile>
     <Compile Include="DynamicObjectSource.cs" />
     <Compile Include="DynamicDebuggerVisualizer.cs" />
     <Compile Include="Forms\TemporaryForm.cs">

diff --git a/Src/BridgeVs.DynamicVisualizers/Properties/AssemblyInfo.cs b/Src/BridgeVs.DynamicVisualizers/Properties/AssemblyInfo.cs
@@ -31,33 +31,9 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("BridgeVs.DynamicVisualizers")]
-[assembly: AssemblyDescription("LINQBridgeVs Visualizer")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("BridgeVs.DynamicVisualizers")]
-[assembly: AssemblyCopyright("Copyright © Coding Adventures 2013 - 2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("3b0b5c28-e03d-4610-89d8-731083c16acc")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// 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("1.4.7.*")]
+[assembly: AssemblyDescription("LINQBridgeVs Dynamic Visualizer")] 
+[assembly: AssemblyProduct("BridgeVs.DynamicVisualizers")] 
+
 #if TEST
 [assembly: InternalsVisibleTo("BridgeVs.UnitTest, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f575ceee4c0b7992660f21a6c2a09c93eac56d9dad2f20caa2d48bf5d904c9b2af5800ba01cae7b37299bff9486a8b97047959c3fbe16de730cf3397f4bafaefc745dba1ce34cedf27698f2dc96159eaa27eef4093f6c35236f30239a4841b864ea734ed3582478cc4214d76497ceb974ac920f35043de0913a149d1107bd3a1")]
 #endif
diff --git a/Src/BridgeVs.Shared/BridgeVs.Shared.csproj b/Src/BridgeVs.Shared/BridgeVs.Shared.csproj
@@ -75,6 +75,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Options\SerializationOption.cs" />
     <Compile Include="Options\VisualStudioOption.cs" />
+    <Compile Include="Properties\SharedAssemblyProperties.cs" />
     <Compile Include="Serialization\BinarySerializer.cs" />
     <Compile Include="Serialization\IServiceSerializer.cs" />
     <Compile Include="Serialization\JsonSerializer.cs" />

diff --git a/Src/BridgeVs.Shared/Properties/AssemblyInfo.cs b/Src/BridgeVs.Shared/Properties/AssemblyInfo.cs
@@ -31,29 +31,5 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("BridgeVs.Shared")]
-[assembly: AssemblyDescription("Shared classes for BridgeVs")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Coding Adventures")]
+[assembly: AssemblyDescription("Shared classes for BridgeVs")] 
 [assembly: AssemblyProduct("BridgeVs.Shared")]
-[assembly: AssemblyCopyright("Copyright © Coding Adventures 2013 - 2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("bc10f93a-5da2-44f8-ae5e-5603cb46b548")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.4.7.*")]
diff --git a/Src/BridgeVs.Shared/Properties/SharedAssemblyProperties.cs b/Src/BridgeVs.Shared/Properties/SharedAssemblyProperties.cs
@@ -0,0 +1,31 @@
+#region License
+// Copyright (c) 2013 - 2018 Coding Adventures
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+#endregion
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyCopyright("Copyright © Coding Adventures 2013 - 2018")]
+[assembly: AssemblyCompany("Coding Adventures")]
+[assembly: ComVisible(false)]
+[assembly: AssemblyVersion("2.0.*")]
diff --git a/Test/BridgeVs.UnitTest/app.config b/Test/BridgeVs.UnitTest/app.config
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.IO.Abstractions" publicKeyToken="96bf224d23c43e59" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-2.1.0.236" newVersion="2.1.0.256"/>
+        <assemblyIdentity name="System.IO.Abstractions" publicKeyToken="96bf224d23c43e59" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.236" newVersion="2.1.0.256" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.VisualStudio.Threading" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-15.8.0.0" newVersion="15.8.0.0"/>
+        <assemblyIdentity name="Microsoft.VisualStudio.Threading" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-15.8.0.0" newVersion="15.8.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" /></startup></configuration>