Skip to content

Add VersionFeature80ForWorkloads and VersionFeature90ForWorkloads #48637

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 1 commit into from
Apr 22, 2025
Merged

Add VersionFeature80ForWorkloads and VersionFeature90ForWorkloads #48637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@
<!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
<_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>
<!-- workload-specific version information -->
<VersionFeature80ForWorkloads>$([MSBuild]::Add($(VersionFeature80), 1))</VersionFeature80ForWorkloads>
<VersionFeature90ForWorkloads>$([MSBuild]::Add($(VersionFeature90), 1))</VersionFeature90ForWorkloads>
</PropertyGroup>
<PropertyGroup Label="Restore feeds">
<!-- In an orchestrated build, this may be overridden to other Azure feeds. -->
Expand Down
2 changes: 1 addition & 1 deletion ...ET.Workload.Emscripten.net8.Manifest/Microsoft.NET.Workload.Emscripten.net8.Manifest.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<ItemGroup>
<_WorkloadManifestValues Include="NetVersion" Value="net8" />
<_WorkloadManifestValues Include="WorkloadVersion" Value="$(PackageVersion)" />
<_WorkloadManifestValues Include="EmsdkVersion" Value="8.0.$(VersionFeature80)" />
<_WorkloadManifestValues Include="EmsdkVersion" Value="8.0.$(VersionFeature80ForWorkloads)" />
<_WorkloadManifestValues Include="EmscriptenVersion" Value="$(EmscriptenVersionNet8)" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...ET.Workload.Emscripten.net9.Manifest/Microsoft.NET.Workload.Emscripten.net9.Manifest.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<ItemGroup>
<_WorkloadManifestValues Include="NetVersion" Value="net9" />
<_WorkloadManifestValues Include="WorkloadVersion" Value="$(PackageVersion)" />
<_WorkloadManifestValues Include="EmsdkVersion" Value="9.0.$(VersionFeature90)" />
<_WorkloadManifestValues Include="EmsdkVersion" Value="9.0.$(VersionFeature90ForWorkloads)" />
<_WorkloadManifestValues Include="EmscriptenVersion" Value="$(EmscriptenVersionNet9)" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions ...no.Toolchain.Current.Manifest/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
<_WorkloadManifestValues Include="NetVersion" Value="net10" /> <!-- NetCurrent -->
<_WorkloadManifestValues Include="WorkloadVersion" Value="$(PackageVersion)" />
<_WorkloadManifestValues Include="RuntimeVersion" Value="$(MicrosoftNETCoreAppRuntimePackageVersion)" />
<_WorkloadManifestValues Include="RuntimeVersionNet9" Value="9.0.$(VersionFeature90)" />
<_WorkloadManifestValues Include="RuntimeVersionNet8" Value="8.0.$(VersionFeature80)" />
<_WorkloadManifestValues Include="RuntimeVersionNet9" Value="9.0.$(VersionFeature90ForWorkloads)" />
<_WorkloadManifestValues Include="RuntimeVersionNet8" Value="8.0.$(VersionFeature80ForWorkloads)" />
<_WorkloadManifestValues Include="RuntimeVersionNet7" Value="7.0.$(VersionFeature70)" />
<_WorkloadManifestValues Include="RuntimeVersionNet6" Value="6.0.$(VersionFeature60)" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...oad.Mono.Toolchain.net8.Manifest/Microsoft.NET.Workload.Mono.Toolchain.net8.Manifest.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<ItemGroup>
<_WorkloadManifestValues Include="NetVersion" Value="net8" />
<_WorkloadManifestValues Include="WorkloadVersion" Value="$(PackageVersion)" />
<_WorkloadManifestValues Include="RuntimeVersion" Value="8.0.$(VersionFeature80)" />
<_WorkloadManifestValues Include="RuntimeVersion" Value="8.0.$(VersionFeature80ForWorkloads)" />
</ItemGroup>

<Error Condition="'%(_WorkloadManifestValues.Value)' == ''"
Expand Down
2 changes: 1 addition & 1 deletion ...oad.Mono.Toolchain.net9.Manifest/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<ItemGroup>
<_WorkloadManifestValues Include="NetVersion" Value="net9" />
<_WorkloadManifestValues Include="WorkloadVersion" Value="$(PackageVersion)" />
<_WorkloadManifestValues Include="RuntimeVersion" Value="9.0.$(VersionFeature90)" />
<_WorkloadManifestValues Include="RuntimeVersion" Value="9.0.$(VersionFeature90ForWorkloads)" />
</ItemGroup>

<Error Condition="'%(_WorkloadManifestValues.Value)' == ''"
Expand Down
Loading