Skip to content

Commit 4e78f12

Browse files
author
Mirroring
committed
Merge commit '594d7d5b9d6378c2073da15451dd9a6ddfa65781'
2 parents 4789551 + 594d7d5 commit 4e78f12

File tree

7 files changed

+30
-27
lines changed

7 files changed

+30
-27
lines changed

‎eng/Version.Details.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -388,39 +388,39 @@
388388
<Uri>https://github.com/dotnet/winforms</Uri>
389389
<Sha>9b822fd70005bf5632d12fe76811b97b3dd044e4</Sha>
390390
</Dependency>
391-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25208.6">
391+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25225.6">
392392
<Uri>https://github.com/dotnet/arcade</Uri>
393-
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
393+
<Sha>bfbc858ba868b60fffaf7b2150f1d2165b01e786</Sha>
394394
</Dependency>
395395
<!-- Intermediate is necessary for source build. -->
396-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25208.6">
396+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25225.6">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
398+
<Sha>bfbc858ba868b60fffaf7b2150f1d2165b01e786</Sha>
399399
<SourceBuild RepoName="arcade" ManagedOnly="true" />
400400
</Dependency>
401-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25208.6">
401+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25225.6">
402402
<Uri>https://github.com/dotnet/arcade</Uri>
403-
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
403+
<Sha>bfbc858ba868b60fffaf7b2150f1d2165b01e786</Sha>
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25208.6">
405+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25225.6">
406406
<Uri>https://github.com/dotnet/arcade</Uri>
407-
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
407+
<Sha>bfbc858ba868b60fffaf7b2150f1d2165b01e786</Sha>
408408
</Dependency>
409-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25208.6">
409+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25225.6">
410410
<Uri>https://github.com/dotnet/arcade</Uri>
411-
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
411+
<Sha>bfbc858ba868b60fffaf7b2150f1d2165b01e786</Sha>
412412
</Dependency>
413-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25208.6">
413+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25225.6">
414414
<Uri>https://github.com/dotnet/arcade</Uri>
415-
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
415+
<Sha>bfbc858ba868b60fffaf7b2150f1d2165b01e786</Sha>
416416
</Dependency>
417-
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.5.0-preview.1.25211.2">
417+
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.5.0-preview.1.25252.3">
418418
<Uri>https://github.com/dotnet/extensions</Uri>
419-
<Sha>f0a1a79c0b0dfb724edfcbcef82cb22d44e13e13</Sha>
419+
<Sha>9652f798f2de4e40c088075d00d185628c8e3dbb</Sha>
420420
</Dependency>
421-
<Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.5.0-preview.1.25211.2">
421+
<Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.5.0-preview.1.25252.3">
422422
<Uri>https://github.com/dotnet/extensions</Uri>
423-
<Sha>f0a1a79c0b0dfb724edfcbcef82cb22d44e13e13</Sha>
423+
<Sha>9652f798f2de4e40c088075d00d185628c8e3dbb</Sha>
424424
</Dependency>
425425
<Dependency Name="NuGet.Frameworks" Version="6.2.4">
426426
<Uri>https://github.com/nuget/nuget.client</Uri>

‎eng/Versions.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@
143143
<SystemIOHashingVersion>9.0.5</SystemIOHashingVersion>
144144
<SystemRuntimeCachingVersion>9.0.5</SystemRuntimeCachingVersion>
145145
<!-- Packages from dotnet/extensions -->
146-
<MicrosoftExtensionsDiagnosticsTestingVersion>9.5.0-preview.1.25211.2</MicrosoftExtensionsDiagnosticsTestingVersion>
147-
<MicrosoftExtensionsTimeProviderTestingVersion>9.5.0-preview.1.25211.2</MicrosoftExtensionsTimeProviderTestingVersion>
146+
<MicrosoftExtensionsDiagnosticsTestingVersion>9.5.0-preview.1.25252.3</MicrosoftExtensionsDiagnosticsTestingVersion>
147+
<MicrosoftExtensionsTimeProviderTestingVersion>9.5.0-preview.1.25252.3</MicrosoftExtensionsTimeProviderTestingVersion>
148148
<!-- Packages from dotnet/efcore -->
149149
<dotnetefVersion>9.0.5</dotnetefVersion>
150150
<MicrosoftEntityFrameworkCoreInMemoryVersion>9.0.5</MicrosoftEntityFrameworkCoreInMemoryVersion>
@@ -166,10 +166,10 @@
166166
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
167167
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
168168
<!-- Packages from dotnet/arcade -->
169-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25208.6</MicrosoftDotNetBuildTasksInstallersVersion>
170-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25208.6</MicrosoftDotNetBuildTasksTemplatingVersion>
171-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25208.6</MicrosoftDotNetRemoteExecutorVersion>
172-
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.25208.6</MicrosoftSourceBuildIntermediatearcadeVersion>
169+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25225.6</MicrosoftDotNetBuildTasksInstallersVersion>
170+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25225.6</MicrosoftDotNetBuildTasksTemplatingVersion>
171+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25225.6</MicrosoftDotNetRemoteExecutorVersion>
172+
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.25225.6</MicrosoftSourceBuildIntermediatearcadeVersion>
173173
<!-- Packages from dotnet/source-build-externals -->
174174
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>9.0.0-alpha.1.24575.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
175175
<!-- Packages from dotnet/source-build-reference-packages -->

‎eng/common/core-templates/job/source-build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ parameters:
2626
# Specifies the build script to invoke to perform the build in the repo. The default
2727
# './build.sh' should work for typical Arcade repositories, but this is customizable for
2828
# difficult situations.
29+
# buildArguments: ''
30+
# Specifies additional build arguments to pass to the build script.
2931
# jobProperties: {}
3032
# A list of job properties to inject at the top level, for potential extensibility beyond
3133
# container and pool.

‎eng/common/core-templates/job/source-index-stage1.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexUploadPackageVersion: 2.0.0-20240522.1
4-
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1
3+
sourceIndexUploadPackageVersion: 2.0.0-20250425.2
4+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2
55
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
66
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
77
preSteps: []

‎eng/common/core-templates/steps/source-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ steps:
7979
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
8080
--configuration $buildConfig \
8181
--restore --build --pack $publishArgs -bl \
82+
${{ parameters.platform.buildArguments }} \
8283
$officialBuildArgs \
8384
$internalRuntimeDownloadArgs \
8485
$internalRestoreArgs \

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"jdk": "latest"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25208.6",
31-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25208.6"
30+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25225.6",
31+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25225.6"
3232
}
3333
}

‎src/submodules/googletest

0 commit comments

Comments
 (0)