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

Merge pull request #8388 from sfoslund/MergeRC1ToMaster

Browse source 
Merge RC1 to master
This commit is contained in:
Matt Mitchell 2020-09-08 07:39:48 -07:00 • committed by GitHub
commit 97f447f228
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,7 +31,7 @@
<_NETCoreApp30RuntimePackVersion>3.0.3</_NETCoreApp30RuntimePackVersion> <_NETCoreApp30RuntimePackVersion>3.0.3</_NETCoreApp30RuntimePackVersion>
<_NETCoreApp30TargetingPackVersion>3.0.0</_NETCoreApp30TargetingPackVersion> <_NETCoreApp30TargetingPackVersion>3.0.0</_NETCoreApp30TargetingPackVersion>
<_NETCoreApp31RuntimePackVersion>3.1.2</_NETCoreApp31RuntimePackVersion> <_NETCoreApp31RuntimePackVersion>3.1.7</_NETCoreApp31RuntimePackVersion>
<_NETCoreApp31TargetingPackVersion>3.1.0</_NETCoreApp31TargetingPackVersion> <_NETCoreApp31TargetingPackVersion>3.1.0</_NETCoreApp31TargetingPackVersion>
<_WindowsDesktop30RuntimePackVersion>3.0.3</_WindowsDesktop30RuntimePackVersion> <_WindowsDesktop30RuntimePackVersion>3.0.3</_WindowsDesktop30RuntimePackVersion>
@ -281,7 +281,7 @@ Copyright (c) .NET Foundation. All rights reserved.
/> />
<KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref" <KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
TargetFramework="net5.0-windows10.0.17763" TargetFramework="net5.0-windows10.0.17763.0"
RuntimeFrameworkName="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkName="Microsoft.Windows.SDK.NET.Ref"
DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)" DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)" LatestRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)"
@ -294,7 +294,7 @@ Copyright (c) .NET Foundation. All rights reserved.
/> />
<KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref" <KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
TargetFramework="net5.0-windows10.0.18362" TargetFramework="net5.0-windows10.0.18362.0"
RuntimeFrameworkName="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkName="Microsoft.Windows.SDK.NET.Ref"
DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)" DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)" LatestRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)"
@ -307,7 +307,7 @@ Copyright (c) .NET Foundation. All rights reserved.
/> />
<KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref" <KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
TargetFramework="net5.0-windows10.0.19041" TargetFramework="net5.0-windows10.0.19041.0"
RuntimeFrameworkName="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkName="Microsoft.Windows.SDK.NET.Ref"
DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)" DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)" LatestRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)"

6
src/redist/targets/Signing.targets
View file

@ -86,7 +86,11 @@
<ItemGroup> <ItemGroup>
<!-- External files --> <!-- External files -->
<LayoutFilesToSign Include="$(SdkOutputDirectory)**/Newtonsoft.Json.dll"> <LayoutFilesToSign Include="$(SdkOutputDirectory)**/Newtonsoft.Json.dll;
$(SdkOutputDirectory)**/MessagePack.Annotations.dll;
$(SdkOutputDirectory)**/MessagePack.dll;
$(SdkOutputDirectory)**/Nerdbank.Streams.dll;
$(SdkOutputDirectory)**/StreamJsonRpc.dll">
<CertificateName>$(ExternalCertificateId)</CertificateName> <CertificateName>$(ExternalCertificateId)</CertificateName>
</LayoutFilesToSign> </LayoutFilesToSign>
<!-- Built binaries --> <!-- Built binaries -->

2
src/redist/targets/packaging/deb/postinst
View file

@ -10,7 +10,7 @@ Use 'dotnet --help' to see available commands or visit: https://aka.ms/dotnet-cl
Telemetry Telemetry
--------- ---------
The .NET tools collect usage data in order to help us improve your experience. The data is anonymous and doesn't include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. The .NET tools collect usage data in order to help us improve your experience. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell.
Read more about .NET CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry Read more about .NET CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry

2
src/redist/targets/packaging/rpm/scripts/after_install_host.sh
View file

@ -14,7 +14,7 @@ Use 'dotnet --help' to see available commands or visit: https://aka.ms/dotnet-cl
Telemetry Telemetry
--------- ---------
The .NET tools collect usage data in order to help us improve your experience. The data is anonymous and doesn't include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. The .NET tools collect usage data in order to help us improve your experience. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell.
Read more about .NET CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry Read more about .NET CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry

6
test/EndToEnd/GivenWindows50App.cs
View file

@ -13,9 +13,9 @@ namespace EndToEnd
public class GivenWindows50App : TestBase public class GivenWindows50App : TestBase
{ {
[WindowsOnlyTheory] [WindowsOnlyTheory]
[InlineData("10.0.17763")] [InlineData("10.0.17763.0")]
[InlineData("10.0.18362")] [InlineData("10.0.18362.0")]
[InlineData("10.0.19041")] [InlineData("10.0.19041.0")]
public void ItCanBuildAndRun(string targetPlatformVersion) public void ItCanBuildAndRun(string targetPlatformVersion)
{ {
var testInstance = TestAssets.Get(TestAssetKinds.TestProjects, "UseCswinrt") var testInstance = TestAssets.Get(TestAssetKinds.TestProjects, "UseCswinrt")