Skip to content

Commit a3cef5f

Browse files
[release/5.0] Update dependencies from dotnet/arcade (#27683)
[release/5.0] Update dependencies from dotnet/arcade - Merge branch 'release/5.0' into darc-release/5.0-2a6d939a-e51f-4bb6-bbbd-50a66b29c1e7
1 parent 4158756 commit a3cef5f

File tree

11 files changed

+205
-2142
lines changed

11 files changed

+205
-2142
lines changed

NuGet.config

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
<packageSources>
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6+
<!-- Begin: Package sources from dotnet-runtime -->
7+
<add key="darc-pub-dotnet-runtime-7ef6d50" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-7ef6d50b/nuget/v3/index.json" />
8+
<!-- End: Package sources from dotnet-runtime -->
69
<!-- Begin: Package sources from dotnet-efcore -->
710
<add key="darc-pub-dotnet-efcore-53d6d02" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-efcore-53d6d02d/nuget/v3/index.json" />
811
<!-- End: Package sources from dotnet-efcore -->
@@ -11,10 +14,6 @@
1114
<!-- End: Package sources from dotnet-efcore -->
1215
<!-- Begin: Package sources from dotnet-runtime -->
1316
<!-- End: Package sources from dotnet-runtime -->
14-
<!-- Begin: Package sources from dotnet-efcore -->
15-
<!-- End: Package sources from dotnet-efcore -->
16-
<!-- Begin: Package sources from dotnet-runtime -->
17-
<!-- End: Package sources from dotnet-runtime -->
1817
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
1918
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
2019
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -308,17 +308,17 @@
308308
<Uri>https://github.com/dotnet/runtime</Uri>
309309
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
310310
</Dependency>
311-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20510.1">
311+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20560.3">
312312
<Uri>https://github.com/dotnet/arcade</Uri>
313-
<Sha>6813f5aa511a7a4498fa217a54219b5704a01f83</Sha>
313+
<Sha>6f54e001de0c52e52578e5252cb279f5bc9a2eb6</Sha>
314314
</Dependency>
315-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20510.1">
315+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20560.3">
316316
<Uri>https://github.com/dotnet/arcade</Uri>
317-
<Sha>6813f5aa511a7a4498fa217a54219b5704a01f83</Sha>
317+
<Sha>6f54e001de0c52e52578e5252cb279f5bc9a2eb6</Sha>
318318
</Dependency>
319-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20510.1">
319+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20560.3">
320320
<Uri>https://github.com/dotnet/arcade</Uri>
321-
<Sha>6813f5aa511a7a4498fa217a54219b5704a01f83</Sha>
321+
<Sha>6f54e001de0c52e52578e5252cb279f5bc9a2eb6</Sha>
322322
</Dependency>
323323
</ToolsetDependencies>
324324
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
<MicrosoftEntityFrameworkCorePackageVersion>5.0.1</MicrosoftEntityFrameworkCorePackageVersion>
134134
<MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.1</MicrosoftEntityFrameworkCoreDesignPackageVersion>
135135
<!-- Packages from dotnet/arcade -->
136-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20510.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
136+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20560.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
137137
</PropertyGroup>
138138
<!--
139139

eng/common/build.ps1

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Param(
77
[string] $msbuildEngine = $null,
88
[bool] $warnAsError = $true,
99
[bool] $nodeReuse = $true,
10-
[bool] $useDefaultDotnetInstall = $false,
1110
[switch][Alias('r')]$restore,
1211
[switch] $deployDeps,
1312
[switch][Alias('b')]$build,
@@ -66,7 +65,6 @@ function Print-Usage() {
6665
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
6766
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
6867
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"
7068
Write-Host ""
7169

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

eng/common/build.sh

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ 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-
4139
echo ""
4240
echo "Command line arguments not listed above are passed thru to msbuild."
4341
echo "Arguments can also be passed in with a single hyphen."
@@ -80,7 +78,6 @@ prepare_machine=false
8078
verbosity='minimal'
8179
runtime_source_feed=''
8280
runtime_source_feed_key=''
83-
use_default_dotnet_install=false
8481

8582
properties=''
8683
while [[ $# > 0 ]]; do
@@ -159,14 +156,10 @@ while [[ $# > 0 ]]; do
159156
runtime_source_feed=$2
160157
shift
161158
;;
162-
-runtimesourcefeedkey)
159+
-runtimesourcefeedkey)
163160
runtime_source_feed_key=$2
164161
shift
165162
;;
166-
-usedefaultdotnetinstall)
167-
use_default_dotnet_install=$2
168-
shift
169-
;;
170163
*)
171164
properties="$properties $1"
172165
;;

0 commit comments

Comments
 (0)