[main] Update dependencies from dotnet/arcade
This commit is contained in:
dotnet-maestro[bot] 2024-07-01 17:03:28 +00:00 коммит произвёл GitHub
Родитель 8ba543fc51
Коммит 48812ad620
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
7 изменённых файлов: 28 добавлений и 19 удалений

Просмотреть файл

@ -11,25 +11,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24321.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24327.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3aba80fecac252e1cdaffcebc0a37a24a960228b</Sha>
<Sha>ede13bd35571c0c8b0c01edcb057031904c5c955</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24321.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24327.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3aba80fecac252e1cdaffcebc0a37a24a960228b</Sha>
<Sha>ede13bd35571c0c8b0c01edcb057031904c5c955</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24321.4">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24327.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3aba80fecac252e1cdaffcebc0a37a24a960228b</Sha>
<Sha>ede13bd35571c0c8b0c01edcb057031904c5c955</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.8.1-beta.24321.4">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.8.1-beta.24327.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3aba80fecac252e1cdaffcebc0a37a24a960228b</Sha>
<Sha>ede13bd35571c0c8b0c01edcb057031904c5c955</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24321.4">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24327.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3aba80fecac252e1cdaffcebc0a37a24a960228b</Sha>
<Sha>ede13bd35571c0c8b0c01edcb057031904c5c955</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>

Просмотреть файл

@ -13,10 +13,10 @@
<MicrosoftCodeAnalysisAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisAnalyzersVersion>
<MicrosoftCodeAnalysisVersion>4.11.0-3.24329.1</MicrosoftCodeAnalysisVersion>
<!-- arcade -->
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24321.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24321.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24321.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.8.1-beta.24321.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24327.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24327.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24327.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.8.1-beta.24327.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<!--
These are used as reference assemblies only, so they must not take a ProdCon/source-build
version. Insert "RefOnly" to avoid assignment via PVP.

Просмотреть файл

@ -155,10 +155,13 @@ jobs:
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
is1ESPipeline: ${{ parameters.is1ESPipeline }}
- task: PowerShell@2
- task: AzureCLI@2
displayName: Publish Using Darc
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
azureSubscription: "Darc: Maestro Production"
scriptType: ps
scriptLocation: scriptPath
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
arguments: -BuildId $(BARBuildId)
-PublishingInfraVersion 3
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'

Просмотреть файл

@ -18,7 +18,9 @@ steps:
displayName: Setup Internal Feeds
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
env:
Token: ${{ parameters.legacyCredential }}
# If running on dnceng (internal project), just use the default behavior for NuGetAuthenticate.
# If running on DevDiv, NuGetAuthenticate is not really an option. It's scoped to a single feed, and we have many feeds that
# may be added. Instead, we'll use the traditional approach (add cred to nuget.config), but use an account token.

3
eng/common/dotnet-install.sh поставляемый
Просмотреть файл

@ -71,6 +71,9 @@ case $cpuname in
i[3-6]86)
buildarch=x86
;;
riscv64)
buildarch=riscv64
;;
*)
echo "Unknown CPU $cpuname detected, treating it as x64"
buildarch=x64

Просмотреть файл

@ -277,7 +277,8 @@ function Get-MachineArchitecture {
if (($ProcessorArchitecture -Eq "AMD64") -Or
($ProcessorArchitecture -Eq "IA64") -Or
($ProcessorArchitecture -Eq "ARM64") -Or
($ProcessorArchitecture -Eq "LOONGARCH64")) {
($ProcessorArchitecture -Eq "LOONGARCH64") -Or
($ProcessorArchitecture -Eq "RISCV64")) {
return "x64"
}
return "x86"

Просмотреть файл

@ -3,7 +3,7 @@
"dotnet": "9.0.100-preview.5.24307.3"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24321.4",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24327.1",
"Microsoft.Build.Traversal": "3.4.0"
}
}