Skip to content

Commit e31d853

Browse files
tonyhalletttonyhallett
authored
Merge pull request #440 from FortuneN/craig/support-arm64
Craig/support arm64
2 parents bc7b5db + 58f820d commit e31d853

12 files changed

+47
-50
lines changed

‎FineCodeCoverage/FineCodeCoverage.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,6 @@
174174
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="16.0.206" ExcludeAssets="runtime">
175175
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
176176
</PackageReference>
177-
<PackageReference Include="Microsoft.VisualStudio.TestWindow.Interfaces">
178-
<Version>11.0.61030</Version>
179-
</PackageReference>
180177
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
181178
<Version>17.9.28</Version>
182179
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -187,7 +184,7 @@
187184
<PrivateAssets>all</PrivateAssets>
188185
</PackageReference>
189186
<PackageReference Include="Newtonsoft.Json">
190-
<Version>13.0.1</Version>
187+
<Version>13.0.3</Version>
191188
</PackageReference>
192189
<PackageReference Include="NUnit">
193190
<Version>3.13.1</Version>
@@ -210,6 +207,10 @@
210207
</ItemGroup>
211208
<ItemGroup>
212209
<Reference Include="Microsoft.CSharp" />
210+
<Reference Include="Microsoft.VisualStudio.TestWindow.Interfaces, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
211+
<SpecificVersion>False</SpecificVersion>
212+
<HintPath>dlls\Microsoft.VisualStudio.TestWindow.Interfaces.dll</HintPath>
213+
</Reference>
213214
<Reference Include="PresentationCore" />
214215
<Reference Include="PresentationFramework" />
215216
<Reference Include="System" />

‎FineCodeCoverage/dlls/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll

166 KB
Binary file not shown.

‎FineCodeCoverage/dlls/Microsoft.VisualStudio.TestWindow.Interfaces.dll

54.4 KB
Binary file not shown.

‎FineCodeCoverage/source.extension.vsixmanifest

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<Tags>visual studio; code coverage; c#; vb; .net core; coverlet; unit test; free; community edition</Tags>
1111
</Metadata>
1212
<Installation>
13-
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0, 17.0)" />
13+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.11, 17.0)" />
1414
</Installation>
1515
<Dependencies>
1616
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.7,)" />
@@ -21,6 +21,6 @@
2121
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
2222
</Assets>
2323
<Prerequisites>
24-
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,17.0)" DisplayName="Visual Studio core editor" />
24+
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.11,17.0)" DisplayName="Visual Studio core editor" />
2525
</Prerequisites>
2626
</PackageManifest>

‎FineCodeCoverage2022/FineCodeCoverage2022.csproj

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,10 @@
117117
</ItemGroup>
118118
<ItemGroup>
119119
<Reference Include="Microsoft.CSharp" />
120+
<Reference Include="Microsoft.VisualStudio.TestWindow.Interfaces, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
121+
<SpecificVersion>False</SpecificVersion>
122+
<HintPath>dlls\Microsoft.VisualStudio.TestWindow.Interfaces.dll</HintPath>
123+
</Reference>
120124
<Reference Include="PresentationCore" />
121125
<Reference Include="PresentationFramework" />
122126
<Reference Include="System" />
@@ -146,43 +150,40 @@
146150
<Version>1.4.1</Version>
147151
</PackageReference>
148152
<PackageReference Include="Microsoft.CodeAnalysis.Common">
149-
<Version>4.8.0</Version>
153+
<Version>4.10.0</Version>
150154
</PackageReference>
151155
<PackageReference Include="Microsoft.CodeAnalysis.CSharp">
152-
<Version>4.8.0</Version>
156+
<Version>4.10.0</Version>
153157
</PackageReference>
154158
<PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Text">
155-
<Version>4.8.0</Version>
159+
<Version>4.10.0</Version>
156160
</PackageReference>
157161
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic">
158-
<Version>4.8.0</Version>
162+
<Version>4.10.0</Version>
159163
</PackageReference>
160164
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common">
161-
<Version>4.8.0</Version>
165+
<Version>4.10.0</Version>
162166
</PackageReference>
163167
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild">
164-
<Version>4.8.0</Version>
168+
<Version>4.10.0</Version>
165169
</PackageReference>
166170
<PackageReference Include="Microsoft.VisualStudio.Composition.Analyzers">
167-
<Version>17.7.40</Version>
171+
<Version>17.10.37</Version>
168172
</PackageReference>
169-
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.1.32210.191" ExcludeAssets="runtime">
173+
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.10.40171" ExcludeAssets="runtime">
170174
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
171175
</PackageReference>
172-
<PackageReference Include="Microsoft.VisualStudio.TestWindow.Interfaces">
173-
<Version>11.0.61030</Version>
174-
</PackageReference>
175176
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
176-
<Version>17.9.28</Version>
177+
<Version>17.10.48</Version>
177178
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
178179
<PrivateAssets>all</PrivateAssets>
179180
</PackageReference>
180-
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.1.4054">
181+
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.11.414">
181182
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
182183
<PrivateAssets>all</PrivateAssets>
183184
</PackageReference>
184185
<PackageReference Include="Newtonsoft.Json">
185-
<Version>13.0.1</Version>
186+
<Version>13.0.3</Version>
186187
</PackageReference>
187188
<PackageReference Include="ReflectObject">
188189
<Version>1.0.0</Version>
@@ -191,13 +192,13 @@
191192
<Version>1.0.0</Version>
192193
</PackageReference>
193194
<PackageReference Include="StreamJsonRpc">
194-
<Version>2.16.36</Version>
195+
<Version>2.18.48</Version>
195196
</PackageReference>
196197
<PackageReference Include="Svg">
197198
<Version>3.3.0</Version>
198199
</PackageReference>
199200
<PackageReference Include="System.Composition">
200-
<Version>7.0.0</Version>
201+
<Version>8.0.0</Version>
201202
</PackageReference>
202203
<PackageReference Include="System.IO.Compression">
203204
<Version>4.3.0</Version>

