dotnet-installer/eng/ManualVersions.props

19 lines
1.1 KiB
Text
Raw Normal View History

2020-09-18 04:16:38 +00:00
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- The following properties (unlike those in version.props) are maintained manually. So
when there is a merge conflict, the highest version should generally be chosen, rather
than keeping what's in the branch, which is the usual strategy with version.props merge
conflicts.
Basically: In this file, choose the highest version when resolving merge conflicts.
2020-09-18 04:16:38 +00:00
-->
<PropertyGroup>
[automated] Merge branch 'release/6.0.3xx' => 'main' (#13204) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220128.1 (#13141) [release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220203.1 (#13161) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22078.1 -> To Version 6.0.0-servicing.22103.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Update dependencies from https://github.com/dotnet/arcade build 20220202.3 (#13165) Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21609.4 -> To Version 6.0.0-beta.22102.3 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220205.1 (#13178) [release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages * Update dependencies from https://github.com/dotnet/arcade build 20220207.2 (#13187) Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22102.3 -> To Version 6.0.0-beta.22107.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * [release/6.0.3xx] Windows SDK projection update Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Manodasan Wignarajah <mawign@microsoft.com> Co-authored-by: Marc Paine <marcpop@microsoft.com> Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
2022-02-09 22:03:51 +00:00
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.23</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.23</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.23</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.23</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.23</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
2020-09-18 04:16:38 +00:00
</PropertyGroup>
</Project>