Skip to content

Use non-arch specific properties for shared framework versions #36164

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 4 commits into from
May 30, 2025
Merged

Use non-arch specific properties for shared framework versions #36164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99b0697
Use non-arch specific properties for shared framework versions
mmitche May 30, 2025
bf597de
Update Version.Details.xml
mmitche May 30, 2025
febdd11
Update Versions.props
mmitche May 30, 2025
9add5ad
Update global.json
mmitche May 30, 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
6 changes: 1 addition & 5 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,7 @@
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
</Dependency>
<!--
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
All Runtime.$rid packages should have the same version.
-->
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.6.25278.103">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25278.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0a01b394b186e190a80cb55740c13f6293cf5446</Sha>
</Dependency>
Expand Down
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 @@ -26,7 +26,7 @@
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.6.25278.103</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.6.25278.103</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.6.25278.103</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.6.25278.103</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.6.25278.103</MicrosoftNETCorePlatformsVersion>
<SystemTextEncodingsWebVersion>10.0.0-preview.6.25278.103</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>10.0.0-preview.6.25278.103</SystemTextJsonVersion>
<SystemFormatsAsn1Version>10.0.0-preview.6.25278.103</SystemFormatsAsn1Version>
Expand Down
2 changes: 1 addition & 1 deletion eng/helix.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<SasToken>$([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken'))</SasToken>
</AdditionalDotNetPackageFeed>

<AdditionalDotNetPackage Include="$(MicrosoftNETCoreAppRuntimewinx64Version)">
<AdditionalDotNetPackage Include="$(MicrosoftNETCoreAppRefVersion)">
<PackageType>runtime</PackageType>
</AdditionalDotNetPackage>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dotnet": "10.0.100-preview.6.25272.112",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCoreAppRuntimewinx64Version)"
"$(MicrosoftNETCorePlatformsVersion)"
]
}
},
Expand Down
2 changes: 1 addition & 1 deletion test/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<ItemGroup>
<FrameworkReference Update="Microsoft.NETCore.App"
Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'"
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimewinx64Version)"
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRefVersion)"
TargetingPackVersion="$(MicrosoftNETCoreAppRefVersion)" />
</ItemGroup>

Expand Down