Skip to content

Commit b24f1aa

Browse files
dotnet-maestro[bot]ViktorHofer
dotnet-maestro[bot]
and
ViktorHofer
authored
[release/6.0-rc1] Update dependencies from dotnet/arcade (#57628)
* Update dependencies from https://github.com/dotnet/arcade build 20210817.1 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21413.4 -> To Version 6.0.0-beta.21417.1 * Unpin compiler version * Update source-index-stage1.yml * Update dependencies from https://github.com/dotnet/arcade build 20210818.12 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21413.4 -> To Version 6.0.0-beta.21418.12 * Partial cherry pick from a169ca9 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
1 parent fe6bd2d commit b24f1aa

File tree

16 files changed

+118
-91
lines changed

16 files changed

+118
-91
lines changed

‎NuGet.config‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
1818
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
1919
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
20-
<!-- Used for dotnet pack task -->
21-
<add key="nuget-build" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/nuget-build/nuget/v3/index.json" />
2220
<!-- Used for the Rich Navigation indexing task -->
2321
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
2422
</packageSources>

‎eng/Version.Details.xml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -14,73 +14,73 @@
1414
</Dependency>
1515
</ProductDependencies>
1616
<ToolsetDependencies>
17-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21413.4">
17+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21418.12">
1818
<Uri>https://github.com/dotnet/arcade</Uri>
19-
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
19+
<Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21413.4">
21+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21418.12">
2222
<Uri>https://github.com/dotnet/arcade</Uri>
23-
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
23+
<Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21413.4">
25+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21418.12">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
27+
<Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21413.4">
29+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21418.12">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
31+
<Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21413.4">
33+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21418.12">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
35+
<Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21413.4">
37+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21418.12">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
39+
<Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21413.4">
41+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21418.12">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
43+
<Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21413.4">
45+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21418.12">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
47+
<Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21413.4">
49+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21418.12">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
51+
<Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21413.4">
53+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21418.12">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
55+
<Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21413.4">
57+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21418.12">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
59+
<Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21413.4">
61+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21418.12">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
63+
<Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21413.4">
65+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21418.12">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
67+
<Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21413.4">
69+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21418.12">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
71+
<Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21413.4">
73+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21418.12">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
75+
<Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21413.4">
77+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21418.12">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
79+
<Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21413.4">
81+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21418.12">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
83+
<Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
8484
</Dependency>
8585
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
8686
<Uri>https://github.com/microsoft/vstest</Uri>
@@ -202,9 +202,9 @@
202202
<Uri>https://github.com/dotnet/xharness</Uri>
203203
<Sha>e9669dc84ecd668d3bbb748758103e23b394ffef</Sha>
204204
</Dependency>
205-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21413.4">
205+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21418.12">
206206
<Uri>https://github.com/dotnet/arcade</Uri>
207-
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
207+
<Sha>ac8b7514ca8bcac1d071a16b7a92cb52f7058871</Sha>
208208
</Dependency>
209209
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21416.5">
210210
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
1818
<!-- Opt-in/out repo features -->
1919
<UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
20-
<!-- TODO: Upgrade compiler version to enable Static Abstracts in Interfaces, interpolated string handlers, and caller arg expressions; remove this once the employed SDK uses a new enough version. -->
21-
<MicrosoftNetCompilersToolsetVersion>4.0.0-4.21416.10</MicrosoftNetCompilersToolsetVersion>
2220
<UsingToolMicrosoftNetILLinkTasks>true</UsingToolMicrosoftNetILLinkTasks>
2321
<UsingToolIbcOptimization>false</UsingToolIbcOptimization>
2422
<UsingToolXliff>false</UsingToolXliff>
@@ -54,20 +52,20 @@
5452
<!-- SDK dependencies -->
5553
<MicrosoftDotNetPackageValidationVersion>1.0.0-rc.1.21404.21</MicrosoftDotNetPackageValidationVersion>
5654
<!-- Arcade dependencies -->
57-
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21413.4</MicrosoftDotNetApiCompatVersion>
58-
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21413.4</MicrosoftDotNetBuildTasksFeedVersion>
59-
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21413.4</MicrosoftDotNetCodeAnalysisVersion>
60-
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21413.4</MicrosoftDotNetGenAPIVersion>
61-
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21413.4</MicrosoftDotNetGenFacadesVersion>
62-
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21413.4</MicrosoftDotNetXUnitExtensionsVersion>
63-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21413.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
64-
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21413.4</MicrosoftDotNetBuildTasksArchivesVersion>
65-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21413.4</MicrosoftDotNetBuildTasksInstallersVersion>
66-
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21413.4</MicrosoftDotNetBuildTasksPackagingVersion>
67-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.21413.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
68-
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21413.4</MicrosoftDotNetRemoteExecutorVersion>
69-
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21413.4</MicrosoftDotNetVersionToolsTasksVersion>
70-
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21413.4</MicrosoftDotNetPackageTestingVersion>
55+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21418.12</MicrosoftDotNetApiCompatVersion>
56+
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21418.12</MicrosoftDotNetBuildTasksFeedVersion>
57+
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21418.12</MicrosoftDotNetCodeAnalysisVersion>
58+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21418.12</MicrosoftDotNetGenAPIVersion>
59+
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21418.12</MicrosoftDotNetGenFacadesVersion>
60+
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21418.12</MicrosoftDotNetXUnitExtensionsVersion>
61+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21418.12</MicrosoftDotNetXUnitConsoleRunnerVersion>
62+
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21418.12</MicrosoftDotNetBuildTasksArchivesVersion>
63+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21418.12</MicrosoftDotNetBuildTasksInstallersVersion>
64+
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21418.12</MicrosoftDotNetBuildTasksPackagingVersion>
65+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.21418.12</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
66+
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21418.12</MicrosoftDotNetRemoteExecutorVersion>
67+
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21418.12</MicrosoftDotNetVersionToolsTasksVersion>
68+
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21418.12</MicrosoftDotNetPackageTestingVersion>
7169
<!-- NuGet dependencies -->
7270
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
7371
<!-- Installer dependencies -->

‎eng/common/build.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ function InitializeCustomToolset {
187187
}
188188

189189
function Build {
190+
TryLogClientIpAddress
190191
InitializeToolset
191192
InitializeCustomToolset
192193

‎eng/common/post-build/sourcelink-validation.ps1‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ $global:RepoFiles = @{}
1717
$MaxParallelJobs = 16
1818

1919
$MaxRetries = 5
20+
$RetryWaitTimeInSeconds = 30
2021

2122
# Wait time between check for system load
2223
$SecondsBetweenLoadChecks = 10
@@ -99,9 +100,9 @@ $ValidatePackage = {
99100
$Status = 200
100101
$Cache = $using:RepoFiles
101102

102-
$totalRetries = 0
103+
$attempts = 0
103104

104-
while ($totalRetries -lt $using:MaxRetries) {
105+
while ($attempts -lt $using:MaxRetries) {
105106
if ( !($Cache.ContainsKey($FilePath)) ) {
106107
try {
107108
$Uri = $Link -as [System.URI]
@@ -113,7 +114,7 @@ $ValidatePackage = {
113114
else {
114115
# If it's not a github link, we want to break out of the loop and not retry.
115116
$Status = 0
116-
$totalRetries = $using:MaxRetries
117+
$attempts = $using:MaxRetries
117118
}
118119
}
119120
catch {
@@ -123,9 +124,15 @@ $ValidatePackage = {
123124
}
124125

125126
if ($Status -ne 200) {
126-
$totalRetries++
127+
$attempts++
127128

128-
if ($totalRetries -ge $using:MaxRetries) {
129+
if ($attempts -lt $using:MaxRetries)
130+
{
131+
$attemptsLeft = $using:MaxRetries - $attempts
132+
Write-Warning "Download failed, $attemptsLeft attempts remaining, will retry in $using:RetryWaitTimeInSeconds seconds"
133+
Start-Sleep -Seconds $using:RetryWaitTimeInSeconds
134+
}
135+
else {
129136
if ($NumFailedLinks -eq 0) {
130137
if ($FailedFiles.Value -eq 0) {
131138
Write-Host

‎eng/common/sdk-task.ps1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ try {
8383
}
8484

8585
if ($restore) {
86+
Try-LogClientIpAddress
8687
Build 'Restore'
8788
}
8889

‎eng/common/templates/job/source-index-stage1.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,24 @@ jobs:
3434
inputs:
3535
packageType: sdk
3636
version: 3.1.x
37-
38-
- script: ${{ parameters.sourceIndexBuildCommand }}
39-
displayName: Build Repository
37+
installationPath: $(Agent.TempDirectory)/dotnet
38+
workingDirectory: $(Agent.TempDirectory)
4039

4140
- script: |
42-
dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools
43-
dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools
44-
echo ##vso[task.prependpath]$(Build.SourcesDirectory)/.source-index/tools
41+
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
42+
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
4543
displayName: Download Tools
44+
# Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
45+
workingDirectory: $(Agent.TempDirectory)
46+
47+
- script: ${{ parameters.sourceIndexBuildCommand }}
48+
displayName: Build Repository
4649

47-
- script: BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
50+
- script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
4851
displayName: Process Binlog into indexable sln
49-
env:
50-
DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2
5152

5253
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
53-
- script: UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name)
54+
- script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name)
5455
displayName: Upload stage1 artifacts to source index
5556
env:
5657
BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url)
57-
DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2

‎eng/common/tools.ps1‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,9 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
154154
return $global:_DotNetInstallDir
155155
}
156156

157+
# In case of network error, try to log the current IP for reference
158+
Try-LogClientIpAddress
159+
157160
# Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
158161
$env:DOTNET_MULTILEVEL_LOOKUP=0
159162

@@ -872,3 +875,21 @@ if (!$disableConfigureToolsetImport) {
872875
}
873876
}
874877
}
878+
879+
function Try-LogClientIpAddress()
880+
{
881+
Write-Host "Attempting to log this client's IP for Azure Package feed telemetry purposes"
882+
try
883+
{
884+
$result = Invoke-WebRequest -Uri "http://co1.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing
885+
$lines = $result.Content.Split([Environment]::NewLine)
886+
$socketIp = $lines | Select-String -Pattern "^Socket IP:.*"
887+
Write-Host $socketIp
888+
$clientIp = $lines | Select-String -Pattern "^Client IP:.*"
889+
Write-Host $clientIp
890+
}
891+
catch
892+
{
893+
Write-Host "Unable to get this machine's effective IP address for logging: $_"
894+
}
895+
}

‎eng/common/tools.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,13 @@ function StopProcesses {
399399
return 0
400400
}
401401

402+
function TryLogClientIpAddress () {
403+
echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes'
404+
if command -v curl > /dev/null; then
405+
curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: '
406+
fi
407+
}
408+
402409
function MSBuild {
403410
local args=$@
404411
if [[ "$pipelines_log" == true ]]; then

‎eng/native/configurecompiler.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ if (MSVC)
573573
set(CMAKE_ASM_MASM_FLAGS "${CMAKE_ASM_MASM_FLAGS} /guard:ehcont")
574574
add_linker_flag(/guard:ehcont)
575575
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /CETCOMPAT")
576-
endif (CLR_CMAKE_HOST_ARCH_AMD64)
576+
endif (CLR_CMAKE_HOST_ARCH_AMD64 AND NOT CLR_CMAKE_RUNTIME_MONO)
577577

578578
# Statically linked CRT (libcmt[d].lib, libvcruntime[d].lib and libucrt[d].lib) by default. This is done to avoid
579579
# linking in VCRUNTIME140.DLL for a simplified xcopy experience by reducing the dependency on VC REDIST.

0 commit comments

Comments
 (0)