Skip to content

Do not use live shims for tools packages in VMR #48153

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
merged 3 commits into from
Apr 4, 2025
Merged

Do not use live shims for tools packages in VMR #48153

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a69411d
Do not use live shims for tools packages in VMR
NikolaMilosavljevic Apr 3, 2025
2ff8935
Add condition for PackAsToolShimRuntimeIdentifiers property
NikolaMilosavljevic Apr 3, 2025
25ab7de
Update condition
NikolaMilosavljevic Apr 3, 2025
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
4 changes: 3 additions & 1 deletion Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,11 @@
Condition="'$(RunTestsAsTool)' == 'true' And '$(CanRunTestAsTool)' == 'true'"/>

<!-- Update KnownFrameworkReferences to target the right version of the runtime -->
<!-- We cannot use live shims when building tool packs in VMR - only package for current arch is available. -->
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'
and $(MicrosoftNETCoreAppRefPackageVersion.StartsWith('$(_TargetFrameworkVersionWithoutV)'))
and '$(MSBuildProjectName)' != 'sdk-tasks'">
and '$(MSBuildProjectName)' != 'sdk-tasks'
and ('$(DotNetBuild)' != 'true' or '$(PackAsToolShimRuntimeIdentifiers)' == '')">
<FrameworkReference
Update="Microsoft.NETCore.App"
TargetingPackVersion="$(MicrosoftNETCoreAppRefPackageVersion)"
Expand Down
3 changes: 1 addition & 2 deletions src/BuiltInTools/dotnet-format/dotnet-format.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
These identifiers are for generating the shim'd core executables for signing. Not all options
from $(RoslynPortableRuntimeIdentifiers) work or make sense in this context.
-->
<PackAsToolShimRuntimeIdentifiers Condition="'$(DotNetBuild)' != 'true'">win-x64;win-x86;osx-x64</PackAsToolShimRuntimeIdentifiers>
<PackAsToolShimRuntimeIdentifiers Condition="'$(DotNetBuild)' == 'true' and $(SignableShimRuntimeIdentifier.Contains('$(TargetRid)'))">$(TargetRid)</PackAsToolShimRuntimeIdentifiers>
<PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;osx-x64</PackAsToolShimRuntimeIdentifiers>
Copy link
Member

@ViktorHofer ViktorHofer Apr 3, 2025

Choose a reason for hiding this comment

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

What about source-build?

Copy link
Member

@ViktorHofer ViktorHofer Apr 3, 2025

Choose a reason for hiding this comment

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

I see this in the history:

image

Copy link
Member Author

@NikolaMilosavljevic NikolaMilosavljevic Apr 3, 2025

Choose a reason for hiding this comment

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

Perhaps I should add the same condition that we use in aspnetcore - dotnet/aspnetcore#61282

'$(DotNetBuild)' != 'true' OR '$(TargetOsName)' == 'win'

Copy link
Member

@ViktorHofer ViktorHofer Apr 3, 2025

Choose a reason for hiding this comment

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

I think DotNetBuildSourceOnly not true is the right condition here.

Copy link
Member Author

@NikolaMilosavljevic NikolaMilosavljevic Apr 3, 2025

Choose a reason for hiding this comment

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

OK - will fix it.

Copy link
Member Author

@NikolaMilosavljevic NikolaMilosavljevic Apr 3, 2025

Choose a reason for hiding this comment

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

Fixed with 25ab7de


<!-- Avoid https://github.com/dotnet/arcade/issues/9305 -->
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
Expand Down
Loading