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

Merge in 'release/5.0.3xx' changes

Browse source
This commit is contained in:
dotnet-bot 2021-06-15 20:46:36 +00:00
commit 303760f056
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
eng/ManualVersions.props
View file

@ -12,5 +12,6 @@
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.17</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion> <MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.17</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.17</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion> <MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.17</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.17</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion> <MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.17</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.18</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

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

@ -481,6 +481,15 @@ Copyright (c) .NET Foundation. All rights reserved.
TargetingPackName="NETStandard.Library.Ref" TargetingPackName="NETStandard.Library.Ref"
TargetingPackVersion="$(NETStandardLibraryRefPackageVersion)" TargetingPackVersion="$(NETStandardLibraryRefPackageVersion)"
/> />
<!-- Supported Windows versions -->
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.20348.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_20348PackageVersion)" MinimumNETVersion="5.0" />
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.19041.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)" MinimumNETVersion="5.0" />
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.18362.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)" MinimumNETVersion="5.0" />
<WindowsSdkSupportedTargetPlatformVersion Include="10.0.17763.0" WindowsSdkPackageVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)" MinimumNETVersion="5.0" />
<WindowsSdkSupportedTargetPlatformVersion Include="8.0" />
<WindowsSdkSupportedTargetPlatformVersion Include="7.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
]]> ]]>

1
test/EndToEnd/GivenWindows50App.cs
View file

@ -16,6 +16,7 @@ namespace EndToEnd
[InlineData("10.0.17763.0")] [InlineData("10.0.17763.0")]
[InlineData("10.0.18362.0")] [InlineData("10.0.18362.0")]
[InlineData("10.0.19041.0")] [InlineData("10.0.19041.0")]
[InlineData("10.0.20348.0", Skip = "Package not published yet")]
public void ItCanBuildAndRun(string targetPlatformVersion) public void ItCanBuildAndRun(string targetPlatformVersion)
{ {
var testInstance = TestAssets.Get(TestAssetKinds.TestProjects, "UseCswinrt") var testInstance = TestAssets.Get(TestAssetKinds.TestProjects, "UseCswinrt")