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

Update dependencies from https://github.com/dotnet/arcade build 20231103.1 (#51890) 

[main] Update dependencies from dotnet/arcade
This commit is contained in:
dotnet-maestro[bot] 2023-11-06 19:56:01 +00:00 коммит произвёл GitHub
Родитель e74d5c5629
Коммит 94ad7031db
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 21 добавлений и 16 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -371,26 +371,26 @@
<Uri>https://github.com/dotnet/winforms</Uri> <Uri>https://github.com/dotnet/winforms</Uri>
<Sha>63643f83990d9049fc02d69b470ae4c06a6874ef</Sha> <Sha>63643f83990d9049fc02d69b470ae4c06a6874ef</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23528.2"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23553.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>bb2b4326ddf03d86c92bd125dba87e9d8df63463</Sha> <Sha>1f067970472e5eb1877797bc4304dd13f284c7ba</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" /> <SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23528.2"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23553.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>bb2b4326ddf03d86c92bd125dba87e9d8df63463</Sha> <Sha>1f067970472e5eb1877797bc4304dd13f284c7ba</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.23528.2"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.23553.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>bb2b4326ddf03d86c92bd125dba87e9d8df63463</Sha> <Sha>1f067970472e5eb1877797bc4304dd13f284c7ba</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23528.2"> <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23553.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>bb2b4326ddf03d86c92bd125dba87e9d8df63463</Sha> <Sha>1f067970472e5eb1877797bc4304dd13f284c7ba</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.23528.2"> <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.23553.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>bb2b4326ddf03d86c92bd125dba87e9d8df63463</Sha> <Sha>1f067970472e5eb1877797bc4304dd13f284c7ba</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.0.0-alpha.1.23553.1"> <Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.0.0-alpha.1.23553.1">
<Uri>https://github.com/dotnet/extensions</Uri> <Uri>https://github.com/dotnet/extensions</Uri>

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

@ -160,9 +160,9 @@
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion> <NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion> <NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
<!-- Packages from dotnet/arcade --> <!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.23528.2</MicrosoftDotNetBuildTasksInstallersVersion> <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.23553.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.23528.2</MicrosoftDotNetBuildTasksTemplatingVersion> <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.23553.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.23528.2</MicrosoftDotNetRemoteExecutorVersion> <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.23553.1</MicrosoftDotNetRemoteExecutorVersion>
<!-- Packages from dotnet/source-build-externals --> <!-- Packages from dotnet/source-build-externals -->
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>9.0.0-alpha.1.23530.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion> <MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>9.0.0-alpha.1.23530.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
<!-- Packages from dotnet/source-build-reference-packages --> <!-- Packages from dotnet/source-build-reference-packages -->

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

@ -341,7 +341,12 @@ function InitializeBuildTool {
# return values # return values
_InitializeBuildTool="$_InitializeDotNetCli/dotnet" _InitializeBuildTool="$_InitializeDotNetCli/dotnet"
_InitializeBuildToolCommand="msbuild" _InitializeBuildToolCommand="msbuild"
_InitializeBuildToolFramework="net8.0" # use override if it exists - commonly set by source-build
if [[ "${_OverrideArcadeInitializeBuildToolFramework:-x}" == "x" ]]; then
_InitializeBuildToolFramework="net8.0"
else
_InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}"
fi
} }
# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116 # Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116

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

@ -27,7 +27,7 @@
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Yarn.MSBuild": "1.22.10", "Yarn.MSBuild": "1.22.10",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23528.2", "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23553.1",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23528.2" "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23553.1"
} }
} }