Update shims cherry-pick (#12763)

* Update shims

* build issue

VisualFSharp.sln

@@ -180,6 +180,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MicroPerf", "MicroPerf", "{
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "fscAnyCpu", "src\fsharp\fscAnyCpu\fscAnyCpu.fsproj", "{52DCA91F-3843-43E3-8FE1-FB2B66658CBD}"
 EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "shims", "vsintegration\shims\shims.fsproj", "{40C8A6ED-1C2C-4569-8B78-7E88D76361D7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1006,6 +1008,18 @@ Global
 		{52DCA91F-3843-43E3-8FE1-FB2B66658CBD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{52DCA91F-3843-43E3-8FE1-FB2B66658CBD}.Release|x86.ActiveCfg = Release|Any CPU
 		{52DCA91F-3843-43E3-8FE1-FB2B66658CBD}.Release|x86.Build.0 = Release|Any CPU
+		{40C8A6ED-1C2C-4569-8B78-7E88D76361D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{40C8A6ED-1C2C-4569-8B78-7E88D76361D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40C8A6ED-1C2C-4569-8B78-7E88D76361D7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{40C8A6ED-1C2C-4569-8B78-7E88D76361D7}.Debug|x86.Build.0 = Debug|Any CPU
+		{40C8A6ED-1C2C-4569-8B78-7E88D76361D7}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
+		{40C8A6ED-1C2C-4569-8B78-7E88D76361D7}.Proto|Any CPU.Build.0 = Debug|Any CPU
+		{40C8A6ED-1C2C-4569-8B78-7E88D76361D7}.Proto|x86.ActiveCfg = Debug|Any CPU
+		{40C8A6ED-1C2C-4569-8B78-7E88D76361D7}.Proto|x86.Build.0 = Debug|Any CPU
+		{40C8A6ED-1C2C-4569-8B78-7E88D76361D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{40C8A6ED-1C2C-4569-8B78-7E88D76361D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40C8A6ED-1C2C-4569-8B78-7E88D76361D7}.Release|x86.ActiveCfg = Release|Any CPU
+		{40C8A6ED-1C2C-4569-8B78-7E88D76361D7}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1086,6 +1100,7 @@ Global
 		{EE08E954-AE91-4EFA-8595-10931D29E628} = {47112E07-9FF1-43E7-8021-F2A21D6A19A0}
 		{47112E07-9FF1-43E7-8021-F2A21D6A19A0} = {DFB6ADD7-3149-43D9-AFA0-FC4A818B472B}
 		{52DCA91F-3843-43E3-8FE1-FB2B66658CBD} = {B8DDA694-7939-42E3-95E5-265C2217C142}
+		{40C8A6ED-1C2C-4569-8B78-7E88D76361D7} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {48EDBBBE-C8EE-4E3C-8B19-97184A487B37}

setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.csproj

@@ -4,9 +4,13 @@
     <TargetFramework>net472</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="$(FSharpSourcesRoot)\..\vsintegration\shims\shims.fsproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <SwrProperty Include="ProjectDir=$(MSBuildThisFileDirectory)" />
-    <SwrProperty Include="SetupShimsDir=$(MSBuildThisFileDirectory)..\..\shims" />
+    <SwrProperty Include="SetupShimsDir=$(ArtifactsDir)bin\shims\$(Configuration)\$(TargetFramework)" />
     <SwrProperty Include="VSGeneralVersion=$(VSGeneralVersion)" />
     <SwrProperty Include="VsixVersion=$(VsixVersion)" />
   </ItemGroup>

src/fsharp/FSharp.Build/Microsoft.FSharp.Targets

@@ -65,6 +65,8 @@ this file.
     <!-- Here we set the default value to true when nothing is set, it will be removed in a future release when we default to the net sdk compiler -->
     <PropertyGroup Condition="'$(FSharp_Shim_Present)' == 'true'">
         <FSharpPreferNetFrameworkTools Condition="'$(FSharpPreferNetFrameworkTools)' == ''">true</FSharpPreferNetFrameworkTools>
+        <FSCorePackageVersion Condition="'$(_NETCoreSdkIsPreview)' == 'true'">$(Fsc_DotNET_FSCorePreviewPackageVersionNumber)</FSCorePackageVersion>
+        <RestoreAdditionalProjectSources Condition="Exists('$(Fsc_DotNET__FSharpCoreLibraryPacksFolder)')">$(RestoreAdditionalProjectSources);$(Fsc_DotNET__FSharpCoreLibraryPacksFolder)</RestoreAdditionalProjectSources>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(FSharp_Shim_Present)' == 'true' and '$(FSharpPreferNetFrameworkTools)' == 'true'">

tests/fsharp/FSharpSuite.Tests.fsproj

@@ -92,9 +92,6 @@
     <Compile Include="Compiler\Libraries\Core\Reflection\PreComputedTupleConstructorTests.fs" />
     <Compile Include="Compiler\Libraries\Core\Unchecked\DefaultOfTests.fs" />
     <Compile Include="Compiler\Infrastructure\AstCompiler.fs" />
-    <None Include="..\..\setup\shims\Microsoft.FSharp.ShimHelpers.props">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="update.base.line.with.actuals.fsx" />
     <!-- don't include test resources in subdirectories -->
     <EmbeddedResource Remove="**" />
@@ -105,6 +102,10 @@
     <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
     <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" />
     <ProjectReference Include="$(FSharpTestsRoot)\FSharp.Test.Utilities\FSharp.Test.Utilities.fsproj" />
+    <ProjectReference Include="$(FSharpSourcesRoot)\..\vsintegration\shims\shims.fsproj"
+                      Condition="'$(TargetFramework)' == 'net472'">
+        <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
   </ItemGroup>
 
   <ItemGroup>

vsintegration/shims/Library.fs

+namespace shims
+
+module Say =
+    let hello name =
+        printfn "Hello %s" name

setup/shims/Microsoft.FSharp.ShimHelpers.props → vsintegration/shims/Microsoft.FSharp.ShimHelpers.props

@@ -23,6 +23,8 @@
     <Fsc_DotNET_ToolPath>$(NetCoreRoot)</Fsc_DotNET_ToolPath>
     <Fsc_DotNET_ToolExe>dotnet.exe</Fsc_DotNET_ToolExe>
     <Fsc_DotNET_DotnetFscCompilerPath>$(Fsc_DotNet_CompilerPath)fsc.dll</Fsc_DotNET_DotnetFscCompilerPath>
+    <Fsc_DotNET__FSharpCoreLibraryPacksFolder>$(Fsc_DotNet_CompilerPath)library-packs</Fsc_DotNET__FSharpCoreLibraryPacksFolder>
+    <Fsc_DotNET_FSCorePreviewPackageVersionNumber>{{FSharpCorePreviewPackageVersionValue}}</Fsc_DotNET_FSCorePreviewPackageVersionNumber>
 
     <FSharpCompilerPath>$(Fsc_NetFramework_ToolPath)</FSharpCompilerPath>
   </PropertyGroup>

vsintegration/shims/shims.fsproj

+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Library.fs" />
+    <None Include="Microsoft.FSharp.NetSdk.Shim.props" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="Microsoft.FSharp.NetSdk.Shim.targets" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="Microsoft.FSharp.Overrides.NetSdk.Shim.targets" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="Microsoft.FSharp.Shim.targets" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="Microsoft.Portable.FSharp.Shim.targets" CopyToOutputDirectory="PreserveNewest" />
+
+    <NoneSubstituteText Include="Microsoft.FSharp.ShimHelpers.props" CopyToOutputDirectory="PreserveNewest">
+      <TargetFileName>Microsoft.FSharp.ShimHelpers.props</TargetFileName>
+      <Pattern1>{{FSharpCorePreviewPackageVersionValue}}</Pattern1>
+      <Replacement1>$(FSharpCorePreviewPackageVersionValue)</Replacement1>
+    </NoneSubstituteText>
+  </ItemGroup>
+
+</Project>