Skip to content

Commit c31b892

Browse files
dotnet-maestro[bot]wtgodbe
dotnet-maestro[bot]
and
wtgodbe
authored
[main] Update dependencies from dotnet/arcade (#46248)
* Update dependencies from https://github.com/dotnet/arcade build 20230123.10 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 8.0.0-beta.23067.5 -> To Version 8.0.0-beta.23073.10 * Revert "Don't depend on source-build job while it isn't running (#46220)" This reverts commit 7369057. * Revert "Skip Source Build for now (#46190)" This reverts commit c77deeb. Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: wtgodbe <[email protected]>
1 parent 166593f commit c31b892

File tree

5 files changed

+31
-30
lines changed

5 files changed

+31
-30
lines changed

‎.azure/pipelines/ci.yml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -783,20 +783,19 @@ stages:
783783
publishOnError: true
784784
includeForks: true
785785

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

801800
# Publish to the BAR and perform source indexing. Wait until everything else is done.
802801
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
@@ -831,6 +830,7 @@ stages:
831830
- MacOS_Test
832831
- Linux_Test
833832
- Helix_x64
833+
- Source_Build_Managed
834834
pool:
835835
name: NetCore1ESPool-Internal
836836
demands: ImageOverride -equals 1es-windows-2019
@@ -869,6 +869,7 @@ stages:
869869
- MacOS_Test
870870
- Linux_Test
871871
- Helix_x64
872+
- Source_Build_Managed
872873
pool:
873874
name: NetCore1ESPool-Internal
874875
# Visual Studio Enterprise - no BuildTools agents exist internally and job must run on Windows

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -302,26 +302,26 @@
302302
<Uri>https://github.com/dotnet/runtime</Uri>
303303
<Sha>ae70a1c51a334a5e13fa22d500f8a8390052eef5</Sha>
304304
</Dependency>
305-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23067.5">
305+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23073.10">
306306
<Uri>https://github.com/dotnet/arcade</Uri>
307-
<Sha>3600aa80a01e90f38a7b86b9d7c1264e091aa5a8</Sha>
307+
<Sha>083fc0406279952794c853630a08a141eef7244f</Sha>
308308
<SourceBuild RepoName="arcade" ManagedOnly="true" />
309309
</Dependency>
310-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23067.5">
310+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23073.10">
311311
<Uri>https://github.com/dotnet/arcade</Uri>
312-
<Sha>3600aa80a01e90f38a7b86b9d7c1264e091aa5a8</Sha>
312+
<Sha>083fc0406279952794c853630a08a141eef7244f</Sha>
313313
</Dependency>
314-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23067.5">
314+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23073.10">
315315
<Uri>https://github.com/dotnet/arcade</Uri>
316-
<Sha>3600aa80a01e90f38a7b86b9d7c1264e091aa5a8</Sha>
316+
<Sha>083fc0406279952794c853630a08a141eef7244f</Sha>
317317
</Dependency>
318-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23067.5">
318+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23073.10">
319319
<Uri>https://github.com/dotnet/arcade</Uri>
320-
<Sha>3600aa80a01e90f38a7b86b9d7c1264e091aa5a8</Sha>
320+
<Sha>083fc0406279952794c853630a08a141eef7244f</Sha>
321321
</Dependency>
322-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23067.5">
322+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23073.10">
323323
<Uri>https://github.com/dotnet/arcade</Uri>
324-
<Sha>3600aa80a01e90f38a7b86b9d7c1264e091aa5a8</Sha>
324+
<Sha>083fc0406279952794c853630a08a141eef7244f</Sha>
325325
</Dependency>
326326
</ToolsetDependencies>
327327
</Dependencies>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@
135135
<MicrosoftEntityFrameworkCoreVersion>8.0.0-alpha.1.23073.4</MicrosoftEntityFrameworkCoreVersion>
136136
<MicrosoftEntityFrameworkCoreDesignVersion>8.0.0-alpha.1.23073.4</MicrosoftEntityFrameworkCoreDesignVersion>
137137
<!-- Packages from dotnet/arcade -->
138-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23067.5</MicrosoftDotNetBuildTasksInstallersVersion>
139-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23067.5</MicrosoftDotNetBuildTasksTemplatingVersion>
140-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23067.5</MicrosoftDotNetRemoteExecutorVersion>
138+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23073.10</MicrosoftDotNetBuildTasksInstallersVersion>
139+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23073.10</MicrosoftDotNetBuildTasksTemplatingVersion>
140+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23073.10</MicrosoftDotNetRemoteExecutorVersion>
141141
<!-- Packages from dotnet/source-build-externals -->
142142
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.23062.2</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
143143
<!-- Packages from dotnet/xdt -->

‎eng/common/tools.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) {
498498
# Two part minimal VS version, e.g. "15.9", "16.0", etc.
499499
# "components": ["componentId1", "componentId2", ...]
500500
# Array of ids of workload components that must be available in the VS instance.
501-
# See e.g. https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-enterprise
501+
# See e.g. https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-enterprise?view=vs-2017
502502
#
503503
# Returns JSON describing the located VS instance (same format as returned by vswhere),
504504
# or $null if no instance meeting the requirements is found on the machine.

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"msbuild-sdks": {
2929
"Yarn.MSBuild": "1.22.10",
30-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23067.5",
31-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23067.5"
30+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23073.10",
31+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23073.10"
3232
}
3333
}

0 commit comments

Comments
 (0)