Skip to content

Commit e81493e

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/3.1' changes
2 parents 33aa7b0 + 3bdea02 commit e81493e

21 files changed

+337
-332
lines changed

‎.azure/pipelines/jobs/default-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ jobs:
9494
vmImage: ubuntu-20.04
9595
${{ if eq(parameters.agentOs, 'Windows') }}:
9696
${{ if eq(variables['System.TeamProject'], 'public') }}:
97-
name: NetCore-Public
97+
name: NetCore-Svc-Public
9898
demands: ImageOverride -equals 1es-windows-2019-open
9999
${{ if eq(variables['System.TeamProject'], 'internal') }}:
100100
name: NetCore1ESPool-Svc-Internal
101101
# Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
102-
demands: ImageOverride -equals Build.Server.Amd64.VS2019
102+
demands: ImageOverride -equals 1es-windows-2019
103103
variables:
104104
- AgentOsName: ${{ parameters.agentOs }}
105105
- ASPNETCORE_TEST_LOG_MAXPATH: "200" # Keep test log file name length low enough for artifact zipping

‎.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Users referenced in this file will automatically be requested as reviewers for PRs that modify the given paths.
22
# See https://help.github.com/articles/about-code-owners/
33

4-
* @Pilchie
54
/global.json @dotnet/aspnet-build
65
/.azure/ @dotnet/aspnet-build
76
/.config/ @dotnet/aspnet-build

‎eng/Baseline.Designer.props

Lines changed: 211 additions & 211 deletions
Large diffs are not rendered by default.

‎eng/Baseline.xml

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -4,87 +4,87 @@ This file contains a list of all the packages and their versions which were rele
44
Update this list when preparing for a new patch.
55
66
-->
7-
<Baseline Version="3.1.29">
7+
<Baseline Version="3.1.30">
88
<Package Id="AspNetCoreRuntime.3.0.x64" Version="3.0.3" />
99
<Package Id="AspNetCoreRuntime.3.0.x86" Version="3.0.3" />
10-
<Package Id="dotnet-sql-cache" Version="3.1.29" />
10+
<Package Id="dotnet-sql-cache" Version="3.1.30" />
1111
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="3.2.1" />
12-
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.29" />
13-
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.29" />
14-
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.29" />
15-
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.29" />
16-
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.29" />
17-
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.29" />
18-
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.1.29" />
19-
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.29" />
20-
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.29" />
21-
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.1.29" />
22-
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.29" />
23-
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.29" />
24-
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.1.29" />
25-
<Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.29" />
26-
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.29" />
27-
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.29" />
28-
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.29" />
29-
<Package Id="Microsoft.AspNetCore.Components" Version="3.1.29" />
30-
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.29" />
31-
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.29" />
32-
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.29" />
33-
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.29" />
12+
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.30" />
13+
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.30" />
14+
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.30" />
15+
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.30" />
16+
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.30" />
17+
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.30" />
18+
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.1.30" />
19+
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.30" />
20+
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.30" />
21+
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.1.30" />
22+
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.30" />
23+
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.30" />
24+
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.1.30" />
25+
<Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.30" />
26+
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.30" />
27+
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.30" />
28+
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.30" />
29+
<Package Id="Microsoft.AspNetCore.Components" Version="3.1.30" />
30+
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.30" />
31+
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.30" />
32+
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.30" />
33+
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.30" />
3434
<Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1" />
3535
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.1" />
3636
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.1" />
3737
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="3.2.1" />
3838
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.HttpHandler" Version="3.2.1" />
3939
<Package Id="Microsoft.JSInterop.WebAssembly" Version="3.2.1" />
40-
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.29" />
41-
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.29" />
42-
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.29" />
43-
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.1.29" />
44-
<Package Id="Microsoft.AspNetCore.DataProtection" Version="3.1.29" />
45-
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.29" />
40+
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.30" />
41+
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.30" />
42+
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.30" />
43+
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.1.30" />
44+
<Package Id="Microsoft.AspNetCore.DataProtection" Version="3.1.30" />
45+
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.30" />
4646
<Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="3.1.24" />
4747
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="3.1.24" />
48-
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.29" />
49-
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.1.29" />
50-
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.29" />
51-
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.29" />
52-
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.1.29" />
53-
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.29" />
54-
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.29" />
55-
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.1.29" />
56-
<Package Id="Microsoft.AspNetCore.Http.Features" Version="3.1.29" />
57-
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.29" />
58-
<Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.1.29" />
59-
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.1.29" />
60-
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.1.29" />
61-
<Package Id="Microsoft.AspNetCore.Metadata" Version="3.1.29" />
62-
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.1.29" />
63-
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.29" />
64-
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.29" />
65-
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.29" />
66-
<Package Id="Microsoft.AspNetCore.NodeServices" Version="3.1.29" />
67-
<Package Id="Microsoft.AspNetCore.Owin" Version="3.1.29" />
68-
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.29" />
69-
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.1.29" />
70-
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.29" />
71-
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.1.29" />
72-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.1.29" />
73-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.29" />
74-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.29" />
75-
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.1.29" />
76-
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.29" />
77-
<Package Id="Microsoft.AspNetCore.SpaServices" Version="3.1.29" />
78-
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.29" />
79-
<Package Id="Microsoft.AspNetCore.TestHost" Version="3.1.29" />
80-
<Package Id="Microsoft.dotnet-openapi" Version="3.1.29" />
81-
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.1.29" />
82-
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.29" />
83-
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.29" />
84-
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.29" />
85-
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.1.29" />
86-
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.1.29" />
87-
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.29" />
88-
<Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.29" />
89-
<Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.29" />
48+
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.30" />
49+
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.1.30" />
50+
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.30" />
51+
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.30" />
52+
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.1.30" />
53+
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.30" />
54+
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.30" />
55+
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.1.30" />
56+
<Package Id="Microsoft.AspNetCore.Http.Features" Version="3.1.30" />
57+
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.30" />
58+
<Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.1.30" />
59+
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.1.30" />
60+
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.1.30" />
61+
<Package Id="Microsoft.AspNetCore.Metadata" Version="3.1.30" />
62+
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.1.30" />
63+
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.30" />
64+
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.30" />
65+
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.30" />
66+
<Package Id="Microsoft.AspNetCore.NodeServices" Version="3.1.30" />
67+
<Package Id="Microsoft.AspNetCore.Owin" Version="3.1.30" />
68+
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.30" />
69+
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.1.30" />
70+
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.30" />
71+
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.1.30" />
72+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.1.30" />
73+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.30" />
74+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.30" />
75+
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.1.30" />
76+
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.30" />
77+
<Package Id="Microsoft.AspNetCore.SpaServices" Version="3.1.30" />
78+
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.30" />
79+
<Package Id="Microsoft.AspNetCore.TestHost" Version="3.1.30" />
80+
<Package Id="Microsoft.dotnet-openapi" Version="3.1.30" />
81+
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.1.30" />
82+
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.30" />
83+
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.30" />
84+
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.30" />
85+
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.1.30" />
86+
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.1.30" />
87+
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.30" />
88+
<Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.30" />
89+
<Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.30" />
9090
</Baseline>

