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

Commit e36a7c4

Browse files
AnipikAnipik
authored
Merge branch 'release/3.1' into merge/release/3.0-preview9-to-release/3.1
2 parents 3da667a + 89ae1ba commit e36a7c4

File tree

125 files changed

+795
-666
lines changed

Some content is hidden

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

125 files changed

+795
-666
lines changed

‎Directory.Build.props

+2
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,8 @@
361361
<DefineConstants Condition="'$(TargetFramework)' == 'netstandard2.1'">$(DefineConstants),netstandard21</DefineConstants>
362362
<DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp'">$(DefineConstants),netcoreapp</DefineConstants>
363363
<DefineConstants Condition="'$(TargetFramework)' == 'netcoreapp2.0'">$(DefineConstants),netcoreapp20</DefineConstants>
364+
<DefineConstants Condition="'$(TargetFramework)' == 'netcoreapp3.0'">$(DefineConstants),netcoreapp30</DefineConstants>
365+
<DefineConstants Condition="'$(TargetFramework)' == 'netcoreapp5.0'">$(DefineConstants),netcoreapp50</DefineConstants>
364366
</PropertyGroup>
365367

366368
<PropertyGroup>

‎Directory.Build.targets

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
tell Microsoft.Common.targets not to import Directory.Build.targets again
77
-->
88
<ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
9+
<!-- This is a workaround to allow the SDK to accept the netcoreapp5.0 tfm until the SDK supports targeting this tfm. -->
10+
<NETCoreAppMaximumVersion>5.0</NETCoreAppMaximumVersion>
911
</PropertyGroup>
1012

1113
<PropertyGroup>

‎eng/Packaging.props

+4-1
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,15 @@
2323
<SkipBaseLineCheck>true</SkipBaseLineCheck>
2424

2525
<!-- by default all packages will use the same version which revs with respect to product version -->
26-
<PackageVersion Condition="'$(PackageVersion)' == ''">4.6.0</PackageVersion>
26+
<PackageVersion Condition="'$(PackageVersion)' == ''">4.7.0</PackageVersion>
2727
<!-- major.minor.release version of the platforms package we're currently building
2828
Pre-release will be appended during build -->
2929
<PlatformPackageVersion>$(ProductVersion)</PlatformPackageVersion>
3030
<SkipValidatePackageTargetFramework>true</SkipValidatePackageTargetFramework>
3131
<SkipGenerationCheck>true</SkipGenerationCheck>
32+
<!-- The index check here is used to determine if the assembly is containted in a stable package version.
33+
Currently we dont have a stable package for 3.0 releases so we are temporarily opting out of it. -->
34+
<SkipIndexCheck>true</SkipIndexCheck>
3235
</PropertyGroup>
3336

3437
<PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">

‎eng/Packaging.targets

+8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
<Project>
2+
<!-- Add validation for netcoreapp3.1 to package build and testing
3+
This would get moved to arcade with other validate frameworks and should get removed from here. -->
4+
<ItemGroup>
5+
<DefaultValidateFramework Include="netcoreapp3.1">
6+
<RuntimeIDs>@(NETCoreApp30RIDs)</RuntimeIDs>
7+
</DefaultValidateFramework>
8+
</ItemGroup>
9+
210
<!-- There are some packages where we require only one ref for a specific framework to be present. In order to avoid problems with this package when targetting
311
dektop with RAR we will make sure there are no exclude=compile references in the package.
412
For more info, please check issues:

‎eng/Version.Details.xml

