mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix VMR synchronization from a local source (#15230)

Browse source
This commit is contained in:
Přemek Vysoký 2023-01-13 16:00:30 +01:00 • committed by GitHub
parent 2e488c8320
commit 65e01a1eef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.config/dotnet-tools.json
View file

@ -3,7 +3,7 @@
"isRoot": true, "isRoot": true,
"tools": { "tools": {
"microsoft.dotnet.darc": { "microsoft.dotnet.darc": {
"version": "1.1.0-beta.23059.1", "version": "1.1.0-beta.23062.1",
"commands": [ "commands": [
"darc" "darc"
] ]

8
eng/Version.Details.xml
View file

@ -205,13 +205,13 @@
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5a5ae41c42e475e280342b668e668ff34539e36d</Sha> <Sha>5a5ae41c42e475e280342b668e668ff34539e36d</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23059.1"> <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23062.1">
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>60e937ba1a05bfa01ce51a4fe0a10fa3f5b026f8</Sha> <Sha>068e0045e2903fb9a1ac09630c28537f09ec68d8</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.23059.1"> <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.23062.1">
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>60e937ba1a05bfa01ce51a4fe0a10fa3f5b026f8</Sha> <Sha>068e0045e2903fb9a1ac09630c28537f09ec68d8</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12"> <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>

2
eng/Versions.props
View file

@ -30,7 +30,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services --> <!-- Dependency from https://github.com/dotnet/arcade-services -->
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.23059.1</MicrosoftDotNetDarcLibVersion> <MicrosoftDotNetDarcLibVersion>1.1.0-beta.23062.1</MicrosoftDotNetDarcLibVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms --> <!-- Dependency from https://github.com/dotnet/winforms -->

6
eng/vmr-sync.sh
View file

@ -83,7 +83,7 @@ function highlight () {
echo "${COLOR_CYAN}$FAILURE_PREFIX${1//${COLOR_RESET}/${COLOR_CYAN}}${COLOR_CLEAR}" echo "${COLOR_CYAN}$FAILURE_PREFIX${1//${COLOR_RESET}/${COLOR_CYAN}}${COLOR_CLEAR}"
} }
installer_dir="$scriptroot/../" installer_dir=$(realpath "$scriptroot/../")
tmp_dir='' tmp_dir=''
vmr_dir='' vmr_dir=''
vmr_branch='main' vmr_branch='main'
@ -179,10 +179,6 @@ fi
highlight "Starting the synchronization to '$target_ref'.." highlight "Starting the synchronization to '$target_ref'.."
set +e 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 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" highlight "Synchronization succeeded"
else else