Skip to content

Commit 05afda1

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20221005.4 (#44399)
[release/3.1] Update dependencies from dotnet/arcade
1 parent 971e28f commit 05afda1

16 files changed

+27
-30
lines changed

‎NuGet.config

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,13 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-efcore -->
7-
<add key="darc-int-dotnet-efcore-6e3b6bb" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-6e3b6bb2/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-efcore -->
98
<!-- Begin: Package sources from dotnet-extensions -->
10-
<add key="darc-int-dotnet-extensions-a5c93f6" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-a5c93f64/nuget/v3/index.json" />
119
<!-- Begin: Package sources from dotnet-razor-tooling -->
12-
<add key="darc-int-dotnet-razor-tooling-4ca8978" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-razor-tooling-4ca89780/nuget/v3/index.json" />
1310
<!-- End: Package sources from dotnet-razor-tooling -->
1411
<!-- Begin: Package sources from dotnet-corefx -->
1512
<!-- End: Package sources from dotnet-corefx -->
1613
<!-- Begin: Package sources from dotnet-core-setup -->
17-
<add key="darc-int-dotnet-core-setup-0bcbc31" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-0bcbc312/nuget/v3/index.json" />
1814
<!-- End: Package sources from dotnet-core-setup -->
1915
<!-- End: Package sources from dotnet-extensions -->
2016
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
@@ -27,15 +23,11 @@
2723
<clear />
2824
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2925
<!-- Begin: Package sources from dotnet-core-setup -->
30-
<add key="darc-int-dotnet-core-setup-0bcbc31" value="true" />
3126
<!-- Begin: Package sources from dotnet-efcore -->
32-
<add key="darc-int-dotnet-efcore-6e3b6bb" value="true" />
3327
<!-- End: Package sources from dotnet-efcore -->
3428
<!-- Begin: Package sources from dotnet-extensions -->
35-
<add key="darc-int-dotnet-extensions-a5c93f6" value="true" />
3629
<!-- End: Package sources from dotnet-extensions -->
3730
<!-- Begin: Package sources from dotnet-razor-tooling -->
38-
<add key="darc-int-dotnet-razor-tooling-4ca8978" value="true" />
3931
<!-- End: Package sources from dotnet-razor-tooling -->
4032
<!-- End: Package sources from dotnet-core-setup -->
4133
<!-- Begin: Package sources from dotnet-corefx -->

‎eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -418,13 +418,13 @@
418418
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
419419
<Sha>a5c93f643829c9d3d804468b193d27fa68d87bb0</Sha>
420420
</Dependency>
421-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.22378.5">
421+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.22505.4">
422422
<Uri>https://github.com/dotnet/arcade</Uri>
423-
<Sha>0de02c603d72d93709a9c7f31d67289e8833b06a</Sha>
423+
<Sha>ce5a281156dfae3c050e63c1f288b6a488e978fe</Sha>
424424
</Dependency>
425-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22378.5">
425+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22505.4">
426426
<Uri>https://github.com/dotnet/arcade</Uri>
427-
<Sha>0de02c603d72d93709a9c7f31d67289e8833b06a</Sha>
427+
<Sha>ce5a281156dfae3c050e63c1f288b6a488e978fe</Sha>
428428
</Dependency>
429429
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.29-servicing.22417.4" CoherentParentDependency="Microsoft.EntityFrameworkCore">
430430
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
-->
6565
<PropertyGroup Label="Automated">
6666
<!-- Packages from dotnet/arcade -->
67-
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.22378.5</MicrosoftDotNetGenAPIPackageVersion>
67+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.22505.4</MicrosoftDotNetGenAPIPackageVersion>
6868
<!-- Packages from dotnet/roslyn -->
6969
<MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetPackageVersion>
7070
<!-- Packages from dotnet/core-setup -->

‎eng/common/build.ps1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Param(
2424
[switch] $help,
2525
[string] $runtimeSourceFeed = "",
2626
[string] $runtimeSourceFeedKey = "",
27+
[switch] $nativeToolsOnMachine,
2728
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
2829
)
2930

@@ -60,6 +61,7 @@ function Print-Usage() {
6061
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
6162
Write-Host " -runtimeSourceFeed <value> Alternate feed source for restoring .NET Runtimes and SDKs"
6263
Write-Host " -runtimeSourceFeedKey <value> Key value for non-public values of runtimeSourceFeed"
64+
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
6365
Write-Host ""
6466

6567
Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -134,6 +136,9 @@ try {
134136
. $configureToolsetScript
135137
}
136138

139+
if ($nativeToolsOnMachine) {
140+
$env:NativeToolsOnMachine = $true
141+
}
137142
if (($restore) -and ($null -eq $env:DisableNativeToolsetInstalls)) {
138143
InitializeNativeTools
139144
}

‎eng/common/darc-init.ps1

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ param (
1010
function InstallDarcCli ($darcVersion, $toolpath) {
1111
$darcCliPackageName = 'microsoft.dotnet.darc'
1212

13-
$dotnetRoot = InitializeDotNetCli -install:$true
14-
$dotnet = "$dotnetRoot\dotnet.exe"
13+
$dotnet = "dotnet"
1514
$toolList = & "$dotnet" tool list -g
1615

1716
if ($toolList -like "*$darcCliPackageName*") {

‎eng/common/init-tools-native.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ try {
111111
$ToolPath = Convert-Path -Path $BinPath
112112
Write-Host "Adding $ToolName to the path ($ToolPath)..."
113113
Write-Host "##vso[task.prependpath]$ToolPath"
114+
$env:PATH = "$ToolPath;$env:PATH"
114115
$InstalledTools += @{ $ToolName = $ToolDirectory.FullName }
115116
}
116117
}

‎eng/common/templates/job/execute-sdl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- group: DotNet-VSTS-Bot
2121
pool:
2222
name: NetCore1ESPool-Svc-Internal
23-
demands: ImageOverride -equals Build.Server.Amd64.VS2019
23+
demands: ImageOverride -equals windows.vs2019.amd64
2424
steps:
2525
- checkout: self
2626
clean: true

‎eng/common/templates/job/onelocbuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ parameters:
55
# Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
66
pool:
77
name: NetCore1ESPool-Svc-Internal
8-
demands: ImageOverride -equals Build.Server.Amd64.VS2019
8+
demands: ImageOverride -equals windows.vs2019.amd64
99

1010
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
1111
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)

‎eng/common/templates/jobs/jobs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
- ${{ job.job }}
7676
pool:
7777
name: NetCore1ESPool-Svc-Internal
78-
demands: ImageOverride -equals Build.Server.Amd64.VS2019
78+
demands: ImageOverride -equals windows.vs2019.amd64
7979
runAsPublic: ${{ parameters.runAsPublic }}
8080
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
8181
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
@@ -89,4 +89,4 @@ jobs:
8989
- Asset_Registry_Publish
9090
pool:
9191
name: NetCore1ESPool-Svc-Internal
92-
demands: ImageOverride -equals Build.Server.Amd64.VS2019
92+
demands: ImageOverride -equals windows.vs2019.amd64

‎eng/common/templates/post-build/channels/generic-internal-channel.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ stages:
2525
- group: DotNet-Symbol-Server-Pats
2626
pool:
2727
name: NetCore1ESPool-Svc-Internal
28-
demands: ImageOverride -equals Build.Server.Amd64.VS2019
28+
demands: ImageOverride -equals windows.vs2019.amd64
2929
steps:
3030
# This is necessary whenever we want to publish/restore to an AzDO private feed
3131
- task: NuGetAuthenticate@0
@@ -69,7 +69,7 @@ stages:
6969
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }}))
7070
pool:
7171
name: NetCore1ESPool-Svc-Internal
72-
demands: ImageOverride -equals Build.Server.Amd64.VS2019
72+
demands: ImageOverride -equals windows.vs2019.amd64
7373
steps:
7474
- task: DownloadBuildArtifacts@0
7575
displayName: Download Package Artifacts

0 commit comments

Comments
 (0)