dotnet
/
aspnetcore-tooling
зеркало из https://github.com/dotnet/razor.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[main] Update dependencies from dotnet/arcade dotnet/aspnetcore (#4126) 

[main] Update dependencies from dotnet/arcade dotnet/aspnetcore
- Coherency Updates:
  - Microsoft.Extensions.Configuration.Json: from 6.0.0-rc.2.21420.12 to 6.0.0-rc.2.21426.5 (parent: Microsoft.CodeAnalysis.Razor)
  - Microsoft.Extensions.Logging: from 6.0.0-rc.2.21420.12 to 6.0.0-rc.2.21426.5 (parent: Microsoft.CodeAnalysis.Razor)
  - System.Diagnostics.DiagnosticSource: from 6.0.0-rc.2.21420.12 to 6.0.0-rc.2.21426.5 (parent: Microsoft.CodeAnalysis.Razor)
  - System.Resources.Extensions: from 6.0.0-rc.2.21420.12 to 6.0.0-rc.2.21426.5 (parent: Microsoft.CodeAnalysis.Razor)
  - System.Text.Encodings.Web: from 6.0.0-rc.2.21420.12 to 6.0.0-rc.2.21426.5 (parent: Microsoft.CodeAnalysis.Razor)
  - Microsoft.Extensions.DependencyModel: from 6.0.0-rc.2.21420.12 to 6.0.0-rc.2.21426.5 (parent: Microsoft.CodeAnalysis.Razor)
  - Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21420.12 to 6.0.0-rc.2.21426.5 (parent: Microsoft.CodeAnalysis.Razor)
  - Microsoft.NETCore.BrowserDebugHost.Transport: from 6.0.0-rc.2.21420.12 to 6.0.0-rc.2.21426.5 (parent: Microsoft.CodeAnalysis.Razor)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21420.12 to 6.0.0-rc.2.21426.5 (parent: Microsoft.CodeAnalysis.Razor)
  - Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21420.12 to 6.0.0-rc.2.21426.5 (parent: Microsoft.CodeAnalysis.Razor)
This commit is contained in:
dotnet-maestro[bot] 2021-08-26 22:10:10 +00:00 коммит произвёл GitHub
Родитель af3804b015
Коммит b814854095
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
11 изменённых файлов: 111 добавлений и 75 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

72
eng/Version.Details.xml
Просмотреть файл

