Skip to content

Commit 997c2e2

Browse files
authored
Add VersionFeature80ForWorkloads and VersionFeature90ForWorkloads (#48637)
1 parent fa71230 commit 997c2e2

File tree

6 files changed

+9
-6
lines changed

6 files changed

+9
-6
lines changed

eng/Versions.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
<!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
4444
referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
4545
<_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>
46+
<!-- workload-specific version information -->
47+
<VersionFeature80ForWorkloads>$([MSBuild]::Add($(VersionFeature80), 1))</VersionFeature80ForWorkloads>
48+
<VersionFeature90ForWorkloads>$([MSBuild]::Add($(VersionFeature90), 1))</VersionFeature90ForWorkloads>
4649
</PropertyGroup>
4750
<PropertyGroup Label="Restore feeds">
4851
<!-- In an orchestrated build, this may be overridden to other Azure feeds. -->

src/Workloads/Manifests/Microsoft.NET.Workload.Emscripten.net8.Manifest/Microsoft.NET.Workload.Emscripten.net8.Manifest.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<ItemGroup>
1919
<_WorkloadManifestValues Include="NetVersion" Value="net8" />
2020
<_WorkloadManifestValues Include="WorkloadVersion" Value="$(PackageVersion)" />
21-
<_WorkloadManifestValues Include="EmsdkVersion" Value="8.0.$(VersionFeature80)" />
21+
<_WorkloadManifestValues Include="EmsdkVersion" Value="8.0.$(VersionFeature80ForWorkloads)" />
2222
<_WorkloadManifestValues Include="EmscriptenVersion" Value="$(EmscriptenVersionNet8)" />
2323
</ItemGroup>
2424

src/Workloads/Manifests/Microsoft.NET.Workload.Emscripten.net9.Manifest/Microsoft.NET.Workload.Emscripten.net9.Manifest.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<ItemGroup>
1919
<_WorkloadManifestValues Include="NetVersion" Value="net9" />
2020
<_WorkloadManifestValues Include="WorkloadVersion" Value="$(PackageVersion)" />
21-
<_WorkloadManifestValues Include="EmsdkVersion" Value="9.0.$(VersionFeature90)" />
21+
<_WorkloadManifestValues Include="EmsdkVersion" Value="9.0.$(VersionFeature90ForWorkloads)" />
2222
<_WorkloadManifestValues Include="EmscriptenVersion" Value="$(EmscriptenVersionNet9)" />
2323
</ItemGroup>
2424

src/Workloads/Manifests/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
<_WorkloadManifestValues Include="NetVersion" Value="net10" /> <!-- NetCurrent -->
2828
<_WorkloadManifestValues Include="WorkloadVersion" Value="$(PackageVersion)" />
2929
<_WorkloadManifestValues Include="RuntimeVersion" Value="$(MicrosoftNETCoreAppRuntimePackageVersion)" />
30-
<_WorkloadManifestValues Include="RuntimeVersionNet9" Value="9.0.$(VersionFeature90)" />
31-
<_WorkloadManifestValues Include="RuntimeVersionNet8" Value="8.0.$(VersionFeature80)" />
30+
<_WorkloadManifestValues Include="RuntimeVersionNet9" Value="9.0.$(VersionFeature90ForWorkloads)" />
31+
<_WorkloadManifestValues Include="RuntimeVersionNet8" Value="8.0.$(VersionFeature80ForWorkloads)" />
3232
<_WorkloadManifestValues Include="RuntimeVersionNet7" Value="7.0.$(VersionFeature70)" />
3333
<_WorkloadManifestValues Include="RuntimeVersionNet6" Value="6.0.$(VersionFeature60)" />
3434
</ItemGroup>

src/Workloads/Manifests/Microsoft.NET.Workload.Mono.Toolchain.net8.Manifest/Microsoft.NET.Workload.Mono.Toolchain.net8.Manifest.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<ItemGroup>
2020
<_WorkloadManifestValues Include="NetVersion" Value="net8" />
2121
<_WorkloadManifestValues Include="WorkloadVersion" Value="$(PackageVersion)" />
22-
<_WorkloadManifestValues Include="RuntimeVersion" Value="8.0.$(VersionFeature80)" />
22+
<_WorkloadManifestValues Include="RuntimeVersion" Value="8.0.$(VersionFeature80ForWorkloads)" />
2323
</ItemGroup>
2424

2525
<Error Condition="'%(_WorkloadManifestValues.Value)' == ''"

src/Workloads/Manifests/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<ItemGroup>
2020
<_WorkloadManifestValues Include="NetVersion" Value="net9" />
2121
<_WorkloadManifestValues Include="WorkloadVersion" Value="$(PackageVersion)" />
22-
<_WorkloadManifestValues Include="RuntimeVersion" Value="9.0.$(VersionFeature90)" />
22+
<_WorkloadManifestValues Include="RuntimeVersion" Value="9.0.$(VersionFeature90ForWorkloads)" />
2323
</ItemGroup>
2424

2525
<Error Condition="'%(_WorkloadManifestValues.Value)' == ''"

0 commit comments

Comments
 (0)