Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions eng/Version.Details.xml
Original file line numberDiff line numberDiff line change
@@ -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>
Expand DownExpand Up@@ -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>
Expand DownExpand Up@@ -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>
Expand Down
39 changes: 20 additions & 19 deletions eng/Versions.props
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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>
Expand All@@ -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>
Expand DownExpand Up@@ -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 -->
Expand Down
13 changes: 8 additions & 5 deletions eng/docker/build-docker-sdk.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -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"

Expand All@@ -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)
Expand All@@ -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
}
Expand All@@ -73,6 +75,7 @@ else

docker build --tag $imageName `
--build-arg CONFIGURATION=$configuration `
--build-arg "VERSION=$VERSION" `
--file $dockerFile `
$REPO_ROOT_DIR
}
Expand Down
10 changes: 7 additions & 3 deletions eng/docker/build-docker-sdk.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand All@@ -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 $?
13 changes: 8 additions & 5 deletions eng/docker/libraries-sdk.linux.Dockerfile
Original file line numberDiff line numberDiff line change
@@ -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

Expand All@@ -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,
Expand DownExpand Up@@ -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
9 changes: 6 additions & 3 deletions eng/docker/libraries-sdk.windows.Dockerfile
Original file line numberDiff line numberDiff line change
@@ -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';"]
Expand All@@ -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
1 change: 1 addition & 0 deletions eng/pipelines/common/evaluate-paths-job.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ jobs:
- checkout: self
clean: true
fetchDepth: 2
fetchTags: false

- ${{ if ne(parameters.paths[0], '') }}:
- ${{ each path in parameters.paths }}:
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/common/global-build-job.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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) }}:
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/common/templates/runtimes/xplat-job.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,5 +104,6 @@ jobs:
- checkout: self
clean: true
fetchDepth: $(checkoutFetchDepth)
fetchTags: false

- ${{ parameters.steps }}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions eng/Version.Details.xml
Original file line numberDiff line numberDiff line change
@@ -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>
Expand DownExpand Up@@ -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>
Expand DownExpand Up@@ -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>
Expand Down
39 changes: 20 additions & 19 deletions eng/Versions.props
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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>
Expand All@@ -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>
Expand DownExpand Up@@ -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 -->
Expand Down
13 changes: 8 additions & 5 deletions eng/docker/build-docker-sdk.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -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"

Expand All@@ -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)
Expand All@@ -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
}
Expand All@@ -73,6 +75,7 @@ else

docker build --tag $imageName `
--build-arg CONFIGURATION=$configuration `
--build-arg "VERSION=$VERSION" `
--file $dockerFile `
$REPO_ROOT_DIR
}
Expand Down
10 changes: 7 additions & 3 deletions eng/docker/build-docker-sdk.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand All@@ -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 $?
13 changes: 8 additions & 5 deletions eng/docker/libraries-sdk.linux.Dockerfile
Original file line numberDiff line numberDiff line change
@@ -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

Expand All@@ -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,
Expand DownExpand Up@@ -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
9 changes: 6 additions & 3 deletions eng/docker/libraries-sdk.windows.Dockerfile
Original file line numberDiff line numberDiff line change
@@ -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';"]
Expand All@@ -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
1 change: 1 addition & 0 deletions eng/pipelines/common/evaluate-paths-job.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ jobs:
- checkout: self
clean: true
fetchDepth: 2
fetchTags: false

- ${{ if ne(parameters.paths[0], '') }}:
- ${{ each path in parameters.paths }}:
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/common/global-build-job.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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) }}:
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/common/templates/runtimes/xplat-job.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,5 +104,6 @@ jobs:
- checkout: self
clean: true
fetchDepth: $(checkoutFetchDepth)
fetchTags: false

- ${{ parameters.steps }}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions eng/Version.Details.xml
Original file line numberDiff line numberDiff line change
@@ -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>
Expand DownExpand Up@@ -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>
Expand DownExpand Up@@ -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>
Expand Down
39 changes: 20 additions & 19 deletions eng/Versions.props
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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>
Expand All@@ -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>
Expand DownExpand Up@@ -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 -->
Expand Down
13 changes: 8 additions & 5 deletions eng/docker/build-docker-sdk.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -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"

Expand All@@ -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)
Expand All@@ -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
}
Expand All@@ -73,6 +75,7 @@ else

docker build --tag $imageName `
--build-arg CONFIGURATION=$configuration `
--build-arg "VERSION=$VERSION" `
--file $dockerFile `
$REPO_ROOT_DIR
}
Expand Down
10 changes: 7 additions & 3 deletions eng/docker/build-docker-sdk.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand All@@ -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 $?
13 changes: 8 additions & 5 deletions eng/docker/libraries-sdk.linux.Dockerfile
Original file line numberDiff line numberDiff line change
@@ -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

Expand All@@ -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,
Expand DownExpand Up@@ -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
9 changes: 6 additions & 3 deletions eng/docker/libraries-sdk.windows.Dockerfile
Original file line numberDiff line numberDiff line change
@@ -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';"]
Expand All@@ -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
1 change: 1 addition & 0 deletions eng/pipelines/common/evaluate-paths-job.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ jobs:
- checkout: self
clean: true
fetchDepth: 2
fetchTags: false