@ -1,88 +1,88 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Dependencies> <Dependencies>
<ProductDependencies> <ProductDependencies>
<Dependency Name="Microsoft.CodeAnalysis.Razor" Version="6.0.0-rc.2.21420.26"> <Dependency Name="Microsoft.CodeAnalysis.Razor" Version="6.0.0-rc.2.21426.18">
<Uri>https://github.com/dotnet/aspnetcore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>51deae0b18ab779e227b31688a6157441027ea15</Sha> <Sha>744af456f4a0b364c77c31db5c81f468af2c69d5</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.Razor.Internal.Transport" Version="6.0.0-rc.2.21420.26"> <Dependency Name="Microsoft.AspNetCore.Razor.Internal.Transport" Version="6.0.0-rc.2.21426.18">
<Uri>https://github.com/dotnet/aspnetcore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>51deae0b18ab779e227b31688a6157441027ea15</Sha> <Sha>744af456f4a0b364c77c31db5c81f468af2c69d5</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="6.0.0-rc.2.21420.26"> <Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="6.0.0-rc.2.21426.18">
<Uri>https://github.com/dotnet/aspnetcore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>51deae0b18ab779e227b31688a6157441027ea15</Sha> <Sha>744af456f4a0b364c77c31db5c81f468af2c69d5</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.Testing" Version="6.0.0-rc.2.21420.26"> <Dependency Name="Microsoft.AspNetCore.Testing" Version="6.0.0-rc.2.21426.18">
<Uri>https://github.com/dotnet/aspnetcore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>51deae0b18ab779e227b31688a6157441027ea15</Sha> <Sha>744af456f4a0b364c77c31db5c81f468af2c69d5</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="6.0.0-rc.2.21420.26"> <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="6.0.0-rc.2.21426.18">
<Uri>https://github.com/dotnet/aspnetcore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>51deae0b18ab779e227b31688a6157441027ea15</Sha> <Sha>744af456f4a0b364c77c31db5c81f468af2c69d5</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X" Version="6.0.0-rc.2.21420.26"> <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X" Version="6.0.0-rc.2.21426.18">
<Uri>https://github.com/dotnet/aspnetcore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>51deae0b18ab779e227b31688a6157441027ea15</Sha> <Sha>744af456f4a0b364c77c31db5c81f468af2c69d5</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X" Version="6.0.0-rc.2.21420.26"> <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X" Version="6.0.0-rc.2.21426.18">
<Uri>https://github.com/dotnet/aspnetcore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>51deae0b18ab779e227b31688a6157441027ea15</Sha> <Sha>744af456f4a0b364c77c31db5c81f468af2c69d5</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="6.0.0-rc.2.21420.12" CoherentParentDependency="Microsoft.CodeAnalysis.Razor"> <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="6.0.0-rc.2.21426.5" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9f8f736d3533c76aa1689d44a6ade9090a53d403</Sha> <Sha>155a334005294dbac979851a97783476a8b15517</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-rc.2.21420.12" CoherentParentDependency="Microsoft.CodeAnalysis.Razor"> <Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-rc.2.21426.5" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9f8f736d3533c76aa1689d44a6ade9090a53d403</Sha> <Sha>155a334005294dbac979851a97783476a8b15517</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Sdk.Razor" Version="6.0.0-alpha.1.21072.5"> <Dependency Name="Microsoft.NET.Sdk.Razor" Version="6.0.0-alpha.1.21072.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>20b6779cf3af2fed6a8fe64a0865cfab50b776bb</Sha> <Sha>20b6779cf3af2fed6a8fe64a0865cfab50b776bb</Sha>
</Dependency> </Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0-rc.2.21420.12" CoherentParentDependency="Microsoft.CodeAnalysis.Razor"> <Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0-rc.2.21426.5" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9f8f736d3533c76aa1689d44a6ade9090a53d403</Sha> <Sha>155a334005294dbac979851a97783476a8b15517</Sha>
</Dependency> </Dependency>
<Dependency Name="System.Resources.Extensions" Version="6.0.0-rc.2.21420.12" CoherentParentDependency="Microsoft.CodeAnalysis.Razor"> <Dependency Name="System.Resources.Extensions" Version="6.0.0-rc.2.21426.5" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9f8f736d3533c76aa1689d44a6ade9090a53d403</Sha> <Sha>155a334005294dbac979851a97783476a8b15517</Sha>
</Dependency> </Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="6.0.0-rc.2.21420.12" CoherentParentDependency="Microsoft.CodeAnalysis.Razor"> <Dependency Name="System.Text.Encodings.Web" Version="6.0.0-rc.2.21426.5" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9f8f736d3533c76aa1689d44a6ade9090a53d403</Sha> <Sha>155a334005294dbac979851a97783476a8b15517</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-rc.2.21420.12" CoherentParentDependency="Microsoft.CodeAnalysis.Razor"> <Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-rc.2.21426.5" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9f8f736d3533c76aa1689d44a6ade9090a53d403</Sha> <Sha>155a334005294dbac979851a97783476a8b15517</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-rc.2.21420.12" CoherentParentDependency="Microsoft.CodeAnalysis.Razor"> <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-rc.2.21426.5" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9f8f736d3533c76aa1689d44a6ade9090a53d403</Sha> <Sha>155a334005294dbac979851a97783476a8b15517</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.0-rc.2.21420.12" CoherentParentDependency="Microsoft.CodeAnalysis.Razor"> <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.0-rc.2.21426.5" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9f8f736d3533c76aa1689d44a6ade9090a53d403</Sha> <Sha>155a334005294dbac979851a97783476a8b15517</Sha>
</Dependency> </Dependency>
<!-- <!--
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime. Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
All Runtime.$rid packages should have the same version. All Runtime.$rid packages should have the same version.
--> -->
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-rc.2.21420.12" CoherentParentDependency="Microsoft.CodeAnalysis.Razor"> <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-rc.2.21426.5" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9f8f736d3533c76aa1689d44a6ade9090a53d403</Sha> <Sha>155a334005294dbac979851a97783476a8b15517</Sha>
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<!-- Listed as a dependency to workaround https://github.com/dotnet/cli/issues/10528 --> <!-- Listed as a dependency to workaround https://github.com/dotnet/cli/issues/10528 -->
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-rc.2.21420.12" CoherentParentDependency="Microsoft.CodeAnalysis.Razor"> <Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-rc.2.21426.5" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9f8f736d3533c76aa1689d44a6ade9090a53d403</Sha> <Sha>155a334005294dbac979851a97783476a8b15517</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21412.1"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21420.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>58ac7035021bd7277ef7582338afd25403fc9aea</Sha> <Sha>fe787bd48ed72e51a98eb5e4e5e5af74edb531e5</Sha>
</Dependency> </Dependency>
</ToolsetDependencies> </ToolsetDependencies>
</Dependencies> </Dependencies>

