Skip to content

Commit 93cb365

Browse files
vseanreesermsftvseanreesermsft
committed
Merged PR 34388: [internal/release/6.0] Merge from public
Merge from public release/6.0 to internal/release/6.0 and resolve conflicts if necessary
2 parents da0d02a + 1dac04d commit 93cb365

File tree

14 files changed

+635
-403
lines changed

14 files changed

+635
-403
lines changed

‎NuGet.config

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7-
<add key="darc-int-dotnet-runtime-ca8b532" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ca8b5329/nuget/v3/index.json" />
8-
<add key="darc-int-dotnet-runtime-ca8b532-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ca8b5329-2/nuget/v3/index.json" />
9-
<add key="darc-int-dotnet-runtime-ca8b532-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ca8b5329-1/nuget/v3/index.json" />
7+
<add key="darc-int-dotnet-runtime-e0f0de8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e0f0de87/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-runtime-e0f0de8-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e0f0de87-3/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-runtime-e0f0de8-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e0f0de87-2/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-runtime-e0f0de8-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e0f0de87-1/nuget/v3/index.json" />
1011
<!-- End: Package sources from dotnet-runtime -->
1112
<!-- Begin: Package sources from dotnet-efcore -->
12-
<add key="darc-int-dotnet-efcore-301a5c1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-301a5c19/nuget/v3/index.json" />
1313
<!-- End: Package sources from dotnet-efcore -->
1414
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1515
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -27,12 +27,12 @@
2727
<clear />
2828
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2929
<!-- Begin: Package sources from dotnet-efcore -->
30-
<add key="darc-int-dotnet-efcore-301a5c1" value="true" />
3130
<!-- End: Package sources from dotnet-efcore -->
3231
<!-- Begin: Package sources from dotnet-runtime -->
33-
<add key="darc-int-dotnet-runtime-ca8b532-1" value="true" />
34-
<add key="darc-int-dotnet-runtime-ca8b532-2" value="true" />
35-
<add key="darc-int-dotnet-runtime-ca8b532" value="true" />
32+
<add key="darc-int-dotnet-runtime-e0f0de8-1" value="true" />
33+
<add key="darc-int-dotnet-runtime-e0f0de8-2" value="true" />
34+
<add key="darc-int-dotnet-runtime-e0f0de8-3" value="true" />
35+
<add key="darc-int-dotnet-runtime-e0f0de8" value="true" />
3636
<!-- End: Package sources from dotnet-runtime -->
3737
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3838
</disabledPackageSources>

‎eng/Baseline.Designer.props

Lines changed: 222 additions & 222 deletions
Large diffs are not rendered by default.

‎eng/Baseline.xml

Lines changed: 107 additions & 107 deletions
Large diffs are not rendered by default.

