Skip to content
Open
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: 0 additions & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-pub-DotNet-msbuild-Trusted-e5ebe15" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-e5ebe156/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand Down
2 changes: 1 addition & 1 deletion eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="0cf6b19ed68d2d52e097e6af6d6046b4eeefefe2" BarId="309569" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="ab01524bbb2ef1eea0ffaef161b3ef5686e8f256" BarId="310648" />
<ProductDependencies>
<Dependency Name="Microsoft.Build" Version="18.6.1">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
<MicrosoftNETCoreILAsmVersion>5.0.0-preview.7.20364.11</MicrosoftNETCoreILAsmVersion>
<MicrosoftTestPlatformVersion>17.14.1</MicrosoftTestPlatformVersion>
<MicrosoftTestingExtensionsHangDumpVersion>2.0.2</MicrosoftTestingExtensionsHangDumpVersion>
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
<NewtonsoftJsonVersion>13.0.4</NewtonsoftJsonVersion>
<XunitVersion>3.2.2</XunitVersion>
<XunitRunnerConsoleVersion>3.2.2</XunitRunnerConsoleVersion>
<XunitXmlTestLoggerVersion>8.0.0</XunitXmlTestLoggerVersion>
Expand Down
16 changes: 7 additions & 9 deletions src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,15 @@
<NoDefaultExcludes>true</NoDefaultExcludes>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.DotNet.NuGetRepack.Tasks" Version="$(MicrosoftDotNetNuGetRepackTasksVersion)" />
</ItemGroup>
<!-- TODO: Remove UsingTask when upgrading to Arcade 11: https://github.com/dotnet/fsharp/issues/19557 -->
<PropertyGroup>
<_ArcadeSdkMSBuildProjectDir>$([System.IO.Path]::GetDirectoryName('$(ArcadeSdkBuildTasksAssembly)'))\..\</_ArcadeSdkMSBuildProjectDir>
<_BuildReleasePackagesTargets>$(_ArcadeSdkMSBuildProjectDir)BuildReleasePackages.targets</_BuildReleasePackagesTargets>
<MicrosoftDotNetNuGetRepackTaskAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(NuGetPackageRoot)microsoft.dotnet.nugetrepack.tasks\$(MicrosoftDotNetNuGetRepackTasksVersion)\tools\netframework\Microsoft.DotNet.NuGetRepack.Tasks.dll</MicrosoftDotNetNuGetRepackTaskAssembly>
<MicrosoftDotNetNuGetRepackTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(NuGetPackageRoot)microsoft.dotnet.nugetrepack.tasks\$(MicrosoftDotNetNuGetRepackTasksVersion)\tools\net\Microsoft.DotNet.NuGetRepack.Tasks.dll</MicrosoftDotNetNuGetRepackTaskAssembly>
</PropertyGroup>

<Import Project="$(_BuildReleasePackagesTargets)" />
<UsingTask TaskName="Microsoft.DotNet.Tools.UpdatePackageVersionTask" AssemblyFile="$(MicrosoftDotNetNuGetRepackTaskAssembly)" />

<ItemGroup>
<NuspecProperty Include="fSharpCorePreviewPackageVersion=$(FSCorePackageVersionValue)-$(VersionSuffix)" />
Expand Down Expand Up @@ -86,11 +89,6 @@
<Microsoft.DotNet.Tools.UpdatePackageVersionTask Packages="@(_BuiltPackages)" OutputDirectory="$(DependentPackagesDir)Shipping" ExactVersions="true"/>
</Target>

<Target Name="PackageReleasePackages" AfterTargets="Pack" Condition="'$(DotNetFinalVersionKind)' == ''">
<!-- override sdk PackageReleasePackages to do nothing. -->
</Target>


<Target Name="PackDependentProjectsCore">
<PropertyGroup>
<DependentPackagesDir>$([MSBuild]::NormalizeDirectory( '$(ArtifactsDir)', 'packages', '$(Configuration)', 'Dependency' ))</DependentPackagesDir>
Expand Down
9 changes: 6 additions & 3 deletions tests/FSharp.Compiler.Service.Tests/ProjectAnalysisTests.fs
Original file line number Diff line number Diff line change
Expand Up @@ -5856,6 +5856,9 @@ let ``Empty source list produces error FS0207`` () =
// https://github.com/dotnet/fsharp/issues/14969
module internal ProjectActivePatternInSig =

// Dedicated checker to isolate from shared state races with parallel tests.
let checker = FSharpChecker.Create(useTransparentCompiler = FSharp.Test.CompilerAssertHelpers.UseTransparentCompiler)

let fileName1 = Path.ChangeExtension(getTemporaryFileName (), ".fs")
let sigFileName1 = Path.ChangeExtension(fileName1, ".fsi")
let base2 = getTemporaryFileName ()
Expand Down Expand Up @@ -5911,7 +5914,7 @@ let describe x =
[<Fact>]
let ``FindReferences for active patterns in fsi - project has no errors`` () =
let wholeProjectResults =
checker.ParseAndCheckProject(ProjectActivePatternInSig.options)
ProjectActivePatternInSig.checker.ParseAndCheckProject(ProjectActivePatternInSig.options)
|> Async.RunImmediate

for e in wholeProjectResults.Diagnostics do
Expand All @@ -5922,11 +5925,11 @@ let ``FindReferences for active patterns in fsi - project has no errors`` () =
[<Fact>]
let ``FindReferences for active patterns in fsi - finds Even in sig and impl`` () =
let wholeProjectResults =
checker.ParseAndCheckProject(ProjectActivePatternInSig.options)
ProjectActivePatternInSig.checker.ParseAndCheckProject(ProjectActivePatternInSig.options)
|> Async.RunImmediate

let _, typedParse2 =
checker.GetBackgroundCheckResultsForFileInProject(
ProjectActivePatternInSig.checker.GetBackgroundCheckResultsForFileInProject(
ProjectActivePatternInSig.fileName2,
ProjectActivePatternInSig.options
)
Expand Down
Loading