Skip to content

Commit 3b42158

Browse files
codingadventurescodingadventures
committed
adds shared assembly and fixes newtonsoft version
1 parent 2f61a3d commit 3b42158

File tree

12 files changed

+66
-127
lines changed

12 files changed

+66
-127
lines changed

‎Src/BridgeVs.AsyncVsPackage/BridgeVs.VisualStudio.AsyncExtension.csproj

+6-3
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@
6464
<WarningLevel>4</WarningLevel>
6565
</PropertyGroup>
6666
<ItemGroup>
67+
<Compile Include="..\BridgeVs.Shared\Properties\SharedAssemblyProperties.cs">
68+
<Link>Properties\SharedAssemblyProperties.cs</Link>
69+
</Compile>
6770
<Compile Include="BridgeVsExtension.cs" />
6871
<Compile Include="Command\BridgeCommand.cs" />
6972
<Compile Include="Configuration\MsBuildVersionHelper.cs" />
@@ -83,7 +86,7 @@
8386
<Compile Include="Properties\AssemblyInfo.cs" />
8487
</ItemGroup>
8588
<ItemGroup>
86-
<Content Include="..\packages\Newtonsoft.Json.11.0.1\lib\net40\Newtonsoft.Json.dll">
89+
<Content Include="..\packages\Newtonsoft.Json.11.0.2\lib\net40\Newtonsoft.Json.dll">
8790
<IncludeInVSIX>true</IncludeInVSIX>
8891
<Link>Libs\Newtonsoft.Json.dll</Link>
8992
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -237,8 +240,8 @@
237240
<Reference Include="Microsoft.VisualStudio.Validation, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
238241
<HintPath>..\packages\Microsoft.VisualStudio.Validation.15.3.58\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
239242
</Reference>
240-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
241-
<HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
243+
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
244+
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
242245
</Reference>
243246
<Reference Include="PresentationCore" />
244247
<Reference Include="PresentationFramework" />

‎Src/BridgeVs.AsyncVsPackage/Properties/AssemblyInfo.cs

-23
Original file line numberDiff line numberDiff line change
@@ -28,32 +28,9 @@
2828
using System.Runtime.CompilerServices;
2929
using System.Runtime.InteropServices;
3030

31-
// General Information about an assembly is controlled through the following
32-
// set of attributes. Change these attribute values to modify the information
33-
// associated with an assembly.
3431
[assembly: AssemblyTitle("BridgeVs.AsyncVsPackage")]
35-
[assembly: AssemblyDescription("")]
36-
[assembly: AssemblyConfiguration("")]
37-
[assembly: AssemblyCompany("Coding Adventures")]
3832
[assembly: AssemblyProduct("BridgeVs.VisualStudio.AsyncExtension")]
39-
[assembly: AssemblyCopyright("Copyright © Coding Adventures 2013 - 2018")]
40-
// Setting ComVisible to false makes the types in this assembly not visible
41-
// to COM components. If you need to access a type in this assembly from
42-
// COM, set the ComVisible attribute to true on that type.
43-
[assembly: ComVisible(false)]
44-
45-
// Version information for an assembly consists of the following four values:
46-
//
47-
// Major Version
48-
// Minor Version
49-
// Build Number
50-
// Revision
51-
//
52-
// You can specify all the values or you can default the Build and Revision Numbers
53-
// by using the '*' as shown below:
54-
// [assembly: AssemblyVersion("1.0.*")]
5533
[assembly: Guid("2016fd5d-79e9-4823-b927-cb796f7b411a")]
56-
[assembly: AssemblyVersion("2.0.*")]
5734
#if TEST
5835
[assembly: InternalsVisibleTo("BridgeVs.UnitTest, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f575ceee4c0b7992660f21a6c2a09c93eac56d9dad2f20caa2d48bf5d904c9b2af5800ba01cae7b37299bff9486a8b97047959c3fbe16de730cf3397f4bafaefc745dba1ce34cedf27698f2dc96159eaa27eef4093f6c35236f30239a4841b864ea734ed3582478cc4214d76497ceb974ac920f35043de0913a149d1107bd3a1")]
5936
#endif

