Skip to content

Commit 5918bc9

Browse files
[release/7.0] Update dependencies from dotnet/arcade (#44972)
* Update dependencies from https://github.com/dotnet/arcade build 20221108.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22513.4 -> To Version 7.0.0-beta.22558.4 * Revert "Adding `init-nuget` to Linux ARM64 (#44745)" This reverts commit 905fdae. * Revert "Adding nuget --version workaround" This reverts commit b4e2e8c. Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: William Godbe <wigodbe@microsoft.com>
1 parent 33d20ad commit 5918bc9

File tree

5 files changed

+15
-45
lines changed

5 files changed

+15
-45
lines changed

.azure/pipelines/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -489,13 +489,13 @@ stages:
489489
$(_InternalRuntimeDownloadArgs)
490490
displayName: Run build.sh
491491
- script: git clean -xfd src/**/obj/;
492-
./dockerbuild.sh bionic --ci --nobl --arch x64 --build-installers --no-build-deps --no-build-nodejs --init-nuget
492+
./dockerbuild.sh bionic --ci --nobl --arch x64 --build-installers --no-build-deps --no-build-nodejs
493493
-p:OnlyPackPlatformSpecificPackages=true -p:BuildRuntimeArchive=false -p:LinuxInstallerType=deb
494494
$(_BuildArgs)
495495
$(_InternalRuntimeDownloadArgs)
496496
displayName: Build Debian installers
497497
- script: git clean -xfd src/**/obj/;
498-
./dockerbuild.sh rhel --ci --nobl --arch x64 --build-installers --no-build-deps --no-build-nodejs --init-nuget
498+
./dockerbuild.sh rhel --ci --nobl --arch x64 --build-installers --no-build-deps --no-build-nodejs
499499
-p:OnlyPackPlatformSpecificPackages=true -p:BuildRuntimeArchive=false -p:LinuxInstallerType=rpm
500500
-p:AssetManifestFileName=aspnetcore-Linux_x64.xml
501501
$(_BuildArgs)
@@ -568,7 +568,7 @@ stages:
568568
$(_InternalRuntimeDownloadArgs)
569569
displayName: Run build.sh
570570
- script: git clean -xfd src/**/obj/;
571-
./dockerbuild.sh rhel --ci --nobl --arch arm64 --build-installers --no-build-deps --no-build-nodejs --init-nuget
571+
./dockerbuild.sh rhel --ci --nobl --arch arm64 --build-installers --no-build-deps --no-build-nodejs
572572
-p:OnlyPackPlatformSpecificPackages=true -p:BuildRuntimeArchive=false -p:LinuxInstallerType=rpm
573573
-p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
574574
$(_BuildArgs)

eng/Version.Details.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -302,22 +302,22 @@
302302
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
303303
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
304304
</Dependency>
305-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22513.4">
305+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22558.4">
306306
<Uri>https://github.com/dotnet/arcade</Uri>
307-
<Sha>02e28316bf35d1028683ee313f0794776bff18d1</Sha>
307+
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
308308
<SourceBuild RepoName="arcade" ManagedOnly="true" />
309309
</Dependency>
310-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22513.4">
310+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22558.4">
311311
<Uri>https://github.com/dotnet/arcade</Uri>
312-
<Sha>02e28316bf35d1028683ee313f0794776bff18d1</Sha>
312+
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
313313
</Dependency>
314-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22513.4">
314+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22558.4">
315315
<Uri>https://github.com/dotnet/arcade</Uri>
316-
<Sha>02e28316bf35d1028683ee313f0794776bff18d1</Sha>
316+
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
317317
</Dependency>
318-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22513.4">
318+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22558.4">
319319
<Uri>https://github.com/dotnet/arcade</Uri>
320-
<Sha>02e28316bf35d1028683ee313f0794776bff18d1</Sha>
320+
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
321321
</Dependency>
322322
</ToolsetDependencies>
323323
</Dependencies>

eng/Versions.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@
134134
<MicrosoftEntityFrameworkCoreVersion>7.0.0</MicrosoftEntityFrameworkCoreVersion>
135135
<MicrosoftEntityFrameworkCoreDesignVersion>7.0.0</MicrosoftEntityFrameworkCoreDesignVersion>
136136
<!-- Packages from dotnet/arcade -->
137-
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22513.4</MicrosoftDotNetBuildTasksInstallersVersion>
138-
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22513.4</MicrosoftDotNetBuildTasksTemplatingVersion>
137+
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22558.4</MicrosoftDotNetBuildTasksInstallersVersion>
138+
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22558.4</MicrosoftDotNetBuildTasksTemplatingVersion>
139139
<!-- Packages from dotnet/source-build-externals -->
140140
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>7.0.0-alpha.1.22505.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
141141
<!-- Packages from dotnet/xdt -->

eng/build.sh

-30
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ target_arch='x64'
3333
configuration=''
3434
runtime_source_feed=''
3535
runtime_source_feed_key=''
36-
init_nuget=false
3736

3837
if [ "$(uname)" = "Darwin" ]; then
3938
target_os_name='osx'
@@ -83,8 +82,6 @@ Options:
8382
--runtime-source-feed Additional feed that can be used when downloading .NET runtimes and SDKs
8483
--runtime-source-feed-key Key for feed that can be used when downloading .NET runtimes and SDKs
8584
86-
--init-nuget Run nuget --version.
87-
8885
Description:
8986
This build script installs required tools and runs an MSBuild command on this repository
9087
This script can be used to invoke various targets, such as targets to produce packages
@@ -211,9 +208,6 @@ while [[ $# -gt 0 ]]; do
211208
-ci)
212209
ci=true
213210
;;
214-
-init-nuget)
215-
init_nuget=true
216-
;;
217211
-binarylog|-bl)
218212
binary_log=true
219213
;;
@@ -365,30 +359,6 @@ export MSBUILDDEBUGPATH="$log_dir"
365359
_tmp_restore=$restore
366360
restore=true
367361

368-
if [[ "$init_nuget" == true ]]; then
369-
InitializeBuildTool
370-
371-
function RunBuildTool {
372-
"$_InitializeBuildTool" "$@" || {
373-
local exit_code=$?
374-
# We should not Write-PipelineTaskError here because that message shows up in the build summary
375-
# The build already logged an error, that's the reason it failed. Producing an error here only adds noise.
376-
echo "Build failed with exit code $exit_code. Check errors above."
377-
if [[ "$ci" == "true" ]]; then
378-
Write-PipelineSetResult -result "Failed" -message "nuget execution failed."
379-
# Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
380-
# The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error
381-
ExitWithExitCode 0
382-
else
383-
ExitWithExitCode $exit_code
384-
fi
385-
}
386-
}
387-
388-
echo 'Running dotnet nuget --version (issue: https://github.com/NuGet/Home/issues/12159#issuecomment-1278360511)'
389-
RunBuildTool "nuget" "--version"
390-
fi
391-
392362
InitializeToolset
393363

394364
restore=$_tmp_restore=

global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"msbuild-sdks": {
2929
"Yarn.MSBuild": "1.22.10",
30-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22513.4",
31-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22513.4"
30+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22558.4",
31+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22558.4"
3232
}
3333
}

0 commit comments

Comments
 (0)