Skip to content

Commit 5e581b3

Browse files
majochamajocha
authored
Merge branch 'main' into parallelcompilation-fsx
2 parents 2b4e38b + d977e96 commit 5e581b3

9 files changed

Lines changed: 47 additions & 37 deletions

File tree

‎eng/Version.Details.props‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet-arcade dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26222.2</MicrosoftDotNetArcadeSdkPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26255.9</MicrosoftDotNetArcadeSdkPackageVersion>
1010
<!-- dotnet-msbuild dependencies -->
1111
<MicrosoftBuildPackageVersion>18.6.4</MicrosoftBuildPackageVersion>
1212
<MicrosoftBuildFrameworkPackageVersion>18.6.4</MicrosoftBuildFrameworkPackageVersion>
@@ -19,14 +19,14 @@ This file should be imported by eng/Versions.props
1919
<optimizationwindows_ntx64MIBCRuntimePackageVersion>1.0.0-prerelease.26180.1</optimizationwindows_ntx64MIBCRuntimePackageVersion>
2020
<optimizationwindows_ntx86MIBCRuntimePackageVersion>1.0.0-prerelease.26180.1</optimizationwindows_ntx86MIBCRuntimePackageVersion>
2121
<!-- dotnet-roslyn dependencies -->
22-
<MicrosoftCodeAnalysisPackageVersion>5.8.0-1.26254.4</MicrosoftCodeAnalysisPackageVersion>
23-
<MicrosoftCodeAnalysisCompilersPackageVersion>5.8.0-1.26254.4</MicrosoftCodeAnalysisCompilersPackageVersion>
24-
<MicrosoftCodeAnalysisCSharpPackageVersion>5.8.0-1.26254.4</MicrosoftCodeAnalysisCSharpPackageVersion>
25-
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.8.0-1.26254.4</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
26-
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.8.0-1.26254.4</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
27-
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.8.0-1.26254.4</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
28-
<MicrosoftCodeAnalysisFeaturesPackageVersion>5.8.0-1.26254.4</MicrosoftCodeAnalysisFeaturesPackageVersion>
29-
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.8.0-1.26254.4</MicrosoftVisualStudioLanguageServicesPackageVersion>
22+
<MicrosoftCodeAnalysisPackageVersion>5.8.0-1.26256.1</MicrosoftCodeAnalysisPackageVersion>
23+
<MicrosoftCodeAnalysisCompilersPackageVersion>5.8.0-1.26256.1</MicrosoftCodeAnalysisCompilersPackageVersion>
24+
<MicrosoftCodeAnalysisCSharpPackageVersion>5.8.0-1.26256.1</MicrosoftCodeAnalysisCSharpPackageVersion>
25+
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.8.0-1.26256.1</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
26+
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.8.0-1.26256.1</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
27+
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.8.0-1.26256.1</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
28+
<MicrosoftCodeAnalysisFeaturesPackageVersion>5.8.0-1.26256.1</MicrosoftCodeAnalysisFeaturesPackageVersion>
29+
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.8.0-1.26256.1</MicrosoftVisualStudioLanguageServicesPackageVersion>
3030
<!-- dotnet-runtime dependencies -->
3131
<SystemCollectionsImmutablePackageVersion>10.0.2</SystemCollectionsImmutablePackageVersion>
3232
<SystemCompositionPackageVersion>10.0.2</SystemCompositionPackageVersion>

