Skip to content

Commit 6c76c47

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20200831.1 (#3423)
Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat From Version 5.0.0-beta.20427.5 -> To Version 5.0.0-beta.20431.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 825ae23 commit 6c76c47

File tree

11 files changed

+2016
-81
lines changed

11 files changed

+2016
-81
lines changed

eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -103,25 +103,25 @@
103103
</Dependency>
104104
</ProductDependencies>
105105
<ToolsetDependencies>
106-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20427.5">
106+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20431.1">
107107
<Uri>https://github.com/dotnet/arcade</Uri>
108-
<Sha>f2b7fe854a0b1f78c04dfc065164d6d61040f5b8</Sha>
108+
<Sha>4be47e467013f8a07a1ed7b6e49e39c8150bde54</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20427.5">
110+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20431.1">
111111
<Uri>https://github.com/dotnet/arcade</Uri>
112-
<Sha>f2b7fe854a0b1f78c04dfc065164d6d61040f5b8</Sha>
112+
<Sha>4be47e467013f8a07a1ed7b6e49e39c8150bde54</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20427.5">
114+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20431.1">
115115
<Uri>https://github.com/dotnet/arcade</Uri>
116-
<Sha>f2b7fe854a0b1f78c04dfc065164d6d61040f5b8</Sha>
116+
<Sha>4be47e467013f8a07a1ed7b6e49e39c8150bde54</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20427.5">
118+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20431.1">
119119
<Uri>https://github.com/dotnet/arcade</Uri>
120-
<Sha>f2b7fe854a0b1f78c04dfc065164d6d61040f5b8</Sha>
120+
<Sha>4be47e467013f8a07a1ed7b6e49e39c8150bde54</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20427.5">
122+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20431.1">
123123
<Uri>https://github.com/dotnet/arcade</Uri>
124-
<Sha>f2b7fe854a0b1f78c04dfc065164d6d61040f5b8</Sha>
124+
<Sha>4be47e467013f8a07a1ed7b6e49e39c8150bde54</Sha>
125125
</Dependency>
126126
</ToolsetDependencies>
127127
</Dependencies>

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
</PropertyGroup>
4444
<!-- Packages that come from https://github.com/dotnet/arcade -->
4545
<PropertyGroup>
46-
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20427.5</MicrosoftDotNetApiCompatVersion>
47-
<MicrosoftDotNetCodeAnalysisPackageVersion>5.0.0-beta.20427.5</MicrosoftDotNetCodeAnalysisPackageVersion>
48-
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20427.5</MicrosoftDotNetGenAPIVersion>
46+
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20431.1</MicrosoftDotNetApiCompatVersion>
47+
<MicrosoftDotNetCodeAnalysisPackageVersion>5.0.0-beta.20431.1</MicrosoftDotNetCodeAnalysisPackageVersion>
48+
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20431.1</MicrosoftDotNetGenAPIVersion>
4949
</PropertyGroup>
5050
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
5151
<PropertyGroup>

eng/common/build.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Param(
77
[string] $msbuildEngine = $null,
88
[bool] $warnAsError = $true,
99
[bool] $nodeReuse = $true,
10+
[bool] $useDefaultDotnetInstall = $false,
1011
[switch][Alias('r')]$restore,
1112
[switch] $deployDeps,
1213
[switch][Alias('b')]$build,
@@ -65,6 +66,7 @@ function Print-Usage() {
6566
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
6667
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
6768
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
69+
Write-Host " -useDefaultDotnetInstall <value> Use dotnet-install.* scripts from public location as opposed to from eng common folder"
6870
Write-Host ""
6971

7072
Write-Host "Command line arguments not listed above are passed thru to msbuild."

eng/common/build.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ usage()
3636
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
3737
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
3838
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
39+
echo " --useDefaultDotnetInstall <value> Use dotnet-install.* scripts from public location as opposed to from eng common folder"
40+
3941
echo ""
4042
echo "Command line arguments not listed above are passed thru to msbuild."
4143
echo "Arguments can also be passed in with a single hyphen."
@@ -78,6 +80,7 @@ prepare_machine=false
7880
verbosity='minimal'
7981
runtime_source_feed=''
8082
runtime_source_feed_key=''
83+
use_default_dotnet_install=false
8184

8285
properties=''
8386
while [[ $# > 0 ]]; do
@@ -156,10 +159,14 @@ while [[ $# > 0 ]]; do
156159
runtime_source_feed=$2
157160
shift
158161
;;
159-
-runtimesourcefeedkey)
162+
-runtimesourcefeedkey)
160163
runtime_source_feed_key=$2
161164
shift
162165
;;
166+
-usedefaultdotnetinstall)
167+
use_default_dotnet_install=$2
168+
shift
169+
;;
163170
*)
164171
properties="$properties $1"
165172
;;

0 commit comments

Comments
 (0)