Skip to content
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
9 changes: 9 additions & 0 deletions src/Aspire.Hosting.Python/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project>
<PropertyGroup>
<!-- This needs to be set to true before importing parent Directory.Build.props -->
<!-- In preview until the public API is validated. -->
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why isn't this in the csproj?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See conversation here: #6195 (comment)

cc @joperezr

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based on this PR this is the way to do it now
https://github.com/dotnet/aspire/pull/6195/files

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is no longer the case, it was only for RC1 as we had things going RC1 and some other things staying in preview, but now everything should fall back to be preview or stable.

</PropertyGroup>

<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
</Project>
4 changes: 2 additions & 2 deletions src/Aspire.Hosting.Python/PythonAppResource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
namespace Aspire.Hosting.Python;

/// <summary>
/// A resource that represents a python executible or app.
/// A resource that represents a python executable or app.
/// </summary>
/// <param name="name">The name of the resource.</param>
/// <param name="executablePath">The path to the executable used to run the python app.</param>
Expand All @@ -18,4 +18,4 @@ public class PythonAppResource(string name, string executablePath, string projec
{
private static string ThrowIfNull([NotNull] string? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
=> argument ?? throw new ArgumentNullException(paramName);
}
}
10 changes: 5 additions & 5 deletions src/Aspire.Hosting.Python/PythonAppResourceBuilderExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ public static class PythonAppResourceBuilderExtensions
/// </para>
/// </remarks>
/// <example>
/// Add a python app or executible to the application model. In this example the python code entry point is located in the <c>PythonProject</c> directory
/// if this path is relative then it is assumed to be relative to the AppHost directory, and the virtual enviroment path if relative
/// Add a python app or executable to the application model. In this example the python code entry point is located in the <c>PythonProject</c> directory
/// if this path is relative then it is assumed to be relative to the AppHost directory, and the virtual environment path if relative
/// is relative to the project directory. In the example below, if the app host directory is <c>$HOME/repos/MyApp/src/MyApp.AppHost</c> then
/// the ProjectPath would be <c>$HOME/repos/MyApp/src/MyApp.AppHost/PythonProject</c> and the virtual environment path (defaulted) would
/// be <c>$HOME/repos/MyApp/src/MyApp.AppHost/PythonProject/.venv</c>.
Expand Down Expand Up @@ -93,8 +93,8 @@ public static IResourceBuilder<PythonAppResource> AddPythonApp(
/// </para>
/// </remarks>
/// <example>
/// Add a python app or executible to the application model. In this example the python code is located in the <c>PythonProject</c> directory
/// if this path is relative then it is assumed to be relative to the AppHost directory, and the virtual enviroment path if relative
/// Add a python app or executable to the application model. In this example the python code is located in the <c>PythonProject</c> directory
/// if this path is relative then it is assumed to be relative to the AppHost directory, and the virtual environment path if relative
/// is relative to the project directory. In the example below, if the app host directory is <c>$HOME/repos/MyApp/src/MyApp.AppHost</c> then
/// the ProjectPath would be <c>$HOME/repos/MyApp/src/MyApp.AppHost/PythonProject</c> and the virtual environment path (defaulted) would
/// be <c>$HOME/repos/MyApp/src/MyApp.AppHost/PythonProject/.venv</c>.
Expand Down Expand Up @@ -177,4 +177,4 @@ private static void AddOpenTelemetryArguments(CommandLineArgsCallbackContext con
context.Args.Add("--metrics_exporter");
context.Args.Add("otlp");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public static class PythonProjectResourceBuilderExtensions
/// </remarks>
/// <example>
/// Add a python project to the application model. In this example the project is located in the <c>PythonProject</c> directory
/// if this path is relative then it is assumed to be relative to the AppHost directory, and the virtual enviroment path if relative
/// if this path is relative then it is assumed to be relative to the AppHost directory, and the virtual environment path if relative
/// is relative to the project directory. In the example below, if the app host directory is <c>$HOME/repos/MyApp/src/MyApp.AppHost</c> then
/// the ProjectPath would be <c>$HOME/repos/MyApp/src/MyApp.AppHost/PythonProject</c> and the virtual environment path (defaulted) would
/// be <c>$HOME/repos/MyApp/src/MyApp.AppHost/PythonProject/.venv</c>.
Expand Down Expand Up @@ -96,7 +96,7 @@ public static IResourceBuilder<PythonProjectResource> AddPythonProject(
/// </remarks>
/// <example>
/// Add a python project to the application model. In this example the project is located in the <c>PythonProject</c> directory
/// if this path is relative then it is assumed to be relative to the AppHost directory, and the virtual enviroment path if relative
/// if this path is relative then it is assumed to be relative to the AppHost directory, and the virtual environment path if relative
/// is relative to the project directory. In the example below, if the app host directory is <c>$HOME/repos/MyApp/src/MyApp.AppHost</c> then
/// the ProjectPath would be <c>$HOME/repos/MyApp/src/MyApp.AppHost/PythonProject</c> and the virtual environment path (defaulted) would
/// be <c>$HOME/repos/MyApp/src/MyApp.AppHost/PythonProject/.venv</c>.
Expand Down