Skip to content

Commit fdcbd8b

Browse files
nagilsonnagilson
authored
Merge pull request #28556 from dotnet/darc-release/6.0.4xx-c54e478f-753c-4518-9c83-2e55a1ec72eb
[release/6.0.4xx] Update dependencies from dotnet/arcade
2 parents fc0f9bd + 60522d3 commit fdcbd8b

File tree

10 files changed

+27
-21
lines changed

10 files changed

+27
-21
lines changed

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -287,22 +287,22 @@
287287
</Dependency>
288288
</ProductDependencies>
289289
<ToolsetDependencies>
290-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22412.2">
290+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22512.3">
291291
<Uri>https://github.com/dotnet/arcade</Uri>
292-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
292+
<Sha>bb1e72113a7eaf8bebda940beba8cf8bee1b453f</Sha>
293293
<SourceBuild RepoName="arcade" ManagedOnly="true" />
294294
</Dependency>
295-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22412.2">
295+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22512.3">
296296
<Uri>https://github.com/dotnet/arcade</Uri>
297-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
297+
<Sha>bb1e72113a7eaf8bebda940beba8cf8bee1b453f</Sha>
298298
</Dependency>
299-
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.22412.2">
299+
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.22512.3">
300300
<Uri>https://github.com/dotnet/arcade</Uri>
301-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
301+
<Sha>bb1e72113a7eaf8bebda940beba8cf8bee1b453f</Sha>
302302
</Dependency>
303-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22412.2">
303+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22512.3">
304304
<Uri>https://github.com/dotnet/arcade</Uri>
305-
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
305+
<Sha>bb1e72113a7eaf8bebda940beba8cf8bee1b453f</Sha>
306306
</Dependency>
307307
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0">
308308
<Uri>https://github.com/dotnet/runtime</Uri>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<NewtonsoftJsonVersion>$(NewtonsoftJsonPackageVersion)</NewtonsoftJsonVersion>
2929
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3030
<SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
31-
<MicrosoftDotNetSignToolVersion>6.0.0-beta.22412.2</MicrosoftDotNetSignToolVersion>
31+
<MicrosoftDotNetSignToolVersion>6.0.0-beta.22512.3</MicrosoftDotNetSignToolVersion>
3232
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
3333
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
3434
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
@@ -172,7 +172,7 @@
172172
<PropertyGroup>
173173
<FluentAssertionsVersion>4.19.2</FluentAssertionsVersion>
174174
<FluentAssertionsJsonVersion>4.19.0</FluentAssertionsJsonVersion>
175-
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22412.2</MicrosoftDotNetXUnitExtensionsVersion>
175+
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22512.3</MicrosoftDotNetXUnitExtensionsVersion>
176176
<MoqPackageVersion>4.8.2</MoqPackageVersion>
177177
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>6.0.0-beta.22262.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
178178
</PropertyGroup>

‎eng/common/build.ps1‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Param(
2626
[string] $runtimeSourceFeed = '',
2727
[string] $runtimeSourceFeedKey = '',
2828
[switch] $excludePrereleaseVS,
29+
[switch] $nativeToolsOnMachine,
2930
[switch] $help,
3031
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
3132
)
@@ -67,6 +68,7 @@ function Print-Usage() {
6768
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
6869
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
6970
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
71+
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
7072
Write-Host ""
7173

7274
Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -146,6 +148,9 @@ try {
146148
$nodeReuse = $false
147149
}
148150

151+
if ($nativeToolsOnMachine) {
152+
$env:NativeToolsOnMachine = $true
153+
}
149154
if ($restore) {
150155
InitializeNativeTools
151156
}

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
demands: Cmd
5454
# If it's not devdiv, it's dnceng
5555
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
56-
name: NetCore1ESPool-Internal
56+
name: NetCore1ESPool-Svc-Internal
5757
demands: ImageOverride -equals windows.vs2019.amd64
5858
steps:
5959
- checkout: self

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
demands: Cmd
4141
# If it's not devdiv, it's dnceng
4242
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
43-
name: NetCore1ESPool-Internal
43+
name: NetCore1ESPool-Svc-Internal
4444
demands: ImageOverride -equals windows.vs2019.amd64
4545

4646
variables:

‎eng/common/templates/job/source-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ jobs:
4646
# source-build builds run in Docker, including the default managed platform.
4747
pool:
4848
${{ if eq(variables['System.TeamProject'], 'public') }}:
49-
name: NetCore-Public
49+
name: NetCore-Svc-Public
5050
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
5151
${{ if eq(variables['System.TeamProject'], 'internal') }}:
52-
name: NetCore1ESPool-Internal
52+
name: NetCore1ESPool-Svc-Internal
5353
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
5454
${{ if ne(parameters.platform.pool, '') }}:
5555
pool: ${{ parameters.platform.pool }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
demands: Cmd
9090
# If it's not devdiv, it's dnceng
9191
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
92-
name: NetCore1ESPool-Internal
92+
name: NetCore1ESPool-Svc-Internal
9393
demands: ImageOverride -equals windows.vs2019.amd64
9494

9595
runAsPublic: ${{ parameters.runAsPublic }}

‎eng/common/templates/post-build/post-build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ stages:
100100
demands: Cmd
101101
# If it's not devdiv, it's dnceng
102102
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
103-
name: NetCore1ESPool-Internal
103+
name: NetCore1ESPool-Svc-Internal
104104
demands: ImageOverride -equals windows.vs2019.amd64
105105

106106
steps:
@@ -137,7 +137,7 @@ stages:
137137
demands: Cmd
138138
# If it's not devdiv, it's dnceng
139139
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
140-
name: NetCore1ESPool-Internal
140+
name: NetCore1ESPool-Svc-Internal
141141
demands: ImageOverride -equals windows.vs2019.amd64
142142
steps:
143143
- template: setup-maestro-vars.yml
@@ -197,7 +197,7 @@ stages:
197197
demands: Cmd
198198
# If it's not devdiv, it's dnceng
199199
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
200-
name: NetCore1ESPool-Internal
200+
name: NetCore1ESPool-Svc-Internal
201201
demands: ImageOverride -equals windows.vs2019.amd64
202202
steps:
203203
- template: setup-maestro-vars.yml
@@ -254,7 +254,7 @@ stages:
254254
demands: Cmd
255255
# If it's not devdiv, it's dnceng
256256
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
257-
name: NetCore1ESPool-Internal
257+
name: NetCore1ESPool-Svc-Internal
258258
demands: ImageOverride -equals windows.vs2019.amd64
259259
steps:
260260
- template: setup-maestro-vars.yml

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
}
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22412.2",
15-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22412.2"
14+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22512.3",
15+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22512.3"
1616
}
1717
}

0 commit comments

Comments
 (0)