Fix merge issue with dotnet files (dotnet#8163)

xamarin · Feb 22, 2021 · 3a858cd · 3a858cd
1 parent c730458
commit 3a858cd
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj
@@ -35,10 +35,10 @@
     <None Include="Microsoft.FSharp.NetSdk.targets" CopyToOutputDirectory="PreserveNewest" />
     <NoneSubstituteText Include="Microsoft.FSharp.NetSdk.props" CopyToOutputDirectory="PreserveNewest">
       <TargetFileName>Microsoft.FSharp.NetSdk.props</TargetFileName>
-      <Pattern1>{{FSharpCoreShippedVersion}}</Pattern1>
-      <Replacement1>$(FSharpCoreShippedVersion)</Replacement1>
-      <Pattern2>{{FSharpCorePreviewVersion}}</Pattern2>
-      <Replacement2>$(FSharpCorePreviewVersion)</Replacement2>
+      <Pattern1>{{FSharpCoreShippedPackageVersion}}</Pattern1>
+      <Replacement1>$(FSharpCoreShippedPackageVersion)</Replacement1>
+      <Pattern2>{{FSharpCorePreviewPackageVersion}}</Pattern2>
+      <Replacement2>$(FSharpCorePreviewPackageVersion)</Replacement2>
     </NoneSubstituteText>
     <None Include="Microsoft.FSharp.Overrides.NetSdk.targets" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>