‎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>c62ee3d0c9492db518f79bf5e4d364bce7c78c66</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.30-servicing.22476.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
430430
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
1111
<AspNetCorePatchVersion>31</AspNetCorePatchVersion>
1212
<!-- This property should be 'false' between branding & code-merging, 'true' the rest of the time -->
13-
<ValidateBaseline>false</ValidateBaseline>
13+
<ValidateBaseline>true</ValidateBaseline>
1414
<PreReleasePreviewNumber>0</PreReleasePreviewNumber>
1515
<ComponentsWebAssemblyMajorVersion>3</ComponentsWebAssemblyMajorVersion>
1616
<ComponentsWebAssemblyMinorVersion>2</ComponentsWebAssemblyMinorVersion>
@@ -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 -->
@@ -241,7 +241,7 @@
241241
<BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion>
242242
<CastleCorePackageVersion>4.2.1</CastleCorePackageVersion>
243243
<FSharpCorePackageVersion>4.2.1</FSharpCorePackageVersion>
244-
<GoogleProtobufPackageVersion>3.19.4</GoogleProtobufPackageVersion>
244+
<GoogleProtobufPackageVersion>3.19.5</GoogleProtobufPackageVersion>
245245
<GrpcAspNetCorePackageVersion>2.27.0</GrpcAspNetCorePackageVersion>
246246
<IdentityServer4AspNetIdentityPackageVersion>3.0.0</IdentityServer4AspNetIdentityPackageVersion>
247247
<IdentityServer4EntityFrameworkPackageVersion>3.0.0</IdentityServer4EntityFrameworkPackageVersion>

‎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

0 commit comments

Comments
 (0)