Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 4 additions & 22 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -85,34 +85,15 @@
https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json;
</RestoreSources>
<!-- System.* packages -->
<!-- If a System.* package is stuck on version 4.3.x, targets .NET Standard 1.x and hasn't been
updated in years, you most likely DON'T need it, please exercise caution when adding it to the list. -->
<SystemBuffersVersion>4.5.1</SystemBuffersVersion>
<SystemCollectionsImmutableVersion>5.0.0</SystemCollectionsImmutableVersion>
<SystemConsoleVersion>4.3.0</SystemConsoleVersion>
<SystemDataSqlClientPackageVersion>4.3.0</SystemDataSqlClientPackageVersion>
<SystemDesignVersion>4.0.0</SystemDesignVersion>
<SystemDiagnosticsProcessVersion>4.3.0</SystemDiagnosticsProcessVersion>
<SystemDiagnosticsTraceSourceVersion>4.3.0</SystemDiagnosticsTraceSourceVersion>
<MicrosoftDiaSymReaderPortablePdbVersion>1.6.0</MicrosoftDiaSymReaderPortablePdbVersion>
<SystemIoCompressionVersion>4.3.0</SystemIoCompressionVersion>
<SystemLinqExpressionsVersion>4.3.0</SystemLinqExpressionsVersion>
<SystemLinqQueryableVersion>4.3.0</SystemLinqQueryableVersion>
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
<SystemNetRequestsVersion>4.3.0</SystemNetRequestsVersion>
<SystemNetSecurityVersion>4.3.1</SystemNetSecurityVersion>
<SystemReflectionEmitVersion>4.3.0</SystemReflectionEmitVersion>
<SystemReflectionEmitVersion>4.7.0</SystemReflectionEmitVersion>
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
<SystemReflectionTypeExtensionsVersion>4.3.0</SystemReflectionTypeExtensionsVersion>
<SystemRuntimeCachingVersion>1.5.0</SystemRuntimeCachingVersion>
<SystemRuntimeVersion>4.3.0</SystemRuntimeVersion>
<SystemRuntimeInteropServicesVersion>4.3.0</SystemRuntimeInteropServicesVersion>
<SystemRuntimeLoaderVersion>4.3.0</SystemRuntimeLoaderVersion>
<SystemSecurityClaimsVersion>4.3.0</SystemSecurityClaimsVersion>
<SystemSecurityCryptographyAlgorithmsVersion>4.3.0</SystemSecurityCryptographyAlgorithmsVersion>
<SystemSecurityPrincipalVersion>4.3.0</SystemSecurityPrincipalVersion>
<SystemThreadingTasksParallelVersion>4.3.0</SystemThreadingTasksParallelVersion>
<SystemThreadingTasksDataflow>4.11.1</SystemThreadingTasksDataflow>
<SystemThreadingThreadVersion>4.3.0</SystemThreadingThreadVersion>
<SystemThreadingThreadPoolVersion>4.3.0</SystemThreadingThreadPoolVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
<!-- Versions for package groups -->
Expand Down Expand Up @@ -205,6 +186,7 @@
<MicroBuildCoreSentinelVersion>1.0.0</MicroBuildCoreSentinelVersion>
<MicroBuildPluginsSwixBuildVersion>1.1.33</MicroBuildPluginsSwixBuildVersion>
<!-- other packages -->
<BenchmarkDotNetVersion>0.13.2</BenchmarkDotNetVersion>
<FsCheckVersion>2.16.5</FsCheckVersion>
<FSharpDataTypeProvidersVersion>4.3.0.0</FSharpDataTypeProvidersVersion>
<MicrosoftCompositionVersion>1.0.30</MicrosoftCompositionVersion>
Expand Down
15 changes: 7 additions & 8 deletions src/Compiler/AbstractIL/ilreflect.fs
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ type TypeBuilder with
if logRefEmitCalls then
printfn "typeBuilder%d.CreateType()" (abs <| hash typB)

typB.CreateTypeInfo().AsType()
typB.CreateTypeInfo() :> Type

member typB.DefineNestedTypeAndLog(name, attrs) =
let res = typB.DefineNestedType(name, attrs)
Expand Down Expand Up @@ -1902,7 +1902,7 @@ let rec buildMethodPass2 cenv tref (typB: TypeBuilder) emEnv (mdef: ILMethodDef)
let genArgs = getGenericArgumentsOfMethod methB

let emEnv =
envPushTyvars emEnv (Array.append (getGenericArgumentsOfType (typB.AsType())) genArgs)
envPushTyvars emEnv (Array.append (getGenericArgumentsOfType typB) genArgs)

buildGenParamsPass1b cenv emEnv genArgs mdef.GenericParams

Expand Down Expand Up @@ -1965,7 +1965,7 @@ let rec buildMethodPass3 cenv tref modB (typB: TypeBuilder) emEnv (mdef: ILMetho
let methB = envGetMethB emEnv mref

let emEnv =
envPushTyvars emEnv (Array.append (getGenericArgumentsOfType (typB.AsType())) (getGenericArgumentsOfMethod methB))
envPushTyvars emEnv (Array.append (getGenericArgumentsOfType typB) (getGenericArgumentsOfMethod methB))

if not (Array.isEmpty (mdef.Return.CustomAttrs.AsArray())) then
let retB = methB.DefineParameterAndLog(0, ParameterAttributes.Retval, null)
Expand Down Expand Up @@ -2091,8 +2091,7 @@ let buildEventPass3 cenv (typB: TypeBuilder) emEnv (eventDef: ILEventDef) =
//----------------------------------------------------------------------------

let buildMethodImplsPass3 cenv _tref (typB: TypeBuilder) emEnv (mimpl: ILMethodImplDef) =
let bodyMethInfo =
convMethodRef cenv emEnv (typB.AsType()) mimpl.OverrideBy.MethodRef // doc: must be MethodBuilder
let bodyMethInfo = convMethodRef cenv emEnv typB mimpl.OverrideBy.MethodRef // doc: must be MethodBuilder

let (OverridesSpec (mref, dtyp)) = mimpl.Overrides
let declMethTI = convType cenv emEnv dtyp
Expand Down Expand Up @@ -2213,7 +2212,7 @@ and buildTypeTypeDef cenv emEnv modB (typB: TypeBuilder) nesting tdef =
let rec buildTypeDefPass1b cenv nesting emEnv (tdef: ILTypeDef) =
let tref = mkRefForNestedILTypeDef ILScopeRef.Local (nesting, tdef)
let typB = envGetTypB emEnv tref
let genArgs = getGenericArgumentsOfType (typB.AsType())
let genArgs = getGenericArgumentsOfType typB
let emEnv = envPushTyvars emEnv genArgs
// Parent may reference types being defined, so has to come after it's Pass1 creation
tdef.Extends
Expand All @@ -2232,7 +2231,7 @@ let rec buildTypeDefPass1b cenv nesting emEnv (tdef: ILTypeDef) =
let rec buildTypeDefPass2 cenv nesting emEnv (tdef: ILTypeDef) =
let tref = mkRefForNestedILTypeDef ILScopeRef.Local (nesting, tdef)
let typB = envGetTypB emEnv tref
let emEnv = envPushTyvars emEnv (getGenericArgumentsOfType (typB.AsType()))
let emEnv = envPushTyvars emEnv (getGenericArgumentsOfType typB)
// add interface impls
tdef.Implements
|> convTypes cenv emEnv
Expand Down Expand Up @@ -2262,7 +2261,7 @@ let rec buildTypeDefPass2 cenv nesting emEnv (tdef: ILTypeDef) =
let rec buildTypeDefPass3 cenv nesting modB emEnv (tdef: ILTypeDef) =
let tref = mkRefForNestedILTypeDef ILScopeRef.Local (nesting, tdef)
let typB = envGetTypB emEnv tref
let emEnv = envPushTyvars emEnv (getGenericArgumentsOfType (typB.AsType()))
let emEnv = envPushTyvars emEnv (getGenericArgumentsOfType typB)
// add method bodies, properties, events
tdef.Methods |> Seq.iter (buildMethodPass3 cenv tref modB typB emEnv)
tdef.Properties.AsList() |> List.iter (buildPropertyPass3 cenv tref typB emEnv)
Expand Down
38 changes: 3 additions & 35 deletions src/Compiler/FSharp.Compiler.Service.fsproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -->
<Project Sdk="Microsoft.NET.Sdk">

Expand Down Expand Up @@ -56,25 +56,9 @@
<NuspecProperty Include="MicrosoftBuildUtilitiesCorePackageVersion=$(MicrosoftBuildUtilitiesCoreVersion)" />
<NuspecProperty Include="SystemBuffersPackageVersion=$(SystemBuffersVersion)" />
<NuspecProperty Include="SystemCollectionsImmutablePackageVersion=$(SystemCollectionsImmutableVersion)" />
<NuspecProperty Include="SystemDiagnosticsProcessPackageVersion=$(SystemDiagnosticsProcessVersion)" />
<NuspecProperty Include="SystemDiagnosticsTraceSourcePackageVersion=$(SystemDiagnosticsTraceSourceVersion)" />
<NuspecProperty Include="SystemLinqExpressionsPackageVersion=$(SystemLinqExpressionsVersion)" />
<NuspecProperty Include="SystemLinqQueryablePackageVersion=$(SystemLinqQueryableVersion)" />
<NuspecProperty Include="SystemMemoryPackageVersion=$(SystemMemoryVersion)" />
<NuspecProperty Include="SystemNetRequestsPackageVersion=$(SystemNetRequestsVersion)" />
<NuspecProperty Include="SystemNetSecurityPackageVersion=$(SystemNetSecurityVersion)" />
<NuspecProperty Include="SystemReflectionEmitPackageVersion=$(SystemReflectionEmitVersion)" />
<NuspecProperty Include="SystemReflectionMetadataPackageVersion=$(SystemReflectionMetadataVersion)" />
<NuspecProperty Include="SystemReflectionTypeExtensionsPackageVersion=$(SystemReflectionTypeExtensionsVersion)" />
<NuspecProperty Include="SystemRuntimePackageVersion=$(SystemRuntimeVersion)" />
<NuspecProperty Include="SystemRuntimeInteropServicesPackageVersion=$(SystemRuntimeInteropServicesVersion)" />
<NuspecProperty Include="SystemRuntimeLoaderPackageVersion=$(SystemRuntimeLoaderVersion)" />
<NuspecProperty Include="SystemSecurityClaimsPackageVersion=$(SystemSecurityClaimsVersion)" />
<NuspecProperty Include="SystemSecurityCryptographyAlgorithmsPackageVersion=$(SystemSecurityCryptographyAlgorithmsVersion)" />
<NuspecProperty Include="SystemSecurityPrincipalPackageVersion=$(SystemSecurityPrincipalVersion)" />
<NuspecProperty Include="SystemThreadingTasksParallelPackageVersion=$(SystemThreadingTasksParallelVersion)" />
<NuspecProperty Include="SystemThreadingThreadPackageVersion=$(SystemThreadingThreadVersion)" />
<NuspecProperty Include="SystemThreadingThreadPoolPackageVersion=$(SystemThreadingThreadPoolVersion)" />
<NuspecProperty Include="SystemRuntimeCompilerServicesUnsafePackageVersion=$(SystemRuntimeCompilerServicesUnsafeVersion)" />
</ItemGroup>

Expand Down Expand Up @@ -432,8 +416,8 @@
<Compile Include="Service\ItemKey.fsi" />
<Compile Include="Service\ItemKey.fs" />
<Compile Include="Service\SemanticClassificationKey.fsi" />
<Compile Include="Service\SemanticClassificationKey.fs" />
<Compile Include="Service\FSharpSource.fsi" />
<Compile Include="Service\SemanticClassificationKey.fs" />
<Compile Include="Service\FSharpSource.fsi" />
<Compile Include="Service\FSharpSource.fs" />
<Compile Include="Service\IncrementalBuild.fsi" />
<Compile Include="Service\IncrementalBuild.fs" />
Expand Down Expand Up @@ -501,25 +485,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
<PackageReference Include="System.Diagnostics.Process" Version="$(SystemDiagnosticsProcessVersion)" />
<PackageReference Include="System.Diagnostics.TraceSource" Version="$(SystemDiagnosticsTraceSourceVersion)" />
<PackageReference Include="System.Linq.Expressions" Version="$(SystemLinqExpressionsVersion)" />
<PackageReference Include="System.Linq.Queryable" Version="$(SystemLinqExpressionsVersion)" />
<PackageReference Include="System.Net.Requests" Version="$(SystemNetRequestsVersion)" />
<PackageReference Include="System.Net.Security" Version="$(SystemNetSecurityVersion)" />
<PackageReference Include="System.Reflection.Emit" Version="$(SystemReflectionEmitVersion)" />
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="$(SystemReflectionTypeExtensionsVersion)" />
<PackageReference Include="System.Runtime" Version="$(SystemRuntimeVersion)" />
<PackageReference Include="System.Runtime.InteropServices" Version="$(SystemRuntimeInteropServicesVersion)" />
<PackageReference Include="System.Security.Claims" Version="$(SystemSecurityClaimsVersion)" />
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="$(SystemSecurityCryptographyAlgorithmsVersion)" />
<PackageReference Include="System.Security.Principal" Version="$(SystemSecurityPrincipalVersion)" />
<PackageReference Include="System.Threading.Tasks.Parallel" Version="$(SystemThreadingTasksParallelVersion)" />
<PackageReference Include="System.Threading.Thread" Version="$(SystemThreadingThreadVersion)" />
<PackageReference Include="System.Threading.ThreadPool" Version="$(SystemThreadingThreadPoolVersion)" />
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" />
Expand Down
16 changes: 0 additions & 16 deletions src/Compiler/FSharp.Compiler.Service.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,9 @@
<dependency id="Microsoft.Build.Utilities.Core" version="$MicrosoftBuildUtilitiesCorePackageVersion$" exclude="Build,Analyzers" />
<dependency id="System.Buffers" version="$SystemBuffersPackageVersion$" exclude="Build,Analyzers" />
<dependency id="System.Collections.Immutable" version="$SystemCollectionsImmutablePackageVersion$" exclude="Build,Analyzers" />
<dependency id="System.Diagnostics.Process" version="$SystemDiagnosticsProcessPackageVersion$" exclude="Build,Analyzers" />
<dependency id="System.Diagnostics.TraceSource" version="$SystemDiagnosticsTraceSourcePackageVersion$" exclude="Build,Analyzers" />
<dependency id="System.Linq.Expressions" version="$SystemLinqExpressionsPackageVersion$" exclude="Build,Analyzers" />
<dependency id="System.Linq.Queryable" version="$SystemLinqQueryablePackageVersion$" exclude="Build,Analyzers" />
<dependency id="System.Memory" version="$SystemMemoryPackageVersion$" exclude="Build,Analyzers" />
<dependency id="System.Net.Requests" version="$SystemNetRequestsPackageVersion$" exclude="Build,Analyzers" />
<dependency id="System.Net.Security" version="$SystemNetSecurityPackageVersion$" exclude="Build,Analyzers" />
<dependency id="System.Reflection.Emit" version="$SystemReflectionEmitPackageVersion$" exclude="Build,Analyzers" />
<dependency id="System.Reflection.Metadata" version="$SystemReflectionMetadataPackageVersion$" exclude="Build,Analyzers" />
<dependency id="System.Reflection.TypeExtensions" version="$SystemReflectionTypeExtensionsPackageVersion$" exclude="Build,Analyzers" />
<dependency id="System.Runtime" version="$SystemRuntimePackageVersion$" exclude="Build,Analyzers" />
<dependency id="System.Runtime.InteropServices" version="$SystemRuntimeInteropServicesPackageVersion$" exclude="Build,Analyzers" />
<dependency id="System.Runtime.Loader" version="$SystemRuntimeLoaderPackageVersion$" exclude="Build,Analyzers" />
<dependency id="System.Security.Claims" version="$SystemSecurityClaimsPackageVersion$" exclude="Build,Analyzers" />
<dependency id="System.Security.Cryptography.Algorithms" version="$SystemSecurityCryptographyAlgorithmsPackageVersion$" exclude="Build,Analyzers" />
<dependency id="System.Security.Principal" version="$SystemSecurityPrincipalPackageVersion$" exclude="Build,Analyzers" />
<dependency id="System.Threading.Tasks.Parallel" version="$SystemThreadingTasksParallelPackageVersion$" exclude="Build,Analyzers" />
<dependency id="System.Threading.Thread" version="$SystemThreadingThreadPackageVersion$" exclude="Build,Analyzers" />
<dependency id="System.Threading.ThreadPool" version="$SystemThreadingThreadPoolPackageVersion$" exclude="Build,Analyzers" />
<dependency id="System.Runtime.CompilerServices.Unsafe" version="$SystemRuntimeCompilerServicesUnsafePackageVersion$" exclude="Build,Analyzers" />
</group>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,4 @@
<ProjectReference Include="..\FSharp.Core\FSharp.Core.fsproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Reflection.TypeExtensions" Version="$(SystemReflectionTypeExtensionsVersion)" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -48,26 +48,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
<PackageReference Include="System.Diagnostics.Process" Version="$(SystemDiagnosticsProcessVersion)" />
<PackageReference Include="System.Diagnostics.TraceSource" Version="$(SystemDiagnosticsTraceSourceVersion)" />
<PackageReference Include="System.Linq.Expressions" Version="$(SystemLinqExpressionsVersion)" />
<PackageReference Include="System.Linq.Queryable" Version="$(SystemLinqExpressionsVersion)" />
<PackageReference Include="System.Net.Requests" Version="$(SystemNetRequestsVersion)" />
<PackageReference Include="System.Net.Security" Version="$(SystemNetSecurityVersion)" />
<PackageReference Include="System.Reflection.Emit" Version="$(SystemReflectionEmitVersion)" />
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="$(SystemReflectionTypeExtensionsVersion)" />
<PackageReference Include="System.Runtime" Version="$(SystemRuntimeVersion)" />
<PackageReference Include="System.Runtime.InteropServices" Version="$(SystemRuntimeInteropServicesVersion)" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" />
<PackageReference Include="System.Security.Claims" Version="$(SystemSecurityClaimsVersion)" />
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="$(SystemSecurityCryptographyAlgorithmsVersion)" />
<PackageReference Include="System.Security.Principal" Version="$(SystemSecurityPrincipalVersion)" />
<PackageReference Include="System.Threading.Tasks.Parallel" Version="$(SystemThreadingTasksParallelVersion)" />
<PackageReference Include="System.Threading.Thread" Version="$(SystemThreadingThreadVersion)" />
<PackageReference Include="System.Threading.ThreadPool" Version="$(SystemThreadingThreadPoolVersion)" />
</ItemGroup>

</Project>
4 changes: 0 additions & 4 deletions src/fsc/fsc.targets
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Console" Version="$(SystemConsoleVersion)" />
<PackageReference Include="System.Linq.Expressions" Version="$(SystemLinqExpressionsVersion)" />
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" />
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
<PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
<PackageReference Include="System.Security.Principal" Version="$(SystemSecurityPrincipalVersion)" />
</ItemGroup>

</Project>
11 changes: 0 additions & 11 deletions src/fsi/fsi.targets
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,4 @@
<Reference Include="WindowsBase" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
<PackageReference Include="System.Diagnostics.Process" Version="$(SystemDiagnosticsProcessVersion)" />
<PackageReference Include="System.Linq.Expressions" Version="$(SystemLinqExpressionsVersion)" />
<PackageReference Include="System.Reflection.Emit" Version="$(SystemReflectionEmitVersion)" />
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="$(SystemReflectionTypeExtensionsVersion)" />
<PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
<PackageReference Include="System.Security.Principal" Version="$(SystemSecurityPrincipalVersion)" />
<PackageReference Include="System.Threading.Thread" Version="$(SystemThreadingThreadVersion)" />
</ItemGroup>

</Project>
Loading