+36-36
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-rc1.19455.6">
3+
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.0-preview1.19455.11">
44
<Uri>https://github.com/dotnet/coreclr</Uri>
5-
<Sha>aed84886b8d777168f53fae4da15c7af5f7572da</Sha>
5+
<Sha>4b19efd00f93a5eacfa68bb848cf2626578f82d8</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-rc1.19455.6">
7+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.1.0-preview1.19455.11">
88
<Uri>https://github.com/dotnet/coreclr</Uri>
9-
<Sha>aed84886b8d777168f53fae4da15c7af5f7572da</Sha>
9+
<Sha>4b19efd00f93a5eacfa68bb848cf2626578f82d8</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.0.0-rc1.19455.6">
11+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.1.0-preview1.19455.11">
1212
<Uri>https://github.com/dotnet/coreclr</Uri>
13-
<Sha>aed84886b8d777168f53fae4da15c7af5f7572da</Sha>
13+
<Sha>4b19efd00f93a5eacfa68bb848cf2626578f82d8</Sha>
1414
</Dependency>
1515
</ProductDependencies>
1616
<ToolsetDependencies>
@@ -34,65 +34,65 @@
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.19454.31">
37+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19455.21">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
39+
<Sha>e99f81b0e3289cfd851be0d927c1fcffa43af6b5</Sha>
4040
</Dependency>
41-
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19455.3">
41+
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19455.4">
4242
<Uri>https://github.com/dotnet/standard</Uri>
43-
<Sha>209c43e7f6232e7871b6927a510c25ee7dfd5c72</Sha>
43+
<Sha>c4baa9ceabeceef9d7752ed88da12c2f12c914a5</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19454.31">
45+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19455.21">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
47+
<Sha>e99f81b0e3289cfd851be0d927c1fcffa43af6b5</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19454.31">
49+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19455.21">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
51+
<Sha>e99f81b0e3289cfd851be0d927c1fcffa43af6b5</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19454.31">
53+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19455.21">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
55+
<Sha>e99f81b0e3289cfd851be0d927c1fcffa43af6b5</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19454.31">
57+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19455.21">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
59+
<Sha>e99f81b0e3289cfd851be0d927c1fcffa43af6b5</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.1-beta.19454.31">
61+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.1-beta.19455.21">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
63+
<Sha>e99f81b0e3289cfd851be0d927c1fcffa43af6b5</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19454.31">
65+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19455.21">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
67+
<Sha>e99f81b0e3289cfd851be0d927c1fcffa43af6b5</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19454.31">
69+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19455.21">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
71+
<Sha>e99f81b0e3289cfd851be0d927c1fcffa43af6b5</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19454.31">
73+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19455.21">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
75+
<Sha>e99f81b0e3289cfd851be0d927c1fcffa43af6b5</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="1.0.0-beta.19454.31">
77+
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="1.0.0-beta.19455.21">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
79+
<Sha>e99f81b0e3289cfd851be0d927c1fcffa43af6b5</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="1.0.0-beta.19454.31">
81+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="1.0.0-beta.19455.21">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
83+
<Sha>e99f81b0e3289cfd851be0d927c1fcffa43af6b5</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="1.0.0-beta.19454.31">
85+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="1.0.0-beta.19455.21">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
87+
<Sha>e99f81b0e3289cfd851be0d927c1fcffa43af6b5</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19454.31">
89+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19455.21">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
91+
<Sha>e99f81b0e3289cfd851be0d927c1fcffa43af6b5</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.19454.31">
93+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.19455.21">
9494
<Uri>https://github.com/dotnet/arcade</Uri>
95-
<Sha>00d8aa82b488f321204a0e69a81399af9df276a1</Sha>
95+
<Sha>e99f81b0e3289cfd851be0d927c1fcffa43af6b5</Sha>
9696
</Dependency>
9797
<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>

‎eng/Versions.props

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project>
22
<PropertyGroup>
33
<!-- The .NET Core product branding version -->
4-
<ProductVersion>3.0.0</ProductVersion>
4+
<ProductVersion>3.1.0</ProductVersion>
55
<!-- We need to move to 4.7 as part of our versioning change when we switch to arcade to avoid downgrading versions -->
66
<MajorVersion>4</MajorVersion>
77
<MinorVersion>7</MinorVersion>
88
<!-- Always use shipping version instead of dummy version -->
99
<DotNetUseShippingVersions>true</DotNetUseShippingVersions>
10-
<PreReleaseVersionLabel>rc1</PreReleaseVersionLabel>
10+
<PreReleaseVersionLabel>preview1</PreReleaseVersionLabel>
1111
<!-- Opt-in repo features -->
1212
<UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
1313
<UsingToolIbcOptimization>true</UsingToolIbcOptimization>
@@ -29,30 +29,30 @@
2929
</PropertyGroup>
3030
<PropertyGroup>
3131
<!-- Arcade dependencies -->
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>
32+
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19455.21</MicrosoftDotNetApiCompatPackageVersion>
33+
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19455.21</MicrosoftDotNetCodeAnalysisPackageVersion>
34+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19455.21</MicrosoftDotNetGenAPIPackageVersion>
35+
<MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.19455.21</MicrosoftDotNetGenFacadesPackageVersion>
36+
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.1-beta.19455.21</MicrosoftDotNetXUnitExtensionsPackageVersion>
37+
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.5.1-beta.19455.21</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
38+
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19455.21</MicrosoftDotNetBuildTasksPackagingPackageVersion>
39+
<MicrosoftDotNetRemoteExecutorPackageVersion>1.0.0-beta.19455.21</MicrosoftDotNetRemoteExecutorPackageVersion>
40+
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19455.21</MicrosoftDotNetBuildTasksFeedVersion>
41+
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.19455.21</MicrosoftDotNetVersionToolsTasksPackageVersion>
4242
<!-- roslyn -->
4343
<MicrosoftNetCompilersToolsetVersion>3.3.0-beta2-19367-02</MicrosoftNetCompilersToolsetVersion>
4444
<!-- Core-setup dependencies -->
4545
<MicrosoftNETCoreAppPackageVersion>3.0.0-rc1-19455-02</MicrosoftNETCoreAppPackageVersion>
4646
<MicrosoftNETCoreDotNetHostPackageVersion>3.0.0-rc1-19455-02</MicrosoftNETCoreDotNetHostPackageVersion>
4747
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.0.0-rc1-19455-02</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
4848
<!-- Coreclr dependencies -->
49-
<MicrosoftNETCoreILAsmPackageVersion>3.0.0-rc1.19455.6</MicrosoftNETCoreILAsmPackageVersion>
50-
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-rc1.19455.6</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
49+
<MicrosoftNETCoreILAsmPackageVersion>3.1.0-preview1.19455.11</MicrosoftNETCoreILAsmPackageVersion>
50+
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.1.0-preview1.19455.11</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.19455.3</NETStandardLibraryPackageVersion>
55+
<NETStandardLibraryPackageVersion>2.1.0-prerelease.19455.4</NETStandardLibraryPackageVersion>
5656
<!-- dotnet-optimization dependencies -->
5757
<optimizationwindows_ntx64IBCCoreFxPackageVersion>99.99.99-master-20190905.1</optimizationwindows_ntx64IBCCoreFxPackageVersion>
5858
<!-- sni -->

‎eng/common/templates/job/job.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ parameters:
2424

2525
workspace: ''
2626

27-
# Job base template specific parameters
27+
# Job base template specific parameters
2828
# Optional: Enable installing Microbuild plugin
2929
# if 'true', these "variables" must be specified in the variables object or as part of the queue matrix
3030
# _TeamName - the name of your team
@@ -151,6 +151,9 @@ jobs:
151151
continueOnError: ${{ parameters.continueOnError }}
152152
condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
153153

154+
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
155+
- task: NuGetAuthenticate@0
156+
154157
- ${{ each step in parameters.steps }}:
155158
- ${{ step }}
156159

‎eng/common/templates/job/publish-build-assets.yml

+7
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ jobs:
4747
downloadPath: '$(Build.StagingDirectory)/Download'
4848
condition: ${{ parameters.condition }}
4949
continueOnError: ${{ parameters.continueOnError }}
50+
51+
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
52+
- task: NuGetAuthenticate@0
53+
5054
- task: PowerShell@2
5155
displayName: Publish Build Assets
5256
inputs:
@@ -59,6 +63,7 @@ jobs:
5963
/p:Configuration=$(_BuildConfig)
6064
condition: ${{ parameters.condition }}
6165
continueOnError: ${{ parameters.continueOnError }}
66+
6267
- task: powershell@2
6368
displayName: Create ReleaseConfigs Artifact
6469
inputs:
@@ -67,12 +72,14 @@ jobs:
6772
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId)
6873
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)"
6974
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild)
75+
7076
- task: PublishBuildArtifacts@1
7177
displayName: Publish ReleaseConfigs Artifact
7278
inputs:
7379
PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt'
7480
PublishLocation: Container
7581
ArtifactName: ReleaseConfigs
82+
7683
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
7784
- task: PublishBuildArtifacts@1
7885
displayName: Publish Logs to VSTS

0 commit comments

Comments
 (0)