Skip to content

Commit ee19932

Browse files
committed
Merge branch 'main' into AddCoreWcfServicesLatest
2 parents 05e132e + d9fc46e commit ee19932

File tree

161 files changed

+3350
-4480
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+3350
-4480
lines changed

.CodeQL.yml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# This file configures CodeQL runs and TSA bug autofiling. For more information, see:
2+
# https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/codeql/troubleshooting/bugs/generated-library-code
3+
# (Access restricted to Microsoft employees only.)
4+
5+
path_classifiers:
6+
refs:
7+
# The tests/ directories don't contain shipping implementations of code, so they should
8+
# be excluded from analysis.
9+
- src/**/tests/*

azure-pipelines-arcade.yml

+8-3
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,19 @@ extends:
3939
sdl:
4040
sourceAnalysisPool:
4141
name: $(DncEngInternalBuildPool)
42-
image: 1es-windows-2022-pt
42+
image: 1es-windows-2022
4343
os: windows
44+
codeql:
45+
compiled:
46+
enabled: false
47+
justificationForDisabling: 'CodeQL is already enabled in pipeline dotnet-wcf-codeql; this is a duplicate scan'
4448
customBuildTags:
4549
- ES365AIMigrationTooling
4650
stages:
4751
- stage: Build
4852
displayName: Build
4953
jobs:
50-
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
54+
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/release/6.1'))) }}:
5155
- template: /eng/common/templates-official/job/onelocbuild.yml@self
5256
parameters:
5357
MirrorRepo: wcf
@@ -60,14 +64,15 @@ extends:
6064
enablePublishBuildAssets: true
6165
enablePublishUsingPipelines: $(_PublishUsingPipelines)
6266
enableTelemetry: true
67+
enableSourceIndex: ${{ eq(variables['Build.SourceBranch'], 'refs/heads/main') }}
6368
helixRepo: dotnet/wcf
6469
jobs:
6570
- job: Windows
6671
timeoutInMinutes: 90
6772
pool:
6873
${{ if eq(variables._RunAsInternal, True) }}:
6974
name: $(DncEngInternalBuildPool)
70-
image: 1es-windows-2022-pt
75+
image: 1es-windows-2022
7176
os: windows
7277
variables:
7378
- _InternalBuildArgs: ''

dotnet-svcutil.sln

+6
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-svcutil", "src\dotne
99
EndProject
1010
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-svcutil-lib.Tests", "src\dotnet-svcutil\lib\tests\src\dotnet-svcutil-lib.Tests.csproj", "{41376AC5-871E-4CAB-BCF9-1D5CD3351A90}"
1111
EndProject
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Svcutil.NamedPipeMetadataImporter", "src\dotnet-svcutil\lib\Microsoft.Svcutil.NamedPipeMetadataImporter\Microsoft.Svcutil.NamedPipeMetadataImporter.csproj", "{0EAB34F1-983D-4E18-B052-BDBE100DA83F}"
13+
EndProject
1214
Global
1315
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1416
Debug|Any CPU = Debug|Any CPU
@@ -27,6 +29,10 @@ Global
2729
{41376AC5-871E-4CAB-BCF9-1D5CD3351A90}.Debug|Any CPU.Build.0 = Debug|Any CPU
2830
{41376AC5-871E-4CAB-BCF9-1D5CD3351A90}.Release|Any CPU.ActiveCfg = Release|Any CPU
2931
{41376AC5-871E-4CAB-BCF9-1D5CD3351A90}.Release|Any CPU.Build.0 = Release|Any CPU
32+
{0EAB34F1-983D-4E18-B052-BDBE100DA83F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33+
{0EAB34F1-983D-4E18-B052-BDBE100DA83F}.Debug|Any CPU.Build.0 = Debug|Any CPU
34+
{0EAB34F1-983D-4E18-B052-BDBE100DA83F}.Release|Any CPU.ActiveCfg = Release|Any CPU
35+
{0EAB34F1-983D-4E18-B052-BDBE100DA83F}.Release|Any CPU.Build.0 = Release|Any CPU
3036
EndGlobalSection
3137
GlobalSection(SolutionProperties) = preSolution
3238
HideSolutionNode = FALSE

eng/Version.Details.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24178.6">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24324.8">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>4345e14684eab24fa2f8217706756dd7c0787d84</Sha>
9+
<Sha>79f0a2e647b3dcec3a88dcdcb9037736c21fe965</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24178.6">
11+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24324.8">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>4345e14684eab24fa2f8217706756dd7c0787d84</Sha>
13+
<Sha>79f0a2e647b3dcec3a88dcdcb9037736c21fe965</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24178.6">
15+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24324.8">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>4345e14684eab24fa2f8217706756dd7c0787d84</Sha>
17+
<Sha>79f0a2e647b3dcec3a88dcdcb9037736c21fe965</Sha>
1818
</Dependency>
1919
</ToolsetDependencies>
2020
</Dependencies>

eng/Versions.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</PropertyGroup>
1919
<!-- Arcade dependencies -->
2020
<PropertyGroup>
21-
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.24178.6</MicrosoftDotNetGenFacadesPackageVersion>
22-
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24178.6</MicrosoftDotNetXUnitExtensionsPackageVersion>
21+
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.24324.8</MicrosoftDotNetGenFacadesPackageVersion>
22+
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24324.8</MicrosoftDotNetXUnitExtensionsPackageVersion>
2323
</PropertyGroup>
2424
<!-- CoreFx dependencies -->
2525
<PropertyGroup>

eng/common/SetupNugetSources.ps1

+28-24
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
1-
# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds.
2-
# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
1+
# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
2+
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
3+
# disabled internal Maestro (darc-int*) feeds.
34
#
4-
# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
5-
# under <packageSourceCredentials> for each Maestro managed private feed. Two additional credential
6-
# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
5+
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
76
#
8-
# This script needs to be called in every job that will restore packages and which the base repo has
9-
# private AzDO feeds in the NuGet.config.
10-
#
11-
# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)`
12-
# from the AzureDevOps-Artifact-Feeds-Pats variable group.
13-
#
14-
# Any disabledPackageSources entries which start with "darc-int" will be re-enabled as part of this script executing
7+
# See example call for this script below.
158
#
169
# - task: PowerShell@2
1710
# displayName: Setup Private Feeds Credentials
@@ -21,11 +14,18 @@
2114
# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
2215
# env:
2316
# Token: $(dn-bot-dnceng-artifact-feeds-rw)
17+
#
18+
# Note that the NuGetAuthenticate task should be called after SetupNugetSources.
19+
# This ensures that:
20+
# - Appropriate creds are set for the added internal feeds (if not supplied to the scrupt)
21+
# - The credential provider is installed.
22+
#
23+
# This logic is also abstracted into enable-internal-sources.yml.
2424

2525
[CmdletBinding()]
2626
param (
2727
[Parameter(Mandatory = $true)][string]$ConfigFile,
28-
[Parameter(Mandatory = $true)][string]$Password
28+
$Password
2929
)
3030

3131
$ErrorActionPreference = "Stop"
@@ -48,11 +48,17 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern
4848
else {
4949
Write-Host "Package source $SourceName already present."
5050
}
51+
5152
AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd
5253
}
5354

5455
# Add a credential node for the specified source
5556
function AddCredential($creds, $source, $username, $pwd) {
57+
# If no cred supplied, don't do anything.
58+
if (!$pwd) {
59+
return;
60+
}
61+
5662
# Looks for credential configuration for the given SourceName. Create it if none is found.
5763
$sourceElement = $creds.SelectSingleNode($Source)
5864
if ($sourceElement -eq $null)
@@ -110,11 +116,6 @@ if (!(Test-Path $ConfigFile -PathType Leaf)) {
110116
ExitWithExitCode 1
111117
}
112118

113-
if (!$Password) {
114-
Write-PipelineTelemetryError -Category 'Build' -Message 'Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Please supply a valid PAT'
115-
ExitWithExitCode 1
116-
}
117-
118119
# Load NuGet.config
119120
$doc = New-Object System.Xml.XmlDocument
120121
$filename = (Get-Item $ConfigFile).FullName
@@ -127,11 +128,14 @@ if ($sources -eq $null) {
127128
$doc.DocumentElement.AppendChild($sources) | Out-Null
128129
}
129130

130-
# Looks for a <PackageSourceCredentials> node. Create it if none is found.
131-
$creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials")
132-
if ($creds -eq $null) {
133-
$creds = $doc.CreateElement("packageSourceCredentials")
134-
$doc.DocumentElement.AppendChild($creds) | Out-Null
131+
$creds = $null
132+
if ($Password) {
133+
# Looks for a <PackageSourceCredentials> node. Create it if none is found.
134+
$creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials")
135+
if ($creds -eq $null) {
136+
$creds = $doc.CreateElement("packageSourceCredentials")
137+
$doc.DocumentElement.AppendChild($creds) | Out-Null
138+
}
135139
}
136140

137141
# Check for disabledPackageSources; we'll enable any darc-int ones we find there
@@ -164,4 +168,4 @@ foreach ($dotnetVersion in $dotnetVersions) {
164168
}
165169
}
166170

167-
$doc.Save($filename)
171+
$doc.Save($filename)

eng/common/SetupNugetSources.sh

+28-32
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
11
#!/usr/bin/env bash
22

3-
# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds.
4-
# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
3+
# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
4+
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
5+
# disabled internal Maestro (darc-int*) feeds.
6+
#
7+
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
58
#
6-
# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
7-
# under <packageSourceCredentials> for each Maestro's managed private feed. Two additional credential
8-
# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport.
9-
#
10-
# This script needs to be called in every job that will restore packages and which the base repo has
11-
# private AzDO feeds in the NuGet.config.
12-
#
13-
# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)`
14-
# from the AzureDevOps-Artifact-Feeds-Pats variable group.
15-
#
16-
# Any disabledPackageSources entries which start with "darc-int" will be re-enabled as part of this script executing.
9+
# See example call for this script below.
1710
#
1811
# - task: Bash@3
19-
# displayName: Setup Private Feeds Credentials
12+
# displayName: Setup Internal Feeds
2013
# inputs:
2114
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
22-
# arguments: $(Build.SourcesDirectory)/NuGet.config $Token
15+
# arguments: $(Build.SourcesDirectory)/NuGet.config
2316
# condition: ne(variables['Agent.OS'], 'Windows_NT')
24-
# env:
25-
# Token: $(dn-bot-dnceng-artifact-feeds-rw)
17+
# - task: NuGetAuthenticate@1
18+
#
19+
# Note that the NuGetAuthenticate task should be called after SetupNugetSources.
20+
# This ensures that:
21+
# - Appropriate creds are set for the added internal feeds (if not supplied to the scrupt)
22+
# - The credential provider is installed.
23+
#
24+
# This logic is also abstracted into enable-internal-sources.yml.
2625

2726
ConfigFile=$1
2827
CredToken=$2
@@ -48,11 +47,6 @@ if [ ! -f "$ConfigFile" ]; then
4847
ExitWithExitCode 1
4948
fi
5049

51-
if [ -z "$CredToken" ]; then
52-
Write-PipelineTelemetryError -category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. Please supply a valid PAT"
53-
ExitWithExitCode 1
54-
fi
55-
5650
if [[ `uname -s` == "Darwin" ]]; then
5751
NL=$'\\\n'
5852
TB=''
@@ -140,18 +134,20 @@ PackageSources+="$IFS"
140134
PackageSources+=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"')
141135
IFS=$PrevIFS
142136

143-
for FeedName in ${PackageSources[@]} ; do
144-
# Check if there is no existing credential for this FeedName
145-
grep -i "<$FeedName>" $ConfigFile
146-
if [ "$?" != "0" ]; then
147-
echo "Adding credentials for $FeedName."
137+
if [ "$CredToken" ]; then
138+
for FeedName in ${PackageSources[@]} ; do
139+
# Check if there is no existing credential for this FeedName
140+
grep -i "<$FeedName>" $ConfigFile
141+
if [ "$?" != "0" ]; then
142+
echo "Adding credentials for $FeedName."
148143

149-
PackageSourceCredentialsNodeFooter="</packageSourceCredentials>"
150-
NewCredential="${TB}${TB}<$FeedName>${NL}<add key=\"Username\" value=\"dn-bot\" />${NL}<add key=\"ClearTextPassword\" value=\"$CredToken\" />${NL}</$FeedName>"
144+
PackageSourceCredentialsNodeFooter="</packageSourceCredentials>"
145+
NewCredential="${TB}${TB}<$FeedName>${NL}<add key=\"Username\" value=\"dn-bot\" />${NL}<add key=\"ClearTextPassword\" value=\"$CredToken\" />${NL}</$FeedName>"
151146

152-
sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile
153-
fi
154-
done
147+
sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile
148+
fi
149+
done
150+
fi
155151

156152
# Re-enable any entries in disabledPackageSources where the feed name contains darc-int
157153
grep -i "<disabledPackageSources>" $ConfigFile

eng/common/build.ps1

+1-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ Param(
1919
[switch] $pack,
2020
[switch] $publish,
2121
[switch] $clean,
22-
[switch] $verticalBuild,
2322
[switch][Alias('pb')]$productBuild,
2423
[switch][Alias('bl')]$binaryLog,
2524
[switch][Alias('nobl')]$excludeCIBinarylog,
@@ -60,7 +59,6 @@ function Print-Usage() {
6059
Write-Host " -sign Sign build outputs"
6160
Write-Host " -publish Publish artifacts (e.g. symbols)"
6261
Write-Host " -clean Clean the solution"
63-
Write-Host " -verticalBuild Run in 'vertical build' infra mode."
6462
Write-Host " -productBuild Build the solution in the way it will be built in the full .NET product (VMR) build (short: -pb)"
6563
Write-Host ""
6664

@@ -124,7 +122,7 @@ function Build {
124122
/p:Deploy=$deploy `
125123
/p:Test=$test `
126124
/p:Pack=$pack `
127-
/p:DotNetBuildRepo=$($productBuild -or $verticalBuild) `
125+
/p:DotNetBuildRepo=$productBuild `
128126
/p:IntegrationTest=$integrationTest `
129127
/p:PerformanceTest=$performanceTest `
130128
/p:Sign=$sign `

eng/common/build.sh

-8
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
6262
restore=false
6363
build=false
6464
source_build=false
65-
vertical_build=false
6665
product_build=false
6766
rebuild=false
6867
test=false
@@ -141,13 +140,6 @@ while [[ $# > 0 ]]; do
141140
restore=true
142141
pack=true
143142
;;
144-
-verticalbuild|-vb)
145-
build=true
146-
vertical_build=true
147-
product_build=true
148-
restore=true
149-
pack=true
150-
;;
151143
-test|-t)
152144
test=true
153145
;;

0 commit comments

Comments
 (0)