Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/runtime.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>2022-11-12 02:55:10 +0300
committerdotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>2022-11-12 02:55:10 +0300
commit755bd8390e2d299d87e0645aab69164a9be291fc (patch)
treee71dfc644fa5501cc02763b555e832ec836f01eb
parent08214fd1960e94176b1ea5f622102f4b0c7aa638 (diff)
Update dependencies from https://github.com/dotnet/arcade build 20221108.7darc-release/6.0-02b0394f-aa74-4d7d-9f9e-ac6f6ae0de35
Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 6.0.0-beta.22512.3 -> To Version 6.0.0-beta.22558.7
-rw-r--r--eng/Version.Details.xml76
-rw-r--r--eng/Versions.props30
-rwxr-xr-xeng/common/dotnet-install.sh4
-rw-r--r--eng/common/templates/steps/source-build.yml6
-rw-r--r--global.json8
5 files changed, 59 insertions, 65 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4b7bbafe857..84bb77a55d9 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -26,77 +26,77 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22558.2">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22558.7">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha>
+ <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22558.2">
+ <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22558.7">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha>
+ <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22558.2">
+ <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22558.7">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha>
+ <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22558.2">
+ <Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22558.7">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha>
+ <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.22558.2">
+ <Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.22558.7">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha>
+ <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22558.2">
+ <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22558.7">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha>
+ <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22558.2">
+ <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22558.7">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha>
+ <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.22558.2">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.22558.7">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha>
+ <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22558.2">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22558.7">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha>
+ <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22558.2">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22558.7">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha>
+ <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22558.2">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22558.7">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha>
+ <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.22558.2">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.22558.7">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha>
+ <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22558.2">
+ <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22558.7">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha>
+ <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.22558.2">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.22558.7">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha>
+ <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.22558.2">
+ <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.22558.7">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha>
+ <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.22558.2">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.22558.7">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha>
+ <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.22558.2">
+ <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.22558.7">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha>
+ <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.22558.2">
+ <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.22558.7">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha>
+ <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
<Uri>https://github.com/microsoft/vstest</Uri>
@@ -218,9 +218,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>e9669dc84ecd668d3bbb748758103e23b394ffef</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.22558.2">
+ <Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.22558.7">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>841e1fe0d2498a7ac6445e458ae521511ec226ca</Sha>
+ <Sha>a7773a9828c67a9b1fba3d2daee061ec90db3505</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21416.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 610be26c1c3..04294198efc 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -41,21 +41,21 @@
<!-- SDK dependencies -->
<MicrosoftDotNetCompatibilityVersion>1.1.0-preview.22164.17</MicrosoftDotNetCompatibilityVersion>
<!-- Arcade dependencies -->
- <MicrosoftDotNetApiCompatVersion>6.0.0-beta.22558.2</MicrosoftDotNetApiCompatVersion>
- <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22558.2</MicrosoftDotNetBuildTasksFeedVersion>
- <MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.22558.2</MicrosoftDotNetCodeAnalysisVersion>
- <MicrosoftDotNetGenAPIVersion>6.0.0-beta.22558.2</MicrosoftDotNetGenAPIVersion>
- <MicrosoftDotNetGenFacadesVersion>6.0.0-beta.22558.2</MicrosoftDotNetGenFacadesVersion>
- <MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22558.2</MicrosoftDotNetXUnitExtensionsVersion>
- <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22558.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
- <MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.22558.2</MicrosoftDotNetBuildTasksArchivesVersion>
- <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22558.2</MicrosoftDotNetBuildTasksInstallersVersion>
- <MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22558.2</MicrosoftDotNetBuildTasksPackagingVersion>
- <MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22558.2</MicrosoftDotNetBuildTasksTemplatingVersion>
- <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.22558.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
- <MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.22558.2</MicrosoftDotNetRemoteExecutorVersion>
- <MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22558.2</MicrosoftDotNetVersionToolsTasksVersion>
- <MicrosoftDotNetPackageTestingVersion>6.0.0-beta.22558.2</MicrosoftDotNetPackageTestingVersion>
+ <MicrosoftDotNetApiCompatVersion>6.0.0-beta.22558.7</MicrosoftDotNetApiCompatVersion>
+ <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22558.7</MicrosoftDotNetBuildTasksFeedVersion>
+ <MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.22558.7</MicrosoftDotNetCodeAnalysisVersion>
+ <MicrosoftDotNetGenAPIVersion>6.0.0-beta.22558.7</MicrosoftDotNetGenAPIVersion>
+ <MicrosoftDotNetGenFacadesVersion>6.0.0-beta.22558.7</MicrosoftDotNetGenFacadesVersion>
+ <MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22558.7</MicrosoftDotNetXUnitExtensionsVersion>
+ <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22558.7</MicrosoftDotNetXUnitConsoleRunnerVersion>
+ <MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.22558.7</MicrosoftDotNetBuildTasksArchivesVersion>
+ <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22558.7</MicrosoftDotNetBuildTasksInstallersVersion>
+ <MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22558.7</MicrosoftDotNetBuildTasksPackagingVersion>
+ <MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22558.7</MicrosoftDotNetBuildTasksTemplatingVersion>
+ <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.22558.7</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
+ <MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.22558.7</MicrosoftDotNetRemoteExecutorVersion>
+ <MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22558.7</MicrosoftDotNetVersionToolsTasksVersion>
+ <MicrosoftDotNetPackageTestingVersion>6.0.0-beta.22558.7</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh
index fdfeea66e7d..b09ea669f9c 100755
--- a/eng/common/dotnet-install.sh
+++ b/eng/common/dotnet-install.sh
@@ -52,7 +52,7 @@ done
# Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples
cpuname=$(uname -m)
case $cpuname in
- aarch64)
+ arm64|aarch64)
buildarch=arm64
;;
amd64|x86_64)
@@ -61,7 +61,7 @@ case $cpuname in
armv*l)
buildarch=arm
;;
- i686)
+ i[3-6]86)
buildarch=x86
;;
*)
diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml
index b5b3e5aeb3b..abb1b2bcda4 100644
--- a/eng/common/templates/steps/source-build.yml
+++ b/eng/common/templates/steps/source-build.yml
@@ -63,11 +63,6 @@ steps:
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
fi
- runtimeOsArgs=
- if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then
- runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}'
- fi
-
publishArgs=
if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
publishArgs='--publish'
@@ -80,7 +75,6 @@ steps:
$internalRuntimeDownloadArgs \
$internalRestoreArgs \
$targetRidArgs \
- $runtimeOsArgs \
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
/p:ArcadeBuildFromSource=true
displayName: Build
diff --git a/global.json b/global.json
index 9c63d7238b0..d3ac108a835 100644
--- a/global.json
+++ b/global.json
@@ -12,10 +12,10 @@
"python3": "3.7.1"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.22558.2",
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.2",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22558.2",
- "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22558.2",
+ "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.22558.7",
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.7",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22558.7",
+ "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22558.7",
"Microsoft.Build.NoTargets": "3.1.0",
"Microsoft.Build.Traversal": "3.0.23",
"Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6"