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

Merge in 'release/7.0.2xx' changes

Browse source
This commit is contained in:
dotnet-bot 2023-02-27 17:23:41 +00:00
commit b9926d6812
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eng/Versions.props
View file

@ -8,9 +8,9 @@
<VersionMajor>7</VersionMajor> <VersionMajor>7</VersionMajor>
<VersionMinor>0</VersionMinor> <VersionMinor>0</VersionMinor>
<VersionSDKMinor>2</VersionSDKMinor> <VersionSDKMinor>2</VersionSDKMinor>
<VersionFeature>01</VersionFeature> <VersionFeature>02</VersionFeature>
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix> <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel> <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<PreReleaseVersionIteration> <PreReleaseVersionIteration>
</PreReleaseVersionIteration> </PreReleaseVersionIteration>
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion> <MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>

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

@ -63,7 +63,7 @@
<VersionFeature21>30</VersionFeature21> <VersionFeature21>30</VersionFeature21>
<VersionFeature31>32</VersionFeature31> <VersionFeature31>32</VersionFeature31>
<VersionFeature50>17</VersionFeature50> <VersionFeature50>17</VersionFeature50>
<VersionFeature60>$([MSBuild]::Add($(VersionFeature), 14))</VersionFeature60> <VersionFeature60>$([MSBuild]::Add($(VersionFeature), 13))</VersionFeature60>
</PropertyGroup> </PropertyGroup>
<Target Name="GenerateBundledVersionsProps" DependsOnTargets="SetupBundledComponents"> <Target Name="GenerateBundledVersionsProps" DependsOnTargets="SetupBundledComponents">