diff options
author | Bruno Oliveira <brunolins16@users.noreply.github.com> | 2022-10-26 03:10:16 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-26 03:10:16 +0300 |
commit | 68fcc9c09195136d07f6f35681f0ca37eb576d17 (patch) | |
tree | 67308c781aaf466315f5e281648822ad1b3360a6 /eng | |
parent | f73a1835a1454d31337b850e6adaedcf597b5119 (diff) |
Updating SDK version (#44734)
* Update SDK (#44601)
* Update SDK
* Update global.json
* Trying previous version
* Update global.json
* Updating 8.0.100-alpha.1.22524
* Updating MicrosoftNetCompilersToolsetVersion to 4.5.0-1.22517.9
* Fix CA1507
* Removing EnableAltSvc
Co-authored-by: Sébastien Ros <sebastienros@gmail.com>
Co-authored-by: Bruno Oliveira <brunolins16@users.noreply.github.com>
Co-authored-by: Bruno Oliveira <brolivei@microsoft.com>
* Adding nuget --version workaround
Co-authored-by: Mackinnon Buck <mackinnon.buck@gmail.com>
Co-authored-by: Sébastien Ros <sebastienros@gmail.com>
Diffstat (limited to 'eng')
-rw-r--r-- | eng/Versions.props | 2 | ||||
-rwxr-xr-x | eng/build.sh | 30 |
2 files changed, 31 insertions, 1 deletions
diff --git a/eng/Versions.props b/eng/Versions.props index 3e8a2a0718..70a163c09f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -161,7 +161,7 @@ <PropertyGroup Label="Manual"> <!-- Bumping the Roslyn version used in order to ingest the new runtime source generators --> <UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers> - <MicrosoftNetCompilersToolsetVersion>4.4.0-3.22452.8</MicrosoftNetCompilersToolsetVersion> + <MicrosoftNetCompilersToolsetVersion>4.5.0-1.22517.9</MicrosoftNetCompilersToolsetVersion> <!-- DiagnosticAdapter package pinned temporarily until migrated/deprecated --> <MicrosoftExtensionsDiagnosticAdapterVersion>5.0.0-preview.4.20180.4</MicrosoftExtensionsDiagnosticAdapterVersion> <!-- Build tool dependencies --> diff --git a/eng/build.sh b/eng/build.sh index a6b6ba99be..093b04affd 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -33,6 +33,7 @@ target_arch='x64' configuration='' runtime_source_feed='' runtime_source_feed_key='' +init_nuget=false if [ "$(uname)" = "Darwin" ]; then target_os_name='osx' @@ -82,6 +83,8 @@ Options: --runtime-source-feed Additional feed that can be used when downloading .NET runtimes and SDKs --runtime-source-feed-key Key for feed that can be used when downloading .NET runtimes and SDKs + --init-nuget Run nuget --version. + Description: This build script installs required tools and runs an MSBuild command on this repository This script can be used to invoke various targets, such as targets to produce packages @@ -208,6 +211,9 @@ while [[ $# -gt 0 ]]; do -ci) ci=true ;; + -init-nuget) + init_nuget=true + ;; -binarylog|-bl) binary_log=true ;; @@ -359,6 +365,30 @@ export MSBUILDDEBUGPATH="$log_dir" _tmp_restore=$restore restore=true +if [[ "$init_nuget" == true ]]; then + InitializeBuildTool + + function RunBuildTool { + "$_InitializeBuildTool" "$@" || { + local exit_code=$? + # We should not Write-PipelineTaskError here because that message shows up in the build summary + # The build already logged an error, that's the reason it failed. Producing an error here only adds noise. + echo "Build failed with exit code $exit_code. Check errors above." + if [[ "$ci" == "true" ]]; then + Write-PipelineSetResult -result "Failed" -message "nuget execution failed." + # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error + # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error + ExitWithExitCode 0 + else + ExitWithExitCode $exit_code + fi + } + } + + echo 'Running dotnet nuget --version (issue: https://github.com/NuGet/Home/issues/12159#issuecomment-1278360511)' + RunBuildTool "nuget" "--version" +fi + InitializeToolset restore=$_tmp_restore= |