‎FineCodeCoverage2022/dlls/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll

229 KB
Binary file not shown.

‎FineCodeCoverage2022/dlls/Microsoft.VisualStudio.TestWindow.Interfaces.dll

58.4 KB
Binary file not shown.

‎FineCodeCoverage2022/source.extension.vsixmanifest

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,18 @@
1010
<Tags>visual studio; code coverage; c#; vb; .net core; coverlet; unit test; free; community edition</Tags>
1111
</Metadata>
1212
<Installation>
13-
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,18.0)">
13+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.10,18.0)">
1414
<ProductArchitecture>amd64</ProductArchitecture>
1515
</InstallationTarget>
16+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.10,18.0)">
17+
<ProductArchitecture>arm64</ProductArchitecture>
18+
</InstallationTarget>
1619
</Installation>
1720
<Dependencies>
1821
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.7,)" />
1922
</Dependencies>
2023
<Prerequisites>
21-
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0,18.0)" DisplayName="Visual Studio core editor" />
24+
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.10,18.0)" DisplayName="Visual Studio core editor" />
2225
</Prerequisites>
2326
<Assets>
2427
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />

‎FineCodeCoverageTests/FineCodeCoverageTests.csproj

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38+
<Reference Include="Microsoft.VisualStudio.TestWindow.Interfaces, Version=17.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
39+
<SpecificVersion>False</SpecificVersion>
40+
<HintPath>..\FineCodeCoverage2022\dlls\Microsoft.VisualStudio.TestWindow.Interfaces.dll</HintPath>
41+
</Reference>
3842
<Reference Include="netstandard" />
3943
<Reference Include="PresentationCore" />
4044
<Reference Include="PresentationFramework" />
@@ -203,26 +207,17 @@
203207
<Version>1.2.0</Version>
204208
</PackageReference>
205209
<PackageReference Include="Microsoft.CodeAnalysis.CSharp">
206-
<Version>4.8.0</Version>
210+
<Version>4.10.0</Version>
207211
</PackageReference>
208212
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic">
209-
<Version>4.8.0</Version>
210-
</PackageReference>
211-
<PackageReference Include="Microsoft.TestPlatform.ObjectModel">
212-
<Version>11.0.0</Version>
213+
<Version>4.10.0</Version>
213214
</PackageReference>
214215
<PackageReference Include="Microsoft.VisualStudio.SDK">
215-
<Version>17.1.32210.191</Version>
216-
</PackageReference>
217-
<PackageReference Include="Microsoft.VisualStudio.TestWindow.Interfaces">
218-
<Version>11.0.61030</Version>
216+
<Version>17.10.40171</Version>
219217
</PackageReference>
220218
<PackageReference Include="Moq">
221219
<Version>4.16.0</Version>
222220
</PackageReference>
223-
<PackageReference Include="NuGet.Frameworks">
224-
<Version>5.11.0</Version>
225-
</PackageReference>
226221
<PackageReference Include="NUnit">
227222
<Version>3.13.1</Version>
228223
</PackageReference>

