Skip to content

Commit ea7a47d

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/3.1' changes
2 parents 0cbdd74 + 007b40d commit ea7a47d

File tree

7 files changed

+150
-92
lines changed

7 files changed

+150
-92
lines changed

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@
6767
<Uri>https://github.com/dotnet/core-setup</Uri>
6868
<Sha>1a04dd08e56bf52e88668c1ef2bd3f630ad442a5</Sha>
6969
</Dependency>
70-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21110.10">
70+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21158.9">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>251249a04a9686ca2660e2acaa3094446a48f10d</Sha>
72+
<Sha>ab42d248928f65dd174a2383f3256e68d9379bb7</Sha>
7373
</Dependency>
74-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.21110.10">
74+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.21158.9">
7575
<Uri>https://github.com/dotnet/arcade</Uri>
76-
<Sha>251249a04a9686ca2660e2acaa3094446a48f10d</Sha>
76+
<Sha>ab42d248928f65dd174a2383f3256e68d9379bb7</Sha>
7777
</Dependency>
7878
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
7979
<Uri>https://github.com/dotnet/corefx</Uri>
@@ -99,17 +99,17 @@
9999
<Uri>https://github.com/dotnet/coreclr</Uri>
100100
<Sha>c2e8c9f71737d87a95610851587e2a1eaf18c91c</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21110.10">
102+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21158.9">
103103
<Uri>https://github.com/dotnet/arcade</Uri>
104-
<Sha>251249a04a9686ca2660e2acaa3094446a48f10d</Sha>
104+
<Sha>ab42d248928f65dd174a2383f3256e68d9379bb7</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.21110.10">
106+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.21158.9">
107107
<Uri>https://github.com/dotnet/arcade</Uri>
108-
<Sha>251249a04a9686ca2660e2acaa3094446a48f10d</Sha>
108+
<Sha>ab42d248928f65dd174a2383f3256e68d9379bb7</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21110.10">
110+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21158.9">
111111
<Uri>https://github.com/dotnet/arcade</Uri>
112-
<Sha>251249a04a9686ca2660e2acaa3094446a48f10d</Sha>
112+
<Sha>ab42d248928f65dd174a2383f3256e68d9379bb7</Sha>
113113
</Dependency>
114114
<Dependency Name="System.Resources.Extensions" Version="4.7.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
115115
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
</PropertyGroup>
5353
<!-- Packages that come from https://github.com/dotnet/arcade -->
5454
<PropertyGroup>
55-
<MicrosoftDotNetApiCompatVersion>1.0.0-beta.21110.10</MicrosoftDotNetApiCompatVersion>
56-
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.21110.10</MicrosoftDotNetCodeAnalysisPackageVersion>
57-
<MicrosoftDotNetGenAPIVersion>1.0.0-beta.21110.10</MicrosoftDotNetGenAPIVersion>
55+
<MicrosoftDotNetApiCompatVersion>1.0.0-beta.21158.9</MicrosoftDotNetApiCompatVersion>
56+
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.21158.9</MicrosoftDotNetCodeAnalysisPackageVersion>
57+
<MicrosoftDotNetGenAPIVersion>1.0.0-beta.21158.9</MicrosoftDotNetGenAPIVersion>
5858
</PropertyGroup>
5959
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
6060
<PropertyGroup>

‎eng/common/build.ps1‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,40 +22,44 @@ Param(
2222
[switch] $ci,
2323
[switch] $prepareMachine,
2424
[switch] $help,
25+
[string] $runtimeSourceFeed = "",
26+
[string] $runtimeSourceFeedKey = "",
2527
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
2628
)
2729

2830
. $PSScriptRoot\tools.ps1
2931

