зеркало из https://github.com/dotnet/diagnostics.git
[main] Update dependencies from dotnet/arcade (#5191)
[main] Update dependencies from dotnet/arcade
This commit is contained in:
Родитель
b1765adf04
Коммит
727134161c
|
@ -10,19 +10,19 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25061.1">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25067.3">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
|
||||
<Sha>12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb</Sha>
|
||||
</Dependency>
|
||||
<!-- Intermediate is necessary for source build. -->
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25061.1">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25067.3">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
|
||||
<Sha>12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25061.1">
|
||||
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25067.3">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>98b4ae348fa01b99dc6fbfc8f601efd9b90090db</Sha>
|
||||
<Sha>12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22316.2" Pinned="true">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
|
|
|
@ -55,7 +55,7 @@
|
|||
<SystemTextEncodingsWebVersion>8.0.0</SystemTextEncodingsWebVersion>
|
||||
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
|
||||
<XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
|
||||
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25061.1</MicrosoftDotNetCodeAnalysisVersion>
|
||||
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25067.3</MicrosoftDotNetCodeAnalysisVersion>
|
||||
<StyleCopAnalyzersVersion>1.2.0-beta.406</StyleCopAnalyzersVersion>
|
||||
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22316.2</MicrosoftDotNetRemoteExecutorVersion>
|
||||
<cdbsosversion>10.0.26100.1</cdbsosversion>
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
[bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true }
|
||||
|
||||
# Enable repos to use a particular version of the on-line dotnet-install scripts.
|
||||
# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1
|
||||
# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1
|
||||
[string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' }
|
||||
|
||||
# True to use global NuGet cache instead of restoring packages to repository-local directory.
|
||||
|
@ -262,7 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
|
|||
if (!(Test-Path $installScript)) {
|
||||
Create-Directory $dotnetRoot
|
||||
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
|
||||
$uri = "https://raw.githubusercontent.com/dotnet/install-scripts/4b17227b30fbbad567d4d4fba17c59da51bc817b/src/dotnet-install.ps1"
|
||||
$uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1"
|
||||
|
||||
Retry({
|
||||
Write-Host "GET $uri"
|
||||
|
|
|
@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true}
|
|||
use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
|
||||
|
||||
# Enable repos to use a particular version of the on-line dotnet-install scripts.
|
||||
# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh
|
||||
# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh
|
||||
dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'}
|
||||
|
||||
# True to use global NuGet cache instead of restoring packages to repository-local directory.
|
||||
|
@ -295,7 +295,7 @@ function with_retries {
|
|||
function GetDotNetInstallScript {
|
||||
local root=$1
|
||||
local install_script="$root/dotnet-install.sh"
|
||||
local install_script_url="https://raw.githubusercontent.com/dotnet/install-scripts/4b17227b30fbbad567d4d4fba17c59da51bc817b/src/dotnet-install.sh"
|
||||
local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh"
|
||||
|
||||
if [[ ! -a "$install_script" ]]; then
|
||||
mkdir -p "$root"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"tools": {
|
||||
"dotnet": "10.0.100-alpha.1.24611.5",
|
||||
"dotnet": "10.0.100-alpha.1.25064.3",
|
||||
"runtimes": {
|
||||
"dotnet": [
|
||||
"$(MicrosoftNETCoreApp80Version)"
|
||||
|
@ -12,6 +12,6 @@
|
|||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.Build.NoTargets": "3.5.0",
|
||||
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25061.1"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25067.3"
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче