Skip to content
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.

Sign up for GitHub

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

[xharness] Mark the .NET tests project as a .NET project so that we don't try to call nuget restore on it. #9251

Merged
merged 2 commits into from
Jul 31, 2020
Merged

[xharness] Mark the .NET tests project as a .NET project so that we don't try to call nuget restore on it. #9251

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8522722
[xharness] Mark the .NET tests project as a .NET project so that we d…
rolfbjarne Jul 31, 2020
8021da7
[xharness] Mark the .NET generator project as a .NET project as well.
rolfbjarne Jul 31, 2020
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
10 changes: 7 additions & 3 deletions tests/xharness/Jenkins/Jenkins.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,11 @@ Task PopulateTasksAsync ()
};
Tasks.Add (runXtroReporter);

var buildDotNetGeneratorProject = new TestProject (Path.GetFullPath (Path.Combine (HarnessConfiguration.RootDirectory, "bgen", "bgen-tests.csproj")));
var buildDotNetGeneratorProject = new TestProject (Path.GetFullPath (Path.Combine (HarnessConfiguration.RootDirectory, "bgen", "bgen-tests.csproj"))) {
IsDotNetProject = true,
};
var buildDotNetGenerator = new DotNetBuildTask (jenkins: this, testProject: buildDotNetGeneratorProject, processManager: processManager) {
TestProject = new TestProject (Path.GetFullPath (Path.Combine (HarnessConfiguration.RootDirectory, "bgen", "bgen-tests.csproj"))),
TestProject = buildDotNetGeneratorProject,
SpecifyPlatform = false,
SpecifyConfiguration = false,
Platform = TestPlatform.iOS,
Expand All @@ -208,7 +210,9 @@ Task PopulateTasksAsync ()
};
Tasks.Add (runDotNetGenerator);

var buildDotNetTestsProject = new TestProject (Path.GetFullPath (Path.Combine (HarnessConfiguration.RootDirectory, "dotnet", "UnitTests", "DotNetUnitTests.csproj")));
var buildDotNetTestsProject = new TestProject (Path.GetFullPath (Path.Combine (HarnessConfiguration.RootDirectory, "dotnet", "UnitTests", "DotNetUnitTests.csproj"))) {
IsDotNetProject = true,
};
var buildDotNetTests = new DotNetBuildTask (this, testProject: buildDotNetTestsProject, processManager: processManager) {
SpecifyPlatform = false,
Platform = TestPlatform.All,
Expand Down