diff --git a/eng/docker/libraries-sdk.linux.Dockerfile b/eng/docker/libraries-sdk.linux.Dockerfile index 401ce9f1ffd432..779c64f83c09a1 100644 --- a/eng/docker/libraries-sdk.linux.Dockerfile +++ b/eng/docker/libraries-sdk.linux.Dockerfile @@ -14,7 +14,7 @@ FROM $SDK_BASE_IMAGE as target ARG VERSION=8.0 ARG CONFIGURATION=Release -ENV _DOTNET_INSTALL_CHANNEL="$VERSION.1xx" +ENV _DOTNET_INSTALL_CHANNEL=$VERSION # Install latest daily SDK: RUN wget https://dot.net/v1/dotnet-install.sh @@ -52,4 +52,4 @@ COPY --from=corefxbuild \ ENV _ASPNETCORE_SOURCE="/usr/share/dotnet/shared/Microsoft.AspNetCore.App/$VERSION*" ENV _ASPNETCORE_DEST="/live-runtime-artifacts/testhost/net$VERSION-linux-$CONFIGURATION-x64/shared/Microsoft.AspNetCore.App" RUN mkdir -p $_ASPNETCORE_DEST -RUN cp -r $_ASPNETCORE_SOURCE $_ASPNETCORE_DEST \ No newline at end of file +RUN cp -r $_ASPNETCORE_SOURCE $_ASPNETCORE_DEST diff --git a/eng/docker/libraries-sdk.windows.Dockerfile b/eng/docker/libraries-sdk.windows.Dockerfile index 444b0b4c94d452..351d013468e699 100644 --- a/eng/docker/libraries-sdk.windows.Dockerfile +++ b/eng/docker/libraries-sdk.windows.Dockerfile @@ -6,7 +6,7 @@ FROM $SDK_BASE_IMAGE as target SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ARG VERSION=8.0 -ENV _DOTNET_INSTALL_CHANNEL="$VERSION.1xx" +ENV _DOTNET_INSTALL_CHANNEL=$VERSION ARG CONFIGURATION=Release USER ContainerAdministrator @@ -22,4 +22,4 @@ COPY . /live-runtime-artifacts ENV _ASPNETCORE_SOURCE="C:/Program Files/dotnet/shared/Microsoft.AspNetCore.App/$VERSION*" ENV _ASPNETCORE_DEST="C:/live-runtime-artifacts/testhost/net$VERSION-windows-$CONFIGURATION-x64/shared/Microsoft.AspNetCore.App" RUN & New-Item -ItemType Directory -Path $env:_ASPNETCORE_DEST -RUN Copy-Item -Recurse -Path $env:_ASPNETCORE_SOURCE -Destination $env:_ASPNETCORE_DEST \ No newline at end of file +RUN Copy-Item -Recurse -Path $env:_ASPNETCORE_SOURCE -Destination $env:_ASPNETCORE_DEST diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/build-local.ps1 b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/build-local.ps1 index dbdd2e696c6344..2530b5cbb2bfd6 100644 --- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/build-local.ps1 +++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/build-local.ps1 @@ -34,7 +34,7 @@ if (-not (Test-Path -Path $DailyDotnetRoot)) { Write-Host "Downloading daily SDK to: $DailyDotnetRoot" New-Item -ItemType Directory -Path $DailyDotnetRoot Invoke-WebRequest -Uri https://dot.net/v1/dotnet-install.ps1 -OutFile "$DailyDotnetRoot\dotnet-install.ps1" - & "$DailyDotnetRoot\dotnet-install.ps1" -NoPath -Channel "$Version.1xx" -Quality daily -InstallDir $DailyDotnetRoot + & "$DailyDotnetRoot\dotnet-install.ps1" -NoPath -Channel $Version -Quality daily -InstallDir $DailyDotnetRoot } else { Write-Host "Daily SDK found in $DailyDotnetRoot" } diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/build-local.sh b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/build-local.sh index f5a0e2b784575c..0fd20073a7305b 100755 --- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/build-local.sh +++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/build-local.sh @@ -37,7 +37,7 @@ if [[ ! -d $daily_dotnet_root ]]; then echo "Downloading daily SDK to $daily_dotnet_root" mkdir $daily_dotnet_root wget https://dot.net/v1/dotnet-install.sh -O $daily_dotnet_root/dotnet-install.sh - bash $daily_dotnet_root/dotnet-install.sh --no-path --channel $version.1xx --quality daily --install-dir $daily_dotnet_root + bash $daily_dotnet_root/dotnet-install.sh --no-path --channel $version --quality daily --install-dir $daily_dotnet_root else echo "Daily SDK found in $daily_dotnet_root" fi @@ -64,4 +64,4 @@ if [[ ! -f $runscript ]]; then fi echo "To run tests type:" -echo "$runscript [stress test args]" \ No newline at end of file +echo "$runscript [stress test args]" diff --git a/src/libraries/System.Net.Security/tests/StressTests/SslStress/Build-Local.ps1 b/src/libraries/System.Net.Security/tests/StressTests/SslStress/Build-Local.ps1 index cb60b735380d36..5130812a295a5e 100644 --- a/src/libraries/System.Net.Security/tests/StressTests/SslStress/Build-Local.ps1 +++ b/src/libraries/System.Net.Security/tests/StressTests/SslStress/Build-Local.ps1 @@ -38,7 +38,7 @@ if (-not (Test-Path -Path $DailyDotnetRoot)) { Write-Host "Downloading daily SDK to: $DailyDotnetRoot" New-Item -ItemType Directory -Path $DailyDotnetRoot Invoke-WebRequest -Uri https://dot.net/v1/dotnet-install.ps1 -OutFile "$DailyDotnetRoot\dotnet-install.ps1" - & "$DailyDotnetRoot\dotnet-install.ps1" -NoPath -Channel "$Version.1xx" -Quality daily -InstallDir $DailyDotnetRoot + & "$DailyDotnetRoot\dotnet-install.ps1" -NoPath -Channel $Version -Quality daily -InstallDir $DailyDotnetRoot } else { Write-Host "Daily SDK found in $DailyDotnetRoot" } diff --git a/src/libraries/System.Net.Security/tests/StressTests/SslStress/build-local.sh b/src/libraries/System.Net.Security/tests/StressTests/SslStress/build-local.sh index 1d4b0ae73461d9..907bd084035fbe 100755 --- a/src/libraries/System.Net.Security/tests/StressTests/SslStress/build-local.sh +++ b/src/libraries/System.Net.Security/tests/StressTests/SslStress/build-local.sh @@ -39,7 +39,7 @@ if [[ ! -d $daily_dotnet_root ]]; then echo "Downloading daily SDK to $daily_dotnet_root" mkdir $daily_dotnet_root wget https://dot.net/v1/dotnet-install.sh -O $daily_dotnet_root/dotnet-install.sh - bash $daily_dotnet_root/dotnet-install.sh --no-path --channel $version.1xx --quality daily --install-dir $daily_dotnet_root + bash $daily_dotnet_root/dotnet-install.sh --no-path --channel $version --quality daily --install-dir $daily_dotnet_root else echo "Daily SDK found in $daily_dotnet_root" fi @@ -59,4 +59,4 @@ if [[ ! -f $runscript ]]; then fi echo "To run tests type:" -echo "$runscript [stress test args]" \ No newline at end of file +echo "$runscript [stress test args]"