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

Generate text and JSON

Browse source 
Restore the previous text format so that JSON is in addition.
This commit is contained in:
martincostello 2023-07-15 20:12:58 +01:00
parent 15ed53ac32
commit 615e241f6b
1 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/redist/targets/GenerateBundledVersions.targets
View file

@ -44,15 +44,6 @@
<Output TaskParameter="DependencyCommit" PropertyName="DepDotNetSdkCommit" /> <Output TaskParameter="DependencyCommit" PropertyName="DepDotNetSdkCommit" />
</GetDependencyInfo> </GetDependencyInfo>
<!-- Format for productCommits-%rid%.json:
{
"installer": { "commit": "%commit%", "version": "%version%" },
"runtime": { "commit": "%commit%", "version": "%version%" },
"aspnetcore": { "commit": "%commit%", "version": "%version%" },
"windowsdesktop": { "commit": "%commit%", "version": "%version%" },
"sdk": { "commit": "%commit%", "version": "%version%" }
}
-->
<ItemGroup> <ItemGroup>
<Line Include="installer" Version="$(PackageVersion)" Commit="$(BUILD_SOURCEVERSION)" /> <Line Include="installer" Version="$(PackageVersion)" Commit="$(BUILD_SOURCEVERSION)" />
<Line Include="runtime" Version="$(DepRuntimeVersion)" Commit="$(DepRuntimeCommit)" /> <Line Include="runtime" Version="$(DepRuntimeVersion)" Commit="$(DepRuntimeCommit)" />
@ -60,6 +51,29 @@
<Line Include="windowsdesktop" Version="$(DepWindowsDesktopVersion)" Commit="$(DepWindowsDesktopCommit)" /> <Line Include="windowsdesktop" Version="$(DepWindowsDesktopVersion)" Commit="$(DepWindowsDesktopCommit)" />
<Line Include="sdk" Version="$(DepDotNetSdkVersion)" Commit="$(DepDotNetSdkCommit)" /> <Line Include="sdk" Version="$(DepDotNetSdkVersion)" Commit="$(DepDotNetSdkCommit)" />
</ItemGroup> </ItemGroup>
<!-- Format for productCommits-%rid%.txt:
installer_commit="%commit%" installer_version="%version%"
runtime_commit="%commit%" runtime_version="%version%"
aspnetcore_commit="%commit%" aspnetcore_version="%version%"
windowsdesktop_commit="%commit%" windowsdesktop_version="%version%"
sdk_commit="%commit%" sdk_version="%version%"
-->
<WriteLinesToFile
File="$(ArtifactsShippingPackagesDir)productCommit-$(Rid).txt"
Lines="@(Line->'%(Identity)_commit=&quot;%(Commit)&quot; %(Identity)_version=&quot;%(Version)&quot;', '%0A')"
Overwrite="true"
Encoding="ASCII"/>
<!-- Format for productCommits-%rid%.json:
{
"installer": { "commit": "%commit%", "version": "%version%" },
"runtime": { "commit": "%commit%", "version": "%version%" },
"aspnetcore": { "commit": "%commit%", "version": "%version%" },
"windowsdesktop": { "commit": "%commit%", "version": "%version%" },
"sdk": { "commit": "%commit%", "version": "%version%" }
}
-->
<PropertyGroup> <PropertyGroup>
<JsonContents>{%0A@(Line->' &quot;%(Identity)&quot;: { &quot;commit&quot;: &quot;%(Commit)&quot;, &quot;version&quot;: &quot;%(Version)&quot; }', ',%0A')%0A}</JsonContents> <JsonContents>{%0A@(Line->' &quot;%(Identity)&quot;: { &quot;commit&quot;: &quot;%(Commit)&quot;, &quot;version&quot;: &quot;%(Version)&quot; }', ',%0A')%0A}</JsonContents>
</PropertyGroup> </PropertyGroup>