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

[release/8.0] Update dependencies from dotnet/arcade #111410

Open
wants to merge 2 commits into
base: release/8.0
Choose a base branch
from
+63 −60
Open

[release/8.0] Update dependencies from dotnet/arcade #111410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d913ae8
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Jan 14, 2025
5cd5c72
Merge branch 'release/8.0' into darc-release/8.0-91c23e34-7f35-458e-8…
lewing Feb 4, 2025
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
5 changes: 4 additions & 1 deletion NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-b767aab" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b767aaba/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-c458a76" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-c458a76-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-3/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-c458a76-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-c458a76-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-sdk -->
<!-- End: Package sources from dotnet-sdk -->
Expand Down
72 changes: 36 additions & 36 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,79 +111,79 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24516.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25060.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24516.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25060.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.24516.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.25060.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.24516.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.25060.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24516.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25060.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24516.1">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.25060.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.24516.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.25060.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.24516.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.25060.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24516.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25060.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24516.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25060.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.24516.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.25060.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.24516.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.25060.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.24516.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.25060.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24516.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25060.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24516.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25060.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.24516.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.25060.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.24516.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.25060.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.24517.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -334,9 +334,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>8c90d68ba97c7ee54d09fccb854f77ed0f9419ef</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.24516.1">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.25060.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23566.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
30 changes: 15 additions & 15 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,21 +87,21 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>8.0.100</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.24516.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.24516.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.24516.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.24516.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24516.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24516.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.24516.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.24516.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.24516.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.24516.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24516.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.24516.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24516.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.24516.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.24516.1</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.25060.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.25060.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.25060.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.25060.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25060.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.25060.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.25060.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25060.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.25060.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.25060.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25060.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.25060.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25060.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.25060.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.25060.1</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates-official/job/publish-build-assets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
arguments: >
-task PublishBuildAssets -restore -msbuildEngine dotnet
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
/p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
/p:MaestroApiEndpoint=https://maestro.dot.net
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
/p:OfficialBuildId=$(Build.BuildNumber)
condition: ${{ parameters.condition }}
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates-official/post-build/common-variables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ variables:

# Default Maestro++ API Endpoint and API Version
- name: MaestroApiEndPoint
value: "https://maestro-prod.westus2.cloudapp.azure.com"
value: "https://maestro.dot.net"
- name: MaestroApiAccessToken
value: $(MaestroAccessToken)
- name: MaestroApiVersion
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/job/job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ jobs:

- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- task: MicroBuildSigningPlugin@3
- task: MicroBuildSigningPlugin@4
displayName: Install MicroBuild plugin
inputs:
signType: $(_SignType)
Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ function InstallDotNet([string] $dotnetRoot,
$variations += @($installParameters)

$dotnetBuilds = $installParameters.Clone()
$dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public"
$dotnetbuilds.AzureFeed = "https://ci.dot.net/public"
$variations += @($dotnetBuilds)

if ($runtimeSourceFeed) {
Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ function InstallDotNet {
local public_location=("${installParameters[@]}")
variations+=(public_location)

local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public")
local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://ci.dot.net/public")
variations+=(dotnetbuilds)

if [[ -n "${6:-}" ]]; then
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": "8.0.110"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24516.1",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24516.1",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.24516.1",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25060.1",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25060.1",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25060.1",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"
Expand Down
Loading