Skip to content

Commit 418b263

Browse files
vseanreesermsftvseanreesermsft
committed
Merged PR 37392: [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 d84b22e + 7163150 commit 418b263

File tree

10 files changed

+51
-41
lines changed

10 files changed

+51
-41
lines changed

‎NuGet.config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
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
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1013
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -20,6 +23,9 @@
2023
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2124
<!-- Begin: Package sources from dotnet-runtime -->
2225
<add key="darc-int-dotnet-runtime-2b3cfc7" value="true" />
26+
<add key="darc-int-dotnet-runtime-80de56d-1" value="true" />
27+
<add key="darc-int-dotnet-runtime-80de56d-2" value="true" />
28+
<add key="darc-int-dotnet-runtime-80de56d" 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: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -126,29 +126,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
126126
</ProductDependencies>
127127
<ToolsetDependencies>
128128
<!-- Arcade -->
129-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24059.3">
129+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24113.1">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
131+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
132132
</Dependency>
133-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.24059.3">
133+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.24113.1">
134134
<Uri>https://github.com/dotnet/arcade</Uri>
135-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
135+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
136136
</Dependency>
137-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.24059.3">
137+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.24113.1">
138138
<Uri>https://github.com/dotnet/arcade</Uri>
139-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
139+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
140140
</Dependency>
141-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24059.3">
141+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24113.1">
142142
<Uri>https://github.com/dotnet/arcade</Uri>
143-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
143+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.24059.3">
145+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.24113.1">
146146
<Uri>https://github.com/dotnet/arcade</Uri>
147-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
147+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
148148
</Dependency>
149-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24059.3">
149+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24113.1">
150150
<Uri>https://github.com/dotnet/arcade</Uri>
151-
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
151+
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
152152
</Dependency>
153153
</ToolsetDependencies>
154154
</Dependencies>

‎eng/Versions.props‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
</PropertyGroup>
5252
<!-- Arcade -->
5353
<PropertyGroup>
54-
<MicrosoftDotNetGenFacadesPackageVersion>6.0.0-beta.24059.3</MicrosoftDotNetGenFacadesPackageVersion>
55-
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.24059.3</MicrosoftDotNetRemoteExecutorVersion>
56-
<MicrosoftDotNetXUnitExtensionsPackageVersion>6.0.0-beta.24059.3</MicrosoftDotNetXUnitExtensionsPackageVersion>
54+
<MicrosoftDotNetGenFacadesPackageVersion>6.0.0-beta.24113.1</MicrosoftDotNetGenFacadesPackageVersion>
55+
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.24113.1</MicrosoftDotNetRemoteExecutorVersion>
56+
<MicrosoftDotNetXUnitExtensionsPackageVersion>6.0.0-beta.24113.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
5757
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
5858
</PropertyGroup>
5959
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->
@@ -88,6 +88,7 @@
8888
<MicrosoftCodeAnalysisVisualBasicWorkspacesVersion>4.0.0-2.final</MicrosoftCodeAnalysisVisualBasicWorkspacesVersion>
8989
<MicrosoftCodeAnalysisPackagesVersion>1.1.2-beta1.23322.1</MicrosoftCodeAnalysisPackagesVersion>
9090
<MicrosoftCodeAnalysisPublicApiAnalyzers>3.3.0-beta1.final</MicrosoftCodeAnalysisPublicApiAnalyzers>
91+
<NugetPackagingVersion>6.3.4</NugetPackagingVersion>
9192
</PropertyGroup>
9293
<!-- Additional unchanging dependencies -->
9394
<PropertyGroup>

‎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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
"version": "6.0.126"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24059.3",
18-
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24059.3",
19-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24059.3",
17+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24113.1",
18+
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24113.1",
19+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24113.1",
2020
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
2121
"Microsoft.NET.Sdk.IL": "6.0.28-servicing.24114.25"
2222
},

‎src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System.Windows.Forms.Analyzers.CSharp.Tests.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<Nullable>enable</Nullable>
@@ -15,6 +15,8 @@
1515
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
1616
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
1717
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
18+
<PackageReference Include="NuGet.Packaging" Version="$(NugetPackagingVersion)" />
19+
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
1820
<PackageReference Include="Verify.Xunit" Version="$(VerifyXunitVersion)" />
1921
</ItemGroup>
2022

‎src/System.Windows.Forms.Analyzers/tests/UnitTests/System.Windows.Forms.Analyzers.Tests.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
2424
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
2525
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
26+
<PackageReference Include="NuGet.Packaging" Version="$(NugetPackagingVersion)" />
2627
</ItemGroup>
2728

2829
<ItemGroup>

0 commit comments

Comments
 (0)