Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

Commit 97f1f53

Browse files
AnipikAnipik
committed
Merge branch 'release/3.0' into release/3.0-preview9
2 parents 8f95b1e + dc35064 commit 97f1f53

File tree

134 files changed

+2381
-835
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+2381
-835
lines changed

‎.azure-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ stages:
104104
-TsaProjectName "DEVDIV"
105105
-TsaNotificationEmail "$(TsaNotificationEmail)"
106106
-TsaCodebaseAdmin "$(TsaCodebaseAdmin)"
107-
-TsaBugAreaPath "DevDiv\\NET\\NET Core "
107+
-TsaBugAreaPath "DevDiv\NET\NET Core"
108108
-TsaIterationPath "DevDiv"
109109
-TsaRepositoryName "CoreFX"
110110
-TsaCodebaseName "CoreFX"

‎Directory.Build.props

+2-1
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,8 @@
246246
<NoStdLib>true</NoStdLib>
247247
<NoExplicitReferenceToStdLib>true</NoExplicitReferenceToStdLib>
248248
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
249-
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
249+
<!-- Enable the target framework attribute on test assemblies as vstest relies on that property. -->
250+
<GenerateTargetFrameworkAttribute Condition="'$(IsTestProject)' != 'true'">false</GenerateTargetFrameworkAttribute>
250251
<CopyNuGetImplementations>false</CopyNuGetImplementations>
251252
<!-- Don't reference implicit framework packages, all projects in this repo must be explicit -->
252253
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>

‎eng/Version.Details.xml

+44-44
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-preview9.19421.2">
3+
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-rc1.19455.3">
44
<Uri>https://github.com/dotnet/coreclr</Uri>
5-
<Sha>5700445383ee0449072cf9df1c00b3b4a9aeddf5</Sha>
5+
<Sha>668f053e1ad0c4261ec71abc6905e0d48f4c39ca</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview9.19421.2">
7+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-rc1.19455.3">
88
<Uri>https://github.com/dotnet/coreclr</Uri>
9-
<Sha>5700445383ee0449072cf9df1c00b3b4a9aeddf5</Sha>
9+
<Sha>668f053e1ad0c4261ec71abc6905e0d48f4c39ca</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.0.0-preview9.19421.2">
11+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.0.0-rc1.19455.3">
1212
<Uri>https://github.com/dotnet/coreclr</Uri>
13-
<Sha>5700445383ee0449072cf9df1c00b3b4a9aeddf5</Sha>
13+
<Sha>668f053e1ad0c4261ec71abc6905e0d48f4c39ca</Sha>
1414
</Dependency>
1515
</ProductDependencies>
1616
<ToolsetDependencies>
17-
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview9-19414-02">
17+
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-rc1-19455-02">
1818
<Uri>https://github.com/dotnet/core-setup</Uri>
19-
<Sha>f1de07d0abab3899bd7e1facb7e375d6100a2ac8</Sha>
19+
<Sha>caa8d3b1edd7eec947f6283f8342a9249b5d7171</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="3.0.0-preview9-19414-02">
21+
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="3.0.0-rc1-19455-02">
2222
<Uri>https://github.com/dotnet/core-setup</Uri>
23-
<Sha>f1de07d0abab3899bd7e1facb7e375d6100a2ac8</Sha>
23+
<Sha>caa8d3b1edd7eec947f6283f8342a9249b5d7171</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="3.0.0-preview9-19414-02">
25+
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="3.0.0-rc1-19455-02">
2626
<Uri>https://github.com/dotnet/core-setup</Uri>
27-
<Sha>f1de07d0abab3899bd7e1facb7e375d6100a2ac8</Sha>
27+
<Sha>caa8d3b1edd7eec947f6283f8342a9249b5d7171</Sha>
2828
</Dependency>
2929
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview9.19409.15">
3030
<Uri>https://github.com/dotnet/corefx</Uri>
@@ -34,69 +34,69 @@
3434
<Uri>https://github.com/dotnet/corefx</Uri>
3535
<Sha>976b84b4d969ce5d87bc437d811ec8864b47947a</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19421.1">
37+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19454.31">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>7aa107d818fe87e627154c0331d6de5d47f39a45</Sha>
39+
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
4040
</Dependency>
41-
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19414.3">
41+
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19455.3">
4242
<Uri>https://github.com/dotnet/standard</Uri>
43-
<Sha>7d56086e753abe6d9a99f67a9b6c021bf7c809ce</Sha>
43+
<Sha>209c43e7f6232e7871b6927a510c25ee7dfd5c72</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19421.1">
45+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19454.31">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>7aa107d818fe87e627154c0331d6de5d47f39a45</Sha>
47+
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19421.1">
49+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19454.31">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>7aa107d818fe87e627154c0331d6de5d47f39a45</Sha>
51+
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19421.1">
53+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19454.31">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>7aa107d818fe87e627154c0331d6de5d47f39a45</Sha>
55+
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19421.1">
57+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19454.31">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>7aa107d818fe87e627154c0331d6de5d47f39a45</Sha>
59+
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.1-beta.19421.1">
61+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.1-beta.19454.31">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>7aa107d818fe87e627154c0331d6de5d47f39a45</Sha>
63+
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19421.1">
65+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19454.31">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>7aa107d818fe87e627154c0331d6de5d47f39a45</Sha>
67+
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19421.1">
69+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19454.31">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>7aa107d818fe87e627154c0331d6de5d47f39a45</Sha>
71+
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19421.1">
73+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19454.31">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>7aa107d818fe87e627154c0331d6de5d47f39a45</Sha>
75+
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="1.0.0-beta.19421.1">
77+
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="1.0.0-beta.19454.31">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>7aa107d818fe87e627154c0331d6de5d47f39a45</Sha>
79+
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="1.0.0-beta.19421.1">
81+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="1.0.0-beta.19454.31">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>7aa107d818fe87e627154c0331d6de5d47f39a45</Sha>
83+
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="1.0.0-beta.19421.1">
85+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="1.0.0-beta.19454.31">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>7aa107d818fe87e627154c0331d6de5d47f39a45</Sha>
87+
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19421.1">
89+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19454.31">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>7aa107d818fe87e627154c0331d6de5d47f39a45</Sha>
91+
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.19421.1">
93+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.19454.31">
9494
<Uri>https://github.com/dotnet/arcade</Uri>
95-
<Sha>7aa107d818fe87e627154c0331d6de5d47f39a45</Sha>
95+
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
9696
</Dependency>
97-
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190807.1">
97+
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190905.1">
9898
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
99-
<Sha>f721b85e367cd7dacaa74f5761cfd34d9e4fc423</Sha>
99+
<Sha>48fd58c24cddbc6c0b0de1c00204aae1170f4864</Sha>
100100
</Dependency>
101101
</ToolsetDependencies>
102102
</Dependencies>

