Skip to content

Commit d14aef8

Browse files
[main] Update dependencies from dotnet/arcade (#568)
1 parent e5e7b1b commit d14aef8

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

eng/Version.Details.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24623.2">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25079.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>278b1dda181ab18a9fbed73da998e50d128eae21</Sha>
8+
<Sha>cae548d41ddb92922d78f3d9737635d104f650a5</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24623.2">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25079.1">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>278b1dda181ab18a9fbed73da998e50d128eae21</Sha>
12+
<Sha>cae548d41ddb92922d78f3d9737635d104f650a5</Sha>
1313
</Dependency>
1414
</ToolsetDependencies>
1515
</Dependencies>

eng/common/sdk-task.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ try {
6464
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6565
}
6666
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
67-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.1-2" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
6868
}
6969
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7070
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

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

+1-1
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

+1-1
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

+1-1
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)

eng/common/tools.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -384,8 +384,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
384384

385385
# If the version of msbuild is going to be xcopied,
386386
# use this version. Version matches a package here:
387-
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.1-2
388-
$defaultXCopyMSBuildVersion = '17.8.1-2'
387+
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.12.0
388+
$defaultXCopyMSBuildVersion = '17.12.0'
389389

390390
if (!$vsRequirements) {
391391
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

global.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"tools": {
3-
"dotnet": "8.0.110"
3+
"dotnet": "8.0.112"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24623.2",
7-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24623.2"
6+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25079.1",
7+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25079.1"
88
}
99
}

0 commit comments

Comments
 (0)