Skip to content

Commit 47e33b6

Browse files
[VMR] Codeflow 1bc437c-af913ff
[[ commit created by automation ]]
1 parent 401ace4 commit 47e33b6

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

eng/Publishing.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
1414
These packages have already been signed by the FSharp build so we don't need to re-include them for signing. -->
1515
<PropertyGroup Condition="'$(EnableDefaultArtifacts)' == 'true'">
16-
<FSharpCorePath Condition="'$(DotNetFinalVersionKind)' != 'release'">Shipping</FSharpCorePath>
16+
<FSharpCorePath Condition="'$(DotNetFinalVersionKind)' == ''">Shipping</FSharpCorePath>
17+
<FSharpCorePath Condition="'$(DotNetFinalVersionKind)' == 'prerelease'">PreRelease</FSharpCorePath>
1718
<FSharpCorePath Condition="'$(DotNetFinalVersionKind)' == 'release'">Release</FSharpCorePath>
1819

1920
<!--

src/Layout/redist/tools/tool_fsc.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
<Target Name="_ResolvePublishNuGetPackagePdbsAndXml"
3131
AfterTargets="_ResolveCopyLocalAssetsForPublish">
3232
<PropertyGroup>
33-
<FSharpCorePath Condition="'$(DotNetFinalVersionKind)'!='release'">Shipping</FSharpCorePath>
33+
<FSharpCorePath Condition="'$(DotNetFinalVersionKind)'==''">Shipping</FSharpCorePath>
34+
<FSharpCorePath Condition="'$(DotNetFinalVersionKind)'=='prerelease'">PreRelease</FSharpCorePath>
3435
<FSharpCorePath Condition="'$(DotNetFinalVersionKind)'=='release'">Release</FSharpCorePath>
3536
<FSharpTfm>net9.0</FSharpTfm>
3637
<FSharpTfm Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildFromVMR)' == 'true'">$(NetCurrent)</FSharpTfm>

src/Workloads/Manifests/Microsoft.NET.Workload.Emscripten.Current.Manifest/Microsoft.NET.Workload.Emscripten.Current.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="net10" />
2020
<_WorkloadManifestValues Include="WorkloadVersion" Value="$(PackageVersion)" />
21-
<_WorkloadManifestValues Include="EmsdkVersion" Value="$(MicrosoftNETRuntimeEmscriptenSdkInternalVersion)" />
21+
<_WorkloadManifestValues Include="EmsdkVersion" Value="$(MicrosoftNETCoreAppRuntimePackageVersion)" />
2222
<_WorkloadManifestValues Include="EmscriptenVersion" Value="$(EmscriptenVersionCurrent)" />
2323
</ItemGroup>
2424

0 commit comments

Comments
 (0)