3032
function Print-Usage() {
3133
Write-Host "Common settings:"
32-
Write-Host " -configuration <value> Build configuration: 'Debug' or 'Release' (short: -c)"
33-
Write-Host " -platform <value> Platform configuration: 'x86', 'x64' or any valid Platform value to pass to msbuild"
34-
Write-Host " -verbosity <value> Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] (short: -v)"
35-
Write-Host " -binaryLog Output binary log (short: -bl)"
36-
Write-Host " -help Print help and exit"
34+
Write-Host " -configuration <value> Build configuration: 'Debug' or 'Release' (short: -c)"
35+
Write-Host " -platform <value> Platform configuration: 'x86', 'x64' or any valid Platform value to pass to msbuild"
36+
Write-Host " -verbosity <value> Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] (short: -v)"
37+
Write-Host " -binaryLog Output binary log (short: -bl)"
38+
Write-Host " -help Print help and exit"
3739
Write-Host ""
3840

3941
Write-Host "Actions:"
40-
Write-Host " -restore Restore dependencies (short: -r)"
41-
Write-Host " -build Build solution (short: -b)"
42-
Write-Host " -rebuild Rebuild solution"
43-
Write-Host " -deploy Deploy built VSIXes"
44-
Write-Host " -deployDeps Deploy dependencies (e.g. VSIXes for integration tests)"
45-
Write-Host " -test Run all unit tests in the solution (short: -t)"
46-
Write-Host " -integrationTest Run all integration tests in the solution"
47-
Write-Host " -performanceTest Run all performance tests in the solution"
48-
Write-Host " -pack Package build outputs into NuGet packages and Willow components"
49-
Write-Host " -sign Sign build outputs"
50-
Write-Host " -publish Publish artifacts (e.g. symbols)"
42+
Write-Host " -restore Restore dependencies (short: -r)"
43+
Write-Host " -build Build solution (short: -b)"
44+
Write-Host " -rebuild Rebuild solution"
45+
Write-Host " -deploy Deploy built VSIXes"
46+
Write-Host " -deployDeps Deploy dependencies (e.g. VSIXes for integration tests)"
47+
Write-Host " -test Run all unit tests in the solution (short: -t)"
48+
Write-Host " -integrationTest Run all integration tests in the solution"
49+
Write-Host " -performanceTest Run all performance tests in the solution"
50+
Write-Host " -pack Package build outputs into NuGet packages and Willow components"
51+
Write-Host " -sign Sign build outputs"
52+
Write-Host " -publish Publish artifacts (e.g. symbols)"
5153
Write-Host ""
5254

5355
Write-Host "Advanced settings:"
54-
Write-Host " -projects <value> Semi-colon delimited list of sln/proj's to build. Globbing is supported (*.sln)"
55-
Write-Host " -ci Set when running on CI server"
56-
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
57-
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
58-
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
56+
Write-Host " -projects <value> Semi-colon delimited list of sln/proj's to build. Globbing is supported (*.sln)"
57+
Write-Host " -ci Set when running on CI server"
58+
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
59+
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
60+
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
61+
Write-Host " -runtimeSourceFeed <value> Alternate feed source for restoring .NET Runtimes and SDKs"
62+
Write-Host " -runtimeSourceFeedKey <value> Key value for non-public values of runtimeSourceFeed"
5963
Write-Host ""
6064

6165
Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -75,7 +79,7 @@ function InitializeCustomToolset {
7579
}
7680

7781
function Build {
78-
$toolsetBuildProj = InitializeToolset
82+
$toolsetBuildProj = InitializeToolset -runtimeSourceFeed $runtimeSourceFeed -runtimeSourceFeedKey $runtimeSourceFeedKey
7983
InitializeCustomToolset
8084

8185
$bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "Build.binlog") } else { "" }

‎eng/common/build.sh‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,14 @@ usage()
2929
echo ""
3030

3131
echo "Advanced settings:"
32-
echo " --projects <value> Project or solution file(s) to build"
33-
echo " --ci Set when running on CI server"
34-
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
35-
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
36-
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
32+
echo " --projects <value> Project or solution file(s) to build"
33+
echo " --ci Set when running on CI server"
34+
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
35+
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
36+
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
37+
echo " --runtimeSourceFeed <value> Alternate (fallback) source for .NET Runtime and SDK installation"
38+
echo " --runtimeSourceFeedKey <value> Credentials (if needed) for authenticating to runtimeSourceFeed"
39+
3740
echo ""
3841
echo "Command line arguments not listed above are passed thru to msbuild."
3942
echo "Arguments can also be passed in with a single hyphen."
@@ -73,6 +76,9 @@ configuration='Debug'
7376
prepare_machine=false
7477
verbosity='minimal'
7578

79+
runtimeSourceFeed=''
80+
runtimeSourceFeedKey=''
81+
7682
properties=''
7783

