Skip to content

Do not include redist files in runtime packs #66805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VSadov merged 3 commits into from
Mar 19, 2022
Merged

Do not include redist files in runtime packs #66805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a56cb9
do not copy redist files to artefacts
VSadov Mar 18, 2022
be7620d
do not copy redist files to tests
VSadov Mar 18, 2022
20e7ba3
Do not include Redist files in runtime packs
VSadov Mar 18, 2022
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
1 change: 0 additions & 1 deletion eng/liveBuilds.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
<RuntimeFiles Include="$(CoreCLRSharedFrameworkDir)*.*" />
<RuntimeFiles Condition="'$(PgoInstrument)' == 'true'" Include="$(CoreCLRSharedFrameworkDir)PGD/*" />
<CoreCLRCrossTargetFiles Condition="'$(CoreCLRCrossTargetComponentDir)' != ''" Include="$(CoreCLRCrossTargetComponentDir)*.*" IsNative="true" />
<RuntimeFiles Include="$(CoreCLRArtifactsPath)Redist/**/*.dll" />
<RuntimeFiles>
<IsNative>true</IsNative>
</RuntimeFiles>
Expand Down
17 changes: 0 additions & 17 deletions src/coreclr/build-runtime.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,23 +597,6 @@ if %__BuildNative% EQU 1 (
goto ExitWithCode
)

if /i "%__BuildArch%" == "arm64" goto SkipCopyUcrt

if not defined UCRTVersion (
echo %__ErrMsgPrefix%%__MsgPrefix%Error: Please install Windows 10 SDK.
goto ExitWithError
)

set "__UCRTDir=%UniversalCRTSdkDir%Redist\%UCRTVersion%\ucrt\DLLs\%__BuildArch%\"

xcopy /Y/I/E/D/F "!__UCRTDir!*.dll" "%__BinDir%\Redist\ucrt\DLLs\%__BuildArch%"
if not !errorlevel! == 0 (
set __exitCode=!errorlevel!
echo %__ErrMsgPrefix%%__MsgPrefix%Error: Failed to copy the Universal CRT to the artifacts directory.
goto ExitWithCode
)

:SkipCopyUcrt
if %__EnforcePgo% EQU 1 (
set PgoCheckCmd="!PYTHON!" "!__ProjectDir!\scripts\pgocheck.py" "!__BinDir!\coreclr.dll" "!__BinDir!\clrjit.dll"
echo !PgoCheckCmd!
Expand Down
6 changes: 0 additions & 6 deletions src/tests/Common/test_dependencies/test_dependencies.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@

<Target Name="Build" DependsOnTargets="$(TraversalBuildDependsOn)" />

<Target Name="AddUcrtFilesToCoreRoot" BeforeTargets="CopyDependencyToCoreRoot" Condition="'$(TargetOS)' == 'windows'">
<ItemGroup>
<NativeCopyLocalItems Include="$(UniversalCRTSDKDir)Redist\ucrt\DLLs\$(TargetArchitecture)\*.dll" />
</ItemGroup>
</Target>

<Target Name="AddLibrariesToCoreRoot" BeforeTargets="CopyDependencyToCoreRoot" DependsOnTargets="ResolveLibrariesFromLocalBuild">
<ItemGroup>
<RuntimeCopyLocalItems Include="@(LibrariesRuntimeFiles)" />
Expand Down