Skip to content

Commit 03e6bf5

Browse files
333fred333fred
committed
Merge remote-tracking branch 'upstream/main' into merge-main
* upstream/main: (1373 commits) Add docs Use new test plan for dictionary expressions (dotnet#81861) Update dartlab pipeline setup (dotnet#81807) [main] Update dependencies from dotnet/roslyn (dotnet#81649) Fix LSP, everything but handlers Reapply "Update methods to be `async`." (dotnet#81808) Properly await calls to ensure exception handling works for sync and async scenarios Let Razor fill in project information on diagnostics (dotnet#81822) only analyzers Reapply "Update methods to be `async`." (dotnet#81808) only editorfeatures Reapply "Update methods to be `async`." (dotnet#81808) Enable GetTypeInfo for type of object creation syntax (dotnet#81802) Improve error recovery around 'scoped' modifier parsing (dotnet#81636) Only VisualStudio Only features Only analyzers Only editor features Reapply "Update methods to be `async`." (dotnet#81808) ...
2 parents 4082a58 + 0b75006 commit 03e6bf5

File tree

563 files changed

+23536
-3808
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

563 files changed

+23536
-3808
lines changed

‎Ide.slnf‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,14 @@
208208
"src\\VisualStudio\\ExternalAccess\\FSharp\\Microsoft.CodeAnalysis.ExternalAccess.FSharp.csproj",
209209
"src\\VisualStudio\\IntegrationTest\\New.IntegrationTests\\Microsoft.VisualStudio.LanguageServices.New.IntegrationTests.csproj",
210210
"src\\VisualStudio\\IntegrationTest\\TestSetup\\Microsoft.VisualStudio.IntegrationTest.Setup.csproj",
211+
"src\\VisualStudio\\IntegrationTest\\Harness\\IntegrationTestServiceShared\\Microsoft.VisualStudio.IntegrationTestService.Shared.shproj",
212+
"src\\VisualStudio\\IntegrationTest\\Harness\\IntegrationTestServiceDev18\\Microsoft.VisualStudio.IntegrationTestService.Dev18.csproj",
213+
"src\\VisualStudio\\IntegrationTest\\Harness\\XUnitShared\\Microsoft.VisualStudio.Extensibility.Testing.Xunit.Shared.shproj",
214+
"src\\VisualStudio\\IntegrationTest\\Harness\\IntegrationTestsShared\\Microsoft.VisualStudio.Extensibility.Testing.Xunit.IntegrationTests.Shared.shproj",
215+
"src\\VisualStudio\\IntegrationTest\\Harness\\XUnitIntegrationTests\\Microsoft.VisualStudio.Extensibility.Testing.Xunit.IntegrationTests.csproj",
216+
"src\\VisualStudio\\IntegrationTest\\Harness\\XUnit\\Microsoft.VisualStudio.Extensibility.Testing.Xunit.csproj",
217+
"src\\VisualStudio\\IntegrationTest\\Harness\\SourceGeneratorUnitTests\\Microsoft.VisualStudio.Extensibility.Testing.SourceGenerator.UnitTests.csproj",
218+
"src\\VisualStudio\\IntegrationTest\\Harness\\SourceGenerator\\Microsoft.VisualStudio.Extensibility.Testing.SourceGenerator.csproj",
211219
"src\\VisualStudio\\LiveShare\\Impl\\Microsoft.VisualStudio.LanguageServices.LiveShare.csproj",
212220
"src\\VisualStudio\\LiveShare\\Test\\Microsoft.VisualStudio.LanguageServices.LiveShare.UnitTests.csproj",
213221
"src\\VisualStudio\\Setup.Dependencies\\Roslyn.VisualStudio.Setup.Dependencies.csproj",

‎Roslyn.slnx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,14 @@
363363
<Project Path="src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.csproj" />
364364
</Folder>
365365
<Folder Name="/VisualStudio/IntegrationTest/">
366+
<Project Path="src/VisualStudio/IntegrationTest/Harness/SourceGeneratorUnitTests/Microsoft.VisualStudio.Extensibility.Testing.SourceGenerator.UnitTests.csproj" />
367+
<Project Path="src/VisualStudio/IntegrationTest/Harness/SourceGenerator/Microsoft.VisualStudio.Extensibility.Testing.SourceGenerator.csproj" />
368+
<Project Path="src/VisualStudio/IntegrationTest/Harness/IntegrationTestsShared/Microsoft.VisualStudio.Extensibility.Testing.Xunit.IntegrationTests.Shared.shproj" Id="9b5759ad-4eff-4e2d-921b-d617bb8cfa22" />
369+
<Project Path="src/VisualStudio/IntegrationTest/Harness/XUnitIntegrationTests/Microsoft.VisualStudio.Extensibility.Testing.Xunit.IntegrationTests.csproj" />
370+
<Project Path="src/VisualStudio/IntegrationTest/Harness/XUnitShared/Microsoft.VisualStudio.Extensibility.Testing.Xunit.Shared.shproj" Id="d7647395-129b-4f45-8c78-10e6f92fc8ad" />
371+
<Project Path="src/VisualStudio/IntegrationTest/Harness/XUnit/Microsoft.VisualStudio.Extensibility.Testing.Xunit.csproj" />
372+
<Project Path="src/VisualStudio/IntegrationTest/Harness/IntegrationTestServiceDev18/Microsoft.VisualStudio.IntegrationTestService.Dev18.csproj" />
373+
<Project Path="src/VisualStudio/IntegrationTest/Harness/IntegrationTestServiceShared/Microsoft.VisualStudio.IntegrationTestService.Shared.shproj" Id="629938e1-1c2c-4f01-8038-90a34a940ac8" />
366374
<Project Path="src/VisualStudio/IntegrationTest/New.IntegrationTests/Microsoft.VisualStudio.LanguageServices.New.IntegrationTests.csproj">
367375
<BuildDependency Project="src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj" />
368376
</Project>

‎azure-pipelines-integration-dartlab.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ parameters:
3131
- name: sha
3232
type: string
3333
default: 'None'
34+
- name: EnforceLatestCommit
35+
type: boolean
36+
default: true
3437
# Set to 'stop' if you want to keep the test machines around for investigation after test completion.
3538
- name: testMachineCleanUpStrategy
3639
displayName: Test Machine Clean Up Strategy
@@ -93,6 +96,13 @@ stages:
9396
- checkout: RoslynMirror
9497
fetchDepth: 1
9598
fetchTags: false
99+
- ${{ if ne(parameters.prNumber, 'None') }}:
100+
- task: PowerShell@2
101+
displayName: Setup branch for validation
102+
inputs:
103+
filePath: 'eng\setup-pr-validation.ps1'
104+
arguments: "-sourceBranchName $(Build.SourceBranch) -prNumber ${{ parameters.prNumber }} -commitSHA ${{ parameters.sha }} -enforceLatestCommit ${{ iif(parameters.EnforceLatestCommit, '1', '0') }}"
105+
condition: succeeded()
96106
- template: eng/pipelines/test-integration-job.yml
97107
parameters:
98108
configuration: $(_configuration)

‎azure-pipelines.yml‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,12 @@ variables:
7070
${{ else }}:
7171
value: windows.vs2022.amd64
7272

73+
- name: Vs2026PreviewQueueName
74+
${{ if eq(variables['System.TeamProject'], 'public') }}:
75+
value: windows.vs2026preview.scout.amd64.open
76+
${{ else }}:
77+
value: windows.vs2026preview.scout.amd64
78+
7379
- name: UbuntuQueueName
7480
${{ if eq(variables['System.TeamProject'], 'public') }}:
7581
value: Build.Ubuntu.2204.Amd64.Open
@@ -129,16 +135,11 @@ parameters:
129135
type: object
130136
default:
131137
vmImage: macOS-15
132-
- name: vs2022PreviewPool
133-
type: object
134-
default:
135-
name: $(PoolName)
136-
demands: ImageOverride -equals $(Vs2022PreviewQueueName)
137-
- name: vs2022RegularPool
138+
- name: vs2026PreviewPool
138139
type: object
139140
default:
140141
name: $(PoolName)
141-
demands: ImageOverride -equals $(Vs2022RegularQueueName)
142+
demands: ImageOverride -equals $(Vs2026PreviewQueueName)
142143

143144
stages:
144145
- stage: Windows_Debug_Build
@@ -149,7 +150,7 @@ stages:
149150
jobName: Build_Windows_Debug
150151
testArtifactName: Transport_Artifacts_Windows_Debug
151152
configuration: Debug
152-
poolParameters: ${{ parameters.vs2022PreviewPool }}
153+
poolParameters: ${{ parameters.vs2026PreviewPool }}
153154
restoreArguments: -msbuildEngine dotnet /p:UsingToolVSSDK=false /p:GenerateSatelliteAssemblies=false
154155
buildArguments: -msbuildEngine dotnet /p:UsingToolVSSDK=false /p:GenerateSatelliteAssemblies=false /p:PublishReadyToRun=false
155156

@@ -161,7 +162,7 @@ stages:
161162
jobName: Build_Windows_Release
162163
testArtifactName: Transport_Artifacts_Windows_Release
163164
configuration: Release
164-
poolParameters: ${{ parameters.vs2022PreviewPool }}
165+
poolParameters: ${{ parameters.vs2026PreviewPool }}
165166
restoreArguments: -msbuildEngine dotnet /p:UsingToolVSSDK=false /p:GenerateSatelliteAssemblies=false
166167
buildArguments: -msbuildEngine dotnet /p:UsingToolVSSDK=false /p:GenerateSatelliteAssemblies=false /p:PublishReadyToRun=false
167168

@@ -313,7 +314,7 @@ stages:
313314
jobName: Test_Windows_CoreClr_Debug_Single_Machine
314315
testArtifactName: Transport_Artifacts_Windows_Debug
315316
configuration: Debug
316-
poolParameters: ${{ parameters.vs2022RegularPool }}
317+
poolParameters: ${{ parameters.vs2026PreviewPool }}
317318
testArguments: -testCoreClr
318319

319320
- template: eng/pipelines/test-windows-job.yml
@@ -440,7 +441,7 @@ stages:
440441

441442
- job: Correctness_Build_Artifacts
442443
dependsOn: Determine_Changes
443-
pool: ${{ parameters.vs2022PreviewPool }}
444+
pool: ${{ parameters.vs2026PreviewPool }}
444445
timeoutInMinutes: 90
445446
variables:
446447
- template: eng/pipelines/variables-build.yml
@@ -510,7 +511,7 @@ stages:
510511
- job: Correctness_Determinism
511512
dependsOn: Determine_Changes
512513
condition: or(ne(variables['Build.Reason'], 'PullRequest'), eq(dependencies.Determine_Changes.outputs['SetPathVars_compilers.containsChange'], 'true'))
513-
pool: ${{ parameters.vs2022PreviewPool }}
514+
pool: ${{ parameters.vs2026PreviewPool }}
514515
timeoutInMinutes: 90
515516
variables:
516517
- template: eng/pipelines/variables-build.yml
@@ -535,7 +536,7 @@ stages:
535536
- job: Correctness_Bootstrap_Build_Default
536537
dependsOn: Determine_Changes
537538
condition: or(ne(variables['Build.Reason'], 'PullRequest'), eq(dependencies.Determine_Changes.outputs['SetPathVars_compilers.containsChange'], 'true'))
538-
pool: ${{ parameters.vs2022PreviewPool }}
539+
pool: ${{ parameters.vs2026PreviewPool }}
539540
timeoutInMinutes: 90
540541
variables:
541542
- template: eng/pipelines/variables-build.yml
@@ -549,7 +550,7 @@ stages:
549550
- job: Correctness_Bootstrap_Build_Framework
550551
dependsOn: Determine_Changes
551552
condition: ne(variables['Build.Reason'], 'PullRequest')
552-
pool: ${{ parameters.vs2022PreviewPool }}
553+
pool: ${{ parameters.vs2026PreviewPool }}
553554
timeoutInMinutes: 90
554555
variables:
555556
- template: eng/pipelines/variables-build.yml
@@ -572,7 +573,7 @@ stages:
572573
- job: Correctness_Rebuild
573574
dependsOn: Determine_Changes
574575
condition: or(ne(variables['Build.Reason'], 'PullRequest'), eq(dependencies.Determine_Changes.outputs['SetPathVars_compilers.containsChange'], 'true'))
575-
pool: ${{ parameters.vs2022PreviewPool }}
576+
pool: ${{ parameters.vs2026PreviewPool }}
576577
timeoutInMinutes: 90
577578
variables:
578579
- template: eng/pipelines/variables-build.yml

‎docs/Language Feature Status.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ When a feature is merged to the `main` branch, its entry should be moved to the
1616

1717
| Feature | Branch | State | Developer | Reviewer | IDE Buddy | LDM Champ |
1818
| ------- | ------ | ----- | --------- | -------- | --------- | --------- |
19-
| [Dictionary expressions](https://github.com/dotnet/csharplang/issues/8659) | [dictionary-expressions](https://github.com/dotnet/roslyn/tree/features/dictionary-expressions) | [In progress](https://github.com/dotnet/roslyn/issues/76310) | [333fred](https://github.com/333fred) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi), [jcouv](https://github.com/jcouv) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) |
19+
| [Dictionary expressions](https://github.com/dotnet/csharplang/issues/8659) | [dictionary-expressions](https://github.com/dotnet/roslyn/tree/features/dictionary-expressions) | [In progress](https://github.com/dotnet/roslyn/issues/81860) | [333fred](https://github.com/333fred) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi), [jcouv](https://github.com/jcouv) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) |
2020
| [Collection expression arguments](https://github.com/dotnet/csharplang/issues/8887) | [collection-expression-arguments](https://github.com/dotnet/roslyn/tree/features/collection-expression-arguments) | [In progress](https://github.com/dotnet/roslyn/issues/80613) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | [333fred](https://github.com/333fred), [jcouv](https://github.com/jcouv) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) | [CyrusNajmabadi](https://github.com/CyrusNajmabadi) |
2121
| [Unions](https://github.com/dotnet/csharplang/issues/9662) | [Unions](https://github.com/dotnet/roslyn/tree/features/Unions) | [In Progress](https://github.com/dotnet/roslyn/issues/81074) | [AlekseyTs](https://github.com/AlekseyTs) | [RikkiGibson](https://github.com/RikkiGibson), [333fred](https://github.com/333fred) | TBD | [MadsTorgersen](https://github.com/MadsTorgersen) |
2222
| [Closed class hierarchies](https://github.com/dotnet/csharplang/issues/9499) | [closed-class](https://github.com/dotnet/roslyn/tree/features/closed-class) | [In progress](https://github.com/dotnet/roslyn/issues/81039) | [RikkiGibson](https://github.com/RikkiGibson) | [AlekseyTs](https://github.com/AlekseyTs), [jjonescz](https://github.com/jjonescz) | TBD | [mattwar](https://github.com/mattwar) |

‎docs/contributing/target-framework-strategy.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The roslyn repository produces components for a number of different products tha
99
- Repository Source build: requires us to ship `$(NetCurrent)` and `$(NetPrevious)` in workspaces and below (presently `net10.0` and `net9.0` respectively). This is because the output of repository source build is an input to other repository source build and those could be targeting either `$(NetCurrent)` or `$(NetPrevious)`.
1010
- Full Source build: requires us to ship `$(NetCurrent)`
1111
- Visual Studio: requires us to ship `net472` for base IDE components and `$(NetVisualStudio)` (presently `net8.0`) for private runtime components.
12-
- Visual Studio Code: expects us to ship against the same runtime as DevKit (presently `net7.0`) to avoid two runtime downloads.
12+
- Visual Studio Code: expects us to ship against the same runtime as DevKit (presently `net10.0`) to avoid two runtime downloads.
1313
- MSBuildWorkspace: requires to ship a process that must be usable on the lowest supported SDK (presently `net6.0`)
1414

1515
It is not reasonable for us to take the union of all TFM and multi-target every single project to them. That would add several hundred compilations to any build operation which would in turn negatively impact our developer throughput. Instead we attempt to use the TFM where needed. That keeps our builds smaller but increases complexity a bit as we end up shipping a mix of TFM for binaries across our layers.

‎eng/Packages.props‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<PropertyGroup>
33
<!-- Versions used by several individual references below -->
44
<MicrosoftCodeAnalysisTestingVersion>1.1.3-beta1.24319.1</MicrosoftCodeAnalysisTestingVersion>
5-
<MicrosoftVisualStudioExtensibilityTestingVersion>0.1.800-beta</MicrosoftVisualStudioExtensibilityTestingVersion>
65
<_BasicReferenceAssembliesVersion>1.8.3</_BasicReferenceAssembliesVersion>
76
<!-- CodeStyleAnalyzerVersion should we updated together with version of dotnet-format in dotnet-tools.json -->
87
<CodeStyleAnalyzerVersion>4.8.0-3.final</CodeStyleAnalyzerVersion>
@@ -265,8 +264,6 @@
265264
<PackageVersion Include="Microsoft.VisualStudio.Cache" Version="17.3.26-alpha" />
266265
<PackageVersion Include="Microsoft.VisualStudio.Diagnostics.Measurement" Version="17.9.36343-preview.3" />
267266
<PackageVersion Include="Microsoft.VisualStudio.Diagnostics.PerformanceProvider" Version="17.8.36726" />
268-
<PackageVersion Include="Microsoft.VisualStudio.Extensibility.Testing.SourceGenerator" Version="$(MicrosoftVisualStudioExtensibilityTestingVersion)" />
269-
<PackageVersion Include="Microsoft.VisualStudio.Extensibility.Testing.Xunit" Version="$(MicrosoftVisualStudioExtensibilityTestingVersion)" />
270267
<PackageVersion Include="System.Management" Version="7.0.0" />
271268
<PackageVersion Include="System.Drawing.Common" Version="9.0.0" />
272269
<PackageVersion Include="NuGet.SolutionRestoreManager.Interop" Version="4.8.0" />
@@ -311,6 +308,12 @@
311308
<!-- fix of vulnerability in 6.0.0 coming via Microsoft.TeamFoundationServer.Client -->
312309
<PackageVersion Include="System.Security.Cryptography.Xml" Version="8.0.0" />
313310
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
311+
<!--
312+
vs-extension-testing
313+
-->
314+
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.106" />
315+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="$(MicrosoftCodeAnalysisTestingVersion)" />
316+
314317
<!--
315318
Infra
316319
-->

‎eng/Version.Details.props‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/roslyn dependencies -->
9-
<MicrosoftCodeAnalysisPackageVersion>5.3.0-2.25608.6</MicrosoftCodeAnalysisPackageVersion>
10-
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.3.0-2.25608.6</MicrosoftCodeAnalysisAnalyzersPackageVersion>
11-
<MicrosoftCodeAnalysisAnalyzerUtilitiesPackageVersion>5.3.0-2.25608.6</MicrosoftCodeAnalysisAnalyzerUtilitiesPackageVersion>
12-
<MicrosoftNetCompilersToolsetPackageVersion>5.3.0-2.25608.6</MicrosoftNetCompilersToolsetPackageVersion>
13-
<RoslynDiagnosticsAnalyzersPackageVersion>5.3.0-2.25608.6</RoslynDiagnosticsAnalyzersPackageVersion>
9+
<MicrosoftCodeAnalysisPackageVersion>5.3.0-2.25625.1</MicrosoftCodeAnalysisPackageVersion>
10+
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.3.0-2.25625.1</MicrosoftCodeAnalysisAnalyzersPackageVersion>
11+
<MicrosoftCodeAnalysisAnalyzerUtilitiesPackageVersion>5.3.0-2.25625.1</MicrosoftCodeAnalysisAnalyzerUtilitiesPackageVersion>
12+
<MicrosoftNetCompilersToolsetPackageVersion>5.3.0-2.25625.1</MicrosoftNetCompilersToolsetPackageVersion>
13+
<RoslynDiagnosticsAnalyzersPackageVersion>5.3.0-2.25625.1</RoslynDiagnosticsAnalyzersPackageVersion>
1414
<!-- dotnet/dotnet dependencies -->
1515
<MicrosoftDotNetFileBasedProgramsPackageVersion>10.0.200-preview.0.25556.104</MicrosoftDotNetFileBasedProgramsPackageVersion>
16-
<SystemCommandLinePackageVersion>3.0.0-alpha.1.25570.101</SystemCommandLinePackageVersion>
16+
<SystemCommandLinePackageVersion>3.0.0-alpha.1.25619.109</SystemCommandLinePackageVersion>
1717
<!-- dotnet/runtime dependencies -->
1818
<MicrosoftBclAsyncInterfacesPackageVersion>9.0.0</MicrosoftBclAsyncInterfacesPackageVersion>
1919
<MicrosoftExtensionsConfigurationPackageVersion>9.0.0</MicrosoftExtensionsConfigurationPackageVersion>
@@ -42,9 +42,9 @@ This file should be imported by eng/Versions.props
4242
<SystemThreadingTasksDataflowPackageVersion>9.0.0</SystemThreadingTasksDataflowPackageVersion>
4343
<SystemWindowsExtensionsPackageVersion>9.0.0</SystemWindowsExtensionsPackageVersion>
4444
<!-- dotnet/arcade dependencies -->
45-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25603.2</MicrosoftDotNetArcadeSdkPackageVersion>
46-
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25603.2</MicrosoftDotNetHelixSdkPackageVersion>
47-
<MicrosoftDotNetXliffTasksPackageVersion>11.0.0-beta.25603.2</MicrosoftDotNetXliffTasksPackageVersion>
45+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25626.7</MicrosoftDotNetArcadeSdkPackageVersion>
46+
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25626.7</MicrosoftDotNetHelixSdkPackageVersion>
47+
<MicrosoftDotNetXliffTasksPackageVersion>11.0.0-beta.25626.7</MicrosoftDotNetXliffTasksPackageVersion>
4848
<!-- dotnet/symreader dependencies -->
4949
<MicrosoftDiaSymReaderPackageVersion>2.0.0</MicrosoftDiaSymReaderPackageVersion>
5050
<!-- dotnet/arcade-services dependencies -->

0 commit comments

Comments
 (0)