‎eng/Version.Details.xml

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,37 @@
99
-->
1010
<Dependencies>
1111
<ProductDependencies>
12-
<Dependency Name="dotnet-ef" Version="6.0.24">
13-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
14-
<Sha>301a5c190943bb62e8e783a29976059ac2e6ea9c</Sha>
12+
<Dependency Name="dotnet-ef" Version="6.0.23">
13+
<Uri>https://github.com/dotnet/efcore</Uri>
14+
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.24">
17-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
18-
<Sha>301a5c190943bb62e8e783a29976059ac2e6ea9c</Sha>
16+
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.23">
17+
<Uri>https://github.com/dotnet/efcore</Uri>
18+
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.24">
21-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
22-
<Sha>301a5c190943bb62e8e783a29976059ac2e6ea9c</Sha>
20+
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.23">
21+
<Uri>https://github.com/dotnet/efcore</Uri>
22+
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.24">
25-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
26-
<Sha>301a5c190943bb62e8e783a29976059ac2e6ea9c</Sha>
24+
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.23">
25+
<Uri>https://github.com/dotnet/efcore</Uri>
26+
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.24">
29-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
30-
<Sha>301a5c190943bb62e8e783a29976059ac2e6ea9c</Sha>
28+
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.23">
29+
<Uri>https://github.com/dotnet/efcore</Uri>
30+
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.24">
33-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
34-
<Sha>301a5c190943bb62e8e783a29976059ac2e6ea9c</Sha>
32+
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.23">
33+
<Uri>https://github.com/dotnet/efcore</Uri>
34+
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.24">
37-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
38-
<Sha>301a5c190943bb62e8e783a29976059ac2e6ea9c</Sha>
36+
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.23">
37+
<Uri>https://github.com/dotnet/efcore</Uri>
38+
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.24">
41-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
42-
<Sha>301a5c190943bb62e8e783a29976059ac2e6ea9c</Sha>
40+
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.23">
41+
<Uri>https://github.com/dotnet/efcore</Uri>
42+
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
4343
</Dependency>
4444
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0">
4545
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -177,9 +177,9 @@
177177
<Uri>https://github.com/dotnet/runtime</Uri>
178178
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
179179
</Dependency>
180-
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.23-servicing.23463.4">
180+
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.23-servicing.23480.2">
181181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
182-
<Sha>ca8b53290abed6b00ae7a9cc331fbc69bc06026c</Sha>
182+
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
183183
</Dependency>
184184
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.1">
185185
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -247,31 +247,31 @@
247247
</Dependency>
248248
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.23">
249249
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
250-
<Sha>ca8b53290abed6b00ae7a9cc331fbc69bc06026c</Sha>
250+
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
251251
</Dependency>
252252
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.23">
253253
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
254-
<Sha>ca8b53290abed6b00ae7a9cc331fbc69bc06026c</Sha>
254+
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
255255
</Dependency>
256256
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.23">
257257
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
258-
<Sha>ca8b53290abed6b00ae7a9cc331fbc69bc06026c</Sha>
258+
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
259259
</Dependency>
260260
<!--
261261
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
262262
All Runtime.$rid packages should have the same version.
263263
-->
264264
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.23">
265265
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
266-
<Sha>ca8b53290abed6b00ae7a9cc331fbc69bc06026c</Sha>
266+
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
267267
</Dependency>
268268
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.23">
269269
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
270-
<Sha>ca8b53290abed6b00ae7a9cc331fbc69bc06026c</Sha>
270+
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
271271
</Dependency>
272-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.23-servicing.23463.4">
272+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.23-servicing.23480.2">
273273
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
274-
<Sha>ca8b53290abed6b00ae7a9cc331fbc69bc06026c</Sha>
274+
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
275275
</Dependency>
276276
</ProductDependencies>
277277
<ToolsetDependencies>
@@ -280,22 +280,22 @@
280280
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
281281
<Sha>0545d9fd7d80e0e8eaaff87aa0011ad5bc13fcc8</Sha>
282282
</Dependency>
283-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23408.5">
283+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23511.8">
284284
<Uri>https://github.com/dotnet/arcade</Uri>
285-
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
285+
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
286286
<SourceBuild RepoName="arcade" ManagedOnly="true" />
287287
</Dependency>
288-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.23408.5">
288+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.23511.8">
289289
<Uri>https://github.com/dotnet/arcade</Uri>
290-
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
290+
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
291291
</Dependency>
292-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.23408.5">
292+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.23511.8">
293293
<Uri>https://github.com/dotnet/arcade</Uri>
294-
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
294+
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.23408.5">
296+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.23511.8">
297297
<Uri>https://github.com/dotnet/arcade</Uri>
298-
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
298+
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
299299
</Dependency>
300300
</ToolsetDependencies>
301301
</Dependencies>

‎eng/Versions.props

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AspNetCoreMajorVersion>6</AspNetCoreMajorVersion>
1010
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
1111
<AspNetCorePatchVersion>24</AspNetCorePatchVersion>
12-
<ValidateBaseline>false</ValidateBaseline>
12+
<ValidateBaseline>true</ValidateBaseline>
1313
<!--
1414
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
1515
-->
@@ -68,7 +68,7 @@
6868
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.23</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
6969
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.23</MicrosoftNETRuntimeWebAssemblySdkVersion>
7070
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.23</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
71-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.23-servicing.23463.4</MicrosoftNETCoreBrowserDebugHostTransportVersion>
71+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.23-servicing.23480.2</MicrosoftNETCoreBrowserDebugHostTransportVersion>
7272
<MicrosoftExtensionsCachingAbstractionsVersion>6.0.0</MicrosoftExtensionsCachingAbstractionsVersion>
7373
<MicrosoftExtensionsCachingMemoryVersion>6.0.1</MicrosoftExtensionsCachingMemoryVersion>
7474
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
@@ -103,7 +103,7 @@
103103
<MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion>
104104
<MicrosoftExtensionsOptionsVersion>6.0.0</MicrosoftExtensionsOptionsVersion>
105105
<MicrosoftExtensionsPrimitivesVersion>6.0.0</MicrosoftExtensionsPrimitivesVersion>
106-
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.23-servicing.23463.4</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
106+
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.23-servicing.23480.2</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
107107
<SystemDiagnosticsDiagnosticSourceVersion>6.0.1</SystemDiagnosticsDiagnosticSourceVersion>
108108
<SystemDiagnosticsEventLogVersion>6.0.0</SystemDiagnosticsEventLogVersion>
109109
<SystemDirectoryServicesProtocolsVersion>6.0.2</SystemDirectoryServicesProtocolsVersion>
@@ -122,17 +122,17 @@
122122
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
123123
<MicrosoftNETCorePlatformsVersion>6.0.11</MicrosoftNETCorePlatformsVersion>
124124
<!-- Packages from dotnet/efcore -->
125-
<dotnetefVersion>6.0.24</dotnetefVersion>
126-
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.24</MicrosoftEntityFrameworkCoreInMemoryVersion>
127-
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.24</MicrosoftEntityFrameworkCoreRelationalVersion>
128-
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.24</MicrosoftEntityFrameworkCoreSqliteVersion>
129-
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.24</MicrosoftEntityFrameworkCoreSqlServerVersion>
130-
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.24</MicrosoftEntityFrameworkCoreToolsVersion>
131-
<MicrosoftEntityFrameworkCoreVersion>6.0.24</MicrosoftEntityFrameworkCoreVersion>
132-
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.24</MicrosoftEntityFrameworkCoreDesignVersion>
125+
<dotnetefVersion>6.0.23</dotnetefVersion>
126+
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.23</MicrosoftEntityFrameworkCoreInMemoryVersion>
127+
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.23</MicrosoftEntityFrameworkCoreRelationalVersion>
128+
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.23</MicrosoftEntityFrameworkCoreSqliteVersion>
129+
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.23</MicrosoftEntityFrameworkCoreSqlServerVersion>
130+
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.23</MicrosoftEntityFrameworkCoreToolsVersion>
131+
<MicrosoftEntityFrameworkCoreVersion>6.0.23</MicrosoftEntityFrameworkCoreVersion>
132+
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.23</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.23408.5</MicrosoftDotNetBuildTasksInstallersVersion>
135-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.23408.5</MicrosoftDotNetBuildTasksTemplatingVersion>
134+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.23511.8</MicrosoftDotNetBuildTasksInstallersVersion>
135+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.23511.8</MicrosoftDotNetBuildTasksTemplatingVersion>
136136
</PropertyGroup>
137137
<!--
138138

