Skip to content
Merged
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
1 change: 1 addition & 0 deletions docs/release-notes/.FSharp.Compiler.Service/11.0.100.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@
* Debug: fix if and match condition sequence points ([PR #19932](https://github.com/dotnet/fsharp/pull/19932))
* Checker: recover on checking language version ([PR ##19970](https://github.com/dotnet/fsharp/pull/19970))
* Implied argument names for function-to-delegate coercions now fall back to the delegate's `Invoke` parameter names when the function has no recoverable names (e.g. a partial application like `System.Func<int, int>((+) 1)`), instead of synthetic `delegateArg0`, `delegateArg1`, … names. ([PR #20001](https://github.com/dotnet/fsharp/pull/20001))
* Add internal `ResetCompilerGeneratedNameState` to `CompilerGlobalState` name generators so warm-checker re-compilation can produce fresh-process-identical generated names. ([PR #20017](https://github.com/dotnet/fsharp/pull/20017))

### Improved

Expand Down
34 changes: 17 additions & 17 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet-arcade dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26330.1</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26369.1</MicrosoftDotNetArcadeSdkPackageVersion>
<!-- dotnet-msbuild dependencies -->
<MicrosoftBuildPackageVersion>18.10.0-preview-26358-03</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>18.10.0-preview-26358-03</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildTasksCorePackageVersion>18.10.0-preview-26358-03</MicrosoftBuildTasksCorePackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>18.10.0-preview-26358-03</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftBuildPackageVersion>18.10.0-1.26370.18</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>18.10.0-1.26370.18</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildTasksCorePackageVersion>18.10.0-1.26370.18</MicrosoftBuildTasksCorePackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>18.10.0-1.26370.18</MicrosoftBuildUtilitiesCorePackageVersion>
<!-- dotnet-optimization dependencies -->
<optimizationlinuxarm64MIBCRuntimePackageVersion>1.0.0-prerelease.26309.1</optimizationlinuxarm64MIBCRuntimePackageVersion>
<optimizationlinuxx64MIBCRuntimePackageVersion>1.0.0-prerelease.26309.1</optimizationlinuxx64MIBCRuntimePackageVersion>
<optimizationwindows_ntarm64MIBCRuntimePackageVersion>1.0.0-prerelease.26309.1</optimizationwindows_ntarm64MIBCRuntimePackageVersion>
<optimizationwindows_ntx64MIBCRuntimePackageVersion>1.0.0-prerelease.26309.1</optimizationwindows_ntx64MIBCRuntimePackageVersion>
<optimizationwindows_ntx86MIBCRuntimePackageVersion>1.0.0-prerelease.26309.1</optimizationwindows_ntx86MIBCRuntimePackageVersion>
<!-- dotnet-roslyn dependencies -->
<MicrosoftCodeAnalysisPackageVersion>5.10.0-1.26358.9</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCompilersPackageVersion>5.10.0-1.26358.9</MicrosoftCodeAnalysisCompilersPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>5.10.0-1.26358.9</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.10.0-1.26358.9</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.10.0-1.26358.9</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.10.0-1.26358.9</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
<MicrosoftCodeAnalysisFeaturesPackageVersion>5.10.0-1.26358.9</MicrosoftCodeAnalysisFeaturesPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.10.0-1.26358.9</MicrosoftVisualStudioLanguageServicesPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCompilersPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisCompilersPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
<MicrosoftCodeAnalysisFeaturesPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisFeaturesPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.10.0-1.26365.3</MicrosoftVisualStudioLanguageServicesPackageVersion>
<!-- dotnet-runtime dependencies -->
<SystemCollectionsImmutablePackageVersion>10.0.2</SystemCollectionsImmutablePackageVersion>
<SystemCompositionPackageVersion>10.0.2</SystemCompositionPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>10.0.2</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemReflectionMetadataPackageVersion>10.0.2</SystemReflectionMetadataPackageVersion>
<SystemCollectionsImmutablePackageVersion>10.0.8</SystemCollectionsImmutablePackageVersion>
<SystemCompositionPackageVersion>10.0.8</SystemCompositionPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>10.0.8</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemReflectionMetadataPackageVersion>10.0.8</SystemReflectionMetadataPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.8</SystemSecurityCryptographyXmlPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
Expand Down
60 changes: 30 additions & 30 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,74 +2,74 @@
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="c802bb0f0b272d8547b12719c604c65f6beb1912" BarId="313071" />
<ProductDependencies>
<Dependency Name="Microsoft.Build" Version="18.10.0-preview-26358-03">
<Dependency Name="Microsoft.Build" Version="18.10.0-1.26370.18">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>98935500d8efcb66c1f32927cb2976ea067172d2</Sha>
<Sha>eae54023463db15e9a9081f35a959c9162797643</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Framework" Version="18.10.0-preview-26358-03">
<Dependency Name="Microsoft.Build.Framework" Version="18.10.0-1.26370.18">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>98935500d8efcb66c1f32927cb2976ea067172d2</Sha>
<Sha>eae54023463db15e9a9081f35a959c9162797643</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Tasks.Core" Version="18.10.0-preview-26358-03">
<Dependency Name="Microsoft.Build.Tasks.Core" Version="18.10.0-1.26370.18">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>98935500d8efcb66c1f32927cb2976ea067172d2</Sha>
<Sha>eae54023463db15e9a9081f35a959c9162797643</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.10.0-preview-26358-03">
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.10.0-1.26370.18">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>98935500d8efcb66c1f32927cb2976ea067172d2</Sha>
<Sha>eae54023463db15e9a9081f35a959c9162797643</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis" Version="5.10.0-1.26358.9">
<Dependency Name="Microsoft.CodeAnalysis" Version="5.10.0-1.26365.3">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>35967bab3447f7edd6162baee7048f801f18fffe</Sha>
<Sha>3d32d464e2949f054086fbb5346e4beea0c6df56</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Features" Version="5.10.0-1.26358.9">
<Dependency Name="Microsoft.CodeAnalysis.Features" Version="5.10.0-1.26365.3">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>35967bab3447f7edd6162baee7048f801f18fffe</Sha>
<Sha>3d32d464e2949f054086fbb5346e4beea0c6df56</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.10.0-1.26358.9">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.10.0-1.26365.3">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>35967bab3447f7edd6162baee7048f801f18fffe</Sha>
<Sha>3d32d464e2949f054086fbb5346e4beea0c6df56</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.10.0-1.26358.9">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.10.0-1.26365.3">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>35967bab3447f7edd6162baee7048f801f18fffe</Sha>
<Sha>3d32d464e2949f054086fbb5346e4beea0c6df56</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.10.0-1.26358.9">
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.10.0-1.26365.3">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>35967bab3447f7edd6162baee7048f801f18fffe</Sha>
<Sha>3d32d464e2949f054086fbb5346e4beea0c6df56</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.10.0-1.26358.9">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.10.0-1.26365.3">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>35967bab3447f7edd6162baee7048f801f18fffe</Sha>
<Sha>3d32d464e2949f054086fbb5346e4beea0c6df56</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Compilers" Version="5.10.0-1.26358.9">
<Dependency Name="Microsoft.CodeAnalysis.Compilers" Version="5.10.0-1.26365.3">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>35967bab3447f7edd6162baee7048f801f18fffe</Sha>
<Sha>3d32d464e2949f054086fbb5346e4beea0c6df56</Sha>
</Dependency>
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.10.0-1.26358.9">
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.10.0-1.26365.3">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>35967bab3447f7edd6162baee7048f801f18fffe</Sha>
<Sha>3d32d464e2949f054086fbb5346e4beea0c6df56</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Collections.Immutable" Version="10.0.2">
<Dependency Name="System.Collections.Immutable" Version="10.0.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>
</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Composition" Version="10.0.2">
<Dependency Name="System.Composition" Version="10.0.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>
</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="10.0.2">
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="10.0.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>
</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Reflection.Metadata" Version="10.0.2">
<Dependency Name="System.Reflection.Metadata" Version="10.0.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>
</Sha>
Expand All @@ -82,9 +82,9 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26330.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26369.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f87bce1e0d389d515282c5f74466d629ef653026</Sha>
<Sha>09bc8c946f4c4ae5d031c8875b85a6b8f1876b93</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.26309.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
39 changes: 28 additions & 11 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,9 @@
<SystemBuffersVersion>4.6.1</SystemBuffersVersion>
<SystemMemoryVersion>4.6.3</SystemMemoryVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.2</SystemRuntimeCompilerServicesUnsafeVersion>
<!-- System.* packages from dotnet/runtime, aligned with MSBuild and Roslyn deps. -->
<SystemPackagesVersion>10.0.2</SystemPackagesVersion>
<SystemCollectionsImmutableVersion>$(SystemPackagesVersion)</SystemCollectionsImmutableVersion>
<SystemCompositionVersion>$(SystemPackagesVersion)</SystemCompositionVersion>
<SystemDiagnosticsDiagnosticSourceVersion>$(SystemPackagesVersion)</SystemDiagnosticsDiagnosticSourceVersion>
<SystemReflectionMetadataVersion>$(SystemPackagesVersion)</SystemReflectionMetadataVersion>
<!-- System.Collections.Immutable, System.Composition, System.Diagnostics.DiagnosticSource and
System.Reflection.Metadata flow from dotnet/runtime via Maestro (see eng/Version.Details.props).
Do not pin them here; an override would downgrade the versions Roslyn requires and cause NU1605. -->
</PropertyGroup>

<PropertyGroup>
Expand All @@ -108,16 +105,17 @@
<MicrosoftVisualStudioShellPackagesVersion>18.0.2188-preview.1</MicrosoftVisualStudioShellPackagesVersion>
<VisualStudioProjectSystemPackagesVersion>18.0.1237-pre</VisualStudioProjectSystemPackagesVersion>
<VisualStudioShellProjectsPackages>18.0.2077-preview.1</VisualStudioShellProjectsPackages>
<MicrosoftVisualStudioThreadingPackagesVersion>18.0.5</MicrosoftVisualStudioThreadingPackagesVersion>
<MicrosoftVisualStudioThreadingPackagesVersion>18.7.19</MicrosoftVisualStudioThreadingPackagesVersion>

<!-- Roslyn packages. Rest is managed by maestro bot and is in the imported .Details.props file -->
<MicrosoftCodeAnalysisTestResourcesProprietaryVersion>2.0.28</MicrosoftCodeAnalysisTestResourcesProprietaryVersion>
<!-- Visual Studio Shell packages -->
<MicrosoftVisualStudioInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioInteropVersion>
<MicrosoftVisualStudioImagingInterop140DesignTimeVersion>$(VisualStudioShellProjectsPackages)</MicrosoftVisualStudioImagingInterop140DesignTimeVersion>
<MicrosoftVisualStudioShellInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellInteropVersion>
<MicrosoftVisualStudioTextManagerInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioTextManagerInteropVersion>
<MicrosoftVisualStudioOLEInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioOLEInteropVersion>
<!-- Interop packages are pinned to the version required by Microsoft.VisualStudio.SDK (pulled transitively via Microsoft.CodeAnalysis.ExternalAccess.FSharp), which is newer than the other shell packages. -->
<MicrosoftVisualStudioShellInteropVersion>18.9.438</MicrosoftVisualStudioShellInteropVersion>
<MicrosoftVisualStudioTextManagerInteropVersion>18.9.438</MicrosoftVisualStudioTextManagerInteropVersion>
<MicrosoftVisualStudioOLEInteropVersion>18.9.438</MicrosoftVisualStudioOLEInteropVersion>
<MicrosoftVisualStudioShellDesignVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellDesignVersion>
<MicrosoftInternalVisualStudioShellFrameworkVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftInternalVisualStudioShellFrameworkVersion>
<MicrosoftVisualStudioPackageLanguageService150Version>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioPackageLanguageService150Version>
Expand All @@ -132,7 +130,12 @@
<MicrosoftVisualStudioEditorVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioEditorVersion>
<MicrosoftVisualStudioLanguageStandardClassificationVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioLanguageStandardClassificationVersion>
<MicrosoftVisualStudioLanguageIntellisenseVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioLanguageIntellisenseVersion>
<MicrosoftVisualStudioPlatformVSEditorVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioPlatformVSEditorVersion>
<!-- Microsoft.VisualStudio.Platform.VSEditor is the runtime implementation of the editor. Unlike the other editor
packages it is not pulled transitively by Microsoft.CodeAnalysis.ExternalAccess.FSharp, so it stays at the
explicit pin while Microsoft.VisualStudio.Text.* / .Editor get bumped to 18.9.123 transitively. Pin VSEditor to
the matching 18.9.123 so its implementation types load against the newer Text.Internal interfaces; otherwise the
VsMocks MEF catalog throws ReflectionTypeLoadException and every legacy VS unit test fails. -->
<MicrosoftVisualStudioPlatformVSEditorVersion>18.9.123</MicrosoftVisualStudioPlatformVSEditorVersion>
<MicrosoftVisualStudioTextUIWpfVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextUIWpfVersion>
<NuGetVisualStudioVersion>17.14.0</NuGetVisualStudioVersion>
<MicrosoftVisualStudioExtensibilityTestingVersion>0.1.800-beta</MicrosoftVisualStudioExtensibilityTestingVersion>
Expand All @@ -141,6 +144,20 @@
<!-- Visual Studio Threading packages -->
<MicrosoftVisualStudioThreadingVersion>$(MicrosoftVisualStudioThreadingPackagesVersion)</MicrosoftVisualStudioThreadingVersion>

<!-- Transitive packages pinned to the versions required by Microsoft.CodeAnalysis.ExternalAccess.FSharp
(via Microsoft.VisualStudio.SDK 18.9.496), which are newer than the versions the Shell packages pull in.
Pinning them avoids MSB3277 assembly version conflicts across the vsintegration projects. -->
<MicrosoftVisualStudioValidationVersion>18.7.1</MicrosoftVisualStudioValidationVersion>
<MicrosoftVisualStudioRpcContractsVersion>18.9.453</MicrosoftVisualStudioRpcContractsVersion>
<MicrosoftServiceHubFrameworkVersion>4.10.128</MicrosoftServiceHubFrameworkVersion>
<StreamJsonRpcVersion>2.26.5</StreamJsonRpcVersion>

<!-- Microsoft.VisualStudio.Shell.15.0 18.9.x references Microsoft.VisualStudio.SolutionPersistence at runtime but
does not declare it as a NuGet dependency (it is expected to come from the VS install). The standalone VS unit
test host loads Shell.15.0 into a MEF catalog, so the assembly must be deployed next to it or Assembly.GetTypes
throws and every legacy VS unit test fails. -->
<MicrosoftVisualStudioSolutionPersistenceVersion>1.0.52</MicrosoftVisualStudioSolutionPersistenceVersion>

<!-- Visual Studio Project System packages-->
<MicrosoftVisualStudioProjectSystemVersion>$(VisualStudioProjectSystemPackagesVersion)</MicrosoftVisualStudioProjectSystemVersion>
<MicrosoftVisualStudioProjectSystemManagedVersion>2.3.6152103</MicrosoftVisualStudioProjectSystemManagedVersion>
Expand Down
6 changes: 5 additions & 1 deletion eng/common/SetupNugetSources.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@
# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1
# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token
# env:
# Token: $(dn-bot-dnceng-artifact-feeds-rw)
# Token: $(InternalFeedToken)
#
# Note: This logic is abstracted into enable-internal-sources.yml, which uses
# NuGetAuthenticate or a WIF-backed service connection. Prefer that template
# over calling this script directly.
#
# Note that the NuGetAuthenticate task should be called after SetupNugetSources.
# This ensures that:
Expand Down
Loading