Skip to content

Commit 1d1d527

Browse files
dotnet-maestro[bot]Shyam-Gupta
dotnet-maestro[bot]
and
Shyam-Gupta
authored
[release/10.0] Source code updates from dotnet/dotnet (#14111)
* Update dependencies from https://github.com/dotnet/dotnet build 293404 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.CMake.Sdk, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.XUnitV3Extensions (Version 10.0.0-beta.25601.110 -> 10.0.0-beta.25604.105) Microsoft.NET.Sdk.IL, Microsoft.NETCore.App.Ref, Microsoft.NETCore.ILAsm, Microsoft.NETCore.ILDAsm, Microsoft.Win32.SystemEvents, runtime.win-x64.Microsoft.NETCore.ILAsm, System.CodeDom, System.Configuration.ConfigurationManager, System.Formats.Nrbf, System.IO.Hashing, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Text.Encodings.Web, System.Text.Json, System.Windows.Extensions, runtime.win-x86.Microsoft.NETCore.ILAsm (Version 10.0.2 -> 10.0.2) Microsoft.NETCore.Platforms (Version 10.0.2-servicing.25601.110 -> 10.0.2-servicing.25604.105) * Backflow from https://github.com/dotnet/dotnet / ed2ddf8 build 293627 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 293627 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.CMake.Sdk, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.XUnitV3Extensions (Version 10.0.0-beta.25604.105 -> 10.0.0-beta.25605.116) Microsoft.NET.Sdk.IL, Microsoft.NETCore.App.Ref, Microsoft.NETCore.ILAsm, Microsoft.NETCore.ILDAsm, Microsoft.Win32.SystemEvents, runtime.win-x64.Microsoft.NETCore.ILAsm, System.CodeDom, System.Configuration.ConfigurationManager, System.Formats.Nrbf, System.IO.Hashing, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Text.Encodings.Web, System.Text.Json, System.Windows.Extensions, runtime.win-x86.Microsoft.NETCore.ILAsm (Version 10.0.2 -> 10.0.2) Microsoft.NETCore.Platforms (Version 10.0.2-servicing.25604.105 -> 10.0.2-servicing.25605.116) * Update dependencies from https://github.com/dotnet/dotnet build 293783 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.CMake.Sdk, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.XUnitV3Extensions (Version 10.0.0-beta.25605.116 -> 10.0.0-beta.25608.105) Microsoft.NET.Sdk.IL, Microsoft.NETCore.App.Ref, Microsoft.NETCore.ILAsm, Microsoft.NETCore.ILDAsm, Microsoft.Win32.SystemEvents, runtime.win-x64.Microsoft.NETCore.ILAsm, System.CodeDom, System.Configuration.ConfigurationManager, System.Formats.Nrbf, System.IO.Hashing, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Text.Encodings.Web, System.Text.Json, System.Windows.Extensions, runtime.win-x86.Microsoft.NETCore.ILAsm (Version 10.0.2 -> 10.0.2) Microsoft.NETCore.Platforms (Version 10.0.2-servicing.25605.116 -> 10.0.2-servicing.25608.105) * Update packageSource key in NuGet.config --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Shyam Gupta <shgu@microsoft.com>
1 parent bb08309 commit 1d1d527

15 files changed

Lines changed: 119 additions & 71 deletions

‎NuGet.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-dotnet -->
7-
<add key="darc-pub-dotnet-dotnet-7dedd35" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-7dedd353/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-dotnet-279bb6e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-279bb6e9/nuget/v3/index.json" />
88
<!-- End: Package sources from dotnet-dotnet -->
99
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1010
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -21,7 +21,7 @@
2121
</packageSources>
2222
<packageSourceMapping>
2323
<clear />
24-
<packageSource key="darc-pub-dotnet-dotnet-7dedd35">
24+
<packageSource key="darc-pub-dotnet-dotnet-279bb6e">
2525
<package pattern="Microsoft.*" />
2626
<package pattern="runtime.*" />
2727
<package pattern="System.*" />

‎eng/Publishing.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33
<PropertyGroup>
4-
<PublishingVersion>3</PublishingVersion>
54
<ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
65
</PropertyGroup>
76
</Project>

‎eng/Version.Details.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25601.110</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25601.110</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11-
<MicrosoftDotNetCMakeSdkPackageVersion>10.0.0-beta.25601.110</MicrosoftDotNetCMakeSdkPackageVersion>
12-
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25601.110</MicrosoftDotNetGenFacadesPackageVersion>
13-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25601.110</MicrosoftDotNetHelixSdkPackageVersion>
14-
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25601.110</MicrosoftDotNetRemoteExecutorPackageVersion>
15-
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.25601.110</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25608.105</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25608.105</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11+
<MicrosoftDotNetCMakeSdkPackageVersion>10.0.0-beta.25608.105</MicrosoftDotNetCMakeSdkPackageVersion>
12+
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25608.105</MicrosoftDotNetGenFacadesPackageVersion>
13+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25608.105</MicrosoftDotNetHelixSdkPackageVersion>
14+
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25608.105</MicrosoftDotNetRemoteExecutorPackageVersion>
15+
<MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.25608.105</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
1616
<MicrosoftNETSdkILPackageVersion>10.0.2</MicrosoftNETSdkILPackageVersion>
1717
<MicrosoftNETCoreAppRefPackageVersion>10.0.2</MicrosoftNETCoreAppRefPackageVersion>
1818
<MicrosoftNETCoreILAsmPackageVersion>10.0.2</MicrosoftNETCoreILAsmPackageVersion>
1919
<MicrosoftNETCoreILDAsmPackageVersion>10.0.2</MicrosoftNETCoreILDAsmPackageVersion>
20-
<MicrosoftNETCorePlatformsPackageVersion>10.0.2-servicing.25601.110</MicrosoftNETCorePlatformsPackageVersion>
20+
<MicrosoftNETCorePlatformsPackageVersion>10.0.2-servicing.25608.105</MicrosoftNETCorePlatformsPackageVersion>
2121
<MicrosoftWin32SystemEventsPackageVersion>10.0.2</MicrosoftWin32SystemEventsPackageVersion>
2222
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>10.0.2</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
2323
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>10.0.2</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>

‎eng/Version.Details.xml‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,110 +6,110 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
66
And you can check these with "darc get-dependencies <dash dash>target-repo "winforms"
77
-->
88
<Dependencies>
9-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="7dedd35363daf74f94a980da38f2cf4dc86cc23a" BarId="292938" />
9+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="winforms" Sha="279bb6e979485785576d9279b6582cf7006c6f91" BarId="293783" />
1010
<ProductDependencies>
11-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.2-servicing.25601.110">
11+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.2-servicing.25608.105">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
13+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
1414
</Dependency>
1515
<Dependency Name="System.Resources.Extensions" Version="10.0.2">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
17+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
1818
</Dependency>
1919
<Dependency Name="System.Windows.Extensions" Version="10.0.2">
2020
<Uri>https://github.com/dotnet/dotnet</Uri>
21-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
21+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
2222
</Dependency>
2323
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.2">
2424
<Uri>https://github.com/dotnet/dotnet</Uri>
25-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
25+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
2626
</Dependency>
2727
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.2">
2828
<Uri>https://github.com/dotnet/dotnet</Uri>
29-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
29+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
3030
</Dependency>
3131
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="10.0.2">
3232
<Uri>https://github.com/dotnet/dotnet</Uri>
33-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
33+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
3434
</Dependency>
3535
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="10.0.2">
3636
<Uri>https://github.com/dotnet/dotnet</Uri>
37-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
37+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
3838
</Dependency>
3939
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.2">
4040
<Uri>https://github.com/dotnet/dotnet</Uri>
41-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
41+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
4242
</Dependency>
4343
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.2">
4444
<Uri>https://github.com/dotnet/dotnet</Uri>
45-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
45+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
4646
</Dependency>
4747
<Dependency Name="System.Text.Encodings.Web" Version="10.0.2">
4848
<Uri>https://github.com/dotnet/dotnet</Uri>
49-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
49+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
5050
</Dependency>
5151
<Dependency Name="System.Text.Json" Version="10.0.2">
5252
<Uri>https://github.com/dotnet/dotnet</Uri>
53-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
53+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
5454
</Dependency>
5555
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.2">
5656
<Uri>https://github.com/dotnet/dotnet</Uri>
57-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
57+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
5858
</Dependency>
5959
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.2">
6060
<Uri>https://github.com/dotnet/dotnet</Uri>
61-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
61+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
6262
</Dependency>
6363
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.2">
6464
<Uri>https://github.com/dotnet/dotnet</Uri>
65-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
65+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
6666
</Dependency>
6767
<Dependency Name="System.CodeDom" Version="10.0.2">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
69+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
7070
</Dependency>
7171
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.2">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
73+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
7474
</Dependency>
7575
<Dependency Name="System.Formats.Nrbf" Version="10.0.2">
7676
<Uri>https://github.com/dotnet/dotnet</Uri>
77-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
77+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
7878
</Dependency>
7979
<Dependency Name="System.IO.Hashing" Version="10.0.2">
8080
<Uri>https://github.com/dotnet/dotnet</Uri>
81-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
81+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
8282
</Dependency>
8383
</ProductDependencies>
8484
<ToolsetDependencies>
8585
<!-- Arcade -->
86-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25601.110">
86+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25608.105">
8787
<Uri>https://github.com/dotnet/dotnet</Uri>
88-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
88+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25601.110">
90+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25608.105">
9191
<Uri>https://github.com/dotnet/dotnet</Uri>
92-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
92+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25601.110">
94+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="10.0.0-beta.25608.105">
9595
<Uri>https://github.com/dotnet/dotnet</Uri>
96-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
96+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25601.110">
98+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25608.105">
9999
<Uri>https://github.com/dotnet/dotnet</Uri>
100-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
100+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25601.110">
102+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25608.105">
103103
<Uri>https://github.com/dotnet/dotnet</Uri>
104-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
104+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.25601.110">
106+
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.25608.105">
107107
<Uri>https://github.com/dotnet/dotnet</Uri>
108-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
108+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25601.110">
110+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25608.105">
111111
<Uri>https://github.com/dotnet/dotnet</Uri>
112-
<Sha>7dedd35363daf74f94a980da38f2cf4dc86cc23a</Sha>
112+
<Sha>279bb6e979485785576d9279b6582cf7006c6f91</Sha>
113113
</Dependency>
114114
</ToolsetDependencies>
115115
</Dependencies>

‎eng/common/core-templates/job/publish-build-assets.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,14 @@ jobs:
120120

121121
- task: NuGetAuthenticate@1
122122

123+
# Populate internal runtime variables.
124+
- template: /eng/common/templates/steps/enable-internal-sources.yml
125+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
126+
parameters:
127+
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
128+
129+
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
130+
123131
- task: AzureCLI@2
124132
displayName: Publish Build Assets
125133
inputs:
@@ -132,6 +140,9 @@ jobs:
132140
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
133141
/p:MaestroApiEndpoint=https://maestro.dot.net
134142
/p:OfficialBuildId=$(OfficialBuildId)
143+
-runtimeSourceFeed https://ci.dot.net/internal
144+
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
145+
135146
condition: ${{ parameters.condition }}
136147
continueOnError: ${{ parameters.continueOnError }}
137148

@@ -200,6 +211,8 @@ jobs:
200211
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
201212
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
202213
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
214+
-runtimeSourceFeed https://ci.dot.net/internal
215+
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
203216
204217
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
205218
- template: /eng/common/core-templates/steps/publish-logs.yml

‎eng/common/core-templates/job/source-index-stage1.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ parameters:
33
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
44
preSteps: []
55
binlogPath: artifacts/log/Debug/Build.binlog
6-
condition: ''
6+
condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
77
dependsOn: ''
88
pool: ''
99
is1ESPipeline: ''
@@ -25,10 +25,10 @@ jobs:
2525
pool:
2626
${{ if eq(variables['System.TeamProject'], 'public') }}:
2727
name: $(DncEngPublicBuildPool)
28-
image: windows.vs2022.amd64.open
28+
image: windows.vs2026preview.scout.amd64.open
2929
${{ if eq(variables['System.TeamProject'], 'internal') }}:
3030
name: $(DncEngInternalBuildPool)
31-
image: windows.vs2022.amd64
31+
image: windows.vs2026preview.scout.amd64
3232

3333
steps:
3434
- ${{ if eq(parameters.is1ESPipeline, '') }}:
@@ -41,4 +41,4 @@ jobs:
4141

4242
- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
4343
parameters:
44-
binLogPath: ${{ parameters.binLogPath }}
44+
binLogPath: ${{ parameters.binLogPath }}

‎eng/common/core-templates/post-build/post-build.yml‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,11 @@ stages:
127127
${{ else }}:
128128
${{ if eq(parameters.is1ESPipeline, true) }}:
129129
name: $(DncEngInternalBuildPool)
130-
image: windows.vs2022.amd64
130+
image: windows.vs2026preview.scout.amd64
131131
os: windows
132132
${{ else }}:
133133
name: $(DncEngInternalBuildPool)
134-
demands: ImageOverride -equals windows.vs2022.amd64
134+
demands: ImageOverride -equals windows.vs2026preview.scout.amd64
135135

136136
steps:
137137
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
@@ -175,7 +175,7 @@ stages:
175175
os: windows
176176
${{ else }}:
177177
name: $(DncEngInternalBuildPool)
178-
demands: ImageOverride -equals windows.vs2022.amd64
178+
demands: ImageOverride -equals windows.vs2026preview.scout.amd64
179179
steps:
180180
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
181181
parameters:
@@ -236,7 +236,7 @@ stages:
236236
os: windows
237237
${{ else }}:
238238
name: $(DncEngInternalBuildPool)
239-
demands: ImageOverride -equals windows.vs2022.amd64
239+
demands: ImageOverride -equals windows.vs2026preview.scout.amd64
240240
steps:
241241
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
242242
parameters:
@@ -307,6 +307,13 @@ stages:
307307

308308
- task: NuGetAuthenticate@1
309309

310+
# Populate internal runtime variables.
311+
- template: /eng/common/templates/steps/enable-internal-sources.yml
312+
parameters:
313+
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
314+
315+
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
316+
310317
# Darc is targeting 8.0, so make sure it's installed
311318
- task: UseDotNet@2
312319
inputs:
@@ -328,3 +335,5 @@ stages:
328335
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
329336
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
330337
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
338+
-runtimeSourceFeed https://ci.dot.net/internal
339+
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'

0 commit comments

Comments
 (0)