‎Src/BridgeVs.AsyncVsPackage/app.config

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
6-
<assemblyIdentity name="Microsoft.VisualStudio.Threading" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
7-
<bindingRedirect oldVersion="0.0.0.0-15.8.0.0" newVersion="15.8.0.0"/>
6+
<assemblyIdentity name="Microsoft.VisualStudio.Threading" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-15.8.0.0" newVersion="15.8.0.0" />
88
</dependentAssembly>
99
<dependentAssembly>
10-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
11-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
10+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
1212
</dependentAssembly>
1313
</assemblyBinding>
1414
</runtime>
15-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/></startup></configuration>
15+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" /></startup></configuration>

‎Src/BridgeVs.AsyncVsPackage/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<package id="Microsoft.VisualStudio.Utilities" version="15.8.28010" targetFramework="net461" />
2727
<package id="Microsoft.VisualStudio.Validation" version="15.3.58" targetFramework="net461" />
2828
<package id="Microsoft.VSSDK.BuildTools" version="16.0.85" targetFramework="net461" developmentDependency="true" />
29-
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="net461" />
29+
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net471" />
3030
<package id="StreamJsonRpc" version="1.3.23" targetFramework="net461" />
3131
<package id="System.ValueTuple" version="4.3.0" targetFramework="net461" />
3232
<package id="VSSDK.DTE" version="7.0.4" targetFramework="net461" />

‎Src/BridgeVs.Build/BridgeVs.Build.csproj

+3
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@
4444
<AssemblyOriginatorKeyFile>..\BridgeVs.AsyncVsPackage\Key.snk</AssemblyOriginatorKeyFile>
4545
</PropertyGroup>
4646
<ItemGroup>
47+
<Compile Include="..\BridgeVs.Shared\Properties\SharedAssemblyProperties.cs">
48+
<Link>Properties\SharedAssemblyProperties.cs</Link>
49+
</Compile>
4750
<Compile Include="SInjection.cs" />
4851
<Compile Include="Tasks\CleanBuildTask.cs" />
4952
<Compile Include="Tasks\MapperBuildTask.cs" />

‎Src/BridgeVs.Build/Properties/AssemblyInfo.cs

+3-34
Original file line numberDiff line numberDiff line change
@@ -25,43 +25,12 @@
2525

2626
using System.Reflection;
2727
using System.Runtime.CompilerServices;
28-
using System.Runtime.InteropServices;
29-
3028
// General Information about an assembly is controlled through the following
3129
// set of attributes. Change these attribute values to modify the information
3230
// associated with an assembly.
3331

34-
[assembly: AssemblyTitle("BridgeVs.Build")]
35-
[assembly: AssemblyDescription("")]
36-
[assembly: AssemblyConfiguration("")]
37-
[assembly: AssemblyCompany("Coding Adventures")]
38-
[assembly: AssemblyProduct("BridgeVs.Build")]
39-
[assembly: AssemblyCopyright("Copyright © Coding Adventures 2013 - 2018")]
40-
[assembly: AssemblyTrademark("")]
41-
[assembly: AssemblyCulture("")]
42-
43-
// Setting ComVisible to false makes the types in this assembly not visible
44-
// to COM components. If you need to access a type in this assembly from
45-
// COM, set the ComVisible attribute to true on that type.
46-
47-
[assembly: ComVisible(false)]
48-
49-
// The following GUID is for the ID of the typelib if this project is exposed to COM
50-
51-
[assembly: Guid("2340df47-cde3-46a8-a03c-c3aca2579395")]
52-
53-
// Version information for an assembly consists of the following four values:
54-
//
55-
// Major Version
56-
// Minor Version
57-
// Build Number
58-
// Revision
59-
//
60-
// You can specify all the values or you can default the Build and Revision Numbers
61-
// by using the '*' as shown below:
62-
// [assembly: AssemblyVersion("1.0.*")]
32+
[assembly: AssemblyTitle("BridgeVs.Build")]
33+
6334
#if TEST
6435
[assembly: InternalsVisibleTo("BridgeVs.UnitTest, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f575ceee4c0b7992660f21a6c2a09c93eac56d9dad2f20caa2d48bf5d904c9b2af5800ba01cae7b37299bff9486a8b97047959c3fbe16de730cf3397f4bafaefc745dba1ce34cedf27698f2dc96159eaa27eef4093f6c35236f30239a4841b864ea734ed3582478cc4214d76497ceb974ac920f35043de0913a149d1107bd3a1")]
65-
#endif
66-
67-
[assembly: AssemblyVersion("1.4.7.*")]
36+
#endif