34
eng/Versions.props
Просмотреть файл

@ -49,24 +49,24 @@
--> -->
<PropertyGroup Label="Automated"> <PropertyGroup Label="Automated">
<MicrosoftCodeAnalysisRazorPackageVersion>6.0.0-rc.2.21420.26</MicrosoftCodeAnalysisRazorPackageVersion> <MicrosoftCodeAnalysisRazorPackageVersion>6.0.0-rc.2.21426.18</MicrosoftCodeAnalysisRazorPackageVersion>
<MicrosoftAspNetCoreRazorInternalTransportPackageVersion>6.0.0-rc.2.21420.26</MicrosoftAspNetCoreRazorInternalTransportPackageVersion> <MicrosoftAspNetCoreRazorInternalTransportPackageVersion>6.0.0-rc.2.21426.18</MicrosoftAspNetCoreRazorInternalTransportPackageVersion>
<MicrosoftAspNetCoreRazorLanguagePackageVersion>6.0.0-rc.2.21420.26</MicrosoftAspNetCoreRazorLanguagePackageVersion> <MicrosoftAspNetCoreRazorLanguagePackageVersion>6.0.0-rc.2.21426.18</MicrosoftAspNetCoreRazorLanguagePackageVersion>
<MicrosoftAspNetCoreTestingPackageVersion>6.0.0-rc.2.21420.26</MicrosoftAspNetCoreTestingPackageVersion> <MicrosoftAspNetCoreTestingPackageVersion>6.0.0-rc.2.21426.18</MicrosoftAspNetCoreTestingPackageVersion>
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>6.0.0-rc.2.21420.26</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion> <MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>6.0.0-rc.2.21426.18</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
<MicrosoftAspNetCoreMvcRazorExtensionsVersion1_XPackageVersion>6.0.0-rc.2.21420.26</MicrosoftAspNetCoreMvcRazorExtensionsVersion1_XPackageVersion> <MicrosoftAspNetCoreMvcRazorExtensionsVersion1_XPackageVersion>6.0.0-rc.2.21426.18</MicrosoftAspNetCoreMvcRazorExtensionsVersion1_XPackageVersion>
<MicrosoftAspNetCoreMvcRazorExtensionsVersion2_XPackageVersion>6.0.0-rc.2.21420.26</MicrosoftAspNetCoreMvcRazorExtensionsVersion2_XPackageVersion> <MicrosoftAspNetCoreMvcRazorExtensionsVersion2_XPackageVersion>6.0.0-rc.2.21426.18</MicrosoftAspNetCoreMvcRazorExtensionsVersion2_XPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>6.0.0-rc.2.21420.12</MicrosoftExtensionsConfigurationJsonPackageVersion> <MicrosoftExtensionsConfigurationJsonPackageVersion>6.0.0-rc.2.21426.5</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-rc.2.21420.12</MicrosoftExtensionsDependencyModelPackageVersion> <MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-rc.2.21426.5</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>6.0.0-rc.2.21420.12</MicrosoftExtensionsLoggingPackageVersion> <MicrosoftExtensionsLoggingPackageVersion>6.0.0-rc.2.21426.5</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>6.0.0-rc.2.21420.12</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion> <MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>6.0.0-rc.2.21426.5</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-rc.2.21420.12</MicrosoftNETCoreAppRefPackageVersion> <MicrosoftNETCoreAppRefPackageVersion>6.0.0-rc.2.21426.5</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-rc.2.21420.12</MicrosoftNETCoreAppRuntimewinx64PackageVersion> <MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-rc.2.21426.5</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>6.0.0-rc.2.21420.12</MicrosoftNETCorePlatformsPackageVersion> <MicrosoftNETCorePlatformsPackageVersion>6.0.0-rc.2.21426.5</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETSdkRazorPackageVersion>6.0.0-alpha.1.21072.5</MicrosoftNETSdkRazorPackageVersion> <MicrosoftNETSdkRazorPackageVersion>6.0.0-alpha.1.21072.5</MicrosoftNETSdkRazorPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>6.0.0-rc.2.21420.12</SystemDiagnosticsDiagnosticSourcePackageVersion> <SystemDiagnosticsDiagnosticSourcePackageVersion>6.0.0-rc.2.21426.5</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemResourcesExtensionsPackageVersion>6.0.0-rc.2.21420.12</SystemResourcesExtensionsPackageVersion> <SystemResourcesExtensionsPackageVersion>6.0.0-rc.2.21426.5</SystemResourcesExtensionsPackageVersion>
<SystemTextEncodingsWebPackageVersion>6.0.0-rc.2.21420.12</SystemTextEncodingsWebPackageVersion> <SystemTextEncodingsWebPackageVersion>6.0.0-rc.2.21426.5</SystemTextEncodingsWebPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="Dependency version settings"> <PropertyGroup Label="Dependency version settings">
<!-- <!--

