Merge in 'release/6.0.4xx' changes
This commit is contained in:
commit
c5a0cfd4ac
1 changed files with 6 additions and 6 deletions
|
@ -9,11 +9,11 @@
|
|||
Basically: In this file, choose the highest version when resolving merge conflicts.
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.28</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.28</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.28</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.28</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.28</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.28</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.29</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.29</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.29</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.29</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.29</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.29</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
Loading…
Reference in a new issue