‎Src/BridgeVs.DynamicVisualizers/BridgeVs.DynamicVisualizers.csproj

+3
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@
7979
<Reference Include="System.Xml" />
8080
</ItemGroup>
8181
<ItemGroup>
82+
<Compile Include="..\BridgeVs.Shared\Properties\SharedAssemblyProperties.cs">
83+
<Link>Properties\SharedAssemblyProperties.cs</Link>
84+
</Compile>
8285
<Compile Include="DynamicObjectSource.cs" />
8386
<Compile Include="DynamicDebuggerVisualizer.cs" />
8487
<Compile Include="Forms\TemporaryForm.cs">

‎Src/BridgeVs.DynamicVisualizers/Properties/AssemblyInfo.cs

+3-27
Original file line numberDiff line numberDiff line change
@@ -31,33 +31,9 @@
3131
// set of attributes. Change these attribute values to modify the information
3232
// associated with an assembly.
3333
[assembly: AssemblyTitle("BridgeVs.DynamicVisualizers")]
34-
[assembly: AssemblyDescription("LINQBridgeVs Visualizer")]
35-
[assembly: AssemblyConfiguration("")]
36-
[assembly: AssemblyCompany("")]
37-
[assembly: AssemblyProduct("BridgeVs.DynamicVisualizers")]
38-
[assembly: AssemblyCopyright("Copyright © Coding Adventures 2013 - 2018")]
39-
[assembly: AssemblyTrademark("")]
40-
[assembly: AssemblyCulture("")]
41-
42-
// Setting ComVisible to false makes the types in this assembly not visible
43-
// to COM components. If you need to access a type in this assembly from
44-
// COM, set the ComVisible attribute to true on that type.
45-
[assembly: ComVisible(false)]
46-
47-
// The following GUID is for the ID of the typelib if this project is exposed to COM
48-
[assembly: Guid("3b0b5c28-e03d-4610-89d8-731083c16acc")]
49-
50-
// Version information for an assembly consists of the following four values:
51-
//
52-
// Major Version
53-
// Minor Version
54-
// Build Number
55-
// Revision
56-
//
57-
// You can specify all the values or you can default the Build and Revision Numbers
58-
// by using the '*' as shown below:
59-
// [assembly: AssemblyVersion("1.0.*")]
60-
[assembly: AssemblyVersion("1.4.7.*")]
34+
[assembly: AssemblyDescription("LINQBridgeVs Dynamic Visualizer")]
35+
[assembly: AssemblyProduct("BridgeVs.DynamicVisualizers")]
36+
6137
#if TEST
6238
[assembly: InternalsVisibleTo("BridgeVs.UnitTest, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f575ceee4c0b7992660f21a6c2a09c93eac56d9dad2f20caa2d48bf5d904c9b2af5800ba01cae7b37299bff9486a8b97047959c3fbe16de730cf3397f4bafaefc745dba1ce34cedf27698f2dc96159eaa27eef4093f6c35236f30239a4841b864ea734ed3582478cc4214d76497ceb974ac920f35043de0913a149d1107bd3a1")]
6339
#endif

‎Src/BridgeVs.Shared/BridgeVs.Shared.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
<Compile Include="Properties\AssemblyInfo.cs" />
7676
<Compile Include="Options\SerializationOption.cs" />
7777
<Compile Include="Options\VisualStudioOption.cs" />
78+
<Compile Include="Properties\SharedAssemblyProperties.cs" />
7879
<Compile Include="Serialization\BinarySerializer.cs" />
7980
<Compile Include="Serialization\IServiceSerializer.cs" />
8081
<Compile Include="Serialization\JsonSerializer.cs" />