‎FineCodeCoverageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_IRunSettingsService_Tests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44
using System.IO;
55
using System.Xml.XPath;
66
using System.Collections.Generic;
7-
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
87
using AutoMoq;
98
using System.Threading;
109
using FineCodeCoverage.Core.Utilities;
1110
using FineCodeCoverage.Engine.MsTestPlatform.CodeCoverage;
12-
using System;
1311

1412
namespace FineCodeCoverageTests.MsCodeCoverage
1513
{

‎FineCodeCoverageTests/MsCodeCoverage/UserRunSettingsService_Analysis_Tests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using NUnit.Framework;
2-
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
32
using FineCodeCoverage.Engine.MsTestPlatform.CodeCoverage;
43
using FineCodeCoverage.Core.Utilities;
54
using Moq;

‎FineCodeCoverageTests/app.config

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,55 +24,55 @@
2424
</dependentAssembly>
2525
<dependentAssembly>
2626
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
27-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
27+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
2828
</dependentAssembly>
2929
<dependentAssembly>
3030
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
31-
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
31+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
3232
</dependentAssembly>
3333
<dependentAssembly>
3434
<assemblyIdentity name="Microsoft.VisualStudio.Threading" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
35-
<bindingRedirect oldVersion="0.0.0.0-17.1.0.0" newVersion="17.7.0.0" />
35+
<bindingRedirect oldVersion="0.0.0.0-17.10.0.0" newVersion="17.10.0.0" />
3636
</dependentAssembly>
3737
<dependentAssembly>
3838
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
3939
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
4040
</dependentAssembly>
4141
<dependentAssembly>
4242
<assemblyIdentity name="StreamJsonRpc" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
43-
<bindingRedirect oldVersion="0.0.0.0-2.8.0.0" newVersion="2.8.0.0" />
43+
<bindingRedirect oldVersion="0.0.0.0-2.18.0.0" newVersion="2.18.0.0" />
4444
</dependentAssembly>
4545
<dependentAssembly>
4646
<assemblyIdentity name="Microsoft.VisualStudio.Validation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
47-
<bindingRedirect oldVersion="0.0.0.0-17.0.0.0" newVersion="17.6.0.0" />
47+
<bindingRedirect oldVersion="0.0.0.0-17.8.0.0" newVersion="17.8.0.0" />
4848
</dependentAssembly>
4949
<dependentAssembly>
5050
<assemblyIdentity name="Microsoft.VisualStudio.Shell.Interop" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
5151
<bindingRedirect oldVersion="0.0.0.0-17.0.0.0" newVersion="17.0.0.0" />
5252
</dependentAssembly>
5353
<dependentAssembly>
5454
<assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
55-
<bindingRedirect oldVersion="0.0.0.0-4.8.0.0" newVersion="4.8.0.0" />
55+
<bindingRedirect oldVersion="0.0.0.0-4.10.0.0" newVersion="4.10.0.0" />
5656
</dependentAssembly>
5757
<dependentAssembly>
5858
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
59-
<bindingRedirect oldVersion="0.0.0.0-4.8.0.0" newVersion="4.8.0.0" />
59+
<bindingRedirect oldVersion="0.0.0.0-4.10.0.0" newVersion="4.10.0.0" />
6060
</dependentAssembly>
6161
<dependentAssembly>
6262
<assemblyIdentity name="Microsoft.CodeAnalysis.VisualBasic" publicKeyToken="31bf3856ad364e35" culture="neutral" />
63-
<bindingRedirect oldVersion="0.0.0.0-4.8.0.0" newVersion="4.8.0.0" />
63+
<bindingRedirect oldVersion="0.0.0.0-4.10.0.0" newVersion="4.10.0.0" />
6464
</dependentAssembly>
6565
<dependentAssembly>
6666
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
67-
<bindingRedirect oldVersion="0.0.0.0-5.0.0.1" newVersion="5.0.0.1" />
67+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
6868
</dependentAssembly>
6969
<dependentAssembly>
7070
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
71-
<bindingRedirect oldVersion="0.0.0.0-5.0.0.1" newVersion="5.0.0.1" />
71+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
7272
</dependentAssembly>
7373
<dependentAssembly>
7474
<assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
75-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
75+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
7676
</dependentAssembly>
7777
</assemblyBinding>
7878
</runtime>

0 commit comments

Comments
 (0)