Skip to content

Commit

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

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 , 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 8.0.0-beta.22503.1 -> To Version 8.0.0-beta.22511.1

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

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 , 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 8.0.0-beta.22503.1 -> To Version 8.0.0-beta.22512.1

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

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 , 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 8.0.0-beta.22503.1 -> To Version 8.0.0-beta.22513.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Marek Safar <marek.safar@gmail.com>
  • Loading branch information
@dotnet-maestro @marek-safar
3 people authored Oct 19, 2022
1 parent 5ef4c68 commit b48c3ab
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 57 deletions.
76 changes: 40 additions & 36 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,73 +86,77 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22503.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22513.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
<Sha>32f13f8a8af8085ca09fbf93513ac848582c4a41</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22503.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22513.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
<Sha>32f13f8a8af8085ca09fbf93513ac848582c4a41</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.22480.2">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.22513.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
<Sha>32f13f8a8af8085ca09fbf93513ac848582c4a41</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.22503.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.22513.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
<Sha>32f13f8a8af8085ca09fbf93513ac848582c4a41</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.22503.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.22513.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
<Sha>32f13f8a8af8085ca09fbf93513ac848582c4a41</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22503.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.22513.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
<Sha>32f13f8a8af8085ca09fbf93513ac848582c4a41</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.22503.1">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22513.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
<Sha>32f13f8a8af8085ca09fbf93513ac848582c4a41</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.22503.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.22513.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
<Sha>32f13f8a8af8085ca09fbf93513ac848582c4a41</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22503.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.22513.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
<Sha>32f13f8a8af8085ca09fbf93513ac848582c4a41</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.22503.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22513.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
<Sha>32f13f8a8af8085ca09fbf93513ac848582c4a41</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.22503.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.22513.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
<Sha>32f13f8a8af8085ca09fbf93513ac848582c4a41</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.22503.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.22513.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
<Sha>32f13f8a8af8085ca09fbf93513ac848582c4a41</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.22503.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.22513.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
<Sha>32f13f8a8af8085ca09fbf93513ac848582c4a41</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.22503.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.22513.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
<Sha>32f13f8a8af8085ca09fbf93513ac848582c4a41</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.22503.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.22513.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
<Sha>32f13f8a8af8085ca09fbf93513ac848582c4a41</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.22503.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.22513.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
<Sha>32f13f8a8af8085ca09fbf93513ac848582c4a41</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.22503.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.22513.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
<Sha>32f13f8a8af8085ca09fbf93513ac848582c4a41</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.22513.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>32f13f8a8af8085ca09fbf93513ac848582c4a41</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22510.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -270,9 +274,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>f5293bf5ff2009386d2529df8f5812fa7464f597</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.22503.1">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.22513.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
<Sha>32f13f8a8af8085ca09fbf93513ac848582c4a41</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22511.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
31 changes: 16 additions & 15 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,21 +79,22 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>8.0.100-alpha.1.22511.23</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.22480.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.22480.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.22480.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.22480.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22480.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.22480.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.22480.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.22480.2</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.22513.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.22513.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.22513.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.22513.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.22513.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.22513.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22513.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.22513.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.22513.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.22513.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.22513.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.22513.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.22513.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.22513.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.22513.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.22513.2</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
5 changes: 3 additions & 2 deletions eng/common/templates/job/onelocbuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,14 @@ parameters:
MirrorRepo: ''
MirrorBranch: main
condition: ''
JobNameSuffix: ''

jobs:
- job: OneLocBuild
- job: OneLocBuild${{ parameters.JobNameSuffix }}

dependsOn: ${{ parameters.dependsOn }}

displayName: OneLocBuild
displayName: OneLocBuild${{ parameters.JobNameSuffix }}

${{ if ne(parameters.pool, '') }}:
pool: ${{ parameters.pool }}
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/jobs/source-build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ parameters:
# This is the default platform provided by Arcade, intended for use by a managed-only repo.
defaultManagedPlatform:
name: 'Managed'
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-latest'
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'

# Defines the platforms on which to run build jobs. One job is created for each platform, and the
# object in this array is sent to the job template as 'platform'. If no platforms are specified,
Expand Down
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": "7.0.100-rc.1.22431.12"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22503.1",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22503.1",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22503.1",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22513.2",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22513.2",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22513.2",
"Microsoft.Build.NoTargets": "3.5.0",
"Microsoft.Build.Traversal": "3.1.6",
"Microsoft.NET.Sdk.IL": "8.0.0-alpha.1.22507.5"
Expand Down

0 comments on commit b48c3ab

Please sign in to comment.