File tree Expand file tree Collapse file tree 3 files changed +9
-6
lines changed
src/Installer/redist-installer/targets
test/EndToEnd-Installer.Tests Expand file tree Collapse file tree 3 files changed +9
-6
lines changed Original file line number Diff line number Diff line change 9
9
Basically: In this file, choose the highest version when resolving merge conflicts.
10
10
-->
11
11
<PropertyGroup >
12
- <MicrosoftWindowsSDKNETRef10_0_17763PackageVersion >10.0.17763.31</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion >
13
- <MicrosoftWindowsSDKNETRef10_0_18362PackageVersion >10.0.18362.31</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion >
14
- <MicrosoftWindowsSDKNETRef10_0_19041PackageVersion >10.0.19041.31</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion >
15
- <MicrosoftWindowsSDKNETRef10_0_20348PackageVersion >10.0.20348.31</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion >
16
- <MicrosoftWindowsSDKNETRef10_0_22000PackageVersion >10.0.22000.31</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion >
17
- <MicrosoftWindowsSDKNETRef10_0_22621PackageVersion >10.0.22621.31</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion >
12
+ <MicrosoftWindowsSDKNETRef10_0_17763PackageVersion >10.0.17763.34</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion >
13
+ <MicrosoftWindowsSDKNETRef10_0_18362PackageVersion >10.0.18362.34</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion >
14
+ <MicrosoftWindowsSDKNETRef10_0_19041PackageVersion >10.0.19041.34</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion >
15
+ <MicrosoftWindowsSDKNETRef10_0_20348PackageVersion >10.0.20348.34</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion >
16
+ <MicrosoftWindowsSDKNETRef10_0_22000PackageVersion >10.0.22000.34</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion >
17
+ <MicrosoftWindowsSDKNETRef10_0_22621PackageVersion >10.0.22621.34</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion >
18
+ <MicrosoftWindowsSDKNETRef10_0_26100PackageVersion >10.0.26100.34</MicrosoftWindowsSDKNETRef10_0_26100PackageVersion >
18
19
</PropertyGroup >
19
20
20
21
</Project >
Original file line number Diff line number Diff line change @@ -1177,6 +1177,7 @@ Copyright (c) .NET Foundation. All rights reserved.
1177
1177
/>
1178
1178
1179
1179
<!-- Supported Windows versions -->
1180
+ <WindowsSdkSupportedTargetPlatformVersion Include="10.0.26100.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_26100PackageVersion)" MinimumNETVersion="6.0" />
1180
1181
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.22621.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_22621PackageVersion)" MinimumNETVersion="6.0" />
1181
1182
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.22000.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_22000PackageVersion)" MinimumNETVersion="6.0" />
1182
1183
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.20348.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_20348PackageVersion)" MinimumNETVersion="6.0" />
Original file line number Diff line number Diff line change @@ -19,6 +19,7 @@ public class GivenWindowsApp : TestBase
19
19
[ InlineData ( "10.0.20348.0" ) ]
20
20
[ InlineData ( "10.0.22000.0" ) ]
21
21
[ InlineData ( "10.0.22621.0" ) ]
22
+ [ InlineData ( "10.0.26100.0" ) ]
22
23
public void ItCanBuildAndRun ( string targetPlatformVersion )
23
24
{
24
25
var testInstance = TestAssets . Get ( TestAssetKinds . TestProjects , "UseCswinrt" )
You can’t perform that action at this time.
0 commit comments