Skip to content

Commit

Permalink
Merged PR 37392: [internal/release/6.0] Merge from public
Browse files Browse the repository at this point in the history
Merge from public release/6.0 to internal/release/6.0 and resolve conflicts if necessary
vseanreesermsft committed Feb 16, 2024

Verified

This commit was signed with the committer’s verified signature. The key has expired.
wjwwood William Woodall
2 parents d84b22e + 7163150 commit 418b263
Showing 10 changed files with 51 additions and 41 deletions.
6 changes: 6 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
@@ -5,6 +5,9 @@
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<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" />
<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" />
<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" />
<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" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -20,6 +23,9 @@
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-2b3cfc7" value="true" />
<add key="darc-int-dotnet-runtime-80de56d-1" value="true" />
<add key="darc-int-dotnet-runtime-80de56d-2" value="true" />
<add key="darc-int-dotnet-runtime-80de56d" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
24 changes: 12 additions & 12 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -126,29 +126,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
</ProductDependencies>
<ToolsetDependencies>
<!-- Arcade -->
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24059.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24113.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.24059.3">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.24113.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.24059.3">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.24113.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24059.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24113.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.24059.3">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.24113.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24059.3">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24113.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
7 changes: 4 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -51,9 +51,9 @@
</PropertyGroup>
<!-- Arcade -->
<PropertyGroup>
<MicrosoftDotNetGenFacadesPackageVersion>6.0.0-beta.24059.3</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.24059.3</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>6.0.0-beta.24059.3</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>6.0.0-beta.24113.1</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.24113.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>6.0.0-beta.24113.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
</PropertyGroup>
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->
@@ -88,6 +88,7 @@
<MicrosoftCodeAnalysisVisualBasicWorkspacesVersion>4.0.0-2.final</MicrosoftCodeAnalysisVisualBasicWorkspacesVersion>
<MicrosoftCodeAnalysisPackagesVersion>1.1.2-beta1.23322.1</MicrosoftCodeAnalysisPackagesVersion>
<MicrosoftCodeAnalysisPublicApiAnalyzers>3.3.0-beta1.final</MicrosoftCodeAnalysisPublicApiAnalyzers>
<NugetPackagingVersion>6.3.4</NugetPackagingVersion>
</PropertyGroup>
<!-- Additional unchanging dependencies -->
<PropertyGroup>
4 changes: 2 additions & 2 deletions eng/common/post-build/publish-using-darc.ps1
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ param(
try {
. $PSScriptRoot\post-build-utils.ps1

$darc = Get-Darc
$darc = Get-Darc

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

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

Write-Host 'done.'
}
}
catch {
Write-Host $_
Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels."
10 changes: 5 additions & 5 deletions eng/common/templates/job/publish-build-assets.yml
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@ jobs:
checkDownloadedFiles: true
condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}

- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- task: NuGetAuthenticate@1

@@ -74,7 +74,7 @@ jobs:
/p:OfficialBuildId=$(Build.BuildNumber)
condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}

- task: powershell@2
displayName: Create ReleaseConfigs Artifact
inputs:
@@ -83,7 +83,7 @@ jobs:
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId)
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)"
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild)
- task: PublishBuildArtifacts@1
displayName: Publish ReleaseConfigs Artifact
inputs:
@@ -109,7 +109,7 @@ jobs:
- task: PublishBuildArtifacts@1
displayName: Publish SymbolPublishingExclusionsFile Artifact
condition: eq(variables['SymbolExclusionFile'], 'true')
condition: eq(variables['SymbolExclusionFile'], 'true')
inputs:
PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
PublishLocation: Container
@@ -118,4 +118,4 @@ jobs:
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
- template: /eng/common/templates/steps/publish-logs.yml
parameters:
JobLabel: 'Publish_Artifacts_Logs'
JobLabel: 'Publish_Artifacts_Logs'
10 changes: 5 additions & 5 deletions eng/common/templates/jobs/jobs.yml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ parameters:
enabled: false
# Optional: Include toolset dependencies in the generated graph files
includeToolset: false

# Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job
jobs: []

@@ -40,7 +40,7 @@ parameters:
jobs:
- ${{ each job in parameters.jobs }}:
- template: ../job/job.yml
parameters:
parameters:
# pass along parameters
${{ each parameter in parameters }}:
${{ if ne(parameter.key, 'jobs') }}:
@@ -68,7 +68,7 @@ jobs:
${{ parameter.key }}: ${{ parameter.value }}

- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:

- ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}:
- template: ../job/publish-build-assets.yml
parameters:
@@ -88,8 +88,8 @@ jobs:
name: VSEngSS-MicroBuild2022-1ES
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Svc-Internal
${{ else }}:
name: NetCore1ESPool-Publishing-Internal
demands: ImageOverride -equals windows.vs2019.amd64

runAsPublic: ${{ parameters.runAsPublic }}
20 changes: 10 additions & 10 deletions eng/common/templates/post-build/post-build.yml
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ parameters:
displayName: Enable NuGet validation
type: boolean
default: true

- name: publishInstallersAndChecksums
displayName: Publish installers and checksums
type: boolean
@@ -124,8 +124,8 @@ stages:
displayName: Validate
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1
arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
-ToolDestinationPath $(Agent.BuildDirectory)/Extract/
arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
-ToolDestinationPath $(Agent.BuildDirectory)/Extract/

- job:
displayName: Signing Validation
@@ -220,9 +220,9 @@ stages:
displayName: Validate
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1
arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/
-ExtractPath $(Agent.BuildDirectory)/Extract/
-GHRepoName $(Build.Repository.Name)
arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/
-ExtractPath $(Agent.BuildDirectory)/Extract/
-GHRepoName $(Build.Repository.Name)
-GHCommit $(Build.SourceVersion)
-SourcelinkCliVersion $(SourceLinkCLIVersion)
continueOnError: true
@@ -253,8 +253,8 @@ stages:
name: VSEngSS-MicroBuild2022-1ES
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Svc-Internal
${{ else }}:
name: NetCore1ESPool-Publishing-Internal
demands: ImageOverride -equals windows.vs2019.amd64
steps:
- template: setup-maestro-vars.yml
@@ -266,10 +266,10 @@ stages:
displayName: Publish Using Darc
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
arguments: -BuildId $(BARBuildId)
arguments: -BuildId $(BARBuildId)
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
-MaestroToken '$(MaestroApiAccessToken)'
-WaitPublishingFinish true
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -14,9 +14,9 @@
"version": "6.0.126"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24059.3",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24059.3",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24059.3",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24113.1",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24113.1",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24113.1",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "6.0.28-servicing.24114.25"
},
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

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

Original file line number Diff line number Diff line change
@@ -23,6 +23,7 @@
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
<PackageReference Include="NuGet.Packaging" Version="$(NugetPackagingVersion)" />
</ItemGroup>

<ItemGroup>

0 comments on commit 418b263

Please sign in to comment.