Skip to content

Commit 6cefec8

Browse files
vseanreesermsftvseanreesermsft
committed
Merged PR 34384: [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 08ee1fe + de6de0e commit 6cefec8

File tree

6 files changed

+114
-35
lines changed

6 files changed

+114
-35
lines changed

‎NuGet.config‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
<clear />
66
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
77
<!-- Begin: Package sources from dotnet-runtime -->
8-
<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-e0f0de8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e0f0de87/nuget/v3/index.json" />
9+
<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" />
10+
<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" />
11+
<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" />
912
<!-- End: Package sources from dotnet-runtime -->
1013
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1114
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -19,7 +22,10 @@
1922
<disabledPackageSources>
2023
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2124
<!-- Begin: Package sources from dotnet-runtime -->
22-
<add key="darc-int-dotnet-runtime-ca8b532" value="true" />
25+
<add key="darc-int-dotnet-runtime-e0f0de8-1" value="true" />
26+
<add key="darc-int-dotnet-runtime-e0f0de8-2" value="true" />
27+
<add key="darc-int-dotnet-runtime-e0f0de8-3" value="true" />
28+
<add key="darc-int-dotnet-runtime-e0f0de8" value="true" />
2329
<!-- End: Package sources from dotnet-runtime -->
2430
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2531
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.23-servicing.23463.14">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.23-servicing.23480.3">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
6-
<Sha>4c9c993698c298801739cd2dc25efa7ffe700bde</Sha>
6+
<Sha>a8ba4b39b59ca421254550010de48b33d7c7b57d</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.23-servicing.23463.14">
8+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.23-servicing.23480.3">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>4c9c993698c298801739cd2dc25efa7ffe700bde</Sha>
10+
<Sha>a8ba4b39b59ca421254550010de48b33d7c7b57d</Sha>
1111
</Dependency>
1212
<Dependency Name="System.CodeDom" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
1313
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -57,51 +57,51 @@
5757
<Uri>https://github.com/dotnet/runtime</Uri>
5858
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
5959
</Dependency>
60-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.23-servicing.23463.4" CoherentParentDependency="Microsoft.Private.Winforms">
60+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.23-servicing.23480.2" CoherentParentDependency="Microsoft.Private.Winforms">
6161
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
62-
<Sha>ca8b53290abed6b00ae7a9cc331fbc69bc06026c</Sha>
62+
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
6363
</Dependency>
64-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.23-servicing.23463.4" CoherentParentDependency="Microsoft.Private.Winforms">
64+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.23-servicing.23480.2" CoherentParentDependency="Microsoft.Private.Winforms">
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66-
<Sha>ca8b53290abed6b00ae7a9cc331fbc69bc06026c</Sha>
66+
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
6767
</Dependency>
6868
<Dependency Name="System.Resources.Extensions" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
6969
<Uri>https://github.com/dotnet/runtime</Uri>
7070
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
7171
</Dependency>
7272
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.23" CoherentParentDependency="Microsoft.Private.Winforms">
7373
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
74-
<Sha>ca8b53290abed6b00ae7a9cc331fbc69bc06026c</Sha>
74+
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
7575
</Dependency>
7676
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.23" CoherentParentDependency="Microsoft.Private.Winforms">
7777
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
78-
<Sha>ca8b53290abed6b00ae7a9cc331fbc69bc06026c</Sha>
78+
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
7979
</Dependency>
80-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.23-servicing.23463.4" CoherentParentDependency="Microsoft.Private.Winforms">
80+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.23-servicing.23480.2" CoherentParentDependency="Microsoft.Private.Winforms">
8181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
82-
<Sha>ca8b53290abed6b00ae7a9cc331fbc69bc06026c</Sha>
82+
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
8383
</Dependency>
8484
</ProductDependencies>
8585
<ToolsetDependencies>
86-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23408.5">
86+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23511.8">
8787
<Uri>https://github.com/dotnet/arcade</Uri>
88-
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
88+
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.23408.5">
90+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.23511.8">
9191
<Uri>https://github.com/dotnet/arcade</Uri>
92-
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
92+
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.23408.5">
94+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.23511.8">
9595
<Uri>https://github.com/dotnet/arcade</Uri>
96-
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
96+
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.23408.5">
98+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.23511.8">
9999
<Uri>https://github.com/dotnet/arcade</Uri>
100-
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
100+
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.23408.5">
102+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.23511.8">
103103
<Uri>https://github.com/dotnet/arcade</Uri>
104-
<Sha>98fd22588fbb0f407faa6a74cb1aa79031306151</Sha>
104+
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
105105
</Dependency>
106106
</ToolsetDependencies>
107107
</Dependencies>

‎eng/Versions.props‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
</PropertyGroup>
2727
<!-- NuGet Package Versions -->
2828
<PropertyGroup>
29-
<MicrosoftPrivateWinformsVersion>6.0.23-servicing.23463.14</MicrosoftPrivateWinformsVersion>
29+
<MicrosoftPrivateWinformsVersion>6.0.23-servicing.23480.3</MicrosoftPrivateWinformsVersion>
3030
</PropertyGroup>
3131
<!-- Packages that come from https://github.com/dotnet/coreclr -->
3232
<PropertyGroup>
3333
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19562.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
34-
<MicrosoftNETCoreILDAsmVersion>6.0.23-servicing.23463.4</MicrosoftNETCoreILDAsmVersion>
35-
<MicrosoftNETCoreILAsmVersion>6.0.23-servicing.23463.4</MicrosoftNETCoreILAsmVersion>
34+
<MicrosoftNETCoreILDAsmVersion>6.0.23-servicing.23480.2</MicrosoftNETCoreILDAsmVersion>
35+
<MicrosoftNETCoreILAsmVersion>6.0.23-servicing.23480.2</MicrosoftNETCoreILAsmVersion>
3636
</PropertyGroup>
3737
<!-- Packages that come from https://github.com/dotnet/core-setup -->
3838
<PropertyGroup>
39-
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.23-servicing.23463.4</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
39+
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.23-servicing.23480.2</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
4040
<MicrosoftNETCoreAppRefVersion>6.0.23</MicrosoftNETCoreAppRefVersion>
4141
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.23</MicrosoftNETCoreAppRuntimewinx64Version>
4242
<MicrosoftNETCorePlatformsVersion>6.0.11</MicrosoftNETCorePlatformsVersion>
@@ -56,9 +56,9 @@
5656
</PropertyGroup>
5757
<!-- Packages that come from https://github.com/dotnet/arcade -->
5858
<PropertyGroup>
59-
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.23408.5</MicrosoftDotNetApiCompatVersion>
60-
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.23408.5</MicrosoftDotNetCodeAnalysisPackageVersion>
61-
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.23408.5</MicrosoftDotNetGenAPIVersion>
59+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.23511.8</MicrosoftDotNetApiCompatVersion>
60+
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.23511.8</MicrosoftDotNetCodeAnalysisPackageVersion>
61+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.23511.8</MicrosoftDotNetGenAPIVersion>
6262
</PropertyGroup>
6363
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
6464
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->

‎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,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "6.0.121",
3+
"dotnet": "6.0.123",
44
"runtimes": {
55
"dotnet": [
66
"2.1.7",
@@ -12,11 +12,11 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23408.5",
16-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23408.5"
15+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23511.8",
16+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23511.8"
1717
},
1818
"sdk": {
19-
"version": "6.0.121"
19+
"version": "6.0.123"
2020
},
2121
"native-tools": {
2222
"strawberry-perl": "5.28.1.1-1",

0 commit comments

Comments
 (0)