‎eng/common/retain-build.ps1

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
2+
Param(
3+
[Parameter(Mandatory=$true)][int] $buildId,
4+
[Parameter(Mandatory=$true)][string] $azdoOrgUri,
5+
[Parameter(Mandatory=$true)][string] $azdoProject,
6+
[Parameter(Mandatory=$true)][string] $token
7+
)
8+
9+
$ErrorActionPreference = 'Stop'
10+
Set-StrictMode -Version 2.0
11+
12+
function Get-AzDOHeaders(
13+
[string] $token)
14+
{
15+
$base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(":${token}"))
16+
$headers = @{"Authorization"="Basic $base64AuthInfo"}
17+
return $headers
18+
}
19+
20+
function Update-BuildRetention(
21+
[string] $azdoOrgUri,
22+
[string] $azdoProject,
23+
[int] $buildId,
24+
[string] $token)
25+
{
26+
$headers = Get-AzDOHeaders -token $token
27+
$requestBody = "{
28+
`"keepForever`": `"true`"
29+
}"
30+
31+
$requestUri = "${azdoOrgUri}/${azdoProject}/_apis/build/builds/${buildId}?api-version=6.0"
32+
write-Host "Attempting to retain build using the following URI: ${requestUri} ..."
33+
34+
try {
35+
Invoke-RestMethod -Uri $requestUri -Method Patch -Body $requestBody -Header $headers -contentType "application/json"
36+
Write-Host "Updated retention settings for build ${buildId}."
37+
}
38+
catch {
39+
Write-Error "Failed to update retention settings for build: $_.Exception.Response.StatusDescription"
40+
exit 1
41+
}
42+
}
43+
44+
Update-BuildRetention -azdoOrgUri $azdoOrgUri -azdoProject $azdoProject -buildId $buildId -token $token
45+
exit 0

‎eng/common/templates/steps/retain-build.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
parameters:
2+
# Optional azure devops PAT with build execute permissions for the build's organization,
3+
# only needed if the build that should be retained ran on a different organization than
4+
# the pipeline where this template is executing from
5+
Token: ''
6+
# Optional BuildId to retain, defaults to the current running build
7+
BuildId: ''
8+
# Azure devops Organization URI for the build in the https://dev.azure.com/<organization> format.
9+
# Defaults to the organization the current pipeline is running on
10+
AzdoOrgUri: '$(System.CollectionUri)'
11+
# Azure devops project for the build. Defaults to the project the current pipeline is running on
12+
AzdoProject: '$(System.TeamProject)'
13+
14+
steps:
15+
- task: powershell@2
16+
inputs:
17+
targetType: 'filePath'
18+
filePath: eng/common/retain-build.ps1
19+
pwsh: true
20+
arguments: >
21+
-AzdoOrgUri: ${{parameters.AzdoOrgUri}}
22+
-AzdoProject ${{parameters.AzdoProject}}
23+
-Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }}
24+
-BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}}
25+
displayName: Enable permanent build retention
26+
env:
27+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
28+
BUILD_ID: $(Build.BuildId)

‎global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "6.0.122"
3+
"version": "6.0.123"
44
},
55
"tools": {
6-
"dotnet": "6.0.122",
6+
"dotnet": "6.0.123",
77
"runtimes": {
88
"dotnet/x64": [
99
"2.1.30",
@@ -29,7 +29,7 @@
2929
},
3030
"msbuild-sdks": {
3131
"Yarn.MSBuild": "1.22.10",
32-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23408.5",
33-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23408.5"
32+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23511.8",
33+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23511.8"
3434
}
3535
}

0 commit comments

Comments
 (0)