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

Merge in 'release/6.0.1xx' changes

Browse source
This commit is contained in:
dotnet-bot 2022-02-09 00:42:19 +00:00
commit 051db0b2f4
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
eng/ManualVersions.props
View file

@ -9,10 +9,10 @@
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.22</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion> <MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.23</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.22</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion> <MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.23</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.22</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion> <MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.23</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.22</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion> <MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.23</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.22</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion> <MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.23</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

2
eng/Versions.props
View file

@ -121,7 +121,7 @@
<NUnit3Templates50PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates50PackageVersion> <NUnit3Templates50PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates50PackageVersion>
<MicrosoftDotNetCommonItemTemplates50PackageVersion>$(MicrosoftDotNetCommonItemTemplates50PackageVersion)</MicrosoftDotNetCommonItemTemplates50PackageVersion> <MicrosoftDotNetCommonItemTemplates50PackageVersion>$(MicrosoftDotNetCommonItemTemplates50PackageVersion)</MicrosoftDotNetCommonItemTemplates50PackageVersion>
<MicrosoftDotNetCommonProjectTemplates50PackageVersion>$(MicrosoftDotNetCommonItemTemplates50PackageVersion)</MicrosoftDotNetCommonProjectTemplates50PackageVersion> <MicrosoftDotNetCommonProjectTemplates50PackageVersion>$(MicrosoftDotNetCommonItemTemplates50PackageVersion)</MicrosoftDotNetCommonProjectTemplates50PackageVersion>
<AspNetCorePackageVersionFor50Templates>5.0.13</AspNetCorePackageVersionFor50Templates> <AspNetCorePackageVersionFor50Templates>5.0.14</AspNetCorePackageVersionFor50Templates>
<!-- 3.1 Template versions --> <!-- 3.1 Template versions -->
<MicrosoftDotnetWinFormsProjectTemplates31PackageVersion>4.8.1-servicing.19605.5</MicrosoftDotnetWinFormsProjectTemplates31PackageVersion> <MicrosoftDotnetWinFormsProjectTemplates31PackageVersion>4.8.1-servicing.19605.5</MicrosoftDotnetWinFormsProjectTemplates31PackageVersion>
<MicrosoftDotNetWpfProjectTemplates31PackageVersion>3.1.2-servicing.20066.4</MicrosoftDotNetWpfProjectTemplates31PackageVersion> <MicrosoftDotNetWpfProjectTemplates31PackageVersion>3.1.2-servicing.20066.4</MicrosoftDotNetWpfProjectTemplates31PackageVersion>