Skip to content

Commit 0ad38f0

Browse files
tonyhalletttonyhallett
authored
Merge pull request #486 from tonyhallett/referenced-projects-output-type
Check output type for exe for Azure function projects that do not pro…
2 parents e945f0b + 0c0b724 commit 0ad38f0

39 files changed

+543
-326
lines changed

‎FineCodeCoverage/FineCodeCoverage.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,6 @@
147147
<PackageReference Include="ExCSS">
148148
<Version>4.1.1</Version>
149149
</PackageReference>
150-
<PackageReference Include="Microsoft.Build.Locator">
151-
<Version>1.4.1</Version>
152-
</PackageReference>
153150
<PackageReference Include="Microsoft.CodeAnalysis.Common">
154151
<Version>3.11.0</Version>
155152
</PackageReference>
@@ -182,6 +179,9 @@
182179
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
183180
<PrivateAssets>all</PrivateAssets>
184181
</PackageReference>
182+
<PackageReference Include="Microsoft.VisualStudio.VCProjectEngine">
183+
<Version>16.10.31320.204</Version>
184+
</PackageReference>
185185
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.8.3038">
186186
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
187187
<PrivateAssets>all</PrivateAssets>

‎FineCodeCoverage2022/FineCodeCoverage2022.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,6 @@
146146
<PackageReference Include="ExCSS">
147147
<Version>4.1.1</Version>
148148
</PackageReference>
149-
<PackageReference Include="Microsoft.Build.Locator">
150-
<Version>1.4.1</Version>
151-
</PackageReference>
152149
<PackageReference Include="Microsoft.CodeAnalysis.Common">
153150
<Version>4.10.0</Version>
154151
</PackageReference>
@@ -181,6 +178,9 @@
181178
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
182179
<PrivateAssets>all</PrivateAssets>
183180
</PackageReference>
181+
<PackageReference Include="Microsoft.VisualStudio.VCProjectEngine">
182+
<Version>17.10.40170</Version>
183+
</PackageReference>
184184
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.11.414">
185185
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
186186
<PrivateAssets>all</PrivateAssets>

‎FineCodeCoverageTests/CoverageProject_Tests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class CoverageProject_Tests
1212
[SetUp]
1313
public void SetUp()
1414
{
15-
coverageProject = new CoverageProject(null, null, null, null, null, false);
15+
coverageProject = new CoverageProject(null, null, null, null);
1616
tempProjectFilePath = Path.Combine(Path.GetTempPath(), "testproject.csproj");
1717
coverageProject.ProjectFile = tempProjectFilePath;
1818
}

‎FineCodeCoverageTests/CoverletConsole_Tests.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using FineCodeCoverage.Core.Utilities;
99
using FineCodeCoverage.Engine.Coverlet;
1010
using FineCodeCoverage.Engine.Model;
11-
using FineCodeCoverage.Engine.OpenCover;
1211
using FineCodeCoverage.Options;
1312
using Moq;
1413
using NUnit.Framework;
@@ -46,8 +45,8 @@ public void Should_Unqualified_Qualified_ExcludeByAttribute()
4645
private Mock<ICoverageProject> SafeMockCoverageProject()
4746
{
4847
var mockCoverageProject = new Mock<ICoverageProject>();
49-
mockCoverageProject.SetupGet(coverageProject => coverageProject.IncludedReferencedProjects).Returns(new List<string>());
50-
mockCoverageProject.SetupGet(coverageProject => coverageProject.ExcludedReferencedProjects).Returns(new List<string>());
48+
mockCoverageProject.SetupGet(coverageProject => coverageProject.IncludedReferencedProjects).Returns(new List<IReferencedProject>());
49+
mockCoverageProject.SetupGet(coverageProject => coverageProject.ExcludedReferencedProjects).Returns(new List<IReferencedProject>());
5150
mockCoverageProject.SetupGet(coverageProject => coverageProject.Settings).Returns(new Mock<IAppOptions>().Object);
5251
return mockCoverageProject;
5352
}

