diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index b059ebd61620f4..b4a4cb6770cd57 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
- "version": "6.0.0-prerelease.23401.2",
+ "version": "6.0.0-prerelease.23455.2",
"commands": [
"xharness"
]
diff --git a/NuGet.config b/NuGet.config
index f03ecf8fdc4d9e..753fcf3a7d9dd2 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -10,6 +10,7 @@
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 75e43e3f8b51f2..33b80962e94730 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -10,15 +10,15 @@
https://github.com/dotnet/emsdk
- f472bde6484a7b860c6647cf2ac64fd2870853e0
+ 0b73b536f6e0d0a6143387439c3308db4db9fdfe
https://github.com/dotnet/emsdk
- f472bde6484a7b860c6647cf2ac64fd2870853e0
+ 0b73b536f6e0d0a6143387439c3308db4db9fdfe
https://github.com/dotnet/emsdk
- f472bde6484a7b860c6647cf2ac64fd2870853e0
+ 0b73b536f6e0d0a6143387439c3308db4db9fdfe
https://github.com/dotnet/wcf
@@ -26,77 +26,77 @@
-
+
https://github.com/dotnet/arcade
- 98fd22588fbb0f407faa6a74cb1aa79031306151
+ 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18
-
+
https://github.com/dotnet/arcade
- 98fd22588fbb0f407faa6a74cb1aa79031306151
+ 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18
-
+
https://github.com/dotnet/arcade
- 98fd22588fbb0f407faa6a74cb1aa79031306151
+ 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18
-
+
https://github.com/dotnet/arcade
- 98fd22588fbb0f407faa6a74cb1aa79031306151
+ 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18
-
+
https://github.com/dotnet/arcade
- 98fd22588fbb0f407faa6a74cb1aa79031306151
+ 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18
-
+
https://github.com/dotnet/arcade
- 98fd22588fbb0f407faa6a74cb1aa79031306151
+ 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18
-
+
https://github.com/dotnet/arcade
- 98fd22588fbb0f407faa6a74cb1aa79031306151
+ 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18
-
+
https://github.com/dotnet/arcade
- 98fd22588fbb0f407faa6a74cb1aa79031306151
+ 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18
-
+
https://github.com/dotnet/arcade
- 98fd22588fbb0f407faa6a74cb1aa79031306151
+ 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18
-
+
https://github.com/dotnet/arcade
- 98fd22588fbb0f407faa6a74cb1aa79031306151
+ 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18
-
+
https://github.com/dotnet/arcade
- 98fd22588fbb0f407faa6a74cb1aa79031306151
+ 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18
-
+
https://github.com/dotnet/arcade
- 98fd22588fbb0f407faa6a74cb1aa79031306151
+ 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18
-
+
https://github.com/dotnet/arcade
- 98fd22588fbb0f407faa6a74cb1aa79031306151
+ 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18
-
+
https://github.com/dotnet/arcade
- 98fd22588fbb0f407faa6a74cb1aa79031306151
+ 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18
-
+
https://github.com/dotnet/arcade
- 98fd22588fbb0f407faa6a74cb1aa79031306151
+ 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18
-
+
https://github.com/dotnet/arcade
- 98fd22588fbb0f407faa6a74cb1aa79031306151
+ 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18
-
+
https://github.com/dotnet/arcade
- 98fd22588fbb0f407faa6a74cb1aa79031306151
+ 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18
-
+
https://github.com/dotnet/arcade
- 98fd22588fbb0f407faa6a74cb1aa79031306151
+ 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18
https://github.com/microsoft/vstest
@@ -214,17 +214,17 @@
https://github.com/mono/linker
c8499798a2a09639174e2f5c694d6652794cc73d
-
+
https://github.com/dotnet/xharness
- 5aa438c8aa5ca20646b5d91149fd9be8646dbe65
+ dcd239f92887f600f75093d5ffff27b2dfeb034b
-
+
https://github.com/dotnet/xharness
- 5aa438c8aa5ca20646b5d91149fd9be8646dbe65
+ dcd239f92887f600f75093d5ffff27b2dfeb034b
-
+
https://github.com/dotnet/arcade
- 98fd22588fbb0f407faa6a74cb1aa79031306151
+ 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
diff --git a/eng/Versions.props b/eng/Versions.props
index ce33daa90d4a11..a356548c2c3925 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,11 +1,11 @@
- 6.0.23
+ 6.0.24
6
0
- 23
+ 24
6.0.400
servicing
@@ -42,21 +42,21 @@
1.1.0-preview.22164.17
- 6.0.0-beta.23408.5
- 6.0.0-beta.23408.5
- 6.0.0-beta.23408.5
- 6.0.0-beta.23408.5
- 6.0.0-beta.23408.5
- 6.0.0-beta.23408.5
- 2.5.1-beta.23408.5
- 6.0.0-beta.23408.5
- 6.0.0-beta.23408.5
- 6.0.0-beta.23408.5
- 6.0.0-beta.23408.5
- 6.0.0-beta.23408.5
- 6.0.0-beta.23408.5
- 6.0.0-beta.23408.5
- 6.0.0-beta.23408.5
+ 6.0.0-beta.23511.8
+ 6.0.0-beta.23511.8
+ 6.0.0-beta.23511.8
+ 6.0.0-beta.23511.8
+ 6.0.0-beta.23511.8
+ 6.0.0-beta.23511.8
+ 2.5.1-beta.23511.8
+ 6.0.0-beta.23511.8
+ 6.0.0-beta.23511.8
+ 6.0.0-beta.23511.8
+ 6.0.0-beta.23511.8
+ 6.0.0-beta.23511.8
+ 6.0.0-beta.23511.8
+ 6.0.0-beta.23511.8
+ 6.0.0-beta.23511.8
6.0.0-preview.1.102
@@ -143,8 +143,8 @@
1.0.1-prerelease-00006
17.4.0-preview-20220707-01
- 6.0.0-prerelease.23401.2
- 6.0.0-prerelease.23401.2
+ 6.0.0-prerelease.23455.2
+ 6.0.0-prerelease.23455.2
6.0.0-alpha.0.23411.2
6.0.0-alpha.0.23367.3
2.4.2-pre.9
diff --git a/eng/common/retain-build.ps1 b/eng/common/retain-build.ps1
new file mode 100644
index 00000000000000..e7ba975adeb6b1
--- /dev/null
+++ b/eng/common/retain-build.ps1
@@ -0,0 +1,45 @@
+
+Param(
+[Parameter(Mandatory=$true)][int] $buildId,
+[Parameter(Mandatory=$true)][string] $azdoOrgUri,
+[Parameter(Mandatory=$true)][string] $azdoProject,
+[Parameter(Mandatory=$true)][string] $token
+)
+
+$ErrorActionPreference = 'Stop'
+Set-StrictMode -Version 2.0
+
+function Get-AzDOHeaders(
+ [string] $token)
+{
+ $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(":${token}"))
+ $headers = @{"Authorization"="Basic $base64AuthInfo"}
+ return $headers
+}
+
+function Update-BuildRetention(
+ [string] $azdoOrgUri,
+ [string] $azdoProject,
+ [int] $buildId,
+ [string] $token)
+{
+ $headers = Get-AzDOHeaders -token $token
+ $requestBody = "{
+ `"keepForever`": `"true`"
+ }"
+
+ $requestUri = "${azdoOrgUri}/${azdoProject}/_apis/build/builds/${buildId}?api-version=6.0"
+ write-Host "Attempting to retain build using the following URI: ${requestUri} ..."
+
+ try {
+ Invoke-RestMethod -Uri $requestUri -Method Patch -Body $requestBody -Header $headers -contentType "application/json"
+ Write-Host "Updated retention settings for build ${buildId}."
+ }
+ catch {
+ Write-Error "Failed to update retention settings for build: $_.Exception.Response.StatusDescription"
+ exit 1
+ }
+}
+
+Update-BuildRetention -azdoOrgUri $azdoOrgUri -azdoProject $azdoProject -buildId $buildId -token $token
+exit 0
diff --git a/eng/common/templates/steps/retain-build.yml b/eng/common/templates/steps/retain-build.yml
new file mode 100644
index 00000000000000..83d97a26a01ff9
--- /dev/null
+++ b/eng/common/templates/steps/retain-build.yml
@@ -0,0 +1,28 @@
+parameters:
+ # Optional azure devops PAT with build execute permissions for the build's organization,
+ # only needed if the build that should be retained ran on a different organization than
+ # the pipeline where this template is executing from
+ Token: ''
+ # Optional BuildId to retain, defaults to the current running build
+ BuildId: ''
+ # Azure devops Organization URI for the build in the https://dev.azure.com/ format.
+ # Defaults to the organization the current pipeline is running on
+ AzdoOrgUri: '$(System.CollectionUri)'
+ # Azure devops project for the build. Defaults to the project the current pipeline is running on
+ AzdoProject: '$(System.TeamProject)'
+
+steps:
+ - task: powershell@2
+ inputs:
+ targetType: 'filePath'
+ filePath: eng/common/retain-build.ps1
+ pwsh: true
+ arguments: >
+ -AzdoOrgUri: ${{parameters.AzdoOrgUri}}
+ -AzdoProject ${{parameters.AzdoProject}}
+ -Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }}
+ -BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}}
+ displayName: Enable permanent build retention
+ env:
+ SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+ BUILD_ID: $(Build.BuildId)
\ No newline at end of file
diff --git a/global.json b/global.json
index 45cd221a8188e9..87120a6340cb58 100644
--- a/global.json
+++ b/global.json
@@ -1,21 +1,21 @@
{
"sdk": {
- "version": "6.0.121",
+ "version": "6.0.123",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
- "dotnet": "6.0.121"
+ "dotnet": "6.0.123"
},
"native-tools": {
"cmake": "3.16.4",
"python3": "3.7.1"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.23408.5",
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23408.5",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23408.5",
- "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23408.5",
+ "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.23511.8",
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23511.8",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23511.8",
+ "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23511.8",
"Microsoft.Build.NoTargets": "3.1.0",
"Microsoft.Build.Traversal": "3.0.23",
"Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6"