merge

Author: KevinRansom

INTERNAL.md

@@ -43,7 +43,7 @@ near the bottom of the build under the title 'Insert into VS'.  Examine the log
 bottom you'll see a line that looks like `Created request #xxxxxx at https://...`.
 
 To see all insertions created this way (possibly including for other internal teams), check
-[here](https://dev.azure.com/devdiv/DevDiv/_git/VS/pullrequests?creatorId=122d5278-3e55-4868-9d40-1e28c2515fc4&_a=active).
+[here](https://dev.azure.com/devdiv/DevDiv/_git/VS/pullrequests?createdBy=122d5278-3e55-4868-9d40-1e28c2515fc4&_a=active).
 
 ## Less interesting links
 

eng/Version.Details.xml

@@ -3,9 +3,9 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19615.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19630.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>77698ebba1ab096ad9580a5d9ebefe0499ba00ce</Sha>
+      <Sha>01d0b636bfb96edf62a77912de25aa5cef143946</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/common/tools.ps1

@@ -96,6 +96,9 @@ function Exec-Process([string]$command, [string]$commandArgs) {
   }
 }
 
+# createSdkLocationFile parameter enables a file being generated under the toolset directory
+# which writes the sdk's location into. This is only necessary for cmd --> powershell invocations
+# as dot sourcing isn't possible.
 function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
   if (Test-Path variable:global:_DotNetInstallDir) {
     return $global:_DotNetInstallDir
@@ -144,21 +147,23 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
     }
 
     $env:DOTNET_INSTALL_DIR = $dotnetRoot
+  }
 
-    if ($createSdkLocationFile) {
-      # Create a temporary file under the toolset dir and rename it to sdk.txt to avoid races.
-      do { 
-        $sdkCacheFileTemp = Join-Path $ToolsetDir $([System.IO.Path]::GetRandomFileName())
-      } 
-      until (!(Test-Path $sdkCacheFileTemp))
-      Set-Content -Path $sdkCacheFileTemp -Value $dotnetRoot
-
-      try {
-        Rename-Item -Force -Path $sdkCacheFileTemp 'sdk.txt'
-      } catch {
-        # Somebody beat us
-        Remove-Item -Path $sdkCacheFileTemp
-      }
+  # Creates a temporary file under the toolset dir.
+  # The following code block is protecting against concurrent access so that this function can
+  # be called in parallel.
+  if ($createSdkLocationFile) {
+    do { 
+      $sdkCacheFileTemp = Join-Path $ToolsetDir $([System.IO.Path]::GetRandomFileName())
+    } 
+    until (!(Test-Path $sdkCacheFileTemp))
+    Set-Content -Path $sdkCacheFileTemp -Value $dotnetRoot
+  
+    try {
+      Rename-Item -Force -Path $sdkCacheFileTemp 'sdk.txt'
+    } catch {
+      # Somebody beat us
+      Remove-Item -Path $sdkCacheFileTemp
     }
   }
 

fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj

@@ -101,5 +101,6 @@
     <Reference Include="UIAutomationTypes" />
     <ProjectReference Include="CSharp_Analysis\CSharp_Analysis.csproj" />
     <ProjectReference Include="..\FSharp.Compiler.Service.ProjectCracker\FSharp.Compiler.Service.ProjectCracker.fsproj" />
+    <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" />
   </ItemGroup>
 </Project>

global.json

@@ -9,7 +9,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19615.1",
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19630.1",
     "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
   }
 }

src/absil/il.fs

@@ -493,14 +493,6 @@ type ILScopeRef =
 
     member x.IsLocalRef = match x with ILScopeRef.Local -> true | _ -> false
 
-    member x.IsModuleRef = match x with ILScopeRef.Module _ -> true | _ -> false
-
-    member x.IsAssemblyRef= match x with ILScopeRef.Assembly _ -> true | _ -> false
-
-    member x.ModuleRef = match x with ILScopeRef.Module x -> x | _ -> failwith "not a module reference"
-
-    member x.AssemblyRef = match x with ILScopeRef.Assembly x -> x | _ -> failwith "not an assembly reference"
-
     member x.QualifiedName =
         match x with
         | ILScopeRef.Local -> ""
@@ -2627,7 +2619,10 @@ type ILGlobals(primaryScopeRef) =
     let m_typ_UIntPtr = ILType.Value (mkILNonGenericTySpec (m_mkSysILTypeRef tname_UIntPtr))
 
     member x.primaryAssemblyScopeRef = m_typ_Object.TypeRef.Scope
-    member x.primaryAssemblyName = m_typ_Object.TypeRef.Scope.AssemblyRef.Name
+    member x.primaryAssemblyName = 
+        match m_typ_Object.TypeRef.Scope with 
+        | ILScopeRef.Assembly aref -> aref.Name 
+        | _ -> failwith "Invalid primary assembly"
     member x.typ_Object = m_typ_Object
     member x.typ_String = m_typ_String
     member x.typ_Array = m_typ_Array

src/absil/il.fsi

@@ -99,10 +99,6 @@ type ILScopeRef =
     /// A reference to a type in another assembly
     | Assembly of ILAssemblyRef  
     member IsLocalRef: bool
-    member IsModuleRef: bool
-    member IsAssemblyRef: bool
-    member ModuleRef: ILModuleRef
-    member AssemblyRef: ILAssemblyRef
     member QualifiedName: string
 
 // Calling conventions.  

src/absil/ilascii.fs

@@ -226,12 +226,6 @@ let DoubleInstrs : Lazy<InstrTable<DoubleInstr>> =
         ["ldc";"r8"], (fun x -> (AI_ldc (DT_R8, x))) 
     ]
 
-/// Table of parsing and pretty printing data for instructions.
-let MethodSpecInstrs : Lazy<InstrTable<MethodSpecInstr>> =
-    lazy [
-        ["call"], (fun (mspec, y) -> I_call (Normalcall, mspec, y)) 
-    ] 
-
 /// Table of parsing and pretty printing data for instructions.
 let StringInstrs : Lazy<InstrTable<StringInstr>> =
     lazy [

src/absil/ilascii.fsi

@@ -41,7 +41,6 @@ val Int64Instrs:  LazyInstrTable<Int64Instr>
 val Int32Instrs:  LazyInstrTable<Int32Instr>
 val Int32Int32Instrs: LazyInstrTable<Int32Int32Instr>
 val DoubleInstrs:  LazyInstrTable<DoubleInstr>
-val MethodSpecInstrs:  LazyInstrTable<MethodSpecInstr>
 val StringInstrs:  LazyInstrTable<StringInstr>
 val TokenInstrs:  LazyInstrTable<TokenInstr>
 val TypeInstrs:  LazyInstrTable<TypeInstr>

src/absil/illex.fsl

@@ -70,7 +70,6 @@ let kwdInstrTable =
     addTable (fun i -> INSTR_I32_I32 i) Int32Int32Instrs;
     addTable (fun i -> INSTR_I8 i) Int64Instrs;
     addTable (fun i -> INSTR_R i) DoubleInstrs;
-    addTable (fun i -> INSTR_METHOD i) MethodSpecInstrs;
     addTable (fun i -> INSTR_TYPE i) TypeInstrs;
     addTable (fun i -> INSTR_INT_TYPE i) IntTypeInstrs;
     addTable (fun i -> INSTR_VALUETYPE i) ValueTypeInstrs;