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

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

* Update dependencies from https://github.com/dotnet/arcade build 20210624.3

Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21319.2 -> To Version 6.0.0-beta.21324.3

* Update dependencies from https://github.com/dotnet/arcade build 20210628.2

Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21319.2 -> To Version 6.0.0-beta.21328.2

* Update dependencies from https://github.com/dotnet/arcade build 20210629.1

Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 6.0.0-beta.21319.2 -> To Version 6.0.0-beta.21329.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This commit is contained in:
dotnet-maestro[bot] 2021-06-29 16:13:01 -07:00 коммит произвёл GitHub
Родитель 44253f8f56
Коммит 6bf5bcbc86
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 22 добавлений и 13 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -296,22 +296,22 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>969840ecd1964656d5686fa861110d905cd0d6c9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21319.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21329.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a3377cccde8639089f99107e2ba5df2c8cbe6394</Sha>
<Sha>695b2415681884b2afc316877af35018f78b52f5</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21319.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21329.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a3377cccde8639089f99107e2ba5df2c8cbe6394</Sha>
<Sha>695b2415681884b2afc316877af35018f78b52f5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.21319.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.21329.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a3377cccde8639089f99107e2ba5df2c8cbe6394</Sha>
<Sha>695b2415681884b2afc316877af35018f78b52f5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21319.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21329.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a3377cccde8639089f99107e2ba5df2c8cbe6394</Sha>
<Sha>695b2415681884b2afc316877af35018f78b52f5</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>

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

@ -138,8 +138,8 @@
<MicrosoftEntityFrameworkCoreVersion>6.0.0-preview.7.21329.1</MicrosoftEntityFrameworkCoreVersion>
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.0-preview.7.21329.1</MicrosoftEntityFrameworkCoreDesignVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21319.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.21319.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21329.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.21329.1</MicrosoftDotNetBuildTasksTemplatingVersion>
</PropertyGroup>
<!--

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

@ -378,7 +378,16 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
}
$msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" }
return $global:_MSBuildExe = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\msbuild.exe"
$local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin"
$local:Prefer64bit = if (Get-Member -InputObject $vsRequirements -Name 'Prefer64bit') { $vsRequirements.Prefer64bit } else { $false }
if ($local:Prefer64bit -and (Test-Path(Join-Path $local:BinFolder "amd64"))) {
$global:_MSBuildExe = Join-Path $local:BinFolder "amd64\msbuild.exe"
} else {
$global:_MSBuildExe = Join-Path $local:BinFolder "msbuild.exe"
}
return $global:_MSBuildExe
}
function InitializeVisualStudioEnvironmentVariables([string] $vsInstallDir, [string] $vsMajorVersion) {

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

@ -30,7 +30,7 @@
},
"msbuild-sdks": {
"Yarn.MSBuild": "1.22.10",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21319.2",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21319.2"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21329.1",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21329.1"
}
}