mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Progress

Browse source
This commit is contained in:
Forgind 2023-07-28 12:20:25 -07:00
parent f76662028c
commit 63faf3282d
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/redist/targets/BundledManifests.targets
View file

@ -119,6 +119,15 @@
<FormattedBaselineManifest Include="}" /> <FormattedBaselineManifest Include="}" />
</ItemGroup> </ItemGroup>
<<<<<<< Updated upstream
<WriteLinestoFile File="$(RedistLayoutPath)sdk-manifests\BaselineManifest.json" Lines="@(FormattedBaselineManifest)" /> <WriteLinestoFile File="$(RedistLayoutPath)sdk-manifests\BaselineManifest.json" Lines="@(FormattedBaselineManifest)" />
=======
<PropertyGroup>
<BaselineManifestFileName Condition="''$(DotNetFinalVersionKind)' == 'release'">BaselineManifest</BaselineManifestFileName>
<BaselineManifestFileName Condition="''$(DotNetFinalVersionKind)' != 'release'">BaselineManifest</BaselineManifestFileName>
</PropertyGroup>
<WriteLinestoFile File="$(RedistLayoutPath)sdk-manifests\$(BaselineManifestFileName).json" Lines="@(FormattedBaselineManifest)" />
>>>>>>> Stashed changes
</Target> </Target>
</Project> </Project>