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

Merge branch 'release/8.0.1xx' into darc-release/8.0.1xx-8cf85e53-a4b5-44d8-95c9-fda480911c2f

Browse source
This commit is contained in:
Noah Gilson 2023-11-22 11:09:40 -08:00 committed by GitHub
commit 5645f2aa21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eng/Versions.props
View file

@ -26,8 +26,8 @@
<VersionFeature21>30</VersionFeature21>
<VersionFeature31>32</VersionFeature31>
<VersionFeature50>17</VersionFeature50>
<VersionFeature60>$([MSBuild]::Add($(VersionFeature), 24))</VersionFeature60>
<VersionFeature70>$([MSBuild]::Add($(VersionFeature), 13))</VersionFeature70>
<VersionFeature60>$([MSBuild]::Add($(VersionFeature), 25))</VersionFeature60>
<VersionFeature70>$([MSBuild]::Add($(VersionFeature), 14))</VersionFeature70>
<!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
<_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>

5
src/redist/targets/GenerateMSIs.targets
View file

@ -321,6 +321,11 @@
<ReadLinesFromFile File="$(MinimumMSBuildVersionFile)">
<Output TaskParameter="Lines" PropertyName="MinimumVSVersion"/>
</ReadLinesFromFile>
<PropertyGroup Condition=" '$(VersionSDKMinor)' == '1' and '$(StabilizePackageVersion)' == 'true' ">
<MinimumVSVersion>$(MinimumVSVersion.Substring(0,$(MinimumVSVersion.LastIndexOf('.'))))</MinimumVSVersion>
<MinimumVSVersion >$([MSBuild]::Add($(MinimumVSVersion), .1))</MinimumVSVersion>
</PropertyGroup>
</Target>
<Target Name="GenerateSdkBundle"