- ${{ if ne(parameters.paths[0], '') }}:
- ${{ each path in parameters.paths }}:
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/common/global-build-job.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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) }}:
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/common/templates/runtimes/xplat-job.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,5 +104,6 @@ jobs:
- checkout: self
clean: true
fetchDepth: $(checkoutFetchDepth)
fetchTags: false

- ${{ parameters.steps }}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions eng/Version.Details.xml
Original file line numberDiff line numberDiff line change
@@ -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>
Expand DownExpand Up@@ -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>
Expand DownExpand Up@@ -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>
Expand Down
39 changes: 20 additions & 19 deletions eng/Versions.props
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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>
Expand All@@ -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>
Expand DownExpand Up@@ -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 -->
Expand Down
13 changes: 8 additions & 5 deletions eng/docker/build-docker-sdk.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -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"

Expand All@@ -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)
Expand All@@ -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
}
Expand All@@ -73,6 +75,7 @@ else

docker build --tag $imageName `
--build-arg CONFIGURATION=$configuration `
--build-arg "VERSION=$VERSION" `
--file $dockerFile `
$REPO_ROOT_DIR
}
Expand Down
10 changes: 7 additions & 3 deletions eng/docker/build-docker-sdk.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand All@@ -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 $?
13 changes: 8 additions & 5 deletions eng/docker/libraries-sdk.linux.Dockerfile
Original file line numberDiff line numberDiff line change
@@ -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

Expand All@@ -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,
Expand DownExpand Up@@ -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
9 changes: 6 additions & 3 deletions eng/docker/libraries-sdk.windows.Dockerfile
Original file line numberDiff line numberDiff line change
@@ -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';"]
Expand All@@ -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
1 change: 1 addition & 0 deletions eng/pipelines/common/evaluate-paths-job.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ jobs:
- checkout: self
clean: true
fetchDepth: 2
fetchTags: false

- ${{ if ne(parameters.paths[0], '') }}:
- ${{ each path in parameters.paths }}:
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/common/global-build-job.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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) }}:
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/common/templates/runtimes/xplat-job.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,5 +104,6 @@ jobs:
- checkout: self
clean: true
fetchDepth: $(checkoutFetchDepth)
fetchTags: false

- ${{ parameters.steps }}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions eng/Version.Details.xml
Original file line numberDiff line numberDiff line change
@@ -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>
Expand DownExpand Up@@ -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>
Expand DownExpand Up@@ -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>
Expand Down
39 changes: 20 additions & 19 deletions eng/Versions.props
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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>
Expand All@@ -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>
Expand DownExpand Up@@ -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 -->
Expand Down
13 changes: 8 additions & 5 deletions eng/docker/build-docker-sdk.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -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"

Expand All@@ -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)
Expand All@@ -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
}
Expand All@@ -73,6 +75,7 @@ else

docker build --tag $imageName `
--build-arg CONFIGURATION=$configuration `
--build-arg "VERSION=$VERSION" `
--file $dockerFile `
$REPO_ROOT_DIR
}
Expand Down
10 changes: 7 additions & 3 deletions eng/docker/build-docker-sdk.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand All@@ -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 $?
13 changes: 8 additions & 5 deletions eng/docker/libraries-sdk.linux.Dockerfile
Original file line numberDiff line numberDiff line change
@@ -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

Expand All@@ -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,
Expand DownExpand Up@@ -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
9 changes: 6 additions & 3 deletions eng/docker/libraries-sdk.windows.Dockerfile
Original file line numberDiff line numberDiff line change
@@ -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';"]
Expand All@@ -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
1 change: 1 addition & 0 deletions eng/pipelines/common/evaluate-paths-job.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ jobs:
- checkout: self
clean: true
fetchDepth: 2
fetchTags: false

- ${{ if ne(parameters.paths[0], '') }}:
- ${{ each path in parameters.paths }}:
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/common/global-build-job.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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) }}:
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/common/templates/runtimes/xplat-job.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,5 +104,6 @@ jobs:
- checkout: self
clean: true
fetchDepth: $(checkoutFetchDepth)
fetchTags: false

- ${{ parameters.steps }}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions eng/Version.Details.xml
Original file line numberDiff line numberDiff line change
@@ -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>
Expand DownExpand Up@@ -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>
Expand DownExpand Up@@ -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>
Expand Down
39 changes: 20 additions & 19 deletions eng/Versions.props
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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>
Expand All@@ -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>
Expand DownExpand Up@@ -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 -->
Expand Down
13 changes: 8 additions & 5 deletions eng/docker/build-docker-sdk.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -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"

Expand All@@ -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)
Expand All@@ -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
}
Expand All@@ -73,6 +75,7 @@ else