1
eng/common/build.sh
Просмотреть файл

@ -187,6 +187,7 @@ function InitializeCustomToolset {
} }
function Build { function Build {
TryLogClientIpAddress
InitializeToolset InitializeToolset
InitializeCustomToolset InitializeCustomToolset

2
eng/common/init-tools-native.sh
Просмотреть файл

@ -10,7 +10,7 @@ force=false
download_retries=5 download_retries=5
retry_wait_time_seconds=30 retry_wait_time_seconds=30
global_json_file="$(dirname "$(dirname "${scriptroot}")")/global.json" global_json_file="$(dirname "$(dirname "${scriptroot}")")/global.json"
declare -A native_assets declare -a native_assets
. $scriptroot/pipeline-logging-functions.sh . $scriptroot/pipeline-logging-functions.sh
. $scriptroot/native/common-library.sh . $scriptroot/native/common-library.sh

4
eng/common/native/common-library.sh
Просмотреть файл

@ -147,10 +147,14 @@ function NewScriptShim {
fi fi
fi fi
if [[ ! -f $tool_file_path ]]; then
# try to see if the path is lower cased
tool_file_path="$(echo $tool_file_path | tr "[:upper:]" "[:lower:]")"
if [[ ! -f $tool_file_path ]]; then if [[ ! -f $tool_file_path ]]; then
Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Specified tool file path:'$tool_file_path' does not exist" Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Specified tool file path:'$tool_file_path' does not exist"
return 1 return 1
fi fi
fi
local shim_contents=$'#!/usr/bin/env bash\n' local shim_contents=$'#!/usr/bin/env bash\n'
shim_contents+="SHIMARGS="$'$1\n' shim_contents+="SHIMARGS="$'$1\n'

17
eng/common/post-build/sourcelink-validation.ps1
Просмотреть файл

@ -17,6 +17,7 @@ $global:RepoFiles = @{}
$MaxParallelJobs = 16 $MaxParallelJobs = 16
$MaxRetries = 5 $MaxRetries = 5
$RetryWaitTimeInSeconds = 30
# Wait time between check for system load # Wait time between check for system load
$SecondsBetweenLoadChecks = 10 $SecondsBetweenLoadChecks = 10
@ -99,9 +100,9 @@ $ValidatePackage = {
$Status = 200 $Status = 200
$Cache = $using:RepoFiles $Cache = $using:RepoFiles
$totalRetries = 0 $attempts = 0
while ($totalRetries -lt $using:MaxRetries) { while ($attempts -lt $using:MaxRetries) {
if ( !($Cache.ContainsKey($FilePath)) ) { if ( !($Cache.ContainsKey($FilePath)) ) {
try { try {
$Uri = $Link -as [System.URI] $Uri = $Link -as [System.URI]
@ -113,7 +114,7 @@ $ValidatePackage = {
else { else {
# If it's not a github link, we want to break out of the loop and not retry. # If it's not a github link, we want to break out of the loop and not retry.
$Status = 0 $Status = 0
$totalRetries = $using:MaxRetries $attempts = $using:MaxRetries
} }
} }
catch { catch {
@ -123,9 +124,15 @@ $ValidatePackage = {
} }
if ($Status -ne 200) { if ($Status -ne 200) {
$totalRetries++ $attempts++
if ($totalRetries -ge $using:MaxRetries) { if ($attempts -lt $using:MaxRetries)
{
$attemptsLeft = $using:MaxRetries - $attempts
Write-Warning "Download failed, $attemptsLeft attempts remaining, will retry in $using:RetryWaitTimeInSeconds seconds"
Start-Sleep -Seconds $using:RetryWaitTimeInSeconds
}
else {
if ($NumFailedLinks -eq 0) { if ($NumFailedLinks -eq 0) {
if ($FailedFiles.Value -eq 0) { if ($FailedFiles.Value -eq 0) {
Write-Host Write-Host

1
eng/common/sdk-task.ps1
Просмотреть файл

@ -83,6 +83,7 @@ try {
} }
if ($restore) { if ($restore) {
Try-LogClientIpAddress
Build 'Restore' Build 'Restore'
} }

21
eng/common/templates/job/source-index-stage1.yml
Просмотреть файл

@ -34,29 +34,24 @@ jobs:
inputs: inputs:
packageType: sdk packageType: sdk
version: 3.1.x version: 3.1.x
installationPath: $(Agent.TempDirectory)/dotnet
- task: UseDotNet@2 workingDirectory: $(Agent.TempDirectory)
displayName: Use .NET Core sdk
inputs:
useGlobalJson: true
- script: | - script: |
dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
echo ##vso[task.prependpath]$(Build.SourcesDirectory)/.source-index/tools
displayName: Download Tools displayName: Download Tools
# Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
workingDirectory: $(Agent.TempDirectory)
- script: ${{ parameters.sourceIndexBuildCommand }} - script: ${{ parameters.sourceIndexBuildCommand }}
displayName: Build Repository displayName: Build Repository
- script: BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
displayName: Process Binlog into indexable sln displayName: Process Binlog into indexable sln
env:
DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- script: UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name)
displayName: Upload stage1 artifacts to source index displayName: Upload stage1 artifacts to source index
env: env:
BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url)
DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2

21
eng/common/tools.ps1
Просмотреть файл

@ -154,6 +154,9 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
return $global:_DotNetInstallDir return $global:_DotNetInstallDir
} }
# In case of network error, try to log the current IP for reference
Try-LogClientIpAddress
# Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
$env:DOTNET_MULTILEVEL_LOOKUP=0 $env:DOTNET_MULTILEVEL_LOOKUP=0
@ -872,3 +875,21 @@ 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://co1.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: $_"
}
}

7
eng/common/tools.sh
Просмотреть файл

@ -399,6 +399,13 @@ function StopProcesses {
return 0 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://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: '
fi
}
function MSBuild { function MSBuild {
local args=$@ local args=$@
if [[ "$pipelines_log" == true ]]; then if [[ "$pipelines_log" == true ]]; then

2
global.json
Просмотреть файл

@ -18,7 +18,7 @@
"version": "6.0.100-rc.1.21379.2" "version": "6.0.100-rc.1.21379.2"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21412.1", "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21420.4",
"Yarn.MSBuild": "1.22.10" "Yarn.MSBuild": "1.22.10"
} }
} }