Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from 8 repositories #61668

Merged
merged 34 commits into from
Nov 26, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
7b780a8
Update dependencies from https://github.com/dotnet/icu build 20211115.1
dotnet-maestro[bot] Nov 16, 2021
792e334
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Nov 16, 2021
d717887
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Nov 16, 2021
e5a070b
Update dependencies from https://github.com/dotnet/llvm-project build…
dotnet-maestro[bot] Nov 16, 2021
7b8f19b
Update dependencies from https://github.com/dotnet/arcade build 20211…
dotnet-maestro[bot] Nov 17, 2021
48ba17c
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Nov 17, 2021
4277827
Update dependencies from https://github.com/dotnet/roslyn-analyzers b…
dotnet-maestro[bot] Nov 18, 2021
e7184dd
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Nov 19, 2021
56e0c85
Update dependencies from https://github.com/dotnet/arcade build 20211…
dotnet-maestro[bot] Nov 19, 2021
74252a2
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-maestro[bot] Nov 20, 2021
241ba6e
Update dependencies from https://github.com/dotnet/arcade build 20211…
dotnet-maestro[bot] Nov 20, 2021
151c72a
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Nov 20, 2021
80329c7
Update dependencies from https://github.com/dotnet/roslyn-analyzers b…
dotnet-maestro[bot] Nov 21, 2021
18e8d6e
Merge branch 'main' into darc-main-5b62648d-a2f2-4e9a-a1dd-0947b36b1053
premun Nov 22, 2021
baf665b
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Nov 22, 2021
fc4df90
Update dependencies from https://github.com/dotnet/roslyn-analyzers b…
dotnet-maestro[bot] Nov 22, 2021
a3a7afc
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Nov 22, 2021
7b5956a
Merge remote-tracking branch 'dotnet/main' into darc-main-5b62648d-a2…
premun Nov 23, 2021
9b9822c
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Nov 23, 2021
14073a4
Update dependencies from https://github.com/dotnet/roslyn-analyzers b…
dotnet-maestro[bot] Nov 23, 2021
b399878
Merge branch 'main' into darc-main-5b62648d-a2f2-4e9a-a1dd-0947b36b1053
premun Nov 24, 2021
9740b9e
Update dependencies from https://github.com/dotnet/arcade build 20211…
dotnet-maestro[bot] Nov 24, 2021
657e5f9
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Nov 24, 2021
ac7bf34
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Nov 24, 2021
6f5eec5
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Nov 24, 2021
41cbb3c
Merge branch 'main' into darc-main-5b62648d-a2f2-4e9a-a1dd-0947b36b1053
premun Nov 24, 2021
a069f1f
Update dependencies from https://github.com/dotnet/arcade build 20211…
dotnet-maestro[bot] Nov 25, 2021
227872d
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-maestro[bot] Nov 25, 2021
d9e414c
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Nov 25, 2021
7cf3df2
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Nov 25, 2021
39a1d22
Update dependencies from https://github.com/dotnet/arcade build 20211…
dotnet-maestro[bot] Nov 26, 2021
283c9df
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Nov 26, 2021
261af71
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Nov 26, 2021
3a795ef
Update arcade
akoeplinger Nov 26, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update dependencies from https://github.com/dotnet/arcade build 20211…
…123.3

Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , 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 7.0.0-beta.21559.3 -> To Version 7.0.0-beta.21573.3
  • Loading branch information
