diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index c91757e55..c1a7184c8 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.23059.1", + "version": "1.1.0-beta.23062.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 84cd20fc7..31a948ae9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,13 +205,13 @@ https://github.com/dotnet/arcade 5a5ae41c42e475e280342b668e668ff34539e36d - + https://github.com/dotnet/arcade-services - 60e937ba1a05bfa01ce51a4fe0a10fa3f5b026f8 + 068e0045e2903fb9a1ac09630c28537f09ec68d8 - + https://github.com/dotnet/arcade-services - 60e937ba1a05bfa01ce51a4fe0a10fa3f5b026f8 + 068e0045e2903fb9a1ac09630c28537f09ec68d8 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index b6a6c657d..2bcc5277a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,7 +30,7 @@ - 1.1.0-beta.23059.1 + 1.1.0-beta.23062.1 diff --git a/eng/vmr-sync.sh b/eng/vmr-sync.sh index aa747f7a0..715ab3072 100755 --- a/eng/vmr-sync.sh +++ b/eng/vmr-sync.sh @@ -83,7 +83,7 @@ function highlight () { echo "${COLOR_CYAN}$FAILURE_PREFIX${1//${COLOR_RESET}/${COLOR_CYAN}}${COLOR_CLEAR}" } -installer_dir="$scriptroot/../" +installer_dir=$(realpath "$scriptroot/../") tmp_dir='' vmr_dir='' vmr_branch='main' @@ -179,10 +179,6 @@ fi highlight "Starting the synchronization to '$target_ref'.." set +e -# Temporary workaround while we fix fetching commits -rm -rf "$tmp_dir/installer" -cp -r "$installer_dir" "$tmp_dir/installer" - if "$dotnet" darc vmr update --vmr "$vmr_dir" --tmp "$tmp_dir" --$verbosity --recursive --additional-remotes "installer:$installer_dir" "installer:$target_ref"; then highlight "Synchronization succeeded" else