зеркало из https://github.com/dotnet/razor.git
[main] Update dependencies from dotnet/arcade dotnet/aspnetcore (#4175)
[main] Update dependencies from dotnet/arcade dotnet/aspnetcore - Coherency Updates: - Microsoft.Extensions.Configuration.Json: from 6.0.0-rc.2.21430.7 to 6.0.0-rc.2.21466.4 (parent: Microsoft.CodeAnalysis.Razor) - Microsoft.Extensions.Logging: from 6.0.0-rc.2.21430.7 to 6.0.0-rc.2.21466.4 (parent: Microsoft.CodeAnalysis.Razor) - System.Diagnostics.DiagnosticSource: from 6.0.0-rc.2.21430.7 to 6.0.0-rc.2.21466.4 (parent: Microsoft.CodeAnalysis.Razor) - System.Resources.Extensions: from 6.0.0-rc.2.21430.7 to 6.0.0-rc.2.21466.4 (parent: Microsoft.CodeAnalysis.Razor) - System.Text.Encodings.Web: from 6.0.0-rc.2.21430.7 to 6.0.0-rc.2.21466.4 (parent: Microsoft.CodeAnalysis.Razor) - Microsoft.Extensions.DependencyModel: from 6.0.0-rc.2.21430.7 to 6.0.0-rc.2.21466.4 (parent: Microsoft.CodeAnalysis.Razor) - Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21430.7 to 6.0.0-rc.2.21466.4 (parent: Microsoft.CodeAnalysis.Razor) - Microsoft.NETCore.BrowserDebugHost.Transport: from 6.0.0-rc.2.21430.7 to 6.0.0-rc.2.21466.4 (parent: Microsoft.CodeAnalysis.Razor) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21430.7 to 6.0.0-rc.2.21466.4 (parent: Microsoft.CodeAnalysis.Razor) - Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21430.7 to 6.0.0-rc.2.21466.4 (parent: Microsoft.CodeAnalysis.Razor) - Try removing source generator - Update src/Razor/src/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com> - Update src/Razor/src/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
This commit is contained in:
dotnet-maestro[bot]
GitHub
Родитель
3fa73e7f2f
Коммит
88b348bfd7
|
|
@ -1,88 +1,88 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Dependencies>
|
||||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.CodeAnalysis.Razor" Version="6.0.0-rc.2.21430.16">
|
||||
<Dependency Name="Microsoft.CodeAnalysis.Razor" Version="6.0.0-rtm.21467.1">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>4bddb009bbd2147930382adde7842eedc7037581</Sha>
|
||||
<Sha>2fb20b4415cf1402ec437c081d79d8466c6d4e1d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.Razor.Internal.Transport" Version="6.0.0-rc.2.21430.16">
|
||||
<Dependency Name="Microsoft.AspNetCore.Razor.Internal.Transport" Version="6.0.0-rtm.21467.1">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>4bddb009bbd2147930382adde7842eedc7037581</Sha>
|
||||
<Sha>2fb20b4415cf1402ec437c081d79d8466c6d4e1d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="6.0.0-rc.2.21430.16">
|
||||
<Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="6.0.0-rtm.21467.1">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>4bddb009bbd2147930382adde7842eedc7037581</Sha>
|
||||
<Sha>2fb20b4415cf1402ec437c081d79d8466c6d4e1d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.Testing" Version="6.0.0-rc.2.21430.16">
|
||||
<Dependency Name="Microsoft.AspNetCore.Testing" Version="6.0.0-rtm.21467.1">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>4bddb009bbd2147930382adde7842eedc7037581</Sha>
|
||||
<Sha>2fb20b4415cf1402ec437c081d79d8466c6d4e1d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="6.0.0-rc.2.21430.16">
|
||||
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="6.0.0-rtm.21467.1">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>4bddb009bbd2147930382adde7842eedc7037581</Sha>
|
||||
<Sha>2fb20b4415cf1402ec437c081d79d8466c6d4e1d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X" Version="6.0.0-rc.2.21430.16">
|
||||
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X" Version="6.0.0-rtm.21467.1">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>4bddb009bbd2147930382adde7842eedc7037581</Sha>
|
||||
<Sha>2fb20b4415cf1402ec437c081d79d8466c6d4e1d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X" Version="6.0.0-rc.2.21430.16">
|
||||
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X" Version="6.0.0-rtm.21467.1">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>4bddb009bbd2147930382adde7842eedc7037581</Sha>
|
||||
<Sha>2fb20b4415cf1402ec437c081d79d8466c6d4e1d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="6.0.0-rc.2.21430.7" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="6.0.0-rc.2.21466.4" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>bead375240a5dd0abcfac4b1a2327440113b747c</Sha>
|
||||
<Sha>0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-rc.2.21430.7" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-rc.2.21466.4" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>bead375240a5dd0abcfac4b1a2327440113b747c</Sha>
|
||||
<Sha>0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk.Razor" Version="6.0.0-alpha.1.21072.5">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>20b6779cf3af2fed6a8fe64a0865cfab50b776bb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0-rc.2.21430.7" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0-rc.2.21466.4" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>bead375240a5dd0abcfac4b1a2327440113b747c</Sha>
|
||||
<Sha>0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Resources.Extensions" Version="6.0.0-rc.2.21430.7" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Dependency Name="System.Resources.Extensions" Version="6.0.0-rc.2.21466.4" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>bead375240a5dd0abcfac4b1a2327440113b747c</Sha>
|
||||
<Sha>0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Text.Encodings.Web" Version="6.0.0-rc.2.21430.7" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Dependency Name="System.Text.Encodings.Web" Version="6.0.0-rc.2.21466.4" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>bead375240a5dd0abcfac4b1a2327440113b747c</Sha>
|
||||
<Sha>0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-rc.2.21430.7" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-rc.2.21466.4" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>bead375240a5dd0abcfac4b1a2327440113b747c</Sha>
|
||||
<Sha>0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-rc.2.21430.7" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-rc.2.21466.4" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>bead375240a5dd0abcfac4b1a2327440113b747c</Sha>
|
||||
<Sha>0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.0-rc.2.21430.7" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.0-rc.2.21466.4" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>bead375240a5dd0abcfac4b1a2327440113b747c</Sha>
|
||||
<Sha>0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb</Sha>
|
||||
</Dependency>
|
||||
<!--
|
||||
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.
|
||||
-->
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-rc.2.21430.7" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-rc.2.21466.4" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>bead375240a5dd0abcfac4b1a2327440113b747c</Sha>
|
||||
<Sha>0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb</Sha>
|
||||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<!-- Listed as a dependency to workaround https://github.com/dotnet/cli/issues/10528 -->
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-rc.2.21430.7" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-rc.2.21466.4" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>bead375240a5dd0abcfac4b1a2327440113b747c</Sha>
|
||||
<Sha>0bc0c0ac28e74b5d107781a3caa456f9ef2be4bb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21427.6">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21459.5">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
|
||||
<Sha>fa4a48044d33222537e6dbd000f8a2adaa7a15c7</Sha>
|
||||
</Dependency>
|
||||
</ToolsetDependencies>
|
||||
</Dependencies>
|
||||
|
|
|
|||
|
|
@ -49,24 +49,24 @@
|
|||
|
||||
-->
|
||||
<PropertyGroup Label="Automated">
|
||||
<MicrosoftCodeAnalysisRazorPackageVersion>6.0.0-rc.2.21430.16</MicrosoftCodeAnalysisRazorPackageVersion>
|
||||
<MicrosoftAspNetCoreRazorInternalTransportPackageVersion>6.0.0-rc.2.21430.16</MicrosoftAspNetCoreRazorInternalTransportPackageVersion>
|
||||
<MicrosoftAspNetCoreRazorLanguagePackageVersion>6.0.0-rc.2.21430.16</MicrosoftAspNetCoreRazorLanguagePackageVersion>
|
||||
<MicrosoftAspNetCoreTestingPackageVersion>6.0.0-rc.2.21430.16</MicrosoftAspNetCoreTestingPackageVersion>
|
||||
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>6.0.0-rc.2.21430.16</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
|
||||
<MicrosoftAspNetCoreMvcRazorExtensionsVersion1_XPackageVersion>6.0.0-rc.2.21430.16</MicrosoftAspNetCoreMvcRazorExtensionsVersion1_XPackageVersion>
|
||||
<MicrosoftAspNetCoreMvcRazorExtensionsVersion2_XPackageVersion>6.0.0-rc.2.21430.16</MicrosoftAspNetCoreMvcRazorExtensionsVersion2_XPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationJsonPackageVersion>6.0.0-rc.2.21430.7</MicrosoftExtensionsConfigurationJsonPackageVersion>
|
||||
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-rc.2.21430.7</MicrosoftExtensionsDependencyModelPackageVersion>
|
||||
<MicrosoftExtensionsLoggingPackageVersion>6.0.0-rc.2.21430.7</MicrosoftExtensionsLoggingPackageVersion>
|
||||
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>6.0.0-rc.2.21430.7</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-rc.2.21430.7</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-rc.2.21430.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCorePlatformsPackageVersion>6.0.0-rc.2.21430.7</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<MicrosoftCodeAnalysisRazorPackageVersion>6.0.0-rtm.21467.1</MicrosoftCodeAnalysisRazorPackageVersion>
|
||||
<MicrosoftAspNetCoreRazorInternalTransportPackageVersion>6.0.0-rtm.21467.1</MicrosoftAspNetCoreRazorInternalTransportPackageVersion>
|
||||
<MicrosoftAspNetCoreRazorLanguagePackageVersion>6.0.0-rtm.21467.1</MicrosoftAspNetCoreRazorLanguagePackageVersion>
|
||||
<MicrosoftAspNetCoreTestingPackageVersion>6.0.0-rtm.21467.1</MicrosoftAspNetCoreTestingPackageVersion>
|
||||
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>6.0.0-rtm.21467.1</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
|
||||
<MicrosoftAspNetCoreMvcRazorExtensionsVersion1_XPackageVersion>6.0.0-rtm.21467.1</MicrosoftAspNetCoreMvcRazorExtensionsVersion1_XPackageVersion>
|
||||
<MicrosoftAspNetCoreMvcRazorExtensionsVersion2_XPackageVersion>6.0.0-rtm.21467.1</MicrosoftAspNetCoreMvcRazorExtensionsVersion2_XPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationJsonPackageVersion>6.0.0-rc.2.21466.4</MicrosoftExtensionsConfigurationJsonPackageVersion>
|
||||
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-rc.2.21466.4</MicrosoftExtensionsDependencyModelPackageVersion>
|
||||
<MicrosoftExtensionsLoggingPackageVersion>6.0.0-rc.2.21466.4</MicrosoftExtensionsLoggingPackageVersion>
|
||||
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>6.0.0-rc.2.21466.4</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-rc.2.21466.4</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-rc.2.21466.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCorePlatformsPackageVersion>6.0.0-rc.2.21466.4</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<MicrosoftNETSdkRazorPackageVersion>6.0.0-alpha.1.21072.5</MicrosoftNETSdkRazorPackageVersion>
|
||||
<SystemDiagnosticsDiagnosticSourcePackageVersion>6.0.0-rc.2.21430.7</SystemDiagnosticsDiagnosticSourcePackageVersion>
|
||||
<SystemResourcesExtensionsPackageVersion>6.0.0-rc.2.21430.7</SystemResourcesExtensionsPackageVersion>
|
||||
<SystemTextEncodingsWebPackageVersion>6.0.0-rc.2.21430.7</SystemTextEncodingsWebPackageVersion>
|
||||
<SystemDiagnosticsDiagnosticSourcePackageVersion>6.0.0-rc.2.21466.4</SystemDiagnosticsDiagnosticSourcePackageVersion>
|
||||
<SystemResourcesExtensionsPackageVersion>6.0.0-rc.2.21466.4</SystemResourcesExtensionsPackageVersion>
|
||||
<SystemTextEncodingsWebPackageVersion>6.0.0-rc.2.21466.4</SystemTextEncodingsWebPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Label="Dependency version settings">
|
||||
<!--
|
||||
|
|
|
|||
|
|
@ -709,6 +709,15 @@ function MSBuild() {
|
|||
Write-PipelineSetVariable -Name 'NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS' -Value '20'
|
||||
}
|
||||
|
||||
if ($ci) {
|
||||
$env:NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY = 'true'
|
||||
$env:NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT = 6
|
||||
$env:NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS = 1000
|
||||
Write-PipelineSetVariable -Name 'NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY' -Value 'true'
|
||||
Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT' -Value '6'
|
||||
Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000'
|
||||
}
|
||||
|
||||
$toolsetBuildProject = InitializeToolset
|
||||
$basePath = Split-Path -parent $toolsetBuildProject
|
||||
$possiblePaths = @(
|
||||
|
|
@ -717,6 +726,8 @@ function MSBuild() {
|
|||
(Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')),
|
||||
(Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.ArcadeLogging.dll')),
|
||||
(Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
|
||||
(Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.ArcadeLogging.dll')),
|
||||
(Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
|
||||
)
|
||||
$selectedPath = $null
|
||||
foreach ($path in $possiblePaths) {
|
||||
|
|
|
|||
|
|
@ -417,6 +417,13 @@ function MSBuild {
|
|||
export NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS=20
|
||||
Write-PipelineSetVariable -name "NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS" -value "20"
|
||||
Write-PipelineSetVariable -name "NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS" -value "20"
|
||||
|
||||
export NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY=true
|
||||
export NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT=6
|
||||
export NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS=1000
|
||||
Write-PipelineSetVariable -name "NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY" -value "true"
|
||||
Write-PipelineSetVariable -name "NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT" -value "6"
|
||||
Write-PipelineSetVariable -name "NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS" -value "1000"
|
||||
fi
|
||||
|
||||
local toolset_dir="${_InitializeToolset%/*}"
|
||||
|
|
@ -427,6 +434,8 @@ function MSBuild {
|
|||
possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" )
|
||||
possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.ArcadeLogging.dll" )
|
||||
possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" )
|
||||
possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" )
|
||||
possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" )
|
||||
for path in "${possiblePaths[@]}"; do
|
||||
if [[ -f $path ]]; then
|
||||
selectedPath=$path
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"tools": {
|
||||
"dotnet": "6.0.100-rc.1.21379.2",
|
||||
"dotnet": "6.0.100-rc.1.21430.12",
|
||||
"runtimes": {
|
||||
"dotnet": [
|
||||
"2.1.11",
|
||||
|
|
@ -15,10 +15,10 @@
|
|||
}
|
||||
},
|
||||
"sdk": {
|
||||
"version": "6.0.100-rc.1.21379.2"
|
||||
"version": "6.0.100-rc.1.21430.12"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21427.6",
|
||||
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21459.5",
|
||||
"Yarn.MSBuild": "1.22.10"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -277,4 +277,10 @@ using Microsoft.VisualStudio.Shell;
|
|||
<InformationalVersion>$(VsixVersion)</InformationalVersion>
|
||||
</PropertyGroup>
|
||||
</Target>
|
||||
|
||||
<Target Name="_RemoveFrameworkReferenceAnalyzers" AfterTargets="ResolvePackageAssets">
|
||||
<ItemGroup>
|
||||
<ResolvedAnalyzers Remove="@(ResolvedAnalyzers)" Condition="'%(ResolvedAnalyzers.NuGetPackageId)' == 'System.Text.Json'" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче