Skip to content

Commit 3d0d030

Browse files
bclothierbclothier
committed
Fix failing local tests and update appveyor.yml to include the new test project
1 parent a62be58 commit 3d0d030

File tree

5 files changed

+51
-45
lines changed

5 files changed

+51
-45
lines changed

‎RubberduckCodeAnalysis/ComVisibleTypeAnalyzer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace RubberduckCodeAnalysis
1010
[DiagnosticAnalyzer(LanguageNames.CSharp)]
1111
public class ComVisibleTypeAnalyzer : DiagnosticAnalyzer
1212
{
13-
private const string MissingGuidId = "MissingGuidId";
13+
private const string MissingGuidId = "MissingGuid";
1414
private static readonly DiagnosticDescriptor MissingGuidRule = new DiagnosticDescriptor(
1515
MissingGuidId,
1616
new LocalizableResourceString(nameof(Resources.MissingGuidTitle), Resources.ResourceManager, typeof(Resources)),

‎RubberduckTestsCodeAnalysis/RubberduckTestsCodeAnalysis.csproj‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -46,26 +46,26 @@
4646
<Compile Include="Verifiers\DiagnosticVerifier.cs" />
4747
</ItemGroup>
4848
<ItemGroup>
49-
<Reference Include="Microsoft.CodeAnalysis, Version=2.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
50-
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.2.8.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
49+
<Reference Include="Microsoft.CodeAnalysis, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
50+
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.0.0\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
5151
</Reference>
52-
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
53-
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.2.8.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
52+
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
53+
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
5454
</Reference>
55-
<Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces, Version=2.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56-
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.2.8.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
55+
<Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56+
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
5757
</Reference>
58-
<Reference Include="Microsoft.CodeAnalysis.VisualBasic, Version=2.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59-
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.2.8.0\lib\netstandard1.3\Microsoft.CodeAnalysis.VisualBasic.dll</HintPath>
58+
<Reference Include="Microsoft.CodeAnalysis.VisualBasic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59+
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.1.0.0\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll</HintPath>
6060
</Reference>
61-
<Reference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces, Version=2.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
62-
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.2.8.0\lib\netstandard1.3\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll</HintPath>
61+
<Reference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
62+
<HintPath>..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.1.0.0\lib\net45\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll</HintPath>
6363
</Reference>
64-
<Reference Include="Microsoft.CodeAnalysis.Workspaces, Version=2.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
65-
<HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.2.8.0\lib\net46\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
64+
<Reference Include="Microsoft.CodeAnalysis.Workspaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
65+
<HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
6666
</Reference>
67-
<Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop, Version=2.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68-
<HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.2.8.0\lib\net46\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
67+
<Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68+
<HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
6969
</Reference>
7070
<Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
7171
<HintPath>..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll</HintPath>
@@ -79,20 +79,20 @@
7979
<HintPath>..\packages\System.Collections.Immutable.1.4.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
8080
</Reference>
8181
<Reference Include="System.ComponentModel.Composition" />
82-
<Reference Include="System.Composition.AttributedModel, Version=1.0.32.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
83-
<HintPath>..\packages\System.Composition.AttributedModel.1.1.0\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath>
82+
<Reference Include="System.Composition.AttributedModel, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
83+
<HintPath>..\packages\System.Composition.AttributedModel.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath>
8484
</Reference>
85-
<Reference Include="System.Composition.Convention, Version=1.0.32.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
86-
<HintPath>..\packages\System.Composition.Convention.1.1.0\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll</HintPath>
85+
<Reference Include="System.Composition.Convention, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
86+
<HintPath>..\packages\System.Composition.Convention.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll</HintPath>
8787
</Reference>
88-
<Reference Include="System.Composition.Hosting, Version=1.0.32.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
89-
<HintPath>..\packages\System.Composition.Hosting.1.1.0\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll</HintPath>
88+
<Reference Include="System.Composition.Hosting, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
89+
<HintPath>..\packages\System.Composition.Hosting.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll</HintPath>
9090
</Reference>
91-
<Reference Include="System.Composition.Runtime, Version=1.0.32.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
92-
<HintPath>..\packages\System.Composition.Runtime.1.1.0\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll</HintPath>
91+
<Reference Include="System.Composition.Runtime, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
92+
<HintPath>..\packages\System.Composition.Runtime.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll</HintPath>
9393
</Reference>
94-
<Reference Include="System.Composition.TypedParts, Version=1.0.32.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
95-
<HintPath>..\packages\System.Composition.TypedParts.1.1.0\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath>
94+
<Reference Include="System.Composition.TypedParts, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
95+
<HintPath>..\packages\System.Composition.TypedParts.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath>
9696
</Reference>
9797
<Reference Include="System.Console, Version=4.0.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
9898
<HintPath>..\packages\System.Console.4.3.1\lib\net46\System.Console.dll</HintPath>
@@ -169,8 +169,8 @@
169169
</ProjectReference>
170170
</ItemGroup>
171171
<ItemGroup>
172-
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.6.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
173-
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.2.6.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
172+
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
173+
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
174174
</ItemGroup>
175175
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
176176
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

‎RubberduckTestsCodeAnalysis/app.config‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,23 @@
4040
</dependentAssembly>
4141
<dependentAssembly>
4242
<assemblyIdentity name="System.Composition.AttributedModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
43-
<bindingRedirect oldVersion="0.0.0.0-1.0.32.0" newVersion="1.0.32.0" />
43+
<bindingRedirect oldVersion="0.0.0.0-1.0.31.0" newVersion="1.0.31.0" />
4444
</dependentAssembly>
4545
<dependentAssembly>
4646
<assemblyIdentity name="System.Composition.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
47-
<bindingRedirect oldVersion="0.0.0.0-1.0.32.0" newVersion="1.0.32.0" />
47+
<bindingRedirect oldVersion="0.0.0.0-1.0.31.0" newVersion="1.0.31.0" />
4848
</dependentAssembly>
4949
<dependentAssembly>
5050
<assemblyIdentity name="System.Composition.TypedParts" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
51-
<bindingRedirect oldVersion="0.0.0.0-1.0.32.0" newVersion="1.0.32.0" />
51+
<bindingRedirect oldVersion="0.0.0.0-1.0.31.0" newVersion="1.0.31.0" />
5252
</dependentAssembly>
5353
<dependentAssembly>
5454
<assemblyIdentity name="System.Composition.Hosting" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
55-
<bindingRedirect oldVersion="0.0.0.0-1.0.32.0" newVersion="1.0.32.0" />
55+
<bindingRedirect oldVersion="0.0.0.0-1.0.31.0" newVersion="1.0.31.0" />
56+
</dependentAssembly>
57+
<dependentAssembly>
58+
<assemblyIdentity name="System.Xml.ReaderWriter" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
59+
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
5660
</dependentAssembly>
5761
</assemblyBinding>
5862
</runtime>

‎RubberduckTestsCodeAnalysis/packages.config‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.CodeAnalysis" version="2.8.0" targetFramework="net46" />
4-
<package id="Microsoft.CodeAnalysis.Analyzers" version="2.6.0" targetFramework="net46" developmentDependency="true" />
5-
<package id="Microsoft.CodeAnalysis.Common" version="2.8.0" targetFramework="net46" />
6-
<package id="Microsoft.CodeAnalysis.CSharp" version="2.8.0" targetFramework="net46" />
7-
<package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="2.8.0" targetFramework="net46" />
8-
<package id="Microsoft.CodeAnalysis.VisualBasic" version="2.8.0" targetFramework="net46" />
9-
<package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="2.8.0" targetFramework="net46" />
10-
<package id="Microsoft.CodeAnalysis.Workspaces.Common" version="2.8.0" targetFramework="net46" />
3+
<package id="Microsoft.CodeAnalysis" version="1.0.0" targetFramework="net46" />
4+
<package id="Microsoft.CodeAnalysis.Analyzers" version="1.0.0" targetFramework="net46" developmentDependency="true" />
5+
<package id="Microsoft.CodeAnalysis.Common" version="1.0.0" targetFramework="net46" />
6+
<package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0" targetFramework="net46" />
7+
<package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0" targetFramework="net46" />
8+
<package id="Microsoft.CodeAnalysis.VisualBasic" version="1.0.0" targetFramework="net46" />
9+
<package id="Microsoft.CodeAnalysis.VisualBasic.Workspaces" version="1.0.0" targetFramework="net46" />
10+
<package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0" targetFramework="net46" />
11+
<package id="Microsoft.Composition" version="1.0.27" targetFramework="net46" />
1112
<package id="NUnit" version="3.10.1" targetFramework="net46" />
1213
<package id="System.AppContext" version="4.3.0" targetFramework="net46" />
1314
<package id="System.Collections" version="4.3.0" targetFramework="net46" />
1415
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net46" />
1516
<package id="System.Collections.Immutable" version="1.4.0" targetFramework="net46" />
16-
<package id="System.Composition" version="1.1.0" targetFramework="net46" />
17-
<package id="System.Composition.AttributedModel" version="1.1.0" targetFramework="net46" />
18-
<package id="System.Composition.Convention" version="1.1.0" targetFramework="net46" />
19-
<package id="System.Composition.Hosting" version="1.1.0" targetFramework="net46" />
20-
<package id="System.Composition.Runtime" version="1.1.0" targetFramework="net46" />
21-
<package id="System.Composition.TypedParts" version="1.1.0" targetFramework="net46" />
17+
<package id="System.Composition" version="1.0.31" targetFramework="net46" />
18+
<package id="System.Composition.AttributedModel" version="1.0.31" targetFramework="net46" />
19+
<package id="System.Composition.Convention" version="1.0.31" targetFramework="net46" />
20+
<package id="System.Composition.Hosting" version="1.0.31" targetFramework="net46" />
21+
<package id="System.Composition.Runtime" version="1.0.31" targetFramework="net46" />
22+
<package id="System.Composition.TypedParts" version="1.0.31" targetFramework="net46" />
2223
<package id="System.Console" version="4.3.1" targetFramework="net46" />
2324
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net46" />
2425
<package id="System.Diagnostics.FileVersionInfo" version="4.3.0" targetFramework="net46" />

‎appveyor.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ build:
5252
test_script:
5353
# we use -returntargetcode to fail the build if tests fail
5454
- OpenCover.Console.exe -register:user -returntargetcode -target:"nunit3-console.exe" -targetargs:".\RubberduckTests\bin\Release\RubberduckTests.dll" -output:".\Rubberduck_Coverage.xml"
55+
- OpenCover.Console.exe -register:user -returntargetcode -target:"nunit3-console.exe" -targetargs:".\RubberduckTestsCodeAnalysis\bin\Release\RubberduckTestsCodeAnalysis.dll" -output:".\RubberduckCodeAnalysis_Coverage.xml"
5556
# when using test_script, after_test seems to not be executed
5657
- codecov -f "Rubberduck_Coverage.xml"
5758

0 commit comments

Comments
 (0)