Skip to content

Also pass NETCoreSdkRuntimeIdentifier to runtime.proj#104012

Merged
akoeplinger merged 1 commit into
dotnet:mainfrom
am11:patch-1
Jun 26, 2024
Merged

Also pass NETCoreSdkRuntimeIdentifier to runtime.proj#104012
akoeplinger merged 1 commit into
dotnet:mainfrom
am11:patch-1

Conversation

@am11

@am11 am11 commented Jun 26, 2024 •
edited
Loading

Copy link
Copy Markdown
Member

In SingleEntry, we also use this property to formulate the package name:

runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets

Line 8 in d659dab

<_targetsNonPortableSdkRid Condition="'$(RuntimeIdentifier)' == '$(NETCoreSdkRuntimeIdentifier)' and '$(RuntimeIdentifier)' != '$(NETCoreSdkPortableRuntimeIdentifier)'">true</_targetsNonPortableSdkRid>

cc @MichalStrehovsky

@ghost ghost added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Jun 26, 2024
@dotnet-policy-service dotnet-policy-service Bot added the community-contribution Indicates that the PR has been added by a community member label Jun 26, 2024
@am11 am11 added area-NativeAOT-coreclr community-contribution Indicates that the PR has been added by a community member and removed community-contribution Indicates that the PR has been added by a community member needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners labels Jun 26, 2024
@dotnet-policy-service

dotnet-policy-service Bot commented Jun 26, 2024

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @agocke, @MichalStrehovsky, @jkotas
See info in area-owners.md if you want to be subscribed.

MichalStrehovsky
MichalStrehovsky approved these changes Jun 26, 2024
View reviewed changes

@MichalStrehovsky MichalStrehovsky left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@am11 am11 mentioned this pull request Jun 26, 2024
Merged
@am11

am11 commented Jun 26, 2024

Copy link
Copy Markdown
Member Author

Failures are unrelated. Lets merge this to unblock SDK. cc @akoeplinger

@build-analysis build-analysis Bot mentioned this pull request Jun 26, 2024
Closed
@akoeplinger akoeplinger merged commit fd534b2 into dotnet:main Jun 26, 2024
@am11 am11 deleted the patch-1 branch June 26, 2024 11:30
@MichalStrehovsky

MichalStrehovsky commented Jun 26, 2024

Copy link
Copy Markdown
Member

Failures are unrelated. Lets merge this to unblock SDK. cc @akoeplinger

It might take a bit until we can have an official build. Since the last successful build we had a PR that touched files in the repo that have ----- BEGIN PRIVATE KEY ------- and AzDO (where the internal repo that actually makes official builds is hosted) has a major "NOT UNDER MY WATCH" with that. So we can't sync anything from Github right now.

MichalStrehovsky added a commit to MichalStrehovsky/runtime that referenced this pull request Jun 27, 2024
@MichalStrehovsky
Revert "Also pass NETCoreSdkRuntimeIdentifier to runtime.proj (dotnet…
2c8664d 
…#104012)"

This reverts commit fd534b2.
@github-actions github-actions Bot locked and limited conversation to collaborators Jul 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@MichalStrehovsky MichalStrehovsky MichalStrehovsky approved these changes

Assignees

No one assigned

Labels

area-NativeAOT-coreclr community-contribution Indicates that the PR has been added by a community member

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@am11 @MichalStrehovsky @akoeplinger