Skip to content

Commit ac4ec9e

Browse files
Clean-up slngen related logic (#65507)
* Clean-up slngen related logic * Update dotnet-tools.json Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
1 parent 3bfe56e commit ac4ec9e

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
]
2222
},
2323
"microsoft.visualstudio.slngen.tool": {
24-
"version": "6.3.0",
24+
"version": "8.1.6",
2525
"commands": [
2626
"slngen"
2727
]

src/libraries/Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
<Import Project="$(RepositoryEngineeringDir)testing\runtimeConfiguration.targets" />
119119
<Import Project="$(RepositoryEngineeringDir)testing\runsettings.targets" Condition="'$(EnableRunSettingsSupport)' == 'true'" />
120120
<Import Project="$(RepositoryEngineeringDir)testing\coverage.targets" Condition="'$(EnableRunSettingsSupport)' == 'true' or '$(EnableCoverageSupport)' == 'true'" />
121-
<Import Project="$(RepositoryEngineeringDir)slngen.targets" />
121+
<Import Project="$(RepositoryEngineeringDir)slngen.targets" Condition="'$(IsSlnGen)' == 'true'" />
122122

123123
<Import Project="$(RepositoryEngineeringDir)illink.targets" Condition="'$(IsSourceProject)' == 'true'" />
124124
<Import Project="$(RepositoryEngineeringDir)AvoidRestoreCycleOnSelfReference.targets" Condition="'$(AvoidRestoreCycleOnSelfReference)' == 'true'" />

src/libraries/slngen.proj

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
<!--
2-
Targets that can be executed individually even though they are sequenced into build already:
3-
- UpdateSolutionFile: Adds/updates solution files with slngen which includes dependencies.
4-
-->
51
<Project Sdk="Microsoft.Build.NoTargets">
62
<PropertyGroup>
3+
<ScriptExt Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">.cmd</ScriptExt>
4+
<ScriptExt Condition="!$([MSBuild]::IsOSPlatform('WINDOWS'))">.sh</ScriptExt>
75
<ProjTemplatePath>$(RepositoryEngineeringDir)slngen.template.proj</ProjTemplatePath>
86
</PropertyGroup>
97

108
<ItemGroup>
11-
<SolutionFile Include="$(MSBuildThisFileDirectory)*\*.sln" />
12-
<SourceProject Include="$(MSBuildThisFileDirectory)*\src\*.*proj" />
9+
<!-- Unless a "/p:SolutionName" property is passed in, glob all solutions under src/libraries. -->
10+
<SolutionFile Include="$(MSBuildThisFileDirectory)$([MSBuild]::ValueOrDefault('$(SolutionName)', '%2A'))\*.sln" />
1311
</ItemGroup>
1412

1513
<Target Name="UpdateSolutionFile"
@@ -22,7 +20,7 @@
2220
DestinationFiles="%(SolutionFile.ProjFilePath)" />
2321

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

2725
<!-- Delete temporary template file -->
2826
<Delete Files="%(SolutionFile.ProjFilePath)" />
@@ -31,8 +29,7 @@
3129
<Target Name="GetSolutionFiles">
3230
<ItemGroup>
3331
<!-- Add attributes that require a separate item mutation. -->
34-
<SolutionFile ProjFilePath="%(RelativeDir)%(Filename).proj"
35-
NuGetConfigFilePath="%(RelativeDir)NuGet.config" />
32+
<SolutionFile ProjFilePath="%(RelativeDir)%(Filename).proj" />
3633
</ItemGroup>
3734
</Target>
3835
</Project>

0 commit comments

Comments
 (0)