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

Commit 315a683

Browse files
dotnet-maestro[bot]mmitche
authored andcommitted
Update dependencies from https://github.com/dotnet/arcade build 20191122.3 (#42689)
- Microsoft.DotNet.XUnitExtensions - 2.4.1-beta.19572.3 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.19572.3 - Microsoft.DotNet.VersionTools.Tasks - 1.0.0-beta.19572.3 - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19572.3 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19572.3 - Microsoft.DotNet.Build.Tasks.Configuration - 1.0.0-beta.19572.3 - Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19572.3 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19572.3 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19572.3 - Microsoft.DotNet.CoreFxTesting - 1.0.0-beta.19572.3 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19572.3 - Microsoft.DotNet.GenFacades - 1.0.0-beta.19572.3 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19572.3 - Microsoft.DotNet.RemoteExecutor - 1.0.0-beta.19572.3
1 parent 2a67785 commit 315a683

File tree

5 files changed

+127
-55
lines changed

5 files changed

+127
-55
lines changed

eng/Version.Details.xml

+28-28
Original file line numberDiff line numberDiff line change
@@ -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.19569.2">
37+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19572.3">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>e34d933e18ba1cd393bbafcb6018e0f858d3e89e</Sha>
39+
<Sha>0e0d227c57e69c03427d6e668716d62cf4ceb36e</Sha>
4040
</Dependency>
4141
<Dependency Name="NETStandard.Library" Version="2.1.0">
4242
<Uri>https://github.com/dotnet/standard</Uri>
4343
<Sha>a5b5f2e1e369972c8ff1e2183979fab6099f52ef</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19569.2">
45+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19572.3">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>e34d933e18ba1cd393bbafcb6018e0f858d3e89e</Sha>
47+
<Sha>0e0d227c57e69c03427d6e668716d62cf4ceb36e</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19569.2">
49+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19572.3">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>e34d933e18ba1cd393bbafcb6018e0f858d3e89e</Sha>
51+
<Sha>0e0d227c57e69c03427d6e668716d62cf4ceb36e</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19569.2">
53+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19572.3">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>e34d933e18ba1cd393bbafcb6018e0f858d3e89e</Sha>
55+
<Sha>0e0d227c57e69c03427d6e668716d62cf4ceb36e</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19569.2">
57+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19572.3">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>e34d933e18ba1cd393bbafcb6018e0f858d3e89e</Sha>
59+
<Sha>0e0d227c57e69c03427d6e668716d62cf4ceb36e</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.1-beta.19569.2">
61+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.1-beta.19572.3">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>e34d933e18ba1cd393bbafcb6018e0f858d3e89e</Sha>
63+
<Sha>0e0d227c57e69c03427d6e668716d62cf4ceb36e</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19569.2">
65+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19572.3">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>e34d933e18ba1cd393bbafcb6018e0f858d3e89e</Sha>
67+
<Sha>0e0d227c57e69c03427d6e668716d62cf4ceb36e</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19569.2">
69+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19572.3">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>e34d933e18ba1cd393bbafcb6018e0f858d3e89e</Sha>
71+
<Sha>0e0d227c57e69c03427d6e668716d62cf4ceb36e</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19569.2">
73+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19572.3">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>e34d933e18ba1cd393bbafcb6018e0f858d3e89e</Sha>
75+
<Sha>0e0d227c57e69c03427d6e668716d62cf4ceb36e</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="1.0.0-beta.19569.2">
77+
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="1.0.0-beta.19572.3">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>e34d933e18ba1cd393bbafcb6018e0f858d3e89e</Sha>
79+
<Sha>0e0d227c57e69c03427d6e668716d62cf4ceb36e</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="1.0.0-beta.19569.2">
81+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="1.0.0-beta.19572.3">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>e34d933e18ba1cd393bbafcb6018e0f858d3e89e</Sha>
83+
<Sha>0e0d227c57e69c03427d6e668716d62cf4ceb36e</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="1.0.0-beta.19569.2">
85+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="1.0.0-beta.19572.3">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>e34d933e18ba1cd393bbafcb6018e0f858d3e89e</Sha>
87+
<Sha>0e0d227c57e69c03427d6e668716d62cf4ceb36e</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19569.2">
89+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19572.3">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>e34d933e18ba1cd393bbafcb6018e0f858d3e89e</Sha>
91+
<Sha>0e0d227c57e69c03427d6e668716d62cf4ceb36e</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.19569.2">
93+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.19572.3">
9494
<Uri>https://github.com/dotnet/arcade</Uri>
95-
<Sha>e34d933e18ba1cd393bbafcb6018e0f858d3e89e</Sha>
95+
<Sha>0e0d227c57e69c03427d6e668716d62cf4ceb36e</Sha>
9696
</Dependency>
9797
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="3.0.0-release-20190930.1">
9898
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

eng/Versions.props

+10-10
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@
3434
</PropertyGroup>
3535
<PropertyGroup>
3636
<!-- Arcade dependencies -->
37-
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19569.2</MicrosoftDotNetApiCompatPackageVersion>
38-
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19569.2</MicrosoftDotNetCodeAnalysisPackageVersion>
39-
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19569.2</MicrosoftDotNetGenAPIPackageVersion>
40-
<MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.19569.2</MicrosoftDotNetGenFacadesPackageVersion>
41-
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.1-beta.19569.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
42-
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.5.1-beta.19569.2</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
43-
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19569.2</MicrosoftDotNetBuildTasksPackagingPackageVersion>
44-
<MicrosoftDotNetRemoteExecutorPackageVersion>1.0.0-beta.19569.2</MicrosoftDotNetRemoteExecutorPackageVersion>
45-
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19569.2</MicrosoftDotNetBuildTasksFeedVersion>
46-
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.19569.2</MicrosoftDotNetVersionToolsTasksPackageVersion>
37+
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19572.3</MicrosoftDotNetApiCompatPackageVersion>
38+
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19572.3</MicrosoftDotNetCodeAnalysisPackageVersion>
39+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19572.3</MicrosoftDotNetGenAPIPackageVersion>
40+
<MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.19572.3</MicrosoftDotNetGenFacadesPackageVersion>
41+
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.1-beta.19572.3</MicrosoftDotNetXUnitExtensionsPackageVersion>
42+
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.5.1-beta.19572.3</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
43+
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19572.3</MicrosoftDotNetBuildTasksPackagingPackageVersion>
44+
<MicrosoftDotNetRemoteExecutorPackageVersion>1.0.0-beta.19572.3</MicrosoftDotNetRemoteExecutorPackageVersion>
45+
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19572.3</MicrosoftDotNetBuildTasksFeedVersion>
46+
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.19572.3</MicrosoftDotNetVersionToolsTasksPackageVersion>
4747
<!-- roslyn -->
4848
<MicrosoftNetCompilersToolsetVersion>3.3.0-beta2-19367-02</MicrosoftNetCompilersToolsetVersion>
4949
<!-- Core-setup dependencies -->

eng/common/templates/post-build/common-variables.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ variables:
1313
- name: NetCore_5_Dev_Channel_Id
1414
value: 131
1515

16-
# .NET Tools - Validation
17-
- name: NetCore_Tools_Validation_Channel_Id
16+
# .NET Eng - Validation
17+
- name: Net_Eng_Validation_Channel_Id
1818
value: 9
1919

20-
# .NET Tools - Latest
21-
- name: NetCore_Tools_Latest_Channel_Id
20+
# .NET Eng - Latest
21+
- name: Net_Eng_Latest_Channel_Id
2222
value: 2
2323

24-
# .NET 3 Tools - Validation
25-
- name: NETCore_3_Tools_Validation_Channel_Id
24+
# .NET 3 Eng - Validation
25+
- name: NET_3_Eng_Validation_Channel_Id
2626
value: 390
2727

28-
# .NET 3 Tools - Latest
28+
# .NET 3 Eng
2929
- name: NetCore_3_Tools_Channel_Id
3030
value: 344
3131

eng/common/templates/post-build/post-build.yml

+76-4
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ stages:
126126
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
127127
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
128128
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
129-
stageName: 'NetCore_Tools_Latest_Publish'
130-
channelName: '.NET Tools - Latest'
129+
stageName: 'Net_Eng_Latest_Publish'
130+
channelName: '.NET Eng - Latest'
131131
channelId: 2
132132
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
133133
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
@@ -138,8 +138,8 @@ stages:
138138
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
139139
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
140140
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
141-
stageName: 'PVR_Publish'
142-
channelName: '.NET Tools - Validation'
141+
stageName: 'Net_Eng_Validation_Publish'
142+
channelName: '.NET Eng - Validation'
143143
channelId: 9
144144
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
145145
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
@@ -264,3 +264,75 @@ stages:
264264
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
265265
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
266266
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
267+
268+
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
269+
parameters:
270+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
271+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
272+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
273+
stageName: 'NETCore_SDK_301xx_Publishing'
274+
channelName: '.NET Core SDK 3.0.1xx'
275+
channelId: 556
276+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json'
277+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json'
278+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json'
279+
280+
- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
281+
parameters:
282+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
283+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
284+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
285+
stageName: 'NETCore_SDK_301xx_Internal_Publishing'
286+
channelName: '.NET Core SDK 3.0.1xx Internal'
287+
channelId: 555
288+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json'
289+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json'
290+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json'
291+
292+
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
293+
parameters:
294+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
295+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
296+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
297+
stageName: 'NETCore_SDK_311xx_Publishing'
298+
channelName: '.NET Core SDK 3.1.1xx'
299+
channelId: 560
300+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json'
301+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json'
302+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json'
303+
304+
- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
305+
parameters:
306+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
307+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
308+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
309+
stageName: 'NETCore_SDK_311xx_Internal_Publishing'
310+
channelName: '.NET Core SDK 3.1.1xx Internal'
311+
channelId: 559
312+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json'
313+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json'
314+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json'
315+
316+
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
317+
parameters:
318+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
319+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
320+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
321+
stageName: 'NETCore_SDK_312xx_Publishing'
322+
channelName: '.NET Core SDK 3.1.2xx'
323+
channelId: 558
324+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json'
325+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json'
326+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json'
327+
328+
- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
329+
parameters:
330+
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
331+
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
332+
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
333+
stageName: 'NETCore_SDK_312xx_Internal_Publishing'
334+
channelName: '.NET Core SDK 3.1.2xx Internal'
335+
channelId: 557
336+
transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json'
337+
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json'
338+
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json'

global.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"sdk": {
3-
"version": "3.0.100",
3+
"version": "3.0.101",
44
"rollforward": "major"
55
},
66
"tools": {
7-
"dotnet": "3.0.100"
7+
"dotnet": "3.0.101"
88
},
99
"msbuild-sdks": {
10-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19569.2",
11-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19569.2",
12-
"Microsoft.DotNet.Build.Tasks.Configuration": "1.0.0-beta.19569.2",
13-
"Microsoft.DotNet.CoreFxTesting": "1.0.0-beta.19569.2",
10+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19572.3",
11+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19572.3",
12+
"Microsoft.DotNet.Build.Tasks.Configuration": "1.0.0-beta.19572.3",
13+
"Microsoft.DotNet.CoreFxTesting": "1.0.0-beta.19572.3",
1414
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
1515
"Microsoft.NET.Sdk.IL": "3.0.2-servicing.19572.2"
1616
}

0 commit comments

Comments
 (0)