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

Merge 5.0.4xx into 6.0.1xx-preview6

Browse source
This commit is contained in:
Daniel Plaisted 2021-06-18 12:05:51 -07:00
commit f67f6ba948
4 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
eng/ManualVersions.props
View file

@ -9,8 +9,9 @@
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.16</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion> <MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.18</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.16</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion> <MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.18</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.16</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion> <MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.18</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

@ -667,6 +667,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>
]]> ]]>

2
src/redist/targets/GenerateLayout.targets
View file

@ -335,7 +335,7 @@
<DownloadFile Condition=" '@(ComponentToDownload)' != '' And '%(ComponentToDownload.ShouldDownload)' == 'true'" <DownloadFile Condition=" '@(ComponentToDownload)' != '' And '%(ComponentToDownload.ShouldDownload)' == 'true'"
Uri="%(ComponentToDownload.BaseUrl)/%(ComponentToDownload.DownloadFileName)" Uri="%(ComponentToDownload.BaseUrl)/%(ComponentToDownload.DownloadFileName)"
PrivateUri="%(ComponentToDownload.PrivateBaseUrl)/%(ComponentToDownload.DownloadFileName)$(DOTNETCLIMSRC_READ_SAS_TOKEN)" PrivateUri="%(ComponentToDownload.PrivateBaseUrl)/%(ComponentToDownload.DownloadFileName)$([System.Environment]::GetEnvironmentVariable('DOTNETCLIMSRC_READ_SAS_TOKEN'))"
DestinationPath="%(ComponentToDownload.DownloadDestination)" /> DestinationPath="%(ComponentToDownload.DownloadDestination)" />
<ItemGroup> <ItemGroup>

1
test/EndToEnd/GivenWindowsApp.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")