‎eng/Versions.props

+18-18
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<MinorVersion>7</MinorVersion>
88
<!-- Always use shipping version instead of dummy version -->
99
<DotNetUseShippingVersions>true</DotNetUseShippingVersions>
10-
<PreReleaseVersionLabel>preview9</PreReleaseVersionLabel>
10+
<PreReleaseVersionLabel>rc1</PreReleaseVersionLabel>
1111
<!-- Opt-in repo features -->
1212
<UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
1313
<UsingToolIbcOptimization>true</UsingToolIbcOptimization>
@@ -29,32 +29,32 @@
2929
</PropertyGroup>
3030
<PropertyGroup>
3131
<!-- Arcade dependencies -->
32-
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19421.1</MicrosoftDotNetApiCompatPackageVersion>
33-
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19421.1</MicrosoftDotNetCodeAnalysisPackageVersion>
34-
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19421.1</MicrosoftDotNetGenAPIPackageVersion>
35-
<MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.19421.1</MicrosoftDotNetGenFacadesPackageVersion>
36-
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.1-beta.19421.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
37-
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.5.1-beta.19421.1</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
38-
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19421.1</MicrosoftDotNetBuildTasksPackagingPackageVersion>
39-
<MicrosoftDotNetRemoteExecutorPackageVersion>1.0.0-beta.19421.1</MicrosoftDotNetRemoteExecutorPackageVersion>
40-
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19421.1</MicrosoftDotNetBuildTasksFeedVersion>
41-
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.19421.1</MicrosoftDotNetVersionToolsTasksPackageVersion>
32+
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19454.31</MicrosoftDotNetApiCompatPackageVersion>
33+
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19454.31</MicrosoftDotNetCodeAnalysisPackageVersion>
34+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19454.31</MicrosoftDotNetGenAPIPackageVersion>
35+
<MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.19454.31</MicrosoftDotNetGenFacadesPackageVersion>
36+
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.1-beta.19454.31</MicrosoftDotNetXUnitExtensionsPackageVersion>
37+
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.5.1-beta.19454.31</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
38+
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19454.31</MicrosoftDotNetBuildTasksPackagingPackageVersion>
39+
<MicrosoftDotNetRemoteExecutorPackageVersion>1.0.0-beta.19454.31</MicrosoftDotNetRemoteExecutorPackageVersion>
40+
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19454.31</MicrosoftDotNetBuildTasksFeedVersion>
41+
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.19454.31</MicrosoftDotNetVersionToolsTasksPackageVersion>
4242
<!-- roslyn -->
4343
<MicrosoftNetCompilersToolsetVersion>3.3.0-beta2-19367-02</MicrosoftNetCompilersToolsetVersion>
4444
<!-- Core-setup dependencies -->
45-
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview9-19414-02</MicrosoftNETCoreAppPackageVersion>
46-
<MicrosoftNETCoreDotNetHostPackageVersion>3.0.0-preview9-19414-02</MicrosoftNETCoreDotNetHostPackageVersion>
47-
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.0.0-preview9-19414-02</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
45+
<MicrosoftNETCoreAppPackageVersion>3.0.0-rc1-19455-02</MicrosoftNETCoreAppPackageVersion>
46+
<MicrosoftNETCoreDotNetHostPackageVersion>3.0.0-rc1-19455-02</MicrosoftNETCoreDotNetHostPackageVersion>
47+
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.0.0-rc1-19455-02</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
4848
<!-- Coreclr dependencies -->
49-
<MicrosoftNETCoreILAsmPackageVersion>3.0.0-preview9.19421.2</MicrosoftNETCoreILAsmPackageVersion>
50-
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview9.19421.2</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
49+
<MicrosoftNETCoreILAsmPackageVersion>3.0.0-rc1.19455.3</MicrosoftNETCoreILAsmPackageVersion>
50+
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-rc1.19455.3</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
5151
<!-- Corefx dependencies -->
5252
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview9.19409.15</MicrosoftNETCorePlatformsPackageVersion>
5353
<runtimenativeSystemIOPortsPackageVersion>4.6.0-preview9.19409.15</runtimenativeSystemIOPortsPackageVersion>
5454
<!-- Standard dependencies -->
55-
<NETStandardLibraryPackageVersion>2.1.0-prerelease.19414.3</NETStandardLibraryPackageVersion>
55+
<NETStandardLibraryPackageVersion>2.1.0-prerelease.19455.3</NETStandardLibraryPackageVersion>
5656
<!-- dotnet-optimization dependencies -->
57-
<optimizationwindows_ntx64IBCCoreFxPackageVersion>99.99.99-master-20190807.1</optimizationwindows_ntx64IBCCoreFxPackageVersion>
57+
<optimizationwindows_ntx64IBCCoreFxPackageVersion>99.99.99-master-20190905.1</optimizationwindows_ntx64IBCCoreFxPackageVersion>
5858
<!-- sni -->
5959
<RuntimeWinX64RuntimeNativeSystemDataSqlClientSniPackageVersion>4.4.0</RuntimeWinX64RuntimeNativeSystemDataSqlClientSniPackageVersion>
6060
<RuntimeNativeSystemDataSqlClientSniPackageVersion>4.4.0</RuntimeNativeSystemDataSqlClientSniPackageVersion>

