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

reduce test log noise #14705

Closed
wants to merge 1 commit into from
Closed

reduce test log noise #14705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion src/Config/CS_SDK.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<DefineConstants>$(DefineConstants);_LINUX</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(UILib)' == 'true' AND $(RuntimeIdentifier.Contains('win'))">
<!--If we are building the Dynamo.All.sln and if current project is a test project, then include windows and wpf references so that tests can load UI nodes -->
<!--If UILib is true and we are targeting windows, then include windows and wpf references -->
<PropertyGroup Condition=" ( '$(SolutionName)' == 'Dynamo.All' AND '$(TestProject)' == 'true' ) OR ( '$(UILib)' == 'true' AND $(RuntimeIdentifier.Contains('win')) )">
<TargetFramework>$(TargetFramework)-windows</TargetFramework>
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
Expand Down
5 changes: 3 additions & 2 deletions src/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
ToolsVersion="16.0"
DefaultTargets="Build">
<PropertyGroup>
<Solution>Dynamo.All.sln</Solution>
<SolutionName>Dynamo.All</SolutionName>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

SolutionName is part of the msbuild common macros, but only in the VS IDE https://learn.microsoft.com/en-us/cpp/build/reference/common-macros-for-build-commands-and-properties?view=msvc-170
For console builds, we also set the property here

<Solution>$(SolutionName).sln</Solution>
<Platform>Any CPU</Platform>
<DotNet>net8.0</DotNet>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
Expand All @@ -22,7 +23,7 @@

<Target Name="RestorePackages">
<Exec Condition="!Exists($(NuGetPath))" Command="powershell.exe -ExecutionPolicy ByPass -Command Invoke-WebRequest -Uri https://dist.nuget.org/win-x86-commandline/latest/nuget.exe -OutFile $(NuGetPath)" />
<Exec Command="dotnet restore $(Solution) --runtime=$(RuntimeIdentifier) -p:DotNet=$(DotNet)"/>
<Exec Command="dotnet restore $(Solution) --runtime=$(RuntimeIdentifier) -p:DotNet=$(DotNet) -p:SolutionName=$(SolutionName)"/>
Copy link
Contributor

Choose a reason for hiding this comment

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

Why do we need to pass SolutionName to this command in addition to Solution?

</Target>

</Project>
Loading