docker build --tag $imageName `
--build-arg CONFIGURATION=$configuration `
--build-arg "VERSION=$VERSION" `
--file $dockerFile `
$REPO_ROOT_DIR
}
Expand Down
10 changes: 7 additions & 3 deletions eng/docker/build-docker-sdk.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand All@@ -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 $?
13 changes: 8 additions & 5 deletions eng/docker/libraries-sdk.linux.Dockerfile
Original file line numberDiff line numberDiff line change
@@ -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

Expand All@@ -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,
Expand DownExpand Up@@ -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
9 changes: 6 additions & 3 deletions eng/docker/libraries-sdk.windows.Dockerfile
Original file line numberDiff line numberDiff line change
@@ -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';"]
Expand All@@ -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
1 change: 1 addition & 0 deletions eng/pipelines/common/evaluate-paths-job.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ jobs:
- checkout: self
clean: true
fetchDepth: 2
fetchTags: false

- ${{ if ne(parameters.paths[0], '') }}:
- ${{ each path in parameters.paths }}:
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/common/global-build-job.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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) }}:
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/common/templates/runtimes/xplat-job.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,5 +104,6 @@ jobs:
- checkout: self
clean: true
fetchDepth: $(checkoutFetchDepth)
fetchTags: false

- ${{ parameters.steps }}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions eng/Version.Details.xml
Original file line numberDiff line numberDiff line change
@@ -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>
Expand DownExpand Up@@ -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>
Expand DownExpand Up@@ -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>
Expand Down
39 changes: 20 additions & 19 deletions eng/Versions.props
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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>
Expand All@@ -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>
Expand DownExpand Up@@ -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 -->
Expand Down
13 changes: 8 additions & 5 deletions eng/docker/build-docker-sdk.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -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"

Expand All@@ -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)
Expand All@@ -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
}
Expand All@@ -73,6 +75,7 @@ else

docker build --tag $imageName `
--build-arg CONFIGURATION=$configuration `
--build-arg "VERSION=$VERSION" `
--file $dockerFile `
$REPO_ROOT_DIR
}
Expand Down
10 changes: 7 additions & 3 deletions eng/docker/build-docker-sdk.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand All@@ -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 $?
13 changes: 8 additions & 5 deletions eng/docker/libraries-sdk.linux.Dockerfile
Original file line numberDiff line numberDiff line change
@@ -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

Expand All@@ -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,
Expand DownExpand Up@@ -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
9 changes: 6 additions & 3 deletions eng/docker/libraries-sdk.windows.Dockerfile
Original file line numberDiff line numberDiff line change
@@ -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';"]
Expand All@@ -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
1 change: 1 addition & 0 deletions eng/pipelines/common/evaluate-paths-job.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ jobs:
- checkout: self
clean: true
fetchDepth: 2
fetchTags: false

- ${{ if ne(parameters.paths[0], '') }}:
- ${{ each path in parameters.paths }}:
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/common/global-build-job.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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) }}:
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/common/templates/runtimes/xplat-job.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,5 +104,6 @@ jobs:
- checkout: self
clean: true
fetchDepth: $(checkoutFetchDepth)
fetchTags: false

- ${{ parameters.steps }}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions eng/Version.Details.xml
Original file line numberDiff line numberDiff line change
@@ -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>
Expand DownExpand Up@@ -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>
Expand DownExpand Up@@ -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>
Expand Down
39 changes: 20 additions & 19 deletions eng/Versions.props
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand All@@ -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>
Expand All@@ -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>
Expand DownExpand Up@@ -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 -->
Expand Down
13 changes: 8 additions & 5 deletions eng/docker/build-docker-sdk.ps1
Original file line numberDiff line numberDiff line change
Expand Up@@ -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"

Expand All@@ -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)
Expand All@@ -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
}
Expand All@@ -73,6 +75,7 @@ else

docker build --tag $imageName `
--build-arg CONFIGURATION=$configuration `
--build-arg "VERSION=$VERSION" `
--file $dockerFile `
$REPO_ROOT_DIR
}
Expand Down
10 changes: 7 additions & 3 deletions eng/docker/build-docker-sdk.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand All@@ -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 $?
13 changes: 8 additions & 5 deletions eng/docker/libraries-sdk.linux.Dockerfile
Original file line numberDiff line numberDiff line change
@@ -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

Expand All@@ -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,
Expand DownExpand Up@@ -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
9 changes: 6 additions & 3 deletions eng/docker/libraries-sdk.windows.Dockerfile
Original file line numberDiff line numberDiff line change
@@ -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';"]
Expand All@@ -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
1 change: 1 addition & 0 deletions eng/pipelines/common/evaluate-paths-job.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ jobs:
- checkout: self
clean: true
fetchDepth: 2
fetchTags: false

- ${{ if ne(parameters.paths[0], '') }}:
- ${{ each path in parameters.paths }}:
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/common/global-build-job.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -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) }}:
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/common/templates/runtimes/xplat-job.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,5 +104,6 @@ jobs:
- checkout: self
clean: true
fetchDepth: $(checkoutFetchDepth)
fetchTags: false

- ${{ parameters.steps }}
Loading
Loading