Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[main] Update dependencies from dotnet/arcade #98983

Merged
merged 4 commits into from
Feb 29, 2024
Merged

[main] Update dependencies from dotnet/arcade #98983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ae98f2
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Feb 27, 2024
c38f723
Merge branch 'main' into darc-main-589d7581-4471-431e-ad79-3a68beaaab63
ViktorHofer Feb 28, 2024
d8425bd
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Feb 28, 2024
2c4d3e5
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 42 additions & 42 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,87 +124,87 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24112.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24127.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
<Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24112.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24127.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
<Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24112.1">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24127.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
<Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24112.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24127.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
<Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24112.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24127.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
<Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24112.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24127.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
<Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24112.1">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24127.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
<Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24112.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24127.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
<Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24112.1">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24127.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
<Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24112.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24127.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
<Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24112.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24127.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
<Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24112.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24127.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
<Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24112.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24127.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
<Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24112.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24127.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
<Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24112.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24127.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
<Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24112.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24127.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
<Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24112.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24127.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
<Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24112.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24127.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
<Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24112.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24127.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
<Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24112.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24127.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
<Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24119.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -364,9 +364,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>8aa2a4cb80000ebb46ee61cd6ac29b2e63ebe87c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24112.1">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24127.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb</Sha>
<Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24104.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,22 +83,22 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.3.24126.1</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24112.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24112.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24112.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24112.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24112.1</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24112.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24112.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24112.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24112.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24112.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24112.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24112.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24112.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24112.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24112.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24112.1</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24127.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24127.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24127.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24127.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24127.4</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24127.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24127.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24127.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24127.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24127.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24127.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24127.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24127.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24127.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24127.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24127.4</MicrosoftDotNetPackageTestingVersion>
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
<!-- NuGet dependencies -->
Expand Down
6 changes: 5 additions & 1 deletion eng/common/tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ $ErrorActionPreference = 'Stop'
# Base-64 encoded SAS token that has permission to storage container described by $runtimeSourceFeed
[string]$runtimeSourceFeedKey = if (Test-Path variable:runtimeSourceFeedKey) { $runtimeSourceFeedKey } else { $null }

# True if the build is a product build
[bool]$productBuild = if (Test-Path variable:productBuild) { $productBuild } else { $false }

function Create-Directory ([string[]] $path) {
New-Item -Path $path -Force -ItemType 'Directory' | Out-Null
}
Expand Down Expand Up @@ -850,7 +853,8 @@ function MSBuild-Core() {
}

# When running on Azure Pipelines, override the returned exit code to avoid double logging.
if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null) {
# Skip this when the build is a child of the VMR orchestrator build.
if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild -and $properties -notlike "*DotNetBuildRepo=true*") {
Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed."
# Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
# The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error
Expand Down
8 changes: 6 additions & 2 deletions eng/common/tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ fi
runtime_source_feed=${runtime_source_feed:-''}
runtime_source_feed_key=${runtime_source_feed_key:-''}

# True if the build is a product build
product_build=${product_build:-false}

# Resolve any symlinks in the given path.
function ResolvePath {
local path=$1
Expand Down Expand Up @@ -141,7 +144,7 @@ function InitializeDotNetCli {
if [[ $global_json_has_runtimes == false && -n "${DOTNET_INSTALL_DIR:-}" && -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then
dotnet_root="$DOTNET_INSTALL_DIR"
else
dotnet_root="$repo_root/.dotnet"
dotnet_root="${repo_root}.dotnet"

export DOTNET_INSTALL_DIR="$dotnet_root"

Expand Down Expand Up @@ -503,7 +506,8 @@ function MSBuild-Core {
echo "Build failed with exit code $exit_code. Check errors above."

# When running on Azure Pipelines, override the returned exit code to avoid double logging.
if [[ "$ci" == "true" && -n ${SYSTEM_TEAMPROJECT:-} ]]; then
# Skip this when the build is a child of the VMR orchestrator build.
if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true && $properties != *"DotNetBuildRepo=true"* ]]; then
Write-PipelineSetResult -result "Failed" -message "msbuild execution failed."
# Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
# The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"dotnet": "9.0.100-preview.1.24101.2"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24112.1",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24112.1",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24112.1",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24127.4",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24127.4",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24127.4",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "9.0.0-preview.3.24126.1"
Expand Down
Loading