Skip to content

Commit

Permalink
Merge branch 'main' into browser_trim_mt
Browse files Browse the repository at this point in the history
  • Loading branch information
@pavelsavara
pavelsavara authored Jan 10, 2025
2 parents 4e56429 + 0df31bc commit 8cc32b5
Show file tree
Hide file tree
Showing 92 changed files with 4,959 additions and 887 deletions.
1 change: 1 addition & 0 deletions docs/workflow/using-docker.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ The main Docker images are the most commonly used ones, and the ones you will pr
| Azure Linux (x64) | FreeBSD 14 | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-freebsd-14` | `/crossrootfs/x64` |
| Azure Linux (x64) | Ubuntu 18.04 | PPC64le | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-ppc64le` | `/crossrootfs/ppc64le` |
| Azure Linux (x64) | Ubuntu 24.04 | RISC-V | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-riscv64` | `/crossrootfs/riscv64` |
| Azure Linux (x64) | Debian sid | LoongArch | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-loongarch64` | `/crossrootfs/loongarch64` |
| Azure Linux (x64) | Ubuntu 18.04 | S390x | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-s390x` | `/crossrootfs/s390x` |
| Azure Linux (x64) | Ubuntu 16.04 (Wasm) | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-webassembly-amd64` | `/crossrootfs/x64` |
| Debian (x64) | Debian 12 | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-gcc14-amd64` | *N/A* |
Expand Down
84 changes: 42 additions & 42 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,87 +84,87 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.25056.1">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25056.1">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="10.0.0-beta.25057.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -348,9 +348,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>3119edb6d70fb252e6128b0c7e45d3fc2f49f249</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25056.1">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25058.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
<Sha>e7cb34898a1b610eb2a22591a2178da6f1fb7e3c</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25053.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,22 +85,22 @@
<!-- SDK dependencies (also used in wasm build tests -->
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-alpha.1.24622.2</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25056.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25056.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25056.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25056.1</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25056.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25056.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25056.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25056.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25056.1</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25058.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25058.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25058.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25058.4</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25058.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25058.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25058.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25058.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25058.4</MicrosoftDotNetPackageTestingVersion>
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
<!-- NuGet dependencies -->
Expand Down
15 changes: 6 additions & 9 deletions eng/common/cross/build-rootfs.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ __QEMUArch=arm
__UbuntuArch=armhf
__UbuntuRepo=
__UbuntuSuites="updates security backports"
__DebianSuites=
__LLDB_Package="liblldb-3.9-dev"
__SkipUnmount=0

Expand Down Expand Up @@ -188,8 +187,7 @@ while :; do
__AlpineArch=loongarch64
__QEMUArch=loongarch64
__UbuntuArch=loong64
__UbuntuSuites=
__DebianSuites=unreleased
__UbuntuSuites=unreleased
__LLDB_Package="liblldb-19-dev"

if [[ "$__CodeName" == "sid" ]]; then
Expand Down Expand Up @@ -782,6 +780,8 @@ elif [[ "$__CodeName" == "haiku" ]]; then
popd
rm -rf "$__RootfsDir/tmp"
elif [[ -n "$__CodeName" ]]; then
__Suites="$__CodeName $(for suite in $__UbuntuSuites; do echo -n "$__CodeName-$suite "; done)"

if [[ "$__SkipEmulation" == "1" ]]; then
if [[ -z "$AR" ]]; then
if command -v ar &>/dev/null; then
Expand All @@ -794,19 +794,16 @@ elif [[ -n "$__CodeName" ]]; then
fi
fi

# shellcheck disable=SC2086
suites="$__CodeName $__DebianSuites $(echo $__UbuntuSuites | xargs -n 1 | xargs -I {} echo -n "$__CodeName-{} ")"

PYTHON=${PYTHON_EXECUTABLE:-python3}

# shellcheck disable=SC2086,SC2046
echo running "$PYTHON" "$__CrossDir/install-debs.py" --arch "$__UbuntuArch" --mirror "$__UbuntuRepo" --rootfsdir "$__RootfsDir" --artool "$AR" \
$(echo $suites | xargs -n 1 | xargs -I {} echo -n "--suite {} ") \
$(for suite in $__Suites; do echo -n "--suite $suite "; done) \
$__UbuntuPackages

# shellcheck disable=SC2086,SC2046
"$PYTHON" "$__CrossDir/install-debs.py" --arch "$__UbuntuArch" --mirror "$__UbuntuRepo" --rootfsdir "$__RootfsDir" --artool "$AR" \
$(echo $suites | xargs -n 1 | xargs -I {} echo -n "--suite {} ") \
$(for suite in $__Suites; do echo -n "--suite $suite "; done) \
$__UbuntuPackages

exit 0
Expand Down Expand Up @@ -837,7 +834,7 @@ elif [[ -n "$__CodeName" ]]; then
cat > "$__RootfsDir/etc/apt/sources.list.d/$__CodeName.sources" <<EOF
Types: deb
URIs: $__UbuntuRepo
Suites: $__CodeName $__DebianSuites $(echo $__UbuntuSuites | xargs -n 1 | xargs -I {} echo -n "$__CodeName-{} ")
Suites: $__Suites
Components: main universe
Signed-By: $__KeyringFile
EOF
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"dotnet": "10.0.100-alpha.1.24610.7"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25056.1",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25056.1",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25056.1",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25058.4",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25058.4",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25058.4",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.25057.24"
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ add_subdirectory(tools/aot/jitinterface)

if(NOT CLR_CROSS_COMPONENTS_BUILD)
# NativeAOT only buildable for a subset of CoreCLR-supported configurations
if(CLR_CMAKE_HOST_ARCH_ARM64 OR CLR_CMAKE_HOST_ARCH_AMD64 OR CLR_CMAKE_HOST_ARCH_ARM OR CLR_CMAKE_HOST_ARCH_LOONGARCH64 OR (CLR_CMAKE_HOST_ARCH_I386 AND CLR_CMAKE_HOST_WIN32))
if(CLR_CMAKE_HOST_ARCH_ARM64 OR CLR_CMAKE_HOST_ARCH_AMD64 OR CLR_CMAKE_HOST_ARCH_ARM OR CLR_CMAKE_HOST_ARCH_LOONGARCH64 OR CLR_CMAKE_HOST_ARCH_RISCV64 OR (CLR_CMAKE_HOST_ARCH_I386 AND CLR_CMAKE_HOST_WIN32))
add_subdirectory(nativeaot)
endif()
endif(NOT CLR_CROSS_COMPONENTS_BUILD)
Expand Down
5 changes: 5 additions & 0 deletions src/coreclr/dlls/mscorpe/ceefilegenwriter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,11 @@ HRESULT CeeFileGenWriter::getFileTimeStamp(DWORD *pTimeStamp)
return getPEWriter().getFileTimeStamp(pTimeStamp);
} // HRESULT CeeFileGenWriter::getFileTimeStamp()

void CeeFileGenWriter::setFileHeaderTimeStamp(DWORD timeStamp)
{
return getPEWriter().setFileHeaderTimeStamp(timeStamp);
} // void CeeFileGenWriter::setFileHeaderTimeStamp()

HRESULT CeeFileGenWriter::setAddrReloc(UCHAR *instrAddr, DWORD value)
{
*(DWORD *)instrAddr = VAL32(value);
Expand Down
11 changes: 10 additions & 1 deletion src/coreclr/dlls/mscorpe/iceefilegen.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ HRESULT ICeeFileGen::SetVTableEntry64(HCEEFILE ceeFile, ULONG size, void* ptr)
return gen->setVTableEntry64(size, ptr);
}

HRESULT ICeeFileGen::GetFileTimeStamp (HCEEFILE ceeFile, DWORD *pTimeStamp)
HRESULT ICeeFileGen::GetFileTimeStamp(HCEEFILE ceeFile, DWORD *pTimeStamp)
{
TESTANDRETURNPOINTER(ceeFile);
TESTANDRETURNPOINTER(pTimeStamp);
Expand All @@ -455,3 +455,12 @@ HRESULT ICeeFileGen::GetFileTimeStamp (HCEEFILE ceeFile, DWORD *pTimeStamp)
return(gen->getFileTimeStamp(pTimeStamp));
}

HRESULT ICeeFileGen::SetFileHeaderTimeStamp(HCEEFILE ceeFile, DWORD timeStamp)
{
TESTANDRETURNPOINTER(ceeFile);

CeeFileGenWriter *gen = reinterpret_cast<CeeFileGenWriter*>(ceeFile);
gen->setFileHeaderTimeStamp(timeStamp);
return S_OK;
}

5 changes: 5 additions & 0 deletions src/coreclr/dlls/mscorpe/pewriter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1637,6 +1637,11 @@ HRESULT PEWriter::getFileTimeStamp(DWORD *pTimeStamp)
return S_OK;
}

void PEWriter::setFileHeaderTimeStamp(DWORD timeStamp)
{
m_ntHeaders->FileHeader.TimeDateStamp = timeStamp;
}

DWORD PEWriter::getImageBase32()
{
_ASSERTE(isPE32());
Expand Down
1 change: 1 addition & 0 deletions src/coreclr/dlls/mscorpe/pewriter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ class PEWriter : public PESectionMan
size_t getImageBase();

HRESULT getFileTimeStamp(DWORD *pTimeStamp);
void setFileHeaderTimeStamp(DWORD timeStamp);

IMAGE_NT_HEADERS32* ntHeaders32() { return (IMAGE_NT_HEADERS32*) m_ntHeaders; }
IMAGE_NT_HEADERS64* ntHeaders64() { return (IMAGE_NT_HEADERS64*) m_ntHeaders; }
Expand Down
Loading

0 comments on commit 8cc32b5

Please sign in to comment.