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

Update solution files #92209

Merged
merged 2 commits into from
Sep 19, 2023
Merged

Update solution files #92209

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4aae813
Update infra to include tools P2Ps in a tools folder
ViktorHofer Sep 18, 2023
c9bcaf4
Update solution files in reaction to illink P2P changes
ViktorHofer Sep 18, 2023
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 eng/slngen.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<Project>
<PropertyGroup>

<PropertyGroup Condition="'$(SlnGenSolutionFolder)' == ''">
<SlnGenSolutionFolder Condition="'$(IsGeneratorProject)' == 'true'">gen</SlnGenSolutionFolder>
<SlnGenSolutionFolder Condition="'$(IsReferenceAssemblyProject)' == 'true'">ref</SlnGenSolutionFolder>
<SlnGenSolutionFolder Condition="'$(IsTestProject)' == 'true' or '$(IsTrimmingTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true'">tests</SlnGenSolutionFolder>
<SlnGenSolutionFolder Condition="'$(SlnGenSolutionFolder)' == ''">src</SlnGenSolutionFolder>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion src/libraries/slngen.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<!-- Copy template files, required by slngen -->
<Copy SourceFiles="$(ProjTemplatePath)"
DestinationFiles="%(SolutionFile.ProjFilePath)" />

<!-- Invoke slngen -->
<Exec Command="&quot;$(RepoRoot)dotnet$(ScriptExt)&quot; slngen -p SlnGenMainProject=%(SolutionFile.Filename) --launch false --nologo &quot;%(SolutionFile.ProjFilePath)&quot;" />

Expand Down
9 changes: 9 additions & 0 deletions src/tools/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project>

<Import Project="..\..\Directory.Build.props" />

<PropertyGroup>
<SlnGenSolutionFolder>tools</SlnGenSolutionFolder>
</PropertyGroup>

</Project>
Copy link
Member

Choose a reason for hiding this comment

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

nit: add newline at EOF

2 changes: 1 addition & 1 deletion src/tools/illink/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>

<Import Project="..\..\..\Directory.Build.props" />
<Import Project="..\Directory.Build.props" />

<PropertyGroup>
<TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
Expand Down