‎Src/BridgeVs.Shared/Properties/AssemblyInfo.cs

+1-25
Original file line numberDiff line numberDiff line change
@@ -31,29 +31,5 @@
3131
// set of attributes. Change these attribute values to modify the information
3232
// associated with an assembly.
3333
[assembly: AssemblyTitle("BridgeVs.Shared")]
34-
[assembly: AssemblyDescription("Shared classes for BridgeVs")]
35-
[assembly: AssemblyConfiguration("")]
36-
[assembly: AssemblyCompany("Coding Adventures")]
34+
[assembly: AssemblyDescription("Shared classes for BridgeVs")]
3735
[assembly: AssemblyProduct("BridgeVs.Shared")]
38-
[assembly: AssemblyCopyright("Copyright © Coding Adventures 2013 - 2018")]
39-
[assembly: AssemblyTrademark("")]
40-
[assembly: AssemblyCulture("")]
41-
42-
// Setting ComVisible to false makes the types in this assembly not visible
43-
// to COM components. If you need to access a type in this assembly from
44-
// COM, set the ComVisible attribute to true on that type.
45-
[assembly: ComVisible(false)]
46-
47-
// The following GUID is for the ID of the typelib if this project is exposed to COM
48-
[assembly: Guid("bc10f93a-5da2-44f8-ae5e-5603cb46b548")]
49-
50-
// Version information for an assembly consists of the following four values:
51-
//
52-
// Major Version
53-
// Minor Version
54-
// Build Number
55-
// Revision
56-
//
57-
// You can specify all the values or you can default the Build and Revision Numbers
58-
// by using the '*' as shown below:
59-
[assembly: AssemblyVersion("1.4.7.*")]

‎Src/BridgeVs.Shared/Properties/SharedAssemblyProperties.cs

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#region License
2+
// Copyright (c) 2013 - 2018 Coding Adventures
3+
//
4+
// Permission is hereby granted, free of charge, to any person
5+
// obtaining a copy of this software and associated documentation
6+
// files (the "Software"), to deal in the Software without
7+
// restriction, including without limitation the rights to use,
8+
// copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
// copies of the Software, and to permit persons to whom the
10+
// Software is furnished to do so, subject to the following
11+
// conditions:
12+
//
13+
// The above copyright notice and this permission notice shall be
14+
// included in all copies or substantial portions of the Software.
15+
//
16+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17+
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
18+
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
19+
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
20+
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
21+
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
22+
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
23+
// OTHER DEALINGS IN THE SOFTWARE.
24+
#endregion
25+
using System.Reflection;
26+
using System.Runtime.InteropServices;
27+
28+
[assembly: AssemblyCopyright("Copyright © Coding Adventures 2013 - 2018")]
29+
[assembly: AssemblyCompany("Coding Adventures")]
30+
[assembly: ComVisible(false)]
31+
[assembly: AssemblyVersion("2.0.*")]

‎Test/BridgeVs.UnitTest/app.config

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
6-
<assemblyIdentity name="System.IO.Abstractions" publicKeyToken="96bf224d23c43e59" culture="neutral"/>
7-
<bindingRedirect oldVersion="0.0.0.0-2.1.0.236" newVersion="2.1.0.256"/>
6+
<assemblyIdentity name="System.IO.Abstractions" publicKeyToken="96bf224d23c43e59" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-2.1.0.236" newVersion="2.1.0.256" />
88
</dependentAssembly>
99
<dependentAssembly>
10-
<assemblyIdentity name="Microsoft.VisualStudio.Threading" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
11-
<bindingRedirect oldVersion="0.0.0.0-15.8.0.0" newVersion="15.8.0.0"/>
10+
<assemblyIdentity name="Microsoft.VisualStudio.Threading" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-15.8.0.0" newVersion="15.8.0.0" />
1212
</dependentAssembly>
1313
<dependentAssembly>
14-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
15-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
14+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
15+
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
1616
</dependentAssembly>
1717
</assemblyBinding>
1818
</runtime>
19-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/></startup></configuration>
19+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" /></startup></configuration>

0 commit comments

Comments
 (0)