dotnet-maestro[bot] committed Nov 24, 2021
commit 9740b9e6dde1005e6309c4d2cb8a7b7901ea477a
76 changes: 38 additions & 38 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,77 +18,77 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21569.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21573.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21569.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21573.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.21569.2">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.21573.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.21569.2">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.21573.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.21569.2">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.21573.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.21569.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.21573.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21569.2">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21573.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.21569.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.21573.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.21569.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.21573.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21569.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21573.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.21569.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.21573.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.21569.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.21573.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.21569.2">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.21573.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="7.0.0-beta.21569.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="7.0.0-beta.21573.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.21569.2">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.21573.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.21569.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.21573.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.21569.2">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.21573.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.21569.2">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.21573.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
<Uri>https://github.com/microsoft/vstest</Uri>
Expand Down Expand Up @@ -210,9 +210,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>3ea1f36d9a82e31729a941cfde5fc2dda9e29f6a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.21569.2">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.21573.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21569.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
30 changes: 15 additions & 15 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -57,21 +57,21 @@
<!-- SDK dependencies -->
<MicrosoftDotNetCompatibilityVersion>2.0.0-alpha.1.21525.11</MicrosoftDotNetCompatibilityVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.21569.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.21569.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.21569.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.21569.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.21569.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.21569.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21569.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.21569.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.21569.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.21569.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.21569.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.21569.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.21569.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.21569.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.21569.2</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.21573.3</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.21573.3</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.21573.3</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.21573.3</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.21573.3</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.21573.3</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21573.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.21573.3</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.21573.3</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.21573.3</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.21573.3</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.21573.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.21573.3</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.21573.3</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.21573.3</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
4 changes: 0 additions & 4 deletions eng/common/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,6 @@ function InitializeCustomToolset {
}

function Build {

if [[ "$ci" == true ]]; then
TryLogClientIpAddress
fi
InitializeToolset
InitializeCustomToolset

Expand Down
2 changes: 1 addition & 1 deletion eng/common/native/init-compiler.sh
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ if [[ -z "$CC" ]]; then
fi

if [[ "$compiler" == "clang" ]]; then
if command -v "lld$desired_version" > /dev/null; then
if "$CC" -fuse-ld=lld -Wl,--version 2>&1; then
# Only lld version >= 9 can be considered stable
if [[ "$majorVersion" -ge 9 ]]; then
LDFLAGS="-fuse-ld=lld"
Expand Down
3 changes: 0 additions & 3 deletions eng/common/sdk-task.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,6 @@ try {
}

if ($restore) {
if ($ci) {
Try-LogClientIpAddress
}
Build 'Restore'
}

Expand Down
1 change: 1 addition & 0 deletions eng/common/templates/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ jobs:
continueOnError: ${{ parameters.continueOnError }}
condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))

- ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
- task: NuGetAuthenticate@0

- ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}:
Expand Down
21 changes: 0 additions & 21 deletions eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
# Disable telemetry on CI.
if ($ci) {
$env:DOTNET_CLI_TELEMETRY_OPTOUT=1

# In case of network error, try to log the current IP for reference
Try-LogClientIpAddress
}

# Source Build uses DotNetCoreSdkDir variable
Expand Down Expand Up @@ -895,24 +892,6 @@ if (!$disableConfigureToolsetImport) {
}
}

function Try-LogClientIpAddress()
{
Write-Host "Attempting to log this client's IP for Azure Package feed telemetry purposes"
try
{
$result = Invoke-WebRequest -Uri "http://co1r5a.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing
$lines = $result.Content.Split([Environment]::NewLine)
$socketIp = $lines | Select-String -Pattern "^Socket IP:.*"
Write-Host $socketIp
$clientIp = $lines | Select-String -Pattern "^Client IP:.*"
Write-Host $clientIp
}
catch
{
Write-Host "Unable to get this machine's effective IP address for logging: $_"
}
}

#
# If $ci flag is set, turn on (and log that we did) special environment variables for improved Nuget client retry logic.
#
Expand Down
7 changes: 0 additions & 7 deletions eng/common/tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -405,13 +405,6 @@ function StopProcesses {
return 0
}

function TryLogClientIpAddress () {
echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes'
if command -v curl > /dev/null; then
curl -s 'http://co1r5a.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true
fi
}

function MSBuild {
local args=$@
if [[ "$pipelines_log" == true ]]; then
Expand Down
12 changes: 6 additions & 6 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
"sdk": {
"version": "6.0.100-rc.2.21505.57",
"version": "6.0.100",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "6.0.100-rc.2.21505.57"
"dotnet": "6.0.100"
},
"native-tools": {
"cmake": "3.16.4",
"python3": "3.7.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21569.2",
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21569.2",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21569.2",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21569.2",
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21573.3",
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21573.3",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21573.3",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21573.3",
"Microsoft.Build.NoTargets": "3.1.0",
"Microsoft.Build.Traversal": "3.0.23",
"Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21562.1"
Expand Down