Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/arcade (dotnet#101715)
Browse files Browse the repository at this point in the history 
* Update dependencies from https://github.com/dotnet/arcade build 20240429.1

Microsoft.SourceBuild.Intermediate.arcade , 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 , 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.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.24226.3 -> To Version 9.0.0-beta.24229.1

* Update dependencies from https://github.com/dotnet/arcade build 20240429.1

Microsoft.SourceBuild.Intermediate.arcade , 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 , 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.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.24226.3 -> To Version 9.0.0-beta.24229.1

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
  • Loading branch information
@dotnet-maestro @michaelgsharp
2 people authored and michaelgsharp committed May 8, 2024
1 parent 884f90f commit 4616325
Show file tree
Hide file tree
Showing 5 changed files with 90 additions and 74 deletions.
84 changes: 42 additions & 42 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,87 +92,87 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24226.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24229.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97e2f41e909dcabb1103fe98ba4540a246662187</Sha>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24226.3">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24229.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97e2f41e909dcabb1103fe98ba4540a246662187</Sha>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24226.3">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24229.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97e2f41e909dcabb1103fe98ba4540a246662187</Sha>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24226.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24229.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97e2f41e909dcabb1103fe98ba4540a246662187</Sha>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24226.3">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24229.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97e2f41e909dcabb1103fe98ba4540a246662187</Sha>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24226.3">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24229.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97e2f41e909dcabb1103fe98ba4540a246662187</Sha>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24226.3">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24229.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97e2f41e909dcabb1103fe98ba4540a246662187</Sha>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24226.3">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24229.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97e2f41e909dcabb1103fe98ba4540a246662187</Sha>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24226.3">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24229.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97e2f41e909dcabb1103fe98ba4540a246662187</Sha>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24226.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24229.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97e2f41e909dcabb1103fe98ba4540a246662187</Sha>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24226.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24229.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97e2f41e909dcabb1103fe98ba4540a246662187</Sha>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24226.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24229.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97e2f41e909dcabb1103fe98ba4540a246662187</Sha>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24226.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24229.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97e2f41e909dcabb1103fe98ba4540a246662187</Sha>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24226.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24229.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97e2f41e909dcabb1103fe98ba4540a246662187</Sha>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24226.3">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24229.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97e2f41e909dcabb1103fe98ba4540a246662187</Sha>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24226.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24229.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97e2f41e909dcabb1103fe98ba4540a246662187</Sha>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24226.3">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24229.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97e2f41e909dcabb1103fe98ba4540a246662187</Sha>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24226.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24229.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97e2f41e909dcabb1103fe98ba4540a246662187</Sha>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24226.3">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24229.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97e2f41e909dcabb1103fe98ba4540a246662187</Sha>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24226.3">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24229.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97e2f41e909dcabb1103fe98ba4540a246662187</Sha>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24222.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -332,9 +332,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>ec633d9ddbdb86dd3d772989889690821f790484</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24226.3">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24229.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97e2f41e909dcabb1103fe98ba4540a246662187</Sha>
<Sha>be933308b9024d798a9a22c0b8f3c8e3616ffbd8</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24223.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,22 +83,22 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.5.24227.1</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24226.3</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24226.3</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24226.3</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24226.3</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24226.3</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24226.3</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24226.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24226.3</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24226.3</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24226.3</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24226.3</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24226.3</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24226.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24226.3</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24226.3</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24226.3</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24229.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24229.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24229.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24229.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24229.1</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24229.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24229.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24229.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24229.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24229.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24229.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24229.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24229.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24229.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24229.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24229.1</MicrosoftDotNetPackageTestingVersion>
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
<!-- NuGet dependencies -->
Expand Down
18 changes: 17 additions & 1 deletion eng/common/native/init-distro-rid.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ getNonPortableDistroRid()
# shellcheck disable=SC1091
if [ -e "${rootfsDir}/etc/os-release" ]; then
. "${rootfsDir}/etc/os-release"
if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ] || [ "${ID}" = "ol" ]; then
VERSION_ID="${VERSION_ID%.*}" # Remove the last version digit for these distros
fi

if echo "${VERSION_ID:-}" | grep -qE '^([[:digit:]]|\.)+$'; then
nonPortableRid="${ID}.${VERSION_ID}-${targetArch}"
else
Expand All @@ -44,7 +48,19 @@ getNonPortableDistroRid()
nonPortableRid="android.$__android_sdk_version-${targetArch}"
elif [ "$targetOs" = "illumos" ]; then
__uname_version=$(uname -v)
nonPortableRid="illumos-${targetArch}"
case "$__uname_version" in
omnios-*)
__omnios_major_version=$(echo "$__uname_version" | cut -c9-10)
nonPortableRid="omnios.$__omnios_major_version-${targetArch}"
;;
joyent_*)
__smartos_major_version=$(echo "$__uname_version" | cut -c9-10)
nonPortableRid="smartos.$__smartos_major_version-${targetArch}"
;;
*)
nonPortableRid="illumos-${targetArch}"
;;
esac
elif [ "$targetOs" = "solaris" ]; then
__uname_version=$(uname -v)
__solaris_major_version=$(echo "$__uname_version" | cut -d'.' -f1)
Expand Down
24 changes: 12 additions & 12 deletions eng/common/templates/steps/publish-pipeline-artifacts.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ steps:
${{ if parameters.args.continueOnError }}:
continueOnError: ${{ parameters.args.continueOnError }}
inputs:
TargetPath: ${{ parameters.args.TargetPath }}
${{ if parameters.args.ArtifactName }}:
ArtifactName: ${{ parameters.args.ArtifactName }}
${{ if parameters.args.PublishLocation }}:
PublishLocation: ${{ parameters.args.PublishLocation }}
${{ if parameters.args.FileSharePath }}:
FileSharePath: ${{ parameters.args.FileSharePath }}
targetPath: ${{ parameters.args.targetPath }}
${{ if parameters.args.artifactName }}:
artifactName: ${{ parameters.args.artifactName }}
${{ if parameters.args.publishLocation }}:
publishLocation: ${{ parameters.args.publishLocation }}
${{ if parameters.args.fileSharePath }}:
fileSharePath: ${{ parameters.args.fileSharePath }}
${{ if parameters.args.Parallel }}:
Parallel: ${{ parameters.args.Parallel }}
${{ if parameters.args.ParallelCount }}:
ParallelCount: ${{ parameters.args.ParallelCount }}
${{ if parameters.args.Properties }}:
Properties: ${{ properties.args.Properties }}
parallel: ${{ parameters.args.Parallel }}
${{ if parameters.args.parallelCount }}:
parallelCount: ${{ parameters.args.parallelCount }}
${{ if parameters.args.properties }}:
properties: ${{ properties.args.properties }}
6 changes: 3 additions & 3 deletions global.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"dotnet": "9.0.100-preview.3.24204.13"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24226.3",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24226.3",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24226.3",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24229.1",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24229.1",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24229.1",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "9.0.0-preview.4.24229.1"
Expand Down

0 comments on commit 4616325

Please sign in to comment.