Skip to content

Commit 949bfba

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
committed
Update dependencies from https://github.com/dotnet/arcade build 20240627.1
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 9.0.0-beta.24321.4 -> To Version 9.0.0-beta.24327.1
1 parent d22349a commit 949bfba

File tree

7 files changed

+31
-22
lines changed

7 files changed

+31
-22
lines changed

‎eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -388,31 +388,31 @@
388388
<Uri>https://github.com/dotnet/winforms</Uri>
389389
<Sha>10bd60e8b0bbc4639035a36fb7aed414a3581431</Sha>
390390
</Dependency>
391-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24321.4">
391+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24327.1">
392392
<Uri>https://github.com/dotnet/arcade</Uri>
393-
<Sha>3aba80fecac252e1cdaffcebc0a37a24a960228b</Sha>
393+
<Sha>ede13bd35571c0c8b0c01edcb057031904c5c955</Sha>
394394
</Dependency>
395395
<!-- Intermediate is necessary for source build. -->
396-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24321.4">
396+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24327.1">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>3aba80fecac252e1cdaffcebc0a37a24a960228b</Sha>
398+
<Sha>ede13bd35571c0c8b0c01edcb057031904c5c955</Sha>
399399
<SourceBuild RepoName="arcade" ManagedOnly="true" />
400400
</Dependency>
401-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24321.4">
401+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24327.1">
402402
<Uri>https://github.com/dotnet/arcade</Uri>
403-
<Sha>3aba80fecac252e1cdaffcebc0a37a24a960228b</Sha>
403+
<Sha>ede13bd35571c0c8b0c01edcb057031904c5c955</Sha>
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24321.4">
405+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24327.1">
406406
<Uri>https://github.com/dotnet/arcade</Uri>
407-
<Sha>3aba80fecac252e1cdaffcebc0a37a24a960228b</Sha>
407+
<Sha>ede13bd35571c0c8b0c01edcb057031904c5c955</Sha>
408408
</Dependency>
409-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24321.4">
409+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24327.1">
410410
<Uri>https://github.com/dotnet/arcade</Uri>
411-
<Sha>3aba80fecac252e1cdaffcebc0a37a24a960228b</Sha>
411+
<Sha>ede13bd35571c0c8b0c01edcb057031904c5c955</Sha>
412412
</Dependency>
413-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24321.4">
413+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24327.1">
414414
<Uri>https://github.com/dotnet/arcade</Uri>
415-
<Sha>3aba80fecac252e1cdaffcebc0a37a24a960228b</Sha>
415+
<Sha>ede13bd35571c0c8b0c01edcb057031904c5c955</Sha>
416416
</Dependency>
417417
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.0.0-preview.6.24322.1">
418418
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,10 @@
165165
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
166166
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
167167
<!-- Packages from dotnet/arcade -->
168-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24321.4</MicrosoftDotNetBuildTasksInstallersVersion>
169-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24321.4</MicrosoftDotNetBuildTasksTemplatingVersion>
170-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24321.4</MicrosoftDotNetRemoteExecutorVersion>
171-
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.24321.4</MicrosoftSourceBuildIntermediatearcadeVersion>
168+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24327.1</MicrosoftDotNetBuildTasksInstallersVersion>
169+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24327.1</MicrosoftDotNetBuildTasksTemplatingVersion>
170+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24327.1</MicrosoftDotNetRemoteExecutorVersion>
171+
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.24327.1</MicrosoftSourceBuildIntermediatearcadeVersion>
172172
<!-- Packages from dotnet/source-build-externals -->
173173
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>9.0.0-alpha.1.24320.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
174174
<!-- Packages from dotnet/source-build-reference-packages -->

‎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
@@ -27,7 +27,7 @@
2727
"jdk": "11"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24321.4",
31-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24321.4"
30+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24327.1",
31+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24327.1"
3232
}
3333
}

0 commit comments

Comments
 (0)