Skip to content

Commit a21e2d2

Browse files
author
Mirroring
committed
Merge commit '57b1fe73b8c96ccdc13eeff42d14f138ab961259'
2 parents a4d5889 + 57b1fe7 commit a21e2d2

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -349,14 +349,14 @@
349349
<Sha>02fe27cd6a9b001c8feb7938e6ef4b3799745759</Sha>
350350
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
351351
</Dependency>
352-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25060.1">
352+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25060.2">
353353
<Uri>https://github.com/dotnet/source-build-externals</Uri>
354-
<Sha>c301b8babe9ea6aeac4452ccb4dde45cae769282</Sha>
354+
<Sha>c7cb4da26e74ef645e3e98fcb4534a7d66247a82</Sha>
355355
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
356356
</Dependency>
357-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.24415.1">
357+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25060.2">
358358
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
359-
<Sha>fe3794a68bd668d36d4d5014a9e6c9d22c0e6d86</Sha>
359+
<Sha>f9542c50beaefc38dd9d7ec9ea38d54fd154f21a</Sha>
360360
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
361361
</Dependency>
362362
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-preview.1.23463.1">
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24623.2">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25060.1">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>278b1dda181ab18a9fbed73da998e50d128eae21</Sha>
496+
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24623.2">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25060.1">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>278b1dda181ab18a9fbed73da998e50d128eae21</Sha>
501+
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24623.2">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25060.1">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>278b1dda181ab18a9fbed73da998e50d128eae21</Sha>
505+
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24623.2">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25060.1">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>278b1dda181ab18a9fbed73da998e50d128eae21</Sha>
509+
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
510510
</Dependency>
511511
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
512512
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
3737
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3838
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
39-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.24623.2</MicrosoftDotNetSignToolVersion>
39+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25060.1</MicrosoftDotNetSignToolVersion>
4040
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
4141
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4242
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -213,7 +213,7 @@
213213
<PropertyGroup>
214214
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
215215
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
216-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24623.2</MicrosoftDotNetXUnitExtensionsVersion>
216+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25060.1</MicrosoftDotNetXUnitExtensionsVersion>
217217
<MoqPackageVersion>4.18.4</MoqPackageVersion>
218218
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
219219
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
arguments: >
8787
-task PublishBuildAssets -restore -msbuildEngine dotnet
8888
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
89-
/p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
89+
/p:MaestroApiEndpoint=https://maestro.dot.net
9090
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
9191
/p:OfficialBuildId=$(Build.BuildNumber)
9292
condition: ${{ parameters.condition }}

eng/common/templates-official/post-build/common-variables.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ variables:
77

88
# Default Maestro++ API Endpoint and API Version
99
- name: MaestroApiEndPoint
10-
value: "https://maestro-prod.westus2.cloudapp.azure.com"
10+
value: "https://maestro.dot.net"
1111
- name: MaestroApiAccessToken
1212
value: $(MaestroAccessToken)
1313
- name: MaestroApiVersion

eng/common/templates/job/job.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128

129129
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
130130
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
131-
- task: MicroBuildSigningPlugin@3
131+
- task: MicroBuildSigningPlugin@4
132132
displayName: Install MicroBuild plugin
133133
inputs:
134134
signType: $(_SignType)

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24623.2",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24623.2"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25060.1",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25060.1"
1919
}
2020
}

0 commit comments

Comments
 (0)