Skip to content

Check output type for exe for Azure function projects that do not pro… #486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions FineCodeCoverage/FineCodeCoverage.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,6 @@
<PackageReference Include="ExCSS">
<Version>4.1.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.Build.Locator">
<Version>1.4.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.Common">
<Version>3.11.0</Version>
</PackageReference>
Expand Down Expand Up @@ -182,6 +179,9 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.VCProjectEngine">
<Version>16.10.31320.204</Version>
</PackageReference>
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.8.3038">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
Expand Down
6 changes: 3 additions & 3 deletions FineCodeCoverage2022/FineCodeCoverage2022.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,6 @@
<PackageReference Include="ExCSS">
<Version>4.1.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.Build.Locator">
<Version>1.4.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.Common">
<Version>4.10.0</Version>
</PackageReference>
Expand Down Expand Up @@ -181,6 +178,9 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.VCProjectEngine">
<Version>17.10.40170</Version>
</PackageReference>
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.11.414">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
Expand Down
2 changes: 1 addition & 1 deletion FineCodeCoverageTests/CoverageProject_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class CoverageProject_Tests
[SetUp]
public void SetUp()
{
coverageProject = new CoverageProject(null, null, null, null, null, false);
coverageProject = new CoverageProject(null, null, null, null);
tempProjectFilePath = Path.Combine(Path.GetTempPath(), "testproject.csproj");
coverageProject.ProjectFile = tempProjectFilePath;
}
Expand Down
5 changes: 2 additions & 3 deletions FineCodeCoverageTests/CoverletConsole_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using FineCodeCoverage.Core.Utilities;
using FineCodeCoverage.Engine.Coverlet;
using FineCodeCoverage.Engine.Model;
using FineCodeCoverage.Engine.OpenCover;
using FineCodeCoverage.Options;
using Moq;
using NUnit.Framework;
Expand Down Expand Up @@ -46,8 +45,8 @@ public void Should_Unqualified_Qualified_ExcludeByAttribute()
private Mock<ICoverageProject> SafeMockCoverageProject()
{
var mockCoverageProject = new Mock<ICoverageProject>();
mockCoverageProject.SetupGet(coverageProject => coverageProject.IncludedReferencedProjects).Returns(new List<string>());
mockCoverageProject.SetupGet(coverageProject => coverageProject.ExcludedReferencedProjects).Returns(new List<string>());
mockCoverageProject.SetupGet(coverageProject => coverageProject.IncludedReferencedProjects).Returns(new List<IReferencedProject>());
mockCoverageProject.SetupGet(coverageProject => coverageProject.ExcludedReferencedProjects).Returns(new List<IReferencedProject>());
mockCoverageProject.SetupGet(coverageProject => coverageProject.Settings).Returns(new Mock<IAppOptions>().Object);
return mockCoverageProject;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ public void SetUp()
mockCoverageProject = new Mock<ICoverageProject>();
mockCoverageProject.Setup(cp => cp.Settings).Returns(new Mock<IAppOptions>().Object);
mockCoverageProject.Setup(cp => cp.CoverageOutputFolder).Returns("");
mockCoverageProject.Setup(cp => cp.ExcludedReferencedProjects).Returns(new List<string>());
mockCoverageProject.Setup(cp => cp.IncludedReferencedProjects).Returns(new List<string>());
mockCoverageProject.Setup(cp => cp.ExcludedReferencedProjects).Returns(new List<IReferencedProject>());
mockCoverageProject.Setup(cp => cp.IncludedReferencedProjects).Returns(new List<IReferencedProject>());
mockRunSettingsCoverletConfiguration = new Mock<IRunSettingsCoverletConfiguration>();
coverletDataCollectorUtil.runSettingsCoverletConfiguration = mockRunSettingsCoverletConfiguration.Object;
coverletDataCollectorUtil.coverageProject = mockCoverageProject.Object;
Expand Down Expand Up @@ -76,7 +76,7 @@ public async Task Should_Get_Settings_With_Exclude_From_CoverageProject_And_RunS
var projectExclude = new string[] { "excluded" };
mockCoverageProject.Setup(cp => cp.Settings.Exclude).Returns(projectExclude);
mockCoverageProject.Setup(cp => cp.CoverageOutputFolder).Returns("");
var referencedExcluded = new List<string> { "referencedExcluded" };
var referencedExcluded = new List<IReferencedProject> { new ReferencedProject("","referencedExcluded",true) };
mockCoverageProject.Setup(cp => cp.ExcludedReferencedProjects).Returns(referencedExcluded);
mockRunSettingsCoverletConfiguration.Setup(rsc => rsc.Exclude).Returns("rsexclude");
await coverletDataCollectorUtil.RunAsync(CancellationToken.None);
Expand All @@ -86,7 +86,7 @@ public async Task Should_Get_Settings_With_Exclude_From_CoverageProject_And_RunS
[Test]
public async Task Should_Not_Throw_When_Project_Setttings_Exclude_Is_Null_Async()
{
var referencedExcluded = new List<string> { "referencedExcluded" };
var referencedExcluded = new List<IReferencedProject> { new ReferencedProject("", "referencedExcluded", true) };
mockCoverageProject.Setup(cp => cp.ExcludedReferencedProjects).Returns(referencedExcluded);
mockCoverageProject.Setup(cp => cp.CoverageOutputFolder).Returns("");
mockRunSettingsCoverletConfiguration.Setup(rsc => rsc.Exclude).Returns("rsexclude");
Expand Down
13 changes: 5 additions & 8 deletions FineCodeCoverageTests/Initializer_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using FineCodeCoverage.Core.Initialization;
using FineCodeCoverage.Engine;
using FineCodeCoverage.Engine.Model;
using Moq;
using NUnit.Framework;

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

await initializer.InitializeAsync(CancellationToken.None);
callback?.Invoke(initializeException);
Expand Down Expand Up @@ -97,22 +98,18 @@ public async Task Should_Initialize_Dependencies_In_Order_Async()
{
var disposalToken = CancellationToken.None;
List<int> callOrder = new List<int>();
mocker.GetMock<ICoverageProjectFactory>().Setup(cp => cp.Initialize()).Callback(() =>
{
callOrder.Add(1);
});
mocker.GetMock<IFCCEngine>().Setup(engine => engine.Initialize(disposalToken)).Callback(() =>
{
callOrder.Add(2);
callOrder.Add(1);
});

mocker.GetMock<IFirstTimeToolWindowOpener>().Setup(firstTimeToolWindowOpener => firstTimeToolWindowOpener.OpenIfFirstTimeAsync(disposalToken)).Callback(() =>
{
callOrder.Add(3);
callOrder.Add(2);
});

await initializer.InitializeAsync(disposalToken);
Assert.AreEqual(new List<int> { 1, 2, 3 }, callOrder);
Assert.AreEqual(new List<int> { 1, 2 }, callOrder);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,8 @@ public async Task Should_Set_UserRunSettingsProjectDetailsLookup_For_IRunSetting
SetupAppOptionsProvider(RunMsCodeCoverage.IfInRunSettings);

var projectSettings = new Mock<IAppOptions>().Object;
var excludedReferencedProjects = new List<string>();
var includedReferencedProjects = new List<string>();
var excludedReferencedProjects = new List<IReferencedProject>();
var includedReferencedProjects = new List<IReferencedProject>();
var coverageProjects = new List<ICoverageProject>
{
CreateCoverageProject(null),
Expand Down Expand Up @@ -531,8 +531,8 @@ private ICoverageProject CreateCoverageProject(
IAppOptions settings = null,
string coverageOutputFolder = "",
string testDllFile = "",
List<string> excludedReferencedProjects = null,
List<string> includedReferencedProjects = null,
List<IReferencedProject> excludedReferencedProjects = null,
List<IReferencedProject> includedReferencedProjects = null,
string projectFile = ""
)
{
Expand Down
Loading
Loading