‎eng/common/darc-init.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
param (
22
$darcVersion = $null,
3-
$versionEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16"
3+
$versionEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16",
4+
$verbosity = "m"
45
)
56

6-
$verbosity = "m"
77
. $PSScriptRoot\tools.ps1
88

99
function InstallDarcCli ($darcVersion) {

‎eng/common/darc-init.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
source="${BASH_SOURCE[0]}"
44
darcVersion=''
55
versionEndpoint="https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16"
6+
verbosity=m
67

78
while [[ $# > 0 ]]; do
89
opt="$(echo "$1" | awk '{print tolower($0)}')"
@@ -15,6 +16,10 @@ while [[ $# > 0 ]]; do
1516
versionEndpoint=$2
1617
shift
1718
;;
19+
--verbosity)
20+
verbosity=$2
21+
shift
22+
;;
1823
*)
1924
echo "Invalid argument: $1"
2025
usage
@@ -34,7 +39,6 @@ while [[ -h "$source" ]]; do
3439
[[ $source != /* ]] && source="$scriptroot/$source"
3540
done
3641
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
37-
verbosity=m
3842

3943
. "$scriptroot/tools.sh"
4044

‎eng/common/native/CommonLibrary.psm1

+2
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,8 @@ function Get-File {
152152
}
153153
else {
154154
Write-Verbose "Downloading $Uri"
155+
# Don't display the console progress UI - it's a huge perf hit
156+
$ProgressPreference = 'SilentlyContinue'
155157
while($Attempt -Lt $DownloadRetries)
156158
{
157159
try {

0 commit comments

Comments
 (0)