‎eng/Version.Details.xml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="ab01524bbb2ef1eea0ffaef161b3ef5686e8f256" BarId="310648" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="c802bb0f0b272d8547b12719c604c65f6beb1912" BarId="313071" />
44
<ProductDependencies>
55
<Dependency Name="Microsoft.Build" Version="18.6.4">
66
<Uri>https://github.com/dotnet/msbuild</Uri>
@@ -18,37 +18,37 @@
1818
<Uri>https://github.com/dotnet/msbuild</Uri>
1919
<Sha>13cd968a78bb959cf489d8175b4fcf7e55cd0f2e</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.CodeAnalysis" Version="5.8.0-1.26254.4">
21+
<Dependency Name="Microsoft.CodeAnalysis" Version="5.8.0-1.26256.1">
2222
<Uri>https://github.com/dotnet/roslyn</Uri>
23-
<Sha>79141ac95b154f89f943886d561ddfb2b649ad72</Sha>
23+
<Sha>14f8212bdb85d91e2c89d69695751db5176953ac</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.CodeAnalysis.Features" Version="5.8.0-1.26254.4">
25+
<Dependency Name="Microsoft.CodeAnalysis.Features" Version="5.8.0-1.26256.1">
2626
<Uri>https://github.com/dotnet/roslyn</Uri>
27-
<Sha>79141ac95b154f89f943886d561ddfb2b649ad72</Sha>
27+
<Sha>14f8212bdb85d91e2c89d69695751db5176953ac</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.8.0-1.26254.4">
29+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.8.0-1.26256.1">
3030
<Uri>https://github.com/dotnet/roslyn</Uri>
31-
<Sha>79141ac95b154f89f943886d561ddfb2b649ad72</Sha>
31+
<Sha>14f8212bdb85d91e2c89d69695751db5176953ac</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.8.0-1.26254.4">
33+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.8.0-1.26256.1">
3434
<Uri>https://github.com/dotnet/roslyn</Uri>
35-
<Sha>79141ac95b154f89f943886d561ddfb2b649ad72</Sha>
35+
<Sha>14f8212bdb85d91e2c89d69695751db5176953ac</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.8.0-1.26254.4">
37+
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.8.0-1.26256.1">
3838
<Uri>https://github.com/dotnet/roslyn</Uri>
39-
<Sha>79141ac95b154f89f943886d561ddfb2b649ad72</Sha>
39+
<Sha>14f8212bdb85d91e2c89d69695751db5176953ac</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.8.0-1.26254.4">
41+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.8.0-1.26256.1">
4242
<Uri>https://github.com/dotnet/roslyn</Uri>
43-
<Sha>79141ac95b154f89f943886d561ddfb2b649ad72</Sha>
43+
<Sha>14f8212bdb85d91e2c89d69695751db5176953ac</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.CodeAnalysis.Compilers" Version="5.8.0-1.26254.4">
45+
<Dependency Name="Microsoft.CodeAnalysis.Compilers" Version="5.8.0-1.26256.1">
4646
<Uri>https://github.com/dotnet/roslyn</Uri>
47-
<Sha>79141ac95b154f89f943886d561ddfb2b649ad72</Sha>
47+
<Sha>14f8212bdb85d91e2c89d69695751db5176953ac</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.8.0-1.26254.4">
49+
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.8.0-1.26256.1">
5050
<Uri>https://github.com/dotnet/roslyn</Uri>
51-
<Sha>79141ac95b154f89f943886d561ddfb2b649ad72</Sha>
51+
<Sha>14f8212bdb85d91e2c89d69695751db5176953ac</Sha>
5252
</Dependency>
5353
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
5454
<Dependency Name="System.Collections.Immutable" Version="10.0.2">
@@ -76,9 +76,9 @@
7676
</Dependency>
7777
</ProductDependencies>
7878
<ToolsetDependencies>
79-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26222.2">
79+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26255.9">
8080
<Uri>https://github.com/dotnet/arcade</Uri>
81-
<Sha>58713cb9a664ed67642127fcaf70b8c0c3b55ef2</Sha>
81+
<Sha>658b93f2d1c0cdcdfb9c70113ff3c292cde97adb</Sha>
8282
</Dependency>
8383
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.26180.1">
8484
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PropertyGroup>
1515
<!-- Don't use the built in support for pre-release iteration. The nuget repack task doesn't support
1616
the iteration format at the moment. https://github.com/dotnet/arcade/issues/15919 -->
17-
<FSharpPreReleaseIteration>4</FSharpPreReleaseIteration>
17+
<FSharpPreReleaseIteration>5</FSharpPreReleaseIteration>
1818
<PreReleaseVersionLabel>preview$(FSharpPreReleaseIteration)</PreReleaseVersionLabel>
1919
<!-- F# Version components -->
2020
<FSMajorVersion>11</FSMajorVersion>

