Skip to content

Commit fc3d38c

Browse files
dotnet-maestro[bot]radekdoulik
authored andcommitted
Update dependencies from https://github.com/dotnet/arcade build 20240627.1 (#588)
[dotnet/main-16.x] Update dependencies from dotnet/arcade
1 parent f11c9e1 commit fc3d38c

File tree

7 files changed

+24
-15
lines changed

7 files changed

+24
-15
lines changed

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24321.4">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24327.1">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>3aba80fecac252e1cdaffcebc0a37a24a960228b</Sha>
13+
<Sha>ede13bd35571c0c8b0c01edcb057031904c5c955</Sha>
1414
</Dependency>
1515
<!-- Intermediate is necessary for source build. -->
16-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24321.4">
16+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24327.1">
1717
<Uri>https://github.com/dotnet/arcade</Uri>
18-
<Sha>3aba80fecac252e1cdaffcebc0a37a24a960228b</Sha>
18+
<Sha>ede13bd35571c0c8b0c01edcb057031904c5c955</Sha>
1919
<SourceBuild RepoName="arcade" ManagedOnly="true" />
2020
</Dependency>
21-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24321.4">
21+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24327.1">
2222
<Uri>https://github.com/dotnet/arcade</Uri>
23-
<Sha>3aba80fecac252e1cdaffcebc0a37a24a960228b</Sha>
23+
<Sha>ede13bd35571c0c8b0c01edcb057031904c5c955</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24321.4">
25+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24327.1">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>3aba80fecac252e1cdaffcebc0a37a24a960228b</Sha>
27+
<Sha>ede13bd35571c0c8b0c01edcb057031904c5c955</Sha>
2828
</Dependency>
2929
</ToolsetDependencies>
3030
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
77
</PropertyGroup>
88
<PropertyGroup>
9-
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24321.4</MicrosoftDotNetBuildTasksPackagingVersion>
9+
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24327.1</MicrosoftDotNetBuildTasksPackagingVersion>
1010
</PropertyGroup>
1111
</Project>

eng/common/core-templates/job/publish-build-assets.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,13 @@ jobs:
155155
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
156156
is1ESPipeline: ${{ parameters.is1ESPipeline }}
157157

158-
- task: PowerShell@2
158+
- task: AzureCLI@2
159159
displayName: Publish Using Darc
160160
inputs:
161-
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
161+
azureSubscription: "Darc: Maestro Production"
162+
scriptType: ps
163+
scriptLocation: scriptPath
164+
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
162165
arguments: -BuildId $(BARBuildId)
163166
-PublishingInfraVersion 3
164167
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'

eng/common/core-templates/steps/enable-internal-sources.yml

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

eng/common/dotnet-install.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ case $cpuname in
7171
i[3-6]86)
7272
buildarch=x86
7373
;;
74+
riscv64)
75+
buildarch=riscv64
76+
;;
7477
*)
7578
echo "Unknown CPU $cpuname detected, treating it as x64"
7679
buildarch=x64

eng/common/native/CommonLibrary.psm1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,8 @@ function Get-MachineArchitecture {
277277
if (($ProcessorArchitecture -Eq "AMD64") -Or
278278
($ProcessorArchitecture -Eq "IA64") -Or
279279
($ProcessorArchitecture -Eq "ARM64") -Or
280-
($ProcessorArchitecture -Eq "LOONGARCH64")) {
280+
($ProcessorArchitecture -Eq "LOONGARCH64") -Or
281+
($ProcessorArchitecture -Eq "RISCV64")) {
281282
return "x64"
282283
}
283284
return "x86"

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"dotnet": "9.0.100-preview.5.24307.3"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24321.4",
7-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24321.4",
6+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24327.1",
7+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24327.1",
88
"Microsoft.Build.Traversal": "3.4.0"
99
}
1010
}

0 commit comments

Comments
 (0)