Skip to content
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

Jump to bottom

WIP: [test-only, not for merge] Signing in PR runs + revert 31807 #32044

Closed
wants to merge 2 commits into from
Closed

WIP: [test-only, not for merge] Signing in PR runs + revert 31807 #32044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0eed208
Fix signing in PR runs
trylek Feb 7, 2020
4f78b1a
Revert "Revert "Update ILLinkTasksVersion dependency (#2334)" (#31807)"
trylek Feb 10, 2020
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
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
<!-- Docs -->
<MicrosoftPrivateIntellisenseVersion>3.0.0-preview9-190909-1</MicrosoftPrivateIntellisenseVersion>
<!-- ILLink -->
<ILLinkTasksVersion>0.1.6-prerelease.19567.1</ILLinkTasksVersion>
<ILLinkTasksVersion>0.1.6-prerelease.20078.1</ILLinkTasksVersion>
<!-- Mono LLVM -->
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20078.4</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20078.4</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
Expand Down
2 changes: 2 additions & 0 deletions eng/illink.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@
<ILLinkArgs>$(ILLinkArgs) --skip-unresolved true</ILLinkArgs>
<!-- keep interface implementations -->
<ILLinkArgs>$(ILLinkArgs) --disable-opt unusedinterfaces</ILLinkArgs>
<!-- disable optimization to unblock dependencies bump -->
<ILLinkArgs>$(ILLinkArgs) --disable-opt ipconstprop</ILLinkArgs>
<!-- keep PreserveDependencyAttribute unless a project explicitly disables it -->
<ILLinkArgs Condition="'$(ILLinkKeepDepAttributes)' != 'false'">$(ILLinkArgs) --keep-dep-attributes true</ILLinkArgs>
</PropertyGroup>
Expand Down
6 changes: 1 addition & 5 deletions eng/pipelines/installer/jobs/base-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,8 @@ jobs:
eq(parameters.isOfficialBuild, true),
ne(parameters.crossrootfsDir, '')) }}

# TODO: (Consolidation) Enable test signing during PR validation. https://github.com/dotnet/runtime/issues/1026
#
# CoreCLR only produces the UCRT redist file in Release config. When the redist file isn't
# present, signing fails. For now, only sign in official builds which only run Release mode.
- name: SignType
value: ''
value: test

# Set up non-PR build from internal project
- ${{ if eq(parameters.isOfficialBuild, true) }}:
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/src/build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<UcrtFilesToCopy Include="$(UniversalCRTSDKDir)Redist\ucrt\DLLs\$(BuildArch)\*.dll" />
</ItemGroup>

<Copy Condition="'$(BuildType)'=='Release' AND '$(BuildArch)' != 'arm64'"
<Copy Condition="'$(BuildArch)' != 'arm64'"
SourceFiles="@(UcrtFilesToCopy)"
DestinationFolder="$(BinDir)Redist\ucrt\DLLs\$(BuildArch)" />
</Target>
Expand Down