‎FineCodeCoverageTests/CoverletDataCollectorUtil_RunAsync_Tests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ public void SetUp()
3636
mockCoverageProject = new Mock<ICoverageProject>();
3737
mockCoverageProject.Setup(cp => cp.Settings).Returns(new Mock<IAppOptions>().Object);
3838
mockCoverageProject.Setup(cp => cp.CoverageOutputFolder).Returns("");
39-
mockCoverageProject.Setup(cp => cp.ExcludedReferencedProjects).Returns(new List<string>());
40-
mockCoverageProject.Setup(cp => cp.IncludedReferencedProjects).Returns(new List<string>());
39+
mockCoverageProject.Setup(cp => cp.ExcludedReferencedProjects).Returns(new List<IReferencedProject>());
40+
mockCoverageProject.Setup(cp => cp.IncludedReferencedProjects).Returns(new List<IReferencedProject>());
4141
mockRunSettingsCoverletConfiguration = new Mock<IRunSettingsCoverletConfiguration>();
4242
coverletDataCollectorUtil.runSettingsCoverletConfiguration = mockRunSettingsCoverletConfiguration.Object;
4343
coverletDataCollectorUtil.coverageProject = mockCoverageProject.Object;
@@ -76,7 +76,7 @@ public async Task Should_Get_Settings_With_Exclude_From_CoverageProject_And_RunS
7676
var projectExclude = new string[] { "excluded" };
7777
mockCoverageProject.Setup(cp => cp.Settings.Exclude).Returns(projectExclude);
7878
mockCoverageProject.Setup(cp => cp.CoverageOutputFolder).Returns("");
79-
var referencedExcluded = new List<string> { "referencedExcluded" };
79+
var referencedExcluded = new List<IReferencedProject> { new ReferencedProject("","referencedExcluded",true) };
8080
mockCoverageProject.Setup(cp => cp.ExcludedReferencedProjects).Returns(referencedExcluded);
8181
mockRunSettingsCoverletConfiguration.Setup(rsc => rsc.Exclude).Returns("rsexclude");
8282
await coverletDataCollectorUtil.RunAsync(CancellationToken.None);
@@ -86,7 +86,7 @@ public async Task Should_Get_Settings_With_Exclude_From_CoverageProject_And_RunS
8686
[Test]
8787
public async Task Should_Not_Throw_When_Project_Setttings_Exclude_Is_Null_Async()
8888
{
89-
var referencedExcluded = new List<string> { "referencedExcluded" };
89+
var referencedExcluded = new List<IReferencedProject> { new ReferencedProject("", "referencedExcluded", true) };
9090
mockCoverageProject.Setup(cp => cp.ExcludedReferencedProjects).Returns(referencedExcluded);
9191
mockCoverageProject.Setup(cp => cp.CoverageOutputFolder).Returns("");
9292
mockRunSettingsCoverletConfiguration.Setup(rsc => rsc.Exclude).Returns("rsexclude");

‎FineCodeCoverageTests/Initializer_Tests.cs‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using FineCodeCoverage.Core.Initialization;
99
using FineCodeCoverage.Engine;
1010
using FineCodeCoverage.Engine.Model;
11+
using Moq;
1112
using NUnit.Framework;
1213

1314
namespace Test
@@ -50,7 +51,7 @@ public async Task Should_Log_Initializing_When_Initialize_Async()
5051
private async Task InitializeWithExceptionAsync(Action<Exception> callback = null)
5152
{
5253
var initializeException = new Exception("initialize exception");
53-
mocker.Setup<ICoverageProjectFactory>(a => a.Initialize()).Throws(initializeException);
54+
mocker.Setup<IFCCEngine>(fccEngine => fccEngine.Initialize(It.IsAny<CancellationToken>())).Throws(initializeException);
5455

5556
await initializer.InitializeAsync(CancellationToken.None);
5657
callback?.Invoke(initializeException);
@@ -97,22 +98,18 @@ public async Task Should_Initialize_Dependencies_In_Order_Async()
9798
{
9899
var disposalToken = CancellationToken.None;
99100
List<int> callOrder = new List<int>();
100-
mocker.GetMock<ICoverageProjectFactory>().Setup(cp => cp.Initialize()).Callback(() =>
101-
{
102-
callOrder.Add(1);
103-
});
104101
mocker.GetMock<IFCCEngine>().Setup(engine => engine.Initialize(disposalToken)).Callback(() =>
105102
{
106-
callOrder.Add(2);
103+
callOrder.Add(1);
107104
});
108105

109106
mocker.GetMock<IFirstTimeToolWindowOpener>().Setup(firstTimeToolWindowOpener => firstTimeToolWindowOpener.OpenIfFirstTimeAsync(disposalToken)).Callback(() =>
110107
{
111-
callOrder.Add(3);
108+
callOrder.Add(2);
112109
});
113110

114111
await initializer.InitializeAsync(disposalToken);
115-
Assert.AreEqual(new List<int> { 1, 2, 3 }, callOrder);
112+
Assert.AreEqual(new List<int> { 1, 2 }, callOrder);
116113
}
117114
}
118115
}

‎FineCodeCoverageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_IsCollecting_Tests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,8 @@ public async Task Should_Set_UserRunSettingsProjectDetailsLookup_For_IRunSetting
215215
SetupAppOptionsProvider(RunMsCodeCoverage.IfInRunSettings);
216216

217217
var projectSettings = new Mock<IAppOptions>().Object;
218-
var excludedReferencedProjects = new List<string>();
219-
var includedReferencedProjects = new List<string>();
218+
var excludedReferencedProjects = new List<IReferencedProject>();
219+
var includedReferencedProjects = new List<IReferencedProject>();
220220
var coverageProjects = new List<ICoverageProject>
221221
{
222222
CreateCoverageProject(null),
@@ -531,8 +531,8 @@ private ICoverageProject CreateCoverageProject(
531531
IAppOptions settings = null,
532532
string coverageOutputFolder = "",
533533
string testDllFile = "",
534-
List<string> excludedReferencedProjects = null,
535-
List<string> includedReferencedProjects = null,
534+
List<IReferencedProject> excludedReferencedProjects = null,
535+
List<IReferencedProject> includedReferencedProjects = null,
536536
string projectFile = ""
537537
)
538538
{

0 commit comments

Comments
 (0)