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

Jump to bottom

Also detect Unity version from project when running UnityTasks.UnityRunTests #1428

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Also detect Unity version from project when running UnityTasks.UnityRunTests #1428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
558a89c
chore: remove AWS from sponsors
matkoch Sep 10, 2024
9267436
fix(docs): Executes method name (#1422)
PieEatingNinjas Sep 17, 2024
f419d40
fix(docs): GetAllProjects method call (#1421)
PieEatingNinjas Sep 17, 2024
bb3b6a0
fix(tools): EntityFrameworkTasks definite argument (#1420)
BrewingCoder Sep 17, 2024
f35a5e0
Also call DetectUnityVersion when in UnityTasks.UnityRunTests
Sep 23, 2024
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
8 changes: 3 additions & 5 deletions build/Build.Announce.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,9 @@ partial class Build
}

IEnumerable<(string Text, string Url)> AnnouncementSponsors =>
new (string Text, string Url)[]
{
("Octopus Deploy", "https://octopus.com/"),
("Amazon Web Services", "https://aws.amazon.com/"),
};
[
("Octopus Deploy", "https://octopus.com/")
];

// https://api.slack.com/apps/A050ZLH0V40/incoming-webhooks?
[Parameter] [Secret] readonly string SlackWebhook;
Expand Down
8 changes: 4 additions & 4 deletions docs/02-fundamentals/05-targets.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ class Build : NukeBuild
// highlight-start
.OnlyWhenDynamic(() => Data.Any())
// highlight-end
.Execute(() => { });
.Executes(() => { });
}
```

Expand All @@ -229,7 +229,7 @@ class Build : NukeBuild
.WhenSkipped(DependencyBehavior.Execute)
// highlight-end
.DependsOn(A)
.Execute(() => { });
.Executes(() => { });
}
```

Expand Down Expand Up @@ -286,7 +286,7 @@ class Build : NukeBuild

Target B => _ => _
.DependsOn(A)
.Execute(() => { });
.Executes(() => { });
}
```

Expand All @@ -309,7 +309,7 @@ class Build : NukeBuild
.AssuredAfterFailure()
// highlight-end
.DependsOn(A)
.Execute(() => { });
.Executes(() => { });
}
```

Expand Down
2 changes: 1 addition & 1 deletion docs/03-common/07-solution-project-model.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ With an instance of the `Solution` type you can **read and write the solution**
```csharp
// Gather projects
var globalToolProject = Solution.GetProject("Nuke.GlobalTool");
var testProjects = Solution.GetProjects("*.Tests");
var testProjects = Solution.GetAllProjects("*.Tests");

// Gather all solution items
var allItems = Solution.AllSolutionFolders.SelectMany(x => x.Items);
Expand Down
42 changes: 21 additions & 21 deletions source/Nuke.Common/Tools/EntityFramework/EntityFramework.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"customExecutable": true,
"tasks": [
{
"help": "The <c>dotnet ef database drop</c> command is used to drop the database.",
"help": "The <c>dotnet-ef database drop</c> command is used to drop the database.",
"postfix": "DatabaseDrop",
"definiteArgument": "ef database drop",
"definiteArgument": "database drop",
"settingsClass": {
"baseClass": "EntityFrameworkSettings",
"properties": [
Expand All @@ -32,9 +32,9 @@
}
},
{
"help": "The <c>dotnet ef database update</c> command is used to update the database to the last migration or to a specified migration.",
"help": "The <c>dotnet-ef database update</c> command is used to update the database to the last migration or to a specified migration.",
"postfix": "DatabaseUpdate",
"definiteArgument": "ef database update",
"definiteArgument": "database update",
"settingsClass": {
"baseClass": "EntityFrameworkSettings",
"properties": [
Expand All @@ -54,23 +54,23 @@
}
},
{
"help": "The <c>dotnet ef dbcontext info</c> command is used to get information about a <c>DbContext</c> type.",
"help": "The <c>dotnet-ef dbcontext info</c> command is used to get information about a <c>DbContext</c> type.",
"postfix": "DbContextInfo",
"definiteArgument": "ef dbcontext info",
"definiteArgument": "dbcontext info",
"settingsClass": {
"baseClass": "EntityFrameworkSettings"
}
},
{
"help": "The <c>dotnet ef dbcontext list</c> command is used to list available <c>DbContext</c> types.",
"help": "The <c>dotnet-ef dbcontext list</c> command is used to list available <c>DbContext</c> types.",
"postfix": "DbContextList",
"definiteArgument": "ef dbcontext list",
"definiteArgument": "dbcontext list",
"settingsClass": {
"baseClass": "EntityFrameworkSettings"
}
},
{
"help": "The <c>dotnet ef dbcontext scaffold</c> command is used to generate code for a <c>DbContext</c> and entity types for a database. In order for this command to generate an entity type, the database table must have a primary key.",
"help": "The <c>dotnet-ef dbcontext scaffold</c> command is used to generate code for a <c>DbContext</c> and entity types for a database. In order for this command to generate an entity type, the database table must have a primary key.",
"postfix": "DbContextScaffold",
"definiteArgument": "ef dbcontext scaffold",
"settingsClass": {
Expand Down Expand Up @@ -164,9 +164,9 @@
}
},
{
"help": "The <c>dotnet ef dbcontext script</c> command is used to generate a SQL script from the <c>DbContext</c>, bypassing any migrations.",
"help": "The <c>dotnet-ef dbcontext script</c> command is used to generate a SQL script from the <c>DbContext</c>, bypassing any migrations.",
"postfix": "DbContextScript",
"definiteArgument": "ef dbcontext script",
"definiteArgument": "dbcontext script",
"settingsClass": {
"baseClass": "EntityFrameworkSettings",
"properties": [
Expand All @@ -180,9 +180,9 @@
}
},
{
"help": "The <c>dotnet ef migrations add</c> command is used to add a new migration.",
"help": "The <c>dotnet-ef migrations add</c> command is used to add a new migration.",
"postfix": "MigrationsAdd",
"definiteArgument": "ef migrations add",
"definiteArgument": "migrations add",
"settingsClass": {
"baseClass": "EntityFrameworkSettings",
"properties": [
Expand All @@ -208,9 +208,9 @@
}
},
{
"help": "The <c>dotnet ef migrations list</c> command is used to list available migrations.",
"help": "The <c>dotnet-ef migrations list</c> command is used to list available migrations.",
"postfix": "MigrationsList",
"definiteArgument": "ef migrations list",
"definiteArgument": "migrations list",
"settingsClass": {
"baseClass": "EntityFrameworkSettings",
"properties": [
Expand All @@ -230,9 +230,9 @@
}
},
{
"help": "The <c>dotnet ef migrations remove</c> command is used to remove the last migration (rolls back the code changes that were done for the migration).",
"help": "The <c>dotnet-ef migrations remove</c> command is used to remove the last migration (rolls back the code changes that were done for the migration).",
"postfix": "MigrationsRemove",
"definiteArgument": "ef migrations remove",
"definiteArgument": "migrations remove",
"settingsClass": {
"baseClass": "EntityFrameworkSettings",
"properties": [
Expand All @@ -246,9 +246,9 @@
}
},
{
"help": "The <c>dotnet ef migrations bundle</c> command is used to create a bundle.",
"help": "The <c>dotnet-ef migrations bundle</c> command is used to create a bundle.",
"postfix": "MigrationsBundle",
"definiteArgument": "ef migrations bundle",
"definiteArgument": "migrations bundle",
"settingsClass": {
"baseClass": "EntityFrameworkSettings",
"properties": [
Expand Down Expand Up @@ -280,9 +280,9 @@
}
},
{
"help": "The <c>dotnet ef migrations script</c> command is used to generate a SQL script from migrations.",
"help": "The <c>dotnet-ef migrations script</c> command is used to generate a SQL script from migrations.",
"postfix": "MigrationsScript",
"definiteArgument": "ef migrations script",
"definiteArgument": "migrations script",
"settingsClass": {
"baseClass": "EntityFrameworkSettings",
"properties": [
Expand Down
16 changes: 14 additions & 2 deletions source/Nuke.Common/Tools/Unity/UnityTasks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,27 @@ private static string GetProgramFiles()
}

private static void PreProcess(ref UnitySettings unitySettings)
{
var projectSettings = (UnityProjectSettings)unitySettings;
PreProcessWithAutoDetect(ref projectSettings);
}

private static void PreProcess(ref UnityRunTestsSettings unitySettings)
{
var projectSettings = (UnityProjectSettings)unitySettings;
PreProcessWithAutoDetect(ref projectSettings);
}

private static void PreProcessWithAutoDetect(ref UnityProjectSettings unitySettings)
{
if (unitySettings.ProjectPath == null)
Log.Warning("ProjectPath is not set, using last opened/built project");

DetectUnityVersion(ref unitySettings);
PreProcess<UnitySettings>(ref unitySettings);
PreProcess(ref unitySettings);
}

private static void DetectUnityVersion(ref UnitySettings unitySettings)
private static void DetectUnityVersion(ref UnityProjectSettings unitySettings)
{
if (unitySettings.HubVersion != null ||
unitySettings.ProjectPath == null)
Expand Down