Skip to content

Commit 4b9ce36

Browse files
martincostelloaspnet-contrib-service-account[bot]
martincostello
and
aspnet-contrib-service-account[bot]
authored
Update to .NET 9 (#178)
* Update to ASP.NET Core 9 preview 1 - Update to preview 1 of ASP.NET Core 9. - Disable noisy new CA1515 warning. * Bump AngleSharp Bump AngleSharp to 1.1.2. * Update .NET SDK to 9.0.100-preview.2.24157.14 (#181) * Update .NET SDK to 9.0.100-preview.3.24204.13 (#187) * Update .NET SDK Update .NET SDK to version 9.0.100-preview.3.24204.13. --- updated-dependencies: - dependency-name: Microsoft.NET.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: aspnet-contrib-service-account[bot] <161750942+aspnet-contrib-service-account[bot]@users.noreply.github.com> * Bump .NET NuGet packages Bumps .NET dependencies to their latest versions for the .NET 9.0.100-preview.3.24204.13 SDK. Bumps Microsoft.AspNetCore.Mvc.Testing from 9.0.0-preview.2.24128.4 to 9.0.0-preview.3.24172.13. Bumps Microsoft.AspNetCore.TestHost from 9.0.0-preview.2.24128.4 to 9.0.0-preview.3.24172.13. --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Mvc.Testing dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.AspNetCore.TestHost dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: aspnet-contrib-service-account[bot] <161750942+aspnet-contrib-service-account[bot]@users.noreply.github.com> * Update prerelease label Update to preview 3. --------- Signed-off-by: aspnet-contrib-service-account[bot] <161750942+aspnet-contrib-service-account[bot]@users.noreply.github.com> Co-authored-by: aspnet-contrib-service-account[bot] <161750942+aspnet-contrib-service-account[bot]@users.noreply.github.com> Co-authored-by: Martin Costello <[email protected]> * Update to ASP.NET Core 9 preview 4 Update to preview 4 of ASP.NET Core 9. * Update to ASP.NET Core 9 preview 5 (#211) Update to preview 5 of ASP.NET Core 9. * Update to ASP.NET Core 9 preview 6 Update to preview 6 of ASP.NET Core 9. * Update to ASP.NET Core 9 preview 7 Update to preview 7 of ASP.NET Core 9. * Update Arcade (#233) - Annual update of .NET Arcade for .NET 9. - Fix new warning. * Update to .NET 9 RC1 Update to release candidate 1 of ASP.NET Core 9. * Bump System.Text.Encodings.Web Bump transient package reference to fix build. * Update to .NET 9 RC2 Update to release candidate 2 of .NET 9. * Remove unused action Remove unused NuGet action. * Update to .NET 9 GA Update to the stable version of .NET 9. --------- Signed-off-by: aspnet-contrib-service-account[bot] <161750942+aspnet-contrib-service-account[bot]@users.noreply.github.com> Co-authored-by: aspnet-contrib-service-account[bot] <161750942+aspnet-contrib-service-account[bot]@users.noreply.github.com>
1 parent 61fb7dd commit 4b9ce36

File tree

93 files changed

+833
-3039
lines changed

Some content is hidden

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

93 files changed

+833
-3039
lines changed

‎.github/workflows/build.yml

-5
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,6 @@ jobs:
5151
uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0
5252
id: setup-dotnet
5353

54-
- name: Setup NuGet
55-
uses: nuget/setup-nuget@323ab0502cd38fdc493335025a96c8fdb0edc71f # v2.0.1
56-
with:
57-
nuget-version: '5.11.0'
58-
5954
# Arcade only allows the revision to contain up to two characters, and GitHub Actions does not roll-over
6055
# build numbers every day like Azure DevOps does. To balance these two requirements, set the official
6156
# build ID to be the same format as the built-in default from Arcade, except with the revision number

‎Directory.Build.props

+6-3
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@
33
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
44

55
<PropertyGroup>
6-
<DefaultNetCoreTargetFramework>net8.0</DefaultNetCoreTargetFramework>
6+
<DefaultNetCoreTargetFramework>net9.0</DefaultNetCoreTargetFramework>
77
<LangVersion>latest</LangVersion>
8-
<NoWarn>$(NoWarn);CS1591</NoWarn>
8+
<NoWarn>$(NoWarn);CA1515;CS1591</NoWarn>
99
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1010
<DebugSymbols>true</DebugSymbols>
1111
<DebugType>portable</DebugType>
12+
<SuppressSymbolPackageFormatValidation>true</SuppressSymbolPackageFormatValidation>
1213
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
1314
<DefineConstants Condition=" '$(Configuration)' == 'Debug' ">$(DefineConstants);JETBRAINS_ANNOTATIONS</DefineConstants>
1415
<Nullable>enable</Nullable>
1516
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
16-
<CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
17+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
1718
</PropertyGroup>
1819

1920
<PropertyGroup>
@@ -64,6 +65,8 @@
6465

6566
<PropertyGroup>
6667
<EnablePackageValidation>$(IsPackable)</EnablePackageValidation>
68+
<!-- TODO Re-enable when the 9.0.0 packages are published to NuGet.org -->
69+
<EnablePackageValidation>false</EnablePackageValidation>
6770
</PropertyGroup>
6871

6972
<PropertyGroup>

‎Directory.Packages.props

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
<Project>
22

33
<ItemGroup>
4-
<PackageVersion Include="AngleSharp" Version="1.0.6" />
4+
<PackageVersion Include="AngleSharp" Version="1.1.2" />
55
<PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
66
<PackageVersion Include="JustEat.HttpClientInterception" Version="4.3.0" />
77
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.4.0" />
8-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.10" />
9-
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.10" />
10-
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="7.0.3" />
8+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
9+
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.0" />
10+
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="8.0.0" />
1111
<PackageVersion Include="Shouldly" Version="4.2.1" />
12+
<PackageVersion Include="System.Text.Encodings.Web" Version="9.0.0" />
13+
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
14+
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
1215
</ItemGroup>
1316

1417
</Project>

‎eng/Version.Details.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
</ProductDependencies>
66

77
<ToolsetDependencies>
8-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21519.3">
8+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24453.1">
99
<Uri>https://github.com/dotnet/arcade</Uri>
10-
<Sha>85f3aa16d8797b5020f1fda11df1a958feb5f8df</Sha>
10+
<Sha>dd332f2d4e21daa8b79f84251ab156af9a0b11b2</Sha>
1111
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1212
</Dependency>
1313

14-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21519.3">
14+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24453.1">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>85f3aa16d8797b5020f1fda11df1a958feb5f8df</Sha>
16+
<Sha>dd332f2d4e21daa8b79f84251ab156af9a0b11b2</Sha>
1717
</Dependency>
1818
</ToolsetDependencies>
1919

‎eng/Versions.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project>
22

33
<PropertyGroup>
4-
<MajorVersion>8</MajorVersion>
4+
<MajorVersion>9</MajorVersion>
55
<MinorVersion>0</MinorVersion>
6-
<PatchVersion>1</PatchVersion>
6+
<PatchVersion>0</PatchVersion>
77
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
8-
<PackageValidationBaselineVersion>8.0.0</PackageValidationBaselineVersion>
8+
<PackageValidationBaselineVersion Condition=" '$(EnablePackageValidation)' == 'true' AND '$(PackageValidationBaselineVersion)' == '' ">9.0.0</PackageValidationBaselineVersion>
99
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
1010
<PreReleaseVersionIteration></PreReleaseVersionIteration>
1111
<PreReleaseBrandingLabel>Preview $(PreReleaseVersionIteration)</PreReleaseBrandingLabel>

‎eng/common/SetupNugetSources.ps1

+40-36
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"
@@ -35,7 +35,7 @@ Set-StrictMode -Version 2.0
3535
. $PSScriptRoot\tools.ps1
3636

3737
# Add source entry to PackageSources
38-
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) {
38+
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) {
3939
$packageSource = $sources.SelectSingleNode("add[@key='$SourceName']")
4040

4141
if ($packageSource -eq $null)
@@ -48,12 +48,17 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern
4848
else {
4949
Write-Host "Package source $SourceName already present."
5050
}
51-
52-
AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password
51+
52+
AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd
5353
}
5454

5555
# Add a credential node for the specified source
56-
function AddCredential($creds, $source, $username, $password) {
56+
function AddCredential($creds, $source, $username, $pwd) {
57+
# If no cred supplied, don't do anything.
58+
if (!$pwd) {
59+
return;
60+
}
61+
5762
# Looks for credential configuration for the given SourceName. Create it if none is found.
5863
$sourceElement = $creds.SelectSingleNode($Source)
5964
if ($sourceElement -eq $null)
@@ -82,17 +87,18 @@ function AddCredential($creds, $source, $username, $password) {
8287
$passwordElement.SetAttribute("key", "ClearTextPassword")
8388
$sourceElement.AppendChild($passwordElement) | Out-Null
8489
}
85-
$passwordElement.SetAttribute("value", $Password)
90+
91+
$passwordElement.SetAttribute("value", $pwd)
8692
}
8793

88-
function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) {
94+
function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) {
8995
$maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")
9096

9197
Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."
9298

9399
ForEach ($PackageSource in $maestroPrivateSources) {
94100
Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key
95-
AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password
101+
AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd
96102
}
97103
}
98104

@@ -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
@@ -144,23 +148,23 @@ if ($disabledSources -ne $null) {
144148
$userName = "dn-bot"
145149

146150
# Insert credential nodes for Maestro's private feeds
147-
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password
151+
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password
148152

149153
# 3.1 uses a different feed url format so it's handled differently here
150154
$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']")
151155
if ($dotnet31Source -ne $null) {
152-
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
153-
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
156+
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password
157+
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
154158
}
155159

156-
$dotnetVersions = @('5','6','7','8')
160+
$dotnetVersions = @('5','6','7','8','9')
157161

158162
foreach ($dotnetVersion in $dotnetVersions) {
159163
$feedPrefix = "dotnet" + $dotnetVersion;
160164
$dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']")
161165
if ($dotnetSource -ne $null) {
162-
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
163-
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
166+
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password
167+
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
164168
}
165169
}
166170

‎eng/common/SetupNugetSources.sh

+29-33
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=''
@@ -105,7 +99,7 @@ if [ "$?" == "0" ]; then
10599
PackageSources+=('dotnet3.1-internal-transport')
106100
fi
107101

108-
DotNetVersions=('5' '6' '7' '8')
102+
DotNetVersions=('5' '6' '7' '8' '9')
109103

110104
for DotNetVersion in ${DotNetVersions[@]} ; do
111105
FeedPrefix="dotnet${DotNetVersion}";
@@ -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.cmd

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
@echo off
2+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build.ps1""" %*"
3+
exit /b %ErrorLevel%

‎eng/common/build.ps1

+3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Param(
1919
[switch] $pack,
2020
[switch] $publish,
2121
[switch] $clean,
22+
[switch][Alias('pb')]$productBuild,
2223
[switch][Alias('bl')]$binaryLog,
2324
[switch][Alias('nobl')]$excludeCIBinarylog,
2425
[switch] $ci,
@@ -58,6 +59,7 @@ function Print-Usage() {
5859
Write-Host " -sign Sign build outputs"
5960
Write-Host " -publish Publish artifacts (e.g. symbols)"
6061
Write-Host " -clean Clean the solution"
62+
Write-Host " -productBuild Build the solution in the way it will be built in the full .NET product (VMR) build (short: -pb)"
6163
Write-Host ""
6264

6365
Write-Host "Advanced settings:"
@@ -120,6 +122,7 @@ function Build {
120122
/p:Deploy=$deploy `
121123
/p:Test=$test `
122124
/p:Pack=$pack `
125+
/p:DotNetBuildRepo=$productBuild `
123126
/p:IntegrationTest=$integrationTest `
124127
/p:PerformanceTest=$performanceTest `
125128
/p:Sign=$sign `

0 commit comments

Comments
 (0)