‎eng/release/insert-into-vs.yml‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ stages:
1717
name: NetCore1ESPool-Svc-Internal
1818
image: windows.vs2026preview.scout.amd64
1919
variables:
20-
- group: DotNet-VSTS-Infra-Access
21-
- name: InsertAccessToken
22-
value: $(dn-bot-devdiv-build-rw-code-rw-release-rw)
2320
- name: InsertBuildPolicy
2421
value: ${{ parameters.insertBuildPolicy }}
2522
- name: InsertTargetBranch
@@ -70,6 +67,16 @@ stages:
7067
$autoCompleteStr = if ($autoComplete) { 'true' } else { 'false' }
7168
Write-Host "Setting InsertAutoComplete to '$autoCompleteStr'"
7269
Write-Host "##vso[task.setvariable variable=InsertAutoComplete]$autoCompleteStr"
70+
- task: AzureCLI@2
71+
displayName: 'Get DevDiv Access Token (WIF)'
72+
inputs:
73+
azureSubscription: 'dnceng-fsharp-vs-insertion-wif'
74+
scriptType: 'pscore'
75+
scriptLocation: 'inlineScript'
76+
inlineScript: |
77+
$token = az account get-access-token --resource "499b84ac-1321-427f-aa17-267ca6975798" --query accessToken -o tsv
78+
Write-Host "##vso[task.setvariable variable=InsertAccessToken;issecret=true]$token"
79+
condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], '${{ parameters.componentBranchName }}'), eq(variables['Build.SourceBranch'], 'refs/heads/${{ parameters.componentBranchName }}')))
7380
- task: ms-vseng.MicroBuildShipTasks.55100717-a81d-45ea-a363-b8fe3ec375ad.MicroBuildInsertVsPayload@5
7481
displayName: 'Insert VS Payload'
7582
inputs:

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"xcopy-msbuild": "18.0.0"
2323
},
2424
"msbuild-sdks": {
25-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26222.2",
25+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26255.9",
2626
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2"
2727
}
2828
}

‎tests/FSharp.Compiler.ComponentTests/CompilerService/AsyncMemoize.fs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,10 @@ let ``Cancel running jobs with the same key`` () =
439439

440440
job.Wait()
441441

442-
let events = eventsWhen events (received Finished)
442+
// Wait for all 11 jobs to reach a terminal state (canceled/finished/failed)
443+
// before asserting, to avoid snapshot races where some Canceled events
444+
// haven't been observed yet when the Finished event arrives.
445+
let events = eventsWhen events (fun e -> countOf Canceled e + countOf Finished e + countOf Failed e >= 11)
443446

444447
Assert.Equal(0, events |> countOf Failed)
445448

‎tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
107107
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
108108
<PackageReference Include="Microsoft.CodeAnalysis.Test.Resources.Proprietary" Version="$(MicrosoftCodeAnalysisTestResourcesProprietaryVersion)" />
109-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.2" />
109+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
110110
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
111111
<!-- xUnit3 extensibility packages for custom test utilities -->
112112
<PackageReference Include="xunit.v3.common" Version="$(XunitVersion)" />

‎tests/fsharp/core/span/common-pre.fsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ let packagesDir =
55
match Environment.GetEnvironmentVariable("NUGET_PACKAGES") with
66
| null -> Path.Combine(Environment.GetEnvironmentVariable("USERPROFILE"), ".nuget", "packages")
77
| path -> path
8-
File.WriteAllText("refs.generated.fsx", sprintf @"#r @""%s\System.Memory\4.5.3\lib\netstandard2.0\System.Memory.dll""" packagesDir)
8+
File.WriteAllText("refs.generated.fsx", sprintf @"#r @""%s\System.Memory\4.6.3\lib\netstandard2.0\System.Memory.dll""" packagesDir)

‎tests/fsharp/typecheck/sigs/neg107-pre.fsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ let packagesDir =
55
match Environment.GetEnvironmentVariable("NUGET_PACKAGES") with
66
| null -> Path.Combine(Environment.GetEnvironmentVariable("USERPROFILE"), ".nuget", "packages")
77
| path -> path
8-
File.WriteAllText("neg107.generated.fsx", sprintf @"#r @""%s\System.Memory\4.5.3\lib\netstandard2.0\System.Memory.dll""" packagesDir)
8+
File.WriteAllText("neg107.generated.fsx", sprintf @"#r @""%s\System.Memory\4.6.3\lib\netstandard2.0\System.Memory.dll""" packagesDir)

0 commit comments

Comments
 (0)