7884
while [[ $# > 0 ]]; do
@@ -141,6 +147,14 @@ while [[ $# > 0 ]]; do
141147
node_reuse=$2
142148
shift
143149
;;
150+
-runtimesourcefeed)
151+
shift
152+
runtimeSourceFeed="$1"
153+
;;
154+
-runtimesourcefeedkey)
155+
shift
156+
runtimeSourceFeedKey="$1"
157+
;;
144158
*)
145159
properties="$properties $1"
146160
;;
@@ -166,7 +180,7 @@ function InitializeCustomToolset {
166180
}
167181

168182
function Build {
169-
InitializeToolset
183+
InitializeToolset $runtimeSourceFeed $runtimeSourceFeedKey
170184
InitializeCustomToolset
171185

172186
if [[ ! -z "$projects" ]]; then

‎eng/common/tools.ps1‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ function Exec-Process([string]$command, [string]$commandArgs) {
9696
}
9797
}
9898

99-
function InitializeDotNetCli([bool]$install) {
99+
function InitializeDotNetCli([bool]$install, [string] $runtimeSourceFeed, [string] $runtimeSourceFeedKey) {
100100
if (Test-Path variable:global:_DotNetInstallDir) {
101101
return $global:_DotNetInstallDir
102102
}
@@ -138,7 +138,7 @@ function InitializeDotNetCli([bool]$install) {
138138

139139
if (-not (Test-Path(Join-Path $dotnetRoot "sdk\$dotnetSdkVersion"))) {
140140
if ($install) {
141-
InstallDotNetSdk $dotnetRoot $dotnetSdkVersion
141+
InstallDotNetSdk -dotnetRoot $dotnetRoot -version $dotnetSdkVersion -runtimeSourceFeed $runtimeSourceFeed -runtimeSourceFeedKey $runtimeSourceFeedKey
142142
} else {
143143
Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Unable to find dotnet with SDK version '$dotnetSdkVersion'"
144144
ExitWithExitCode 1
@@ -207,8 +207,8 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
207207
return $installScript
208208
}
209209

210-
function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $architecture = "") {
211-
InstallDotNet $dotnetRoot $version $architecture
210+
function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtimeSourceFeed, [string] $runtimeSourceFeedKey ) {
211+
InstallDotNet -dotnetRoot $dotnetRoot -version $version -architecture $architecture -skipNonVersionedFiles $false -runtimeSourceFeed $runtimeSourceFeed -runtimeSourceFeedKey $runtimeSourceFeedKey
212212
}
213213

214214
function InstallDotNet([string] $dotnetRoot,
@@ -233,10 +233,9 @@ function InstallDotNet([string] $dotnetRoot,
233233
& $installScript @installParameters
234234
}
235235
catch {
236-
Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet runtime '$runtime' from public location."
237-
238-
# Only the runtime can be installed from a custom [private] location.
239-
if ($runtime -and ($runtimeSourceFeed -or $runtimeSourceFeedKey)) {
236+
# If we fail, retry from a custom (possibly private) location.
237+
if ($runtimeSourceFeed -or $runtimeSourceFeedKey) {
238+
Write-Host "Failed to install dotnet runtime '$runtime' version '$version' from public location; trying specified alternate feed credentials"
240239
if ($runtimeSourceFeed) { $installParameters.AzureFeed = $runtimeSourceFeed }
241240

242241
if ($runtimeSourceFeedKey) {
@@ -253,6 +252,7 @@ function InstallDotNet([string] $dotnetRoot,
253252
ExitWithExitCode 1
254253
}
255254
} else {
255+
Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet runtime '$runtime' version '$version' from public location."
256256
ExitWithExitCode 1
257257
}
258258
}
@@ -439,7 +439,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){
439439
return $vsInfo[0]
440440
}
441441

442-
function InitializeBuildTool() {
442+
function InitializeBuildTool([string] $runtimeSourceFeed, [string] $runtimeSourceFeedKey) {
443443
if (Test-Path variable:global:_BuildTool) {
444444
return $global:_BuildTool
445445
}
@@ -451,7 +451,7 @@ function InitializeBuildTool() {
451451
# Initialize dotnet cli if listed in 'tools'
452452
$dotnetRoot = $null
453453
if (Get-Member -InputObject $GlobalJson.tools -Name "dotnet") {
454-
$dotnetRoot = InitializeDotNetCli -install:$restore
454+
$dotnetRoot = InitializeDotNetCli -install:$restore -runtimeSourceFeed $runtimeSourceFeed -runtimeSourceFeedKey $runtimeSourceFeedKey
455455
}
456456

457457
if ($msbuildEngine -eq "dotnet") {
@@ -523,7 +523,8 @@ function InitializeNativeTools() {
523523
}
524524
}
525525

526-
function InitializeToolset() {
526+
function InitializeToolset([string] $runtimeSourceFeed, [string] $runtimeSourceFeedKey)
527+
{
527528
if (Test-Path variable:global:_ToolsetBuildProj) {
528529
return $global:_ToolsetBuildProj
529530
}
@@ -545,7 +546,7 @@ function InitializeToolset() {
545546
ExitWithExitCode 1
546547
}
547548

548-
$buildTool = InitializeBuildTool
549+
$buildTool = InitializeBuildTool -runtimeSourceFeed $runtimeSourceFeed -runtimeSourceFeedKey $runtimeSourceFeedKey
549550

550551
$proj = Join-Path $ToolsetDir "restore.proj"
551552
$bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "ToolsetRestore.binlog") } else { "" }

0 commit comments

Comments
 (0)