Skip to content

[main] Update dependencies from dotnet/arcade #46248

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

Merged
merged 3 commits into from
Jan 24, 2023
Merged

[main] Update dependencies from dotnet/arcade #46248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7dfd4c8
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jan 24, 2023
7d923eb
Revert "Don't depend on source-build job while it isn't running (#462…
wtgodbe Jan 24, 2023
df4c6fb
Revert "Skip Source Build for now (#46190)"
wtgodbe Jan 24, 2023
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
29 changes: 15 additions & 14 deletions .azure/pipelines/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,20 +783,19 @@ stages:
publishOnError: true
includeForks: true

# Source build - skip until https://github.com/dotnet/source-build/issues/3111 is resolved
- ${{ if False }}:
- template: /eng/common/templates/job/source-build.yml
parameters:
platform:
name: 'Managed'
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks'
skipPublishValidation: true
jobProperties:
timeoutInMinutes: 120
variables:
# Log environment variables in binary logs to ease debugging
MSBUILDLOGALLENVIRONMENTVARIABLES: true
# Source build
- template: /eng/common/templates/job/source-build.yml
parameters:
platform:
name: 'Managed'
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks'
skipPublishValidation: true
jobProperties:
timeoutInMinutes: 120
variables:
# Log environment variables in binary logs to ease debugging
MSBUILDLOGALLENVIRONMENTVARIABLES: true

# Publish to the BAR and perform source indexing. Wait until everything else is done.
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
Expand Down Expand Up @@ -831,6 +830,7 @@ stages:
- MacOS_Test
- Linux_Test
- Helix_x64
- Source_Build_Managed
pool:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals 1es-windows-2019
Expand Down Expand Up @@ -869,6 +869,7 @@ stages:
- MacOS_Test
- Linux_Test
- Helix_x64
- Source_Build_Managed
pool:
name: NetCore1ESPool-Internal
# Visual Studio Enterprise - no BuildTools agents exist internally and job must run on Windows
Expand Down
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,26 +302,26 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>ae70a1c51a334a5e13fa22d500f8a8390052eef5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23067.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23073.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3600aa80a01e90f38a7b86b9d7c1264e091aa5a8</Sha>
<Sha>083fc0406279952794c853630a08a141eef7244f</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23067.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23073.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3600aa80a01e90f38a7b86b9d7c1264e091aa5a8</Sha>
<Sha>083fc0406279952794c853630a08a141eef7244f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23067.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23073.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3600aa80a01e90f38a7b86b9d7c1264e091aa5a8</Sha>
<Sha>083fc0406279952794c853630a08a141eef7244f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23067.5">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23073.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3600aa80a01e90f38a7b86b9d7c1264e091aa5a8</Sha>
<Sha>083fc0406279952794c853630a08a141eef7244f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23067.5">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23073.10">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3600aa80a01e90f38a7b86b9d7c1264e091aa5a8</Sha>
<Sha>083fc0406279952794c853630a08a141eef7244f</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@
<MicrosoftEntityFrameworkCoreVersion>8.0.0-alpha.1.23073.4</MicrosoftEntityFrameworkCoreVersion>
<MicrosoftEntityFrameworkCoreDesignVersion>8.0.0-alpha.1.23073.4</MicrosoftEntityFrameworkCoreDesignVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23067.5</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23067.5</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23067.5</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23073.10</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23073.10</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23073.10</MicrosoftDotNetRemoteExecutorVersion>
<!-- Packages from dotnet/source-build-externals -->
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.23062.2</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
<!-- Packages from dotnet/xdt -->
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 @@ -498,7 +498,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) {
# Two part minimal VS version, e.g. "15.9", "16.0", etc.
# "components": ["componentId1", "componentId2", ...]
# Array of ids of workload components that must be available in the VS instance.
# See e.g. https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-enterprise
# See e.g. https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-enterprise?view=vs-2017
#
# Returns JSON describing the located VS instance (same format as returned by vswhere),
# or $null if no instance meeting the requirements is found on the machine.
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"msbuild-sdks": {
"Yarn.MSBuild": "1.22.10",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23067.5",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23067.5"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23073.10",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23073.10"
}
}