Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/arcade (#4770)
Browse files Browse the repository at this point in the history
This pull request updates the following dependencies

[marker]: <> (Begin:6d3f346d-45bf-4275-0e83-08d8e40a189f)
## From https://github.com/dotnet/arcade
- **Subscription**: 6d3f346d-45bf-4275-0e83-08d8e40a189f
- **Build**: 20240627.1
- **Date Produced**: June 27, 2024 9:50:19 AM UTC
- **Commit**: ede13bd35571c0c8b0c01edcb057031904c5c955
- **Branch**: refs/heads/main

[DependencyUpdate]: <> (Begin)

- **Updates**:
- **Microsoft.SourceBuild.Intermediate.arcade**: [from
9.0.0-beta.24321.4 to 9.0.0-beta.24327.1][1]
- **Microsoft.DotNet.Arcade.Sdk**: [from 9.0.0-beta.24321.4 to
9.0.0-beta.24327.1][1]
- **Microsoft.DotNet.CodeAnalysis**: [from 9.0.0-beta.24321.4 to
9.0.0-beta.24327.1][1]

[1]: dotnet/arcade@3aba80f...ede13bd

[DependencyUpdate]: <> (End)


[marker]: <> (End:6d3f346d-45bf-4275-0e83-08d8e40a189f)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
  • Loading branch information
dotnet-maestro[bot] and dotnet-maestro[bot] committed Jul 1, 2024
1 parent 36353b2 commit 35a81a5
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 12 deletions.
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@
</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>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24321.4">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24327.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3aba80fecac252e1cdaffcebc0a37a24a960228b</Sha>
<Sha>ede13bd35571c0c8b0c01edcb057031904c5c955</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24321.4">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" 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.RemoteExecutor" Version="7.0.0-beta.22316.2" Pinned="true">
<Uri>https://github.com/dotnet/arcade</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<SystemTextEncodingsWebVersion>6.0.0</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>6.0.8</SystemTextJsonVersion>
<XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24321.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24327.1</MicrosoftDotNetCodeAnalysisVersion>
<StyleCopAnalyzersVersion>1.2.0-beta.406</StyleCopAnalyzersVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22316.2</MicrosoftDotNetRemoteExecutorVersion>
<cdbsosversion>10.0.18362</cdbsosversion>
Expand Down
7 changes: 5 additions & 2 deletions eng/common/core-templates/job/publish-build-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
Expand Down
4 changes: 3 additions & 1 deletion eng/common/core-templates/steps/enable-internal-sources.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions eng/common/dotnet-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion eng/common/native/CommonLibrary.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.5.0",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24321.4"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24327.1"
}
}

0 comments on commit 35a81a5

Please sign in to comment.