Merge commit 'fb7ac0ff0437c5405458a2a953d29a6aeb5e76f0'

Author: Mirroring

eng/Version.Details.xml

@@ -1,8 +1,8 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="8.0.0-rtm.25565.1">
+    <Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="8.0.0-rtm.25625.2">
       <Uri>https://github.com/dotnet/icu</Uri>
-      <Sha>b565264ebc86c4444a7a5d411f69674393d61265</Sha>
+      <Sha>7e1e01ce174204fc50e1b221c59cbd2c7a752441</Sha>
     </Dependency>
     <Dependency Name="System.Net.MsQuic.Transport" Version="8.0.0-alpha.1.23527.1">
       <Uri>https://github.com/dotnet/msquic</Uri>
@@ -185,57 +185,57 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
     </Dependency>
-    <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.25565.1">
+    <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.25625.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
+      <Sha>98185bc6d28f41decb681555c343a62b3c6c165e</Sha>
     </Dependency>
-    <Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.25565.1">
+    <Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.25625.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
+      <Sha>98185bc6d28f41decb681555c343a62b3c6c165e</Sha>
     </Dependency>
-    <Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.25565.1">
+    <Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.25625.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
+      <Sha>98185bc6d28f41decb681555c343a62b3c6c165e</Sha>
     </Dependency>
-    <Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.25565.1">
+    <Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.25625.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
+      <Sha>98185bc6d28f41decb681555c343a62b3c6c165e</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.25565.1">
+    <Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.25625.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
+      <Sha>98185bc6d28f41decb681555c343a62b3c6c165e</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.25565.1">
+    <Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.25625.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
+      <Sha>98185bc6d28f41decb681555c343a62b3c6c165e</Sha>
     </Dependency>
-    <Dependency Name="System.Net.TestData" Version="8.0.0-beta.25565.1">
+    <Dependency Name="System.Net.TestData" Version="8.0.0-beta.25625.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
+      <Sha>98185bc6d28f41decb681555c343a62b3c6c165e</Sha>
     </Dependency>
-    <Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.25565.1">
+    <Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.25625.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
+      <Sha>98185bc6d28f41decb681555c343a62b3c6c165e</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.25565.1">
+    <Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.25625.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
+      <Sha>98185bc6d28f41decb681555c343a62b3c6c165e</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.25565.1">
+    <Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.25625.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
+      <Sha>98185bc6d28f41decb681555c343a62b3c6c165e</Sha>
     </Dependency>
-    <Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.25565.1">
+    <Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.25625.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
+      <Sha>98185bc6d28f41decb681555c343a62b3c6c165e</Sha>
     </Dependency>
-    <Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.25565.1">
+    <Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.25625.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
+      <Sha>98185bc6d28f41decb681555c343a62b3c6c165e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.25565.1">
+    <Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.25625.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
+      <Sha>98185bc6d28f41decb681555c343a62b3c6c165e</Sha>
     </Dependency>
     <Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="16.0.5-alpha.1.25311.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100">
       <Uri>https://github.com/dotnet/llvm-project</Uri>
@@ -354,13 +354,13 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
       <Sha>67613417f5e1af250e6ddfba79f8f2885d8e90fb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.25574.3">
+    <Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.25625.3">
       <Uri>https://github.com/dotnet/hotreload-utils</Uri>
-      <Sha>cf2f6ad655ebd5397042ea09d529ecc0c194a499</Sha>
+      <Sha>e7e99065bbd4a7b911d5cfa56b23d873d9675355</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.25565.1">
+    <Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.25625.3">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>40ac8f2e43695322e5472fef7f3ad85cfdd83e1e</Sha>
+      <Sha>98185bc6d28f41decb681555c343a62b3c6c165e</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.23566.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>

eng/Versions.props

@@ -155,20 +155,20 @@
     <SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
     <runtimenativeSystemIOPortsVersion>8.0.0-rc.1.23406.6</runtimenativeSystemIOPortsVersion>
     <!-- Runtime-Assets dependencies -->
-    <SystemRuntimeNumericsTestDataVersion>8.0.0-beta.25565.1</SystemRuntimeNumericsTestDataVersion>
-    <SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.25565.1</SystemComponentModelTypeConverterTestDataVersion>
-    <SystemDataCommonTestDataVersion>8.0.0-beta.25565.1</SystemDataCommonTestDataVersion>
-    <SystemDrawingCommonTestDataVersion>8.0.0-beta.25565.1</SystemDrawingCommonTestDataVersion>
-    <SystemFormatsTarTestDataVersion>8.0.0-beta.25565.1</SystemFormatsTarTestDataVersion>
-    <SystemIOCompressionTestDataVersion>8.0.0-beta.25565.1</SystemIOCompressionTestDataVersion>
-    <SystemIOPackagingTestDataVersion>8.0.0-beta.25565.1</SystemIOPackagingTestDataVersion>
-    <SystemNetTestDataVersion>8.0.0-beta.25565.1</SystemNetTestDataVersion>
-    <SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.25565.1</SystemPrivateRuntimeUnicodeDataVersion>
-    <SystemRuntimeTimeZoneDataVersion>8.0.0-beta.25565.1</SystemRuntimeTimeZoneDataVersion>
-    <SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.25565.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
-    <SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.25565.1</SystemTextRegularExpressionsTestDataVersion>
-    <SystemWindowsExtensionsTestDataVersion>8.0.0-beta.25565.1</SystemWindowsExtensionsTestDataVersion>
-    <MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.25565.1</MicrosoftDotNetCilStripSourcesVersion>
+    <SystemRuntimeNumericsTestDataVersion>8.0.0-beta.25625.3</SystemRuntimeNumericsTestDataVersion>
+    <SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.25625.3</SystemComponentModelTypeConverterTestDataVersion>
+    <SystemDataCommonTestDataVersion>8.0.0-beta.25625.3</SystemDataCommonTestDataVersion>
+    <SystemDrawingCommonTestDataVersion>8.0.0-beta.25625.3</SystemDrawingCommonTestDataVersion>
+    <SystemFormatsTarTestDataVersion>8.0.0-beta.25625.3</SystemFormatsTarTestDataVersion>
+    <SystemIOCompressionTestDataVersion>8.0.0-beta.25625.3</SystemIOCompressionTestDataVersion>
+    <SystemIOPackagingTestDataVersion>8.0.0-beta.25625.3</SystemIOPackagingTestDataVersion>
+    <SystemNetTestDataVersion>8.0.0-beta.25625.3</SystemNetTestDataVersion>
+    <SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.25625.3</SystemPrivateRuntimeUnicodeDataVersion>
+    <SystemRuntimeTimeZoneDataVersion>8.0.0-beta.25625.3</SystemRuntimeTimeZoneDataVersion>
+    <SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.25625.3</SystemSecurityCryptographyX509CertificatesTestDataVersion>
+    <SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.25625.3</SystemTextRegularExpressionsTestDataVersion>
+    <SystemWindowsExtensionsTestDataVersion>8.0.0-beta.25625.3</SystemWindowsExtensionsTestDataVersion>
+    <MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.25625.3</MicrosoftDotNetCilStripSourcesVersion>
     <!-- dotnet-optimization dependencies -->
     <optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx64MIBCRuntimeVersion>
     <optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -184,10 +184,11 @@
     <NetStandardLibraryVersion>2.0.3</NetStandardLibraryVersion>
     <MicrosoftDiagnosticsToolsRuntimeClientVersion>1.0.4-preview6.19326.1</MicrosoftDiagnosticsToolsRuntimeClientVersion>
     <DNNEVersion>2.0.5</DNNEVersion>
+    <!-- Intentionally using explicit versions for all MSBuild properties - required by source-build. -->
     <MicrosoftBuildVersion>17.8.3</MicrosoftBuildVersion>
-    <MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildTasksCoreVersion>
-    <MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>
-    <MicrosoftBuildUtilitiesCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildUtilitiesCoreVersion>
+    <MicrosoftBuildTasksCoreVersion>17.8.3</MicrosoftBuildTasksCoreVersion>
+    <MicrosoftBuildFrameworkVersion>17.8.3</MicrosoftBuildFrameworkVersion>
+    <MicrosoftBuildUtilitiesCoreVersion>17.8.3</MicrosoftBuildUtilitiesCoreVersion>
     <NugetFrameworksVersion>6.2.4</NugetFrameworksVersion>
     <NugetProjectModelVersion>6.2.4</NugetProjectModelVersion>
     <NugetPackagingVersion>6.2.4</NugetPackagingVersion>
@@ -200,7 +201,7 @@
     <MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.25516.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
     <MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.25516.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
     <MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.25516.2</MicrosoftDotNetXHarnessCLIVersion>
-    <MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.25574.3</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
+    <MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.25625.3</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
     <XUnitVersion>2.4.2</XUnitVersion>
     <XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
     <XUnitRunnerVisualStudioVersion>2.4.5</XUnitRunnerVisualStudioVersion>
@@ -231,7 +232,7 @@
     <!-- ILCompiler -->
     <MicrosoftDotNetILCompilerVersion>8.0.0-rc.1.23406.6</MicrosoftDotNetILCompilerVersion>
     <!-- ICU -->
-    <MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-rtm.25565.1</MicrosoftNETCoreRuntimeICUTransportVersion>
+    <MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-rtm.25625.2</MicrosoftNETCoreRuntimeICUTransportVersion>
     <!-- MsQuic -->
     <MicrosoftNativeQuicMsQuicSchannelVersion>2.4.8</MicrosoftNativeQuicMsQuicSchannelVersion>
     <!-- Mono LLVM -->

eng/docker/build-docker-sdk.ps1

@@ -9,10 +9,11 @@ Param(
   [switch][Alias('w')]$buildWindowsContainers
 )
 
-$dotNetVersion="8.0"
 $ErrorActionPreference = "Stop"
 
 $REPO_ROOT_DIR=$(git -C "$PSScriptRoot" rev-parse --show-toplevel)
+[xml]$xml = Get-Content (Join-Path $REPO_ROOT_DIR "eng\Versions.props")
+$VERSION="$($xml.Project.PropertyGroup.MajorVersion[0]).$($xml.Project.PropertyGroup.MinorVersion[0])"
 
 $dockerFilePrefix="$PSScriptRoot/libraries-sdk"
 
@@ -29,7 +30,7 @@ if ($buildWindowsContainers)
   }
 
   $dockerFile="$dockerFilePrefix.windows.Dockerfile"
-  
+
   # Collect the following artifacts to folder, that will be used as build context for the container,
   # so projects can build and test against the live-built runtime:
   # 1. Reference assembly pack (microsoft.netcore.app.ref)
@@ -54,15 +55,16 @@ if ($buildWindowsContainers)
                      -Destination $dockerContext\targetingpacks.targets
   Copy-Item -Recurse -Path $REPO_ROOT_DIR\src\libraries\System.Net.Quic\src\System\Net\Quic\Interop `
                      -Destination $dockerContext\msquic-interop
-  
+
   # In case of non-CI builds, testhost may already contain Microsoft.AspNetCore.App (see build-local.ps1 in HttpStress):
-  $testHostAspNetCorePath="$dockerContext\testhost\net$dotNetVersion-windows-$configuration-x64/shared/Microsoft.AspNetCore.App"
+  $testHostAspNetCorePath="$dockerContext\testhost\net$VERSION-windows-$configuration-x64/shared/Microsoft.AspNetCore.App"
   if (Test-Path $testHostAspNetCorePath) {
     Remove-Item -Recurse -Force $testHostAspNetCorePath
   }
-  
+
   docker build --tag $imageName `
     --build-arg CONFIGURATION=$configuration `
+    --build-arg VERSION=$VERSION `
     --file $dockerFile `
     $dockerContext
 }
@@ -73,6 +75,7 @@ else
 
   docker build --tag $imageName `
       --build-arg CONFIGURATION=$configuration `
+      --build-arg "VERSION=$VERSION" `
       --file $dockerFile `
       $REPO_ROOT_DIR
 }

eng/docker/build-docker-sdk.sh

@@ -23,8 +23,12 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
 
 imagename="dotnet-sdk-libs-current"
 configuration="Release"
+repo_root=$(git -C "$scriptroot" rev-parse --show-toplevel)
+major_version=$(grep -oP '(?<=<MajorVersion>).*?(?=</MajorVersion>)' "$repo_root/eng/Versions.props")
+minor_version=$(grep -oP '(?<=<MinorVersion>).*?(?=</MinorVersion>)' "$repo_root/eng/Versions.props")
+version="$major_version.$minor_version"
 
-while [[ $# > 0 ]]; do
+while [[ $# -gt 0 ]]; do
   opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
   case "$opt" in
     -imagename|-t)
@@ -41,12 +45,12 @@ while [[ $# > 0 ]]; do
   esac
 done
 
-repo_root=$(git rev-parse --show-toplevel)
 docker_file="$scriptroot/libraries-sdk.linux.Dockerfile"
 
 docker build --tag $imagename \
     --build-arg CONFIGURATION=$configuration \
+    --build-arg VERSION=$version \
     --file $docker_file \
     $repo_root
 
-exit $?
+exit $?

eng/docker/libraries-sdk.linux.Dockerfile

@@ -1,6 +1,6 @@
 # Builds and copies library artifacts into target dotnet sdk image
 ARG BUILD_BASE_IMAGE=mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8
-ARG SDK_BASE_IMAGE=mcr.microsoft.com/dotnet/nightly/sdk:7.0-bullseye-slim
+ARG SDK_BASE_IMAGE=mcr.microsoft.com/dotnet/nightly/sdk:latest
 
 FROM $BUILD_BASE_IMAGE as corefxbuild
 
@@ -12,12 +12,15 @@ RUN ./build.sh clr+libs -runtimeconfiguration Release -configuration $CONFIGURAT
 
 FROM $SDK_BASE_IMAGE as target
 
-ARG VERSION=8.0
+ARG VERSION
 ARG CONFIGURATION=Release
 ENV _DOTNET_INSTALL_CHANNEL=$VERSION
 
+# remove the existing SDK, we want to start from a clean slate with latest daily
+RUN rm -rf /usr/share/dotnet
+
 # Install latest daily SDK:
-RUN wget https://dot.net/v1/dotnet-install.sh
+RUN wget https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh
 RUN bash ./dotnet-install.sh --channel $_DOTNET_INSTALL_CHANNEL --quality daily --install-dir /usr/share/dotnet
 
 # Collect the following artifacts under /live-runtime-artifacts,
@@ -48,8 +51,8 @@ COPY --from=corefxbuild \
     /repo/src/libraries/System.Net.Quic/src/System/Net/Quic/Interop \
     /live-runtime-artifacts/msquic-interop
 
-# Add AspNetCore bits to testhost:
-ENV _ASPNETCORE_SOURCE="/usr/share/dotnet/shared/Microsoft.AspNetCore.App/$VERSION*"
+# Add AspNetCore bits to testhost, there should be only one version since we started from an image without existing SDK:
+ENV _ASPNETCORE_SOURCE="/usr/share/dotnet/shared/Microsoft.AspNetCore.App/*"
 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

eng/docker/libraries-sdk.windows.Dockerfile

@@ -1,6 +1,6 @@
 # escape=`
 # Simple Dockerfile which copies clr and library build artifacts into target dotnet sdk image
-ARG SDK_BASE_IMAGE=mcr.microsoft.com/dotnet/nightly/sdk:7.0-nanoserver-ltsc2022
+ARG SDK_BASE_IMAGE=mcr.microsoft.com/dotnet/nightly/sdk:8.0-nanoserver-ltsc2022
 FROM $SDK_BASE_IMAGE as target
 
 SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
@@ -11,15 +11,18 @@ ARG CONFIGURATION=Release
 
 USER ContainerAdministrator
 
-RUN Invoke-WebRequest -Uri https://dot.net/v1/dotnet-install.ps1 -OutFile .\dotnet-install.ps1
+# remove the existing ASP.NET SDK, we want to keep only the latest one we download later
+RUN Remove-Item -Force -Recurse 'C:/Program Files/dotnet/shared/Microsoft.AspNetCore.App/*'
+
+RUN Invoke-WebRequest -Uri https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1 -OutFile .\dotnet-install.ps1
 RUN & .\dotnet-install.ps1 -Channel $env:_DOTNET_INSTALL_CHANNEL -Quality daily -InstallDir 'C:/Program Files/dotnet'
 
 USER ContainerUser
 
 COPY . /live-runtime-artifacts
 
 # Add AspNetCore bits to testhost:
-ENV _ASPNETCORE_SOURCE="C:/Program Files/dotnet/shared/Microsoft.AspNetCore.App/$VERSION*"
+ENV _ASPNETCORE_SOURCE="C:/Program Files/dotnet/shared/Microsoft.AspNetCore.App/*"
 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

eng/pipelines/common/evaluate-paths-job.yml

@@ -34,6 +34,7 @@ jobs:
     - checkout: self
       clean: true
       fetchDepth: 2
+      fetchTags: false
 
     - ${{ if ne(parameters.paths[0], '') }}:
       - ${{ each path in parameters.paths }}:

eng/pipelines/common/global-build-job.yml

@@ -149,6 +149,7 @@ jobs:
 
     - checkout: self
       clean: true
+      fetchTags: false
       # If running in source build mode, a git stash will be used for the inner clone. Avoid setting a fetch depth,
       # as a stash of a shallow cloned repo is not currently supported.
       ${{ if ne(parameters.isSourceBuild, true) }}:

eng/pipelines/common/templates/runtimes/xplat-job.yml

@@ -104,5 +104,6 @@ jobs:
     - checkout: self
       clean: true
       fetchDepth: $(checkoutFetchDepth)
+      fetchTags: false
 
     - ${{ parameters.steps }}