Skip to content

Commit 11686d3

Browse files
vseanreesermsftvseanreesermsft
committed
Merged PR 37391: [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 364d4a9 + d1b9894 commit 11686d3

File tree

8 files changed

+46
-34
lines changed

8 files changed

+46
-34
lines changed

‎NuGet.config

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,15 @@
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
77
<add key="darc-int-dotnet-runtime-2b3cfc7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2b3cfc79/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-runtime-80de56d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80de56da/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-runtime-80de56d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80de56da-2/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-runtime-80de56d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80de56da-1/nuget/v3/index.json" />
811
<!-- End: Package sources from dotnet-runtime -->
912
<!-- Begin: Package sources from dotnet-efcore -->
1013
<add key="darc-int-dotnet-efcore-b9abbbc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-b9abbbc2/nuget/v3/index.json" />
14+
<add key="darc-int-dotnet-efcore-5188cdc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-5188cdc9/nuget/v3/index.json" />
15+
<add key="darc-int-dotnet-efcore-5188cdc-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-5188cdc9-2/nuget/v3/index.json" />
16+
<add key="darc-int-dotnet-efcore-5188cdc-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-5188cdc9-1/nuget/v3/index.json" />
1117
<!-- End: Package sources from dotnet-efcore -->
1218
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1319
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -26,9 +32,15 @@
2632
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2733
<!-- Begin: Package sources from dotnet-efcore -->
2834
<add key="darc-int-dotnet-efcore-b9abbbc" value="true" />
35+
<add key="darc-int-dotnet-efcore-5188cdc-1" value="true" />
36+
<add key="darc-int-dotnet-efcore-5188cdc-2" value="true" />
37+
<add key="darc-int-dotnet-efcore-5188cdc" value="true" />
2938
<!-- End: Package sources from dotnet-efcore -->
3039
<!-- Begin: Package sources from dotnet-runtime -->
3140
<add key="darc-int-dotnet-runtime-2b3cfc7" value="true" />
41+
<add key="darc-int-dotnet-runtime-80de56d-1" value="true" />
42+
<add key="darc-int-dotnet-runtime-80de56d-2" value="true" />
43+
<add key="darc-int-dotnet-runtime-80de56d" value="true" />
3244
<!-- End: Package sources from dotnet-runtime -->
3345
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3446
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -280,22 +280,22 @@
280280
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
281281
<Sha>2b3cfc799de1c1e629f2194b67e1dbd610ea51c9</Sha>
282282
</Dependency>
283-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24059.3">
283+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24113.1">
284284
<Uri>https://github.com/dotnet/arcade</Uri>
285-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
285+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
286286
<SourceBuild RepoName="arcade" ManagedOnly="true" />
287287
</Dependency>
288-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24059.3">
288+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24113.1">
289289
<Uri>https://github.com/dotnet/arcade</Uri>
290-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
290+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
291291
</Dependency>
292-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24059.3">
292+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24113.1">
293293
<Uri>https://github.com/dotnet/arcade</Uri>
294-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
294+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24059.3">
296+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24113.1">
297297
<Uri>https://github.com/dotnet/arcade</Uri>
298-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
298+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
299299
</Dependency>
300300
</ToolsetDependencies>
301301
</Dependencies>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@
131131
<MicrosoftEntityFrameworkCoreVersion>6.0.28</MicrosoftEntityFrameworkCoreVersion>
132132
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.28</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24059.3</MicrosoftDotNetBuildTasksInstallersVersion>
135-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24059.3</MicrosoftDotNetBuildTasksTemplatingVersion>
134+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24113.1</MicrosoftDotNetBuildTasksInstallersVersion>
135+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24113.1</MicrosoftDotNetBuildTasksTemplatingVersion>
136136
</PropertyGroup>
137137
<!--
138138

‎eng/common/post-build/publish-using-darc.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ param(
1212
try {
1313
. $PSScriptRoot\post-build-utils.ps1
1414

15-
$darc = Get-Darc
15+
$darc = Get-Darc
1616

1717
$optionalParams = [System.Collections.ArrayList]::new()
1818

@@ -46,7 +46,7 @@ try {
4646
}
4747

4848
Write-Host 'done.'
49-
}
49+
}
5050
catch {
5151
Write-Host $_
5252
Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels."

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
checkDownloadedFiles: true
5252
condition: ${{ parameters.condition }}
5353
continueOnError: ${{ parameters.continueOnError }}
54-
54+
5555
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
5656
- task: NuGetAuthenticate@1
5757

@@ -74,7 +74,7 @@ jobs:
7474
/p:OfficialBuildId=$(Build.BuildNumber)
7575
condition: ${{ parameters.condition }}
7676
continueOnError: ${{ parameters.continueOnError }}
77-
77+
7878
- task: powershell@2
7979
displayName: Create ReleaseConfigs Artifact
8080
inputs:
@@ -83,7 +83,7 @@ jobs:
8383
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId)
8484
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)"
8585
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild)
86-
86+
8787
- task: PublishBuildArtifacts@1
8888
displayName: Publish ReleaseConfigs Artifact
8989
inputs:
@@ -109,7 +109,7 @@ jobs:
109109
110110
- task: PublishBuildArtifacts@1
111111
displayName: Publish SymbolPublishingExclusionsFile Artifact
112-
condition: eq(variables['SymbolExclusionFile'], 'true')
112+
condition: eq(variables['SymbolExclusionFile'], 'true')
113113
inputs:
114114
PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
115115
PublishLocation: Container
@@ -118,4 +118,4 @@ jobs:
118118
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
119119
- template: /eng/common/templates/steps/publish-logs.yml
120120
parameters:
121-
JobLabel: 'Publish_Artifacts_Logs'
121+
JobLabel: 'Publish_Artifacts_Logs'

‎eng/common/templates/jobs/jobs.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ parameters:
2020
enabled: false
2121
# Optional: Include toolset dependencies in the generated graph files
2222
includeToolset: false
23-
23+
2424
# Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job
2525
jobs: []
2626

@@ -40,7 +40,7 @@ parameters:
4040
jobs:
4141
- ${{ each job in parameters.jobs }}:
4242
- template: ../job/job.yml
43-
parameters:
43+
parameters:
4444
# pass along parameters
4545
${{ each parameter in parameters }}:
4646
${{ if ne(parameter.key, 'jobs') }}:
@@ -68,7 +68,7 @@ jobs:
6868
${{ parameter.key }}: ${{ parameter.value }}
6969

7070
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
71-
71+
7272
- ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}:
7373
- template: ../job/publish-build-assets.yml
7474
parameters:
@@ -88,8 +88,8 @@ jobs:
8888
name: VSEngSS-MicroBuild2022-1ES
8989
demands: Cmd
9090
# If it's not devdiv, it's dnceng
91-
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
92-
name: NetCore1ESPool-Svc-Internal
91+
${{ else }}:
92+
name: NetCore1ESPool-Publishing-Internal
9393
demands: ImageOverride -equals windows.vs2019.amd64
9494

9595
runAsPublic: ${{ parameters.runAsPublic }}

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ parameters:
3939
displayName: Enable NuGet validation
4040
type: boolean
4141
default: true
42-
42+
4343
- name: publishInstallersAndChecksums
4444
displayName: Publish installers and checksums
4545
type: boolean
@@ -124,8 +124,8 @@ stages:
124124
displayName: Validate
125125
inputs:
126126
filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1
127-
arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
128-
-ToolDestinationPath $(Agent.BuildDirectory)/Extract/
127+
arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
128+
-ToolDestinationPath $(Agent.BuildDirectory)/Extract/
129129

130130
- job:
131131
displayName: Signing Validation
@@ -220,9 +220,9 @@ stages:
220220
displayName: Validate
221221
inputs:
222222
filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1
223-
arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/
224-
-ExtractPath $(Agent.BuildDirectory)/Extract/
225-
-GHRepoName $(Build.Repository.Name)
223+
arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/
224+
-ExtractPath $(Agent.BuildDirectory)/Extract/
225+
-GHRepoName $(Build.Repository.Name)
226226
-GHCommit $(Build.SourceVersion)
227227
-SourcelinkCliVersion $(SourceLinkCLIVersion)
228228
continueOnError: true
@@ -253,8 +253,8 @@ stages:
253253
name: VSEngSS-MicroBuild2022-1ES
254254
demands: Cmd
255255
# If it's not devdiv, it's dnceng
256-
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
257-
name: NetCore1ESPool-Svc-Internal
256+
${{ else }}:
257+
name: NetCore1ESPool-Publishing-Internal
258258
demands: ImageOverride -equals windows.vs2019.amd64
259259
steps:
260260
- template: setup-maestro-vars.yml
@@ -266,10 +266,10 @@ stages:
266266
displayName: Publish Using Darc
267267
inputs:
268268
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
269-
arguments: -BuildId $(BARBuildId)
269+
arguments: -BuildId $(BARBuildId)
270270
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
271271
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
272272
-MaestroToken '$(MaestroApiAccessToken)'
273273
-WaitPublishingFinish true
274274
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
275-
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
275+
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
},
3030
"msbuild-sdks": {
3131
"Yarn.MSBuild": "1.22.19",
32-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24059.3",
33-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24059.3"
32+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24113.1",
33+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24113.1"
3434
}
3535
}

0 commit comments

Comments
 (0)