merge · dotnet/fsharp@1ce0850 · GitHub
Skip to content

Commit 1ce0850

Browse files
KevinRansomKevinRansom
committed
merge
2 parents b40c15c + 9d7fe85 commit 1ce0850

32 files changed

Lines changed: 442 additions & 246 deletions

‎INTERNAL.md‎

Lines changed: 1 addition & 1 deletion

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19615.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19630.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>77698ebba1ab096ad9580a5d9ebefe0499ba00ce</Sha>
8+
<Sha>01d0b636bfb96edf62a77912de25aa5cef143946</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/common/tools.ps1‎

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@ function Exec-Process([string]$command, [string]$commandArgs) {
9696
}
9797
}
9898

99+
# createSdkLocationFile parameter enables a file being generated under the toolset directory
100+
# which writes the sdk's location into. This is only necessary for cmd --> powershell invocations
101+
# as dot sourcing isn't possible.
99102
function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
100103
if (Test-Path variable:global:_DotNetInstallDir) {
101104
return $global:_DotNetInstallDir
@@ -144,21 +147,23 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
144147
}
145148

146149
$env:DOTNET_INSTALL_DIR = $dotnetRoot
150+
}
147151

148-
if ($createSdkLocationFile) {
149-
# Create a temporary file under the toolset dir and rename it to sdk.txt to avoid races.
150-
do {
151-
$sdkCacheFileTemp = Join-Path $ToolsetDir $([System.IO.Path]::GetRandomFileName())
152-
}
153-
until (!(Test-Path $sdkCacheFileTemp))
154-
Set-Content -Path $sdkCacheFileTemp -Value $dotnetRoot
155-
156-
try {
157-
Rename-Item -Force -Path $sdkCacheFileTemp 'sdk.txt'
158-
} catch {
159-
# Somebody beat us
160-
Remove-Item -Path $sdkCacheFileTemp
161-
}
152+
# Creates a temporary file under the toolset dir.
153+
# The following code block is protecting against concurrent access so that this function can
154+
# be called in parallel.
155+
if ($createSdkLocationFile) {
156+
do {
157+
$sdkCacheFileTemp = Join-Path $ToolsetDir $([System.IO.Path]::GetRandomFileName())
158+
}
159+
until (!(Test-Path $sdkCacheFileTemp))
160+
Set-Content -Path $sdkCacheFileTemp -Value $dotnetRoot
161+
162+
try {
163+
Rename-Item -Force -Path $sdkCacheFileTemp 'sdk.txt'
164+
} catch {
165+
# Somebody beat us
166+
Remove-Item -Path $sdkCacheFileTemp
162167
}
163168
}
164169

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,5 +101,6 @@
101101
<Reference Include="UIAutomationTypes" />
102102
<ProjectReference Include="CSharp_Analysis\CSharp_Analysis.csproj" />
103103
<ProjectReference Include="..\FSharp.Compiler.Service.ProjectCracker\FSharp.Compiler.Service.ProjectCracker.fsproj" />
104+
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj" />
104105
</ItemGroup>
105106
</Project>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
}
1010
},
1111
"msbuild-sdks": {
12-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19615.1",
12+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19630.1",
1313
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
1414
}
1515
}

‎src/absil/il.fs‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -493,14 +493,6 @@ type ILScopeRef =
493493

494494
member x.IsLocalRef = match x with ILScopeRef.Local -> true | _ -> false
495495

496-
member x.IsModuleRef = match x with ILScopeRef.Module _ -> true | _ -> false
497-
498-
member x.IsAssemblyRef= match x with ILScopeRef.Assembly _ -> true | _ -> false
499-
500-
member x.ModuleRef = match x with ILScopeRef.Module x -> x | _ -> failwith "not a module reference"
501-
502-
member x.AssemblyRef = match x with ILScopeRef.Assembly x -> x | _ -> failwith "not an assembly reference"
503-
504496
member x.QualifiedName =
505497
match x with
506498
| ILScopeRef.Local -> ""
@@ -2627,7 +2619,10 @@ type ILGlobals(primaryScopeRef) =
26272619
let m_typ_UIntPtr = ILType.Value (mkILNonGenericTySpec (m_mkSysILTypeRef tname_UIntPtr))
26282620

26292621
member x.primaryAssemblyScopeRef = m_typ_Object.TypeRef.Scope
2630-
member x.primaryAssemblyName = m_typ_Object.TypeRef.Scope.AssemblyRef.Name
2622+
member x.primaryAssemblyName =
2623+
match m_typ_Object.TypeRef.Scope with
2624+
| ILScopeRef.Assembly aref -> aref.Name
2625+
| _ -> failwith "Invalid primary assembly"
26312626
member x.typ_Object = m_typ_Object
26322627
member x.typ_String = m_typ_String
26332628
member x.typ_Array = m_typ_Array

‎src/absil/il.fsi‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,6 @@ type ILScopeRef =
9999
/// A reference to a type in another assembly
100100
| Assembly of ILAssemblyRef
101101
member IsLocalRef: bool
102-
member IsModuleRef: bool
103-
member IsAssemblyRef: bool
104-
member ModuleRef: ILModuleRef
105-
member AssemblyRef: ILAssemblyRef
106102
member QualifiedName: string
107103

108104
// Calling conventions.

‎src/absil/ilascii.fs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,12 +226,6 @@ let DoubleInstrs : Lazy<InstrTable<DoubleInstr>> =
226226
["ldc";"r8"], (fun x -> (AI_ldc (DT_R8, x)))
227227
]
228228

229-
/// Table of parsing and pretty printing data for instructions.
230-
let MethodSpecInstrs : Lazy<InstrTable<MethodSpecInstr>> =
231-
lazy [
232-
["call"], (fun (mspec, y) -> I_call (Normalcall, mspec, y))
233-
]
234-
235229
/// Table of parsing and pretty printing data for instructions.
236230
let StringInstrs : Lazy<InstrTable<StringInstr>> =
237231
lazy [

‎src/absil/ilascii.fsi‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ val Int64Instrs: LazyInstrTable<Int64Instr>
4141
val Int32Instrs: LazyInstrTable<Int32Instr>
4242
val Int32Int32Instrs: LazyInstrTable<Int32Int32Instr>
4343
val DoubleInstrs: LazyInstrTable<DoubleInstr>
44-
val MethodSpecInstrs: LazyInstrTable<MethodSpecInstr>
4544
val StringInstrs: LazyInstrTable<StringInstr>
4645
val TokenInstrs: LazyInstrTable<TokenInstr>
4746
val TypeInstrs: LazyInstrTable<TypeInstr>

‎src/absil/illex.fsl‎

Lines changed: 0 additions & 1 deletion

0 commit comments

Comments
 (0)