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

Merge pull request #9715 from dotnet-maestro-bot/merge/release/5.0.2xx-to-master

Browse source 
[automated] Merge branch 'release/5.0.2xx' => 'master'
This commit is contained in:
v-wuzhai 2021-02-19 18:08:04 -08:00 • committed by GitHub
commit c60717918b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
eng/ManualVersions.props
View file

@ -9,8 +9,8 @@
Basically: In this file, choose the highest version when resolving merge conflicts. Basically: In this file, choose the highest version when resolving merge conflicts.
--> -->
<PropertyGroup> <PropertyGroup>
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.13</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion> <MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.14</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.13</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion> <MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.14</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.13</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion> <MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.14</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

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

@ -23,12 +23,16 @@
</Target> </Target>
<PropertyGroup>
<VersionFeature21>$([MSBuild]::Add($(VersionFeature), 25))</VersionFeature21>
<VersionFeature31>$([MSBuild]::Add($(VersionFeature), 12))</VersionFeature31>
</PropertyGroup>
<Target Name="GenerateBundledVersionsProps" DependsOnTargets="SetupBundledComponents"> <Target Name="GenerateBundledVersionsProps" DependsOnTargets="SetupBundledComponents">
<PropertyGroup> <PropertyGroup>
<BundledVersionsPropsFileName>Microsoft.NETCoreSdk.BundledVersions.props</BundledVersionsPropsFileName> <BundledVersionsPropsFileName>Microsoft.NETCoreSdk.BundledVersions.props</BundledVersionsPropsFileName>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<_NETCoreAppPackageVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</_NETCoreAppPackageVersion> <_NETCoreAppPackageVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</_NETCoreAppPackageVersion>
<_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion)</_NETStandardLibraryPackageVersion> <_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion)</_NETStandardLibraryPackageVersion>
@ -50,10 +54,21 @@
<_NETCoreApp30RuntimePackVersion>3.0.3</_NETCoreApp30RuntimePackVersion> <_NETCoreApp30RuntimePackVersion>3.0.3</_NETCoreApp30RuntimePackVersion>
<_NETCoreApp30TargetingPackVersion>3.0.0</_NETCoreApp30TargetingPackVersion> <_NETCoreApp30TargetingPackVersion>3.0.0</_NETCoreApp30TargetingPackVersion>
<_NETCoreApp31RuntimePackVersion>3.1.$(VersionFeature31)</_NETCoreApp31RuntimePackVersion>
<_NETCoreApp31TargetingPackVersion>3.1.0</_NETCoreApp31TargetingPackVersion>
<_WindowsDesktop30RuntimePackVersion>3.0.3</_WindowsDesktop30RuntimePackVersion> <_WindowsDesktop30RuntimePackVersion>3.0.3</_WindowsDesktop30RuntimePackVersion>
<_WindowsDesktop30TargetingPackVersion>3.0.0</_WindowsDesktop30TargetingPackVersion> <_WindowsDesktop30TargetingPackVersion>3.0.0</_WindowsDesktop30TargetingPackVersion>
<_WindowsDesktop31RuntimePackVersion>3.1.$(VersionFeature31)</_WindowsDesktop31RuntimePackVersion>
<_WindowsDesktop31TargetingPackVersion>3.1.0</_WindowsDesktop31TargetingPackVersion>
<_AspNet30RuntimePackVersion>3.0.3</_AspNet30RuntimePackVersion> <_AspNet30RuntimePackVersion>3.0.3</_AspNet30RuntimePackVersion>
<_AspNet30TargetingPackVersion>3.0.1</_AspNet30TargetingPackVersion> <_AspNet30TargetingPackVersion>3.0.1</_AspNet30TargetingPackVersion>
<_AspNet31RuntimePackVersion>3.1.$(VersionFeature31)</_AspNet31RuntimePackVersion>
<_AspNet31TargetingPackVersion>3.1.10</_AspNet31TargetingPackVersion>
<!-- Use only major and minor in target framework version --> <!-- Use only major and minor in target framework version -->
<_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1])</_NETCoreAppTargetFrameworkVersion> <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1])</_NETCoreAppTargetFrameworkVersion>
@ -161,7 +176,7 @@
<ImplicitPackageVariable Include="Microsoft.NETCore.App" <ImplicitPackageVariable Include="Microsoft.NETCore.App"
TargetFrameworkVersion="2.1" TargetFrameworkVersion="2.1"
DefaultVersion="2.1.0" DefaultVersion="2.1.0"
LatestVersion="2.1.25" /> LatestVersion="2.1.$(VersionFeature21)" />
<ImplicitPackageVariable Include="Microsoft.NETCore.App" <ImplicitPackageVariable Include="Microsoft.NETCore.App"
TargetFrameworkVersion="2.2" TargetFrameworkVersion="2.2"
DefaultVersion="2.2.0" DefaultVersion="2.2.0"
@ -169,11 +184,11 @@
<ImplicitPackageVariable Include="Microsoft.AspNetCore.App" <ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
TargetFrameworkVersion="2.1" TargetFrameworkVersion="2.1"
DefaultVersion="2.1.1" DefaultVersion="2.1.1"
LatestVersion="2.1.25"/> LatestVersion="2.1.$(VersionFeature21)"/>
<ImplicitPackageVariable Include="Microsoft.AspNetCore.All" <ImplicitPackageVariable Include="Microsoft.AspNetCore.All"
TargetFrameworkVersion="2.1" TargetFrameworkVersion="2.1"
DefaultVersion="2.1.1" DefaultVersion="2.1.1"
LatestVersion="2.1.25"/> LatestVersion="2.1.$(VersionFeature21)"/>
<ImplicitPackageVariable Include="Microsoft.AspNetCore.App" <ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
TargetFrameworkVersion="2.2" TargetFrameworkVersion="2.2"