From: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 30 Apr 2020 08:40:47 +0000 (+0200)
Subject: [master] Update dependencies from 5 repositories (#35567)
X-Git-Tag: submit/tizen/20210909.063632~8275
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=430c3d51dd851f89d4743c1ae27126f2337a3033;p=platform%2Fupstream%2Fdotnet%2Fruntime.git
[master] Update dependencies from 5 repositories (#35567)
---
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 505b52e..8ba7065 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -6,61 +6,61 @@
-
+
https://github.com/dotnet/arcade
- e13ae00db986456a5012f2d9d479d893b3f5aff6
+ ff09a8a065a615c2fde8df82106bcd1f0fcb32aa
-
+
https://github.com/dotnet/arcade
- e13ae00db986456a5012f2d9d479d893b3f5aff6
+ ff09a8a065a615c2fde8df82106bcd1f0fcb32aa
-
+
https://github.com/dotnet/arcade
- e13ae00db986456a5012f2d9d479d893b3f5aff6
+ ff09a8a065a615c2fde8df82106bcd1f0fcb32aa
-
+
https://github.com/dotnet/arcade
- e13ae00db986456a5012f2d9d479d893b3f5aff6
+ ff09a8a065a615c2fde8df82106bcd1f0fcb32aa
-
+
https://github.com/dotnet/arcade
- e13ae00db986456a5012f2d9d479d893b3f5aff6
+ ff09a8a065a615c2fde8df82106bcd1f0fcb32aa
-
+
https://github.com/dotnet/arcade
- e13ae00db986456a5012f2d9d479d893b3f5aff6
+ ff09a8a065a615c2fde8df82106bcd1f0fcb32aa
-
+
https://github.com/dotnet/arcade
- e13ae00db986456a5012f2d9d479d893b3f5aff6
+ ff09a8a065a615c2fde8df82106bcd1f0fcb32aa
-
+
https://github.com/dotnet/arcade
- e13ae00db986456a5012f2d9d479d893b3f5aff6
+ ff09a8a065a615c2fde8df82106bcd1f0fcb32aa
-
+
https://github.com/dotnet/arcade
- e13ae00db986456a5012f2d9d479d893b3f5aff6
+ ff09a8a065a615c2fde8df82106bcd1f0fcb32aa
-
+
https://github.com/dotnet/arcade
- e13ae00db986456a5012f2d9d479d893b3f5aff6
+ ff09a8a065a615c2fde8df82106bcd1f0fcb32aa
-
+
https://github.com/dotnet/arcade
- e13ae00db986456a5012f2d9d479d893b3f5aff6
+ ff09a8a065a615c2fde8df82106bcd1f0fcb32aa
-
+
https://github.com/dotnet/arcade
- e13ae00db986456a5012f2d9d479d893b3f5aff6
+ ff09a8a065a615c2fde8df82106bcd1f0fcb32aa
-
+
https://github.com/dotnet/arcade
- e13ae00db986456a5012f2d9d479d893b3f5aff6
+ ff09a8a065a615c2fde8df82106bcd1f0fcb32aa
-
+
https://github.com/dotnet/arcade
- e13ae00db986456a5012f2d9d479d893b3f5aff6
+ ff09a8a065a615c2fde8df82106bcd1f0fcb32aa
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
@@ -82,41 +82,41 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
d0bb63d2ec7060714e63ee4082fac48f2e57f3e2
-
+
https://github.com/microsoft/vstest
- cd73b655193877de2f2e49e07bf35cce61d740de
+ 7b08d8dde68037dd839900efd111ad5ece95e4f9
-
+
https://github.com/dotnet/runtime-assets
- 3e5b67e9033c00da5e1ce539c0186cbf171b6ce4
+ 4aa2a9b60112e056b61295826c2def4956b14bbc
-
+
https://github.com/dotnet/runtime-assets
- 3e5b67e9033c00da5e1ce539c0186cbf171b6ce4
+ 4aa2a9b60112e056b61295826c2def4956b14bbc
-
+
https://github.com/dotnet/runtime-assets
- 3e5b67e9033c00da5e1ce539c0186cbf171b6ce4
+ 4aa2a9b60112e056b61295826c2def4956b14bbc
-
+
https://github.com/dotnet/runtime-assets
- 3e5b67e9033c00da5e1ce539c0186cbf171b6ce4
+ 4aa2a9b60112e056b61295826c2def4956b14bbc
-
+
https://github.com/dotnet/runtime-assets
- 3e5b67e9033c00da5e1ce539c0186cbf171b6ce4
+ 4aa2a9b60112e056b61295826c2def4956b14bbc
-
+
https://github.com/dotnet/runtime-assets
- 3e5b67e9033c00da5e1ce539c0186cbf171b6ce4
+ 4aa2a9b60112e056b61295826c2def4956b14bbc
-
+
https://github.com/dotnet/runtime-assets
- 3e5b67e9033c00da5e1ce539c0186cbf171b6ce4
+ 4aa2a9b60112e056b61295826c2def4956b14bbc
-
+
https://github.com/dotnet/runtime-assets
- 3e5b67e9033c00da5e1ce539c0186cbf171b6ce4
+ 4aa2a9b60112e056b61295826c2def4956b14bbc
https://github.com/dotnet/llvm-project
@@ -170,13 +170,13 @@
https://github.com/dotnet/runtime
0375524a91a47ca4db3ee1be548f74bab7e26e76
-
+
https://github.com/mono/linker
- 9ecf45ff1db4482d407c3c166914d4de1c095b90
+ e0465e6cd380a12a23b6cf74d3b7c157e7d4e1e5
-
+
https://github.com/dotnet/xharness
- b5e60afbef710759af87e76f1555547a11606dab
+ 7655f32426ea73d488e2c311932eeaab6c6c176d
diff --git a/eng/Versions.props b/eng/Versions.props
index bd2495f..40757b2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,17 +57,17 @@
- 5.0.0-beta.20221.14
- 5.0.0-beta.20221.14
+ 5.0.0-beta.20224.11
+ 5.0.0-beta.20224.11
5.0.0-beta.20201.2
- 5.0.0-beta.20221.14
- 5.0.0-beta.20221.14
- 5.0.0-beta.20221.14
- 5.0.0-beta.20221.14
- 2.5.1-beta.20221.14
- 5.0.0-beta.20221.14
- 5.0.0-beta.20221.14
- 5.0.0-beta.20221.14
+ 5.0.0-beta.20224.11
+ 5.0.0-beta.20224.11
+ 5.0.0-beta.20224.11
+ 5.0.0-beta.20224.11
+ 2.5.1-beta.20224.11
+ 5.0.0-beta.20224.11
+ 5.0.0-beta.20224.11
+ 5.0.0-beta.20224.11
5.0.0-preview.4.20202.18
5.0.0-preview.4.20202.18
@@ -81,14 +81,14 @@
5.0.0-preview.4.20202.18
5.0.0-alpha.1.19563.3
- 5.0.0-beta.20206.1
- 5.0.0-beta.20206.1
- 5.0.0-beta.20206.1
- 5.0.0-beta.20206.1
- 5.0.0-beta.20206.1
- 5.0.0-beta.20206.1
- 5.0.0-beta.20206.1
- 5.0.0-beta.20206.1
+ 5.0.0-beta.20228.1
+ 5.0.0-beta.20228.1
+ 5.0.0-beta.20228.1
+ 5.0.0-beta.20228.1
+ 5.0.0-beta.20228.1
+ 5.0.0-beta.20228.1
+ 5.0.0-beta.20228.1
+ 5.0.0-beta.20228.1
2.2.0-prerelease.19564.1
@@ -113,8 +113,8 @@
4.8.0
- 16.7.0-preview-20200424-01
- 1.0.0-prerelease.20227.9
+ 16.7.0-preview-20200428-01
+ 1.0.0-prerelease.20228.6
2.4.1
2.0.5
12.0.3
@@ -122,7 +122,7 @@
3.1.0-preview-20200129.1
- 5.0.0-preview.3.20225.2
+ 5.0.0-preview.3.20229.1
6.0.1-alpha.1.20224.3
6.0.1-alpha.1.20224.3
diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1
index 1a91bbb..a68bf0b 100644
--- a/eng/common/sdl/init-sdl.ps1
+++ b/eng/common/sdl/init-sdl.ps1
@@ -24,7 +24,7 @@ $ProgressPreference = 'SilentlyContinue'
# Construct basic auth from AzDO access token; construct URI to the repository's gdn folder stored in that repository; construct location of zip file
$encodedPat = [Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes(":$AzureDevOpsAccessToken"))
$escapedRepository = [Uri]::EscapeDataString("/$Repository/$BranchName/.gdn")
-$uri = "https://dev.azure.com/dnceng/internal/_apis/git/repositories/sdl-tool-cfg/Items?path=$escapedRepository&versionDescriptor[versionOptions]=0&`$format=zip&api-version=5.0-preview.1"
+$uri = "https://dev.azure.com/dnceng/internal/_apis/git/repositories/sdl-tool-cfg/Items?path=$escapedRepository&versionDescriptor[versionOptions]=0&`$format=zip&api-version=5.0"
$zipFile = "$WorkingDirectory/gdn.zip"
Add-Type -AssemblyName System.IO.Compression.FileSystem
diff --git a/eng/common/templates/steps/send-to-helix.yml b/eng/common/templates/steps/send-to-helix.yml
index 30becf0..5eceb48 100644
--- a/eng/common/templates/steps/send-to-helix.yml
+++ b/eng/common/templates/steps/send-to-helix.yml
@@ -10,7 +10,7 @@ parameters:
HelixPostCommands: '' # optional -- commands to run after Helix work item execution
WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects
WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects
- WorkItemTimeout: '' # optional -- a timeout in seconds for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects
+ WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects
CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload
XUnitProjects: '' # optional -- semicolon delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true
XUnitWorkItemTimeout: '' # optional -- the workitem timeout in seconds for all workitems created from the xUnit projects specified by XUnitProjects
@@ -18,8 +18,8 @@ parameters:
XUnitRuntimeTargetFramework: '' # optional -- framework to use for the xUnit console runner
XUnitRunnerVersion: '' # optional -- version of the xUnit nuget package you wish to use on Helix; required for XUnitProjects
IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion
- DotNetCliPackageType: '' # optional -- either 'sdk' or 'runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases.json
- DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases.json
+ DotNetCliPackageType: '' # optional -- either 'sdk' or 'runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases-index.json
+ DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases-index.json
EnableXUnitReporter: false # optional -- true enables XUnit result reporting to Mission Control
WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget."
IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set
diff --git a/eng/illink.targets b/eng/illink.targets
index ac7db3b..ea49897 100644
--- a/eng/illink.targets
+++ b/eng/illink.targets
@@ -87,7 +87,7 @@
$(ILLinkArgs) -v true
- $(ILLinkArgs) --strip-resources false
+ $(ILLinkArgs) --strip-descriptors false
$(ILLinkArgs) --skip-unresolved true
diff --git a/global.json b/global.json
index 5e5af89..350fdf4 100644
--- a/global.json
+++ b/global.json
@@ -12,10 +12,10 @@
"python3": "3.7.1"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20221.14",
- "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20221.14",
- "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20221.14",
- "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20221.14",
+ "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20224.11",
+ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20224.11",
+ "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20224.11",
+ "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20224.11",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "5.0.0-preview.4.20202.18",
"Microsoft.Build.NoTargets": "1.0.53",