Skip to content

Commit 998232c

Browse files
333fred333fred
committed
Merge remote-tracking branch 'upstream/main' into syntaxtree-search
* upstream/main: (62 commits) Prevent assert from being hit (dotnet#62366) Don't offer '??=' for pointer types (dotnet#62476) Integrate generator times into /reportAnalyzer (dotnet#61661) Switch to a callback for cleaning up resources instead of passing in an explicit IDisposable. (dotnet#62373) Filter trees to only those containing global-usings or attributes prior to analyzing them. (dotnet#62444) Update PublishData.json Complete 'file' support for `SyntaxGenerator` (dotnet#62413) Apply changes directly to text buffer (dotnet#62337) Remove LangVer check from extended nameof binding (dotnet#62339) Fixed shared project file error (dotnet#62466) Handle new error codes Use MSBuid generated property for package path Exclude BCL libraries from Roslyn vsix Bump the integration test timeouts a bit Skip the balanced switch dispatch optimization for patterns on floating-point inputs (dotnet#62322) Test helpers shouldn't escape quotes by default (dotnet#62321) Reuse prior TableEntry values in the increment NodeTable builder if possible. (dotnet#62320) Install 3.1 runtime for SBOM tool Generate VS SBOM during official build. Minor refactoring in 'required' handling for override completion (dotnet#62422) ...
2 parents 4a0e19e + 0be968a commit 998232c

File tree

418 files changed

+18947
-5072
lines changed

Some content is hidden

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

418 files changed

+18947
-5072
lines changed

‎Compilers.sln

+31-28
Original file line numberDiff line numberDiff line change
@@ -161,34 +161,6 @@ EndProject
161161
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "vbc-arm64", "src\Compilers\VisualBasic\vbc\arm64\vbc-arm64.csproj", "{48C93F90-8776-4847-96D8-127B896D6C80}"
162162
EndProject
163163
Global
164-
GlobalSection(SharedMSBuildProjectFiles) = preSolution
165-
src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 5
166-
src\Dependencies\CodeAnalysis.Debugging\Microsoft.CodeAnalysis.Debugging.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 5
167-
src\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 5
168-
src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 5
169-
src\Workspaces\SharedUtilitiesAndExtensions\Compiler\CSharp\CSharpCompilerExtensions.projitems*{21b239d0-d144-430f-a394-c066d58ee267}*SharedItemsImports = 5
170-
src\Workspaces\SharedUtilitiesAndExtensions\Workspace\CSharp\CSharpWorkspaceExtensions.projitems*{21b239d0-d144-430f-a394-c066d58ee267}*SharedItemsImports = 5
171-
src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}*SharedItemsImports = 5
172-
src\Compilers\VisualBasic\vbc\VbcCommandLine.projitems*{48c93f90-8776-4847-96d8-127b896d6c80}*SharedItemsImports = 5
173-
src\Compilers\CSharp\csc\CscCommandLine.projitems*{4b45ca0c-03a0-400f-b454-3d4bcb16af38}*SharedItemsImports = 5
174-
src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{54e08bf5-f819-404f-a18d-0ab9ea81ea04}*SharedItemsImports = 13
175-
src\Workspaces\SharedUtilitiesAndExtensions\Compiler\VisualBasic\VisualBasicCompilerExtensions.projitems*{57ca988d-f010-4bf2-9a2e-07d6dcd2ff2c}*SharedItemsImports = 5
176-
src\Workspaces\SharedUtilitiesAndExtensions\Workspace\VisualBasic\VisualBasicWorkspaceExtensions.projitems*{57ca988d-f010-4bf2-9a2e-07d6dcd2ff2c}*SharedItemsImports = 5
177-
src\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
178-
src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
179-
src\Workspaces\SharedUtilitiesAndExtensions\Compiler\Core\CompilerExtensions.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
180-
src\Workspaces\SharedUtilitiesAndExtensions\Workspace\Core\WorkspaceExtensions.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
181-
src\Compilers\Server\VBCSCompiler\VBCSCompilerCommandLine.projitems*{869e3b79-4e91-45fd-ba37-56dbd2f34721}*SharedItemsImports = 5
182-
src\Compilers\Server\VBCSCompiler\VBCSCompilerCommandLine.projitems*{9508f118-f62e-4c16-a6f4-7c3b56e166ad}*SharedItemsImports = 5
183-
src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{b501a547-c911-4a05-ac6e-274a50dff30e}*SharedItemsImports = 5
184-
src\Compilers\CSharp\csc\CscCommandLine.projitems*{b5a27411-77ff-4c43-b0e3-fe09fba5f887}*SharedItemsImports = 5
185-
src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{c1930979-c824-496b-a630-70f5369a636f}*SharedItemsImports = 13
186-
src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{d0bc9be7-24f6-40ca-8dc6-fcb93bd44b34}*SharedItemsImports = 13
187-
src\Dependencies\CodeAnalysis.Debugging\Microsoft.CodeAnalysis.Debugging.projitems*{d73adf7d-2c1c-42ae-b2ab-edc9497e4b71}*SharedItemsImports = 13
188-
src\Compilers\VisualBasic\vbc\VbcCommandLine.projitems*{e58ee9d7-1239-4961-a0c1-f9ec3952c4c1}*SharedItemsImports = 5
189-
src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{e8f0baa5-7327-43d1-9a51-644e81ae55f1}*SharedItemsImports = 13
190-
src\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems*{e919dd77-34f8-4f57-8058-4d3ff4c2b241}*SharedItemsImports = 13
191-
EndGlobalSection
192164
GlobalSection(SolutionConfigurationPlatforms) = preSolution
193165
Debug|Any CPU = Debug|Any CPU
194166
Release|Any CPU = Release|Any CPU
@@ -516,4 +488,35 @@ Global
516488
GlobalSection(ExtensibilityGlobals) = postSolution
517489
SolutionGuid = {6F599E08-A9EA-4FAA-897F-5D824B0210E6}
518490
EndGlobalSection
491+
GlobalSection(SharedMSBuildProjectFiles) = preSolution
492+
src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 5
493+
src\Dependencies\CodeAnalysis.Debugging\Microsoft.CodeAnalysis.Debugging.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 5
494+
src\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 5
495+
src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 5
496+
src\Workspaces\SharedUtilitiesAndExtensions\Compiler\CSharp\CSharpCompilerExtensions.projitems*{21b239d0-d144-430f-a394-c066d58ee267}*SharedItemsImports = 5
497+
src\Workspaces\SharedUtilitiesAndExtensions\Workspace\CSharp\CSharpWorkspaceExtensions.projitems*{21b239d0-d144-430f-a394-c066d58ee267}*SharedItemsImports = 5
498+
src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}*SharedItemsImports = 5
499+
src\Compilers\VisualBasic\vbc\VbcCommandLine.projitems*{48c93f90-8776-4847-96d8-127b896d6c80}*SharedItemsImports = 5
500+
src\Compilers\CSharp\csc\CscCommandLine.projitems*{4b45ca0c-03a0-400f-b454-3d4bcb16af38}*SharedItemsImports = 5
501+
src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{54e08bf5-f819-404f-a18d-0ab9ea81ea04}*SharedItemsImports = 13
502+
src\Workspaces\SharedUtilitiesAndExtensions\Compiler\VisualBasic\VisualBasicCompilerExtensions.projitems*{57ca988d-f010-4bf2-9a2e-07d6dcd2ff2c}*SharedItemsImports = 5
503+
src\Workspaces\SharedUtilitiesAndExtensions\Workspace\VisualBasic\VisualBasicWorkspaceExtensions.projitems*{57ca988d-f010-4bf2-9a2e-07d6dcd2ff2c}*SharedItemsImports = 5
504+
src\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
505+
src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
506+
src\Workspaces\SharedUtilitiesAndExtensions\Compiler\Core\CompilerExtensions.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
507+
src\Workspaces\SharedUtilitiesAndExtensions\Workspace\Core\WorkspaceExtensions.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
508+
src\Compilers\VisualBasic\vbc\VbcCommandLine.projitems*{810b02ad-2ea5-4422-88ac-b71b8ab0df0b}*SharedItemsImports = 13
509+
src\Compilers\Server\VBCSCompiler\VBCSCompilerCommandLine.projitems*{869e3b79-4e91-45fd-ba37-56dbd2f34721}*SharedItemsImports = 5
510+
src\Compilers\Server\VBCSCompiler\VBCSCompilerCommandLine.projitems*{9508f118-f62e-4c16-a6f4-7c3b56e166ad}*SharedItemsImports = 5
511+
src\Compilers\CSharp\csc\CscCommandLine.projitems*{b021ccbc-b2af-4560-af28-ed055f0ed696}*SharedItemsImports = 13
512+
src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{b501a547-c911-4a05-ac6e-274a50dff30e}*SharedItemsImports = 5
513+
src\Compilers\CSharp\csc\CscCommandLine.projitems*{b5a27411-77ff-4c43-b0e3-fe09fba5f887}*SharedItemsImports = 5
514+
src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{c1930979-c824-496b-a630-70f5369a636f}*SharedItemsImports = 13
515+
src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{d0bc9be7-24f6-40ca-8dc6-fcb93bd44b34}*SharedItemsImports = 13
516+
src\Dependencies\CodeAnalysis.Debugging\Microsoft.CodeAnalysis.Debugging.projitems*{d73adf7d-2c1c-42ae-b2ab-edc9497e4b71}*SharedItemsImports = 13
517+
src\Compilers\Server\VBCSCompiler\VBCSCompilerCommandLine.projitems*{d8ef0777-9d65-4849-a7d6-ac81e58e2317}*SharedItemsImports = 13
518+
src\Compilers\VisualBasic\vbc\VbcCommandLine.projitems*{e58ee9d7-1239-4961-a0c1-f9ec3952c4c1}*SharedItemsImports = 5
519+
src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{e8f0baa5-7327-43d1-9a51-644e81ae55f1}*SharedItemsImports = 13
520+
src\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems*{e919dd77-34f8-4f57-8058-4d3ff4c2b241}*SharedItemsImports = 13
521+
EndGlobalSection
519522
EndGlobal

‎Roslyn.sln

+3
Original file line numberDiff line numberDiff line change
@@ -1512,6 +1512,7 @@ Global
15121512
src\ExpressionEvaluator\VisualBasic\Source\ResultProvider\BasicResultProvider.projitems*{76242a2d-2600-49dd-8c15-fea07ecb1843}*SharedItemsImports = 5
15131513
src\Analyzers\Core\Analyzers\Analyzers.projitems*{76e96966-4780-4040-8197-bde2879516f4}*SharedItemsImports = 13
15141514
src\Analyzers\VisualBasic\Tests\VisualBasicAnalyzers.UnitTests.projitems*{7b7f4153-ae93-4908-b8f0-430871589f83}*SharedItemsImports = 13
1515+
src\Compilers\VisualBasic\vbc\VbcCommandLine.projitems*{810b02ad-2ea5-4422-88ac-b71b8ab0df0b}*SharedItemsImports = 13
15151516
src\Analyzers\VisualBasic\Analyzers\VisualBasicAnalyzers.projitems*{94faf461-2e74-4dbb-9813-6b2cde6f1880}*SharedItemsImports = 13
15161517
src\Compilers\Server\VBCSCompiler\VBCSCompilerCommandLine.projitems*{9508f118-f62e-4c16-a6f4-7c3b56e166ad}*SharedItemsImports = 5
15171518
src\Compilers\VisualBasic\vbc\VbcCommandLine.projitems*{975cd834-45f4-4ea0-a395-cb60dbd0e214}*SharedItemsImports = 5
@@ -1527,13 +1528,15 @@ Global
15271528
src\ExpressionEvaluator\Core\Source\ResultProvider\ResultProvider.projitems*{abdbac1e-350e-4dc3-bb45-3504404545ee}*SharedItemsImports = 5
15281529
src\Analyzers\CSharp\Tests\CSharpAnalyzers.UnitTests.projitems*{ac2bcefb-9298-4621-ac48-1ff5e639e48d}*SharedItemsImports = 5
15291530
src\ExpressionEvaluator\VisualBasic\Source\ResultProvider\BasicResultProvider.projitems*{ace53515-482c-4c6a-e2d2-4242a687dfee}*SharedItemsImports = 5
1531+
src\Compilers\CSharp\csc\CscCommandLine.projitems*{b021ccbc-b2af-4560-af28-ed055f0ed696}*SharedItemsImports = 13
15301532
src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{b501a547-c911-4a05-ac6e-274a50dff30e}*SharedItemsImports = 5
15311533
src\ExpressionEvaluator\Core\Source\ResultProvider\ResultProvider.projitems*{bb3ca047-5d00-48d4-b7d3-233c1265c065}*SharedItemsImports = 13
15321534
src\ExpressionEvaluator\CSharp\Source\ResultProvider\CSharpResultProvider.projitems*{bf9dac1e-3a5e-4dc3-bb44-9a64e0d4e9d4}*SharedItemsImports = 5
15331535
src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{c1930979-c824-496b-a630-70f5369a636f}*SharedItemsImports = 13
15341536
src\Workspaces\SharedUtilitiesAndExtensions\Compiler\VisualBasic\VisualBasicCompilerExtensions.projitems*{cec0dce7-8d52-45c3-9295-fc7b16bd2451}*SharedItemsImports = 13
15351537
src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{d0bc9be7-24f6-40ca-8dc6-fcb93bd44b34}*SharedItemsImports = 13
15361538
src\Dependencies\CodeAnalysis.Debugging\Microsoft.CodeAnalysis.Debugging.projitems*{d73adf7d-2c1c-42ae-b2ab-edc9497e4b71}*SharedItemsImports = 13
1539+
src\Compilers\Server\VBCSCompiler\VBCSCompilerCommandLine.projitems*{d8ef0777-9d65-4849-a7d6-ac81e58e2317}*SharedItemsImports = 13
15371540
src\Analyzers\CSharp\CodeFixes\CSharpCodeFixes.projitems*{da973826-c985-4128-9948-0b445e638bdb}*SharedItemsImports = 13
15381541
src\Compilers\Server\VBCSCompiler\VBCSCompilerCommandLine.projitems*{dc8c78cc-b6fe-47bf-93b1-b65a1c67c08d}*SharedItemsImports = 5
15391542
src\Analyzers\VisualBasic\Tests\VisualBasicAnalyzers.UnitTests.projitems*{e512c6c1-f085-4ad7-b0d9-e8f1a0a2a510}*SharedItemsImports = 5

‎azure-pipelines-integration-corehost.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
pool:
3939
name: NetCore1ESPool-Public
4040
demands: ImageOverride -equals $(queueName)
41-
timeoutInMinutes: 135
41+
timeoutInMinutes: 150
4242
variables:
4343
- name: XUNIT_LOGS
4444
value: $(Build.SourcesDirectory)\artifacts\log\Debug
@@ -54,7 +54,7 @@ jobs:
5454
pool:
5555
name: NetCore1ESPool-Public
5656
demands: ImageOverride -equals $(queueName)
57-
timeoutInMinutes: 135
57+
timeoutInMinutes: 150
5858
variables:
5959
- name: XUNIT_LOGS
6060
value: $(Build.SourcesDirectory)\artifacts\log\Debug

‎azure-pipelines-integration-dartlab.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ stages:
6868
configuration: $(_configuration)
6969
oop64bit: $(_oop64bit)
7070
lspEditor: false
71-
shallowCheckout: false
71+
skipCheckout: true

‎azure-pipelines-integration-lsp.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
pool:
2828
name: NetCore1ESPool-Public
2929
demands: ImageOverride -equals $(queueName)
30-
timeoutInMinutes: 135
30+
timeoutInMinutes: 150
3131

3232
steps:
3333
- template: eng/pipelines/test-integration-job.yml

‎azure-pipelines-integration.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
pool:
3636
name: $(poolName)
3737
demands: ImageOverride -equals $(queueName)
38-
timeoutInMinutes: 135
38+
timeoutInMinutes: 150
3939
variables:
4040
- name: XUNIT_LOGS
4141
value: $(Build.SourcesDirectory)\artifacts\log\Debug
@@ -50,7 +50,7 @@ jobs:
5050
pool:
5151
name: $(poolName)
5252
demands: ImageOverride -equals $(queueName)
53-
timeoutInMinutes: 135
53+
timeoutInMinutes: 150
5454
variables:
5555
- name: XUNIT_LOGS
5656
value: $(Build.SourcesDirectory)\artifacts\log\Debug
@@ -65,7 +65,7 @@ jobs:
6565
pool:
6666
name: $(poolName)
6767
demands: ImageOverride -equals $(queueName)
68-
timeoutInMinutes: 135
68+
timeoutInMinutes: 150
6969
variables:
7070
- name: XUNIT_LOGS
7171
value: $(Build.SourcesDirectory)\artifacts\log\Release
@@ -81,7 +81,7 @@ jobs:
8181
pool:
8282
name: $(poolName)
8383
demands: ImageOverride -equals $(queueName)
84-
timeoutInMinutes: 135
84+
timeoutInMinutes: 150
8585
variables:
8686
- name: XUNIT_LOGS
8787
value: $(Build.SourcesDirectory)\artifacts\log\Release

‎azure-pipelines-official.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ stages:
190190
/p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory)
191191
/p:DotnetPublishUsingPipelines=true
192192
/p:IgnoreIbcMergeErrors=true
193+
/p:GenerateSbom=true
193194
condition: succeeded()
194195

195196
- template: eng\common\templates\steps\generate-sbom.yml
@@ -310,7 +311,7 @@ stages:
310311
- OfficialBuild
311312
pool:
312313
name: NetCore1ESPool-Svc-Internal
313-
demands: ImageOverride -equals Build.Server.Amd64.VS2019
314+
demands: ImageOverride -equals Build.Windows.Amd64.VS2022
314315

315316
- stage: insert
316317
dependsOn:

‎docs/compilers/CSharp/Compiler Breaking Changes - DotNet 7.md

+14-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# This document lists known breaking changes in Roslyn after .NET 6 all the way to .NET 7.
22

3+
## Types cannot be named `file`
4+
5+
***Introduced in Visual Studio 2022 version 17.4.*** Starting in C# 11, types cannot be named `file`. The compiler will report an error on all such type names. To work around this, the type name and all usages must be escaped with an `@`:
6+
7+
```csharp
8+
class file {} // Error CS9056
9+
class @file {} // No error
10+
```
11+
12+
This was done as `file` is now a modifier for type declarations.
13+
14+
You can learn more about this change in the associated [csharplang issue](https://github.com/dotnet/csharplang/issues/6011).
15+
316
## Required spaces in #line span directives
417

518
***Introduced in .NET SDK 6.0.400, Visual Studio 2022 version 17.3.***
@@ -83,11 +96,6 @@ Possible workarounds are:
8396

8497
1. Rename the type parameter or parameter to avoid shadowing the name from outer scope.
8598
1. Use a string literal instead of the `nameof` operator.
86-
1. Downgrade the `<LangVersion>` element to 9.0 or earlier.
87-
88-
Note: The break will also apply to C# 10 and earlier when .NET 7 ships, but is
89-
currently scoped down to users of LangVer=preview.
90-
Tracked by https://github.com/dotnet/roslyn/issues/60640
9199

92100
## Cannot return an out parameter by reference
93101

@@ -426,4 +434,4 @@ class @required {} // No error
426434

427435
This was done as `required` is now a member modifier for properties and fields.
428436

429-
You can learn more about this change in the associated [csharplang issue](https://github.com/dotnet/csharplang/issues/3630).
437+
You can learn more about this change in the associated [csharplang issue](https://github.com/dotnet/csharplang/issues/3630).

‎docs/contributing/Compiler Test Plan.md

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ This document provides guidance for thinking about language interactions and tes
3838
# Type and members
3939
- Access modifiers (public, protected, internal, protected internal, private protected, private), static, ref
4040
- type declarations (class, record class/struct with or without positional members, struct, interface, type parameter)
41+
- file-local types
4142
- methods
4243
- fields (required and not)
4344
- properties (including get/set/init accessors, required and not)

‎eng/Version.Details.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@
1313
</Dependency>
1414
</ProductDependencies>
1515
<ToolsetDependencies>
16-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22327.2">
16+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22355.4">
1717
<Uri>https://github.com/dotnet/arcade</Uri>
18-
<Sha>a264eb13fea14125f3ef8d4056586cd66fa55309</Sha>
18+
<Sha>9f45238c23d89cf44a10705db1217e66a441ba5a</Sha>
1919
<SourceBuild RepoName="arcade" ManagedOnly="true" />
2020
</Dependency>
2121
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.1.0-5.22128.4">
2222
<Uri>https://github.com/dotnet/roslyn</Uri>
2323
<Sha>5d10d428050c0d6afef30a072c4ae68776621877</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22327.2">
25+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22355.4">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>a264eb13fea14125f3ef8d4056586cd66fa55309</Sha>
27+
<Sha>9f45238c23d89cf44a10705db1217e66a441ba5a</Sha>
2828
</Dependency>
2929
</ToolsetDependencies>
3030
</Dependencies>

‎eng/Versions.props

+5-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
is expected by the NET SDK used in the Workspace.MSBuild UnitTests. In order to test against the same verion of NuGet
213213
as our configured SDK, we must set the version to be the same.
214214
-->
215-
<NuGetCommonVersion>6.3.0-preview.1.32</NuGetCommonVersion>
215+
<NuGetCommonVersion>6.3.0-preview.2.73</NuGetCommonVersion>
216216
<NuGetConfigurationVersion>$(NuGetCommonVersion)</NuGetConfigurationVersion>
217217
<NuGetFrameworksVersion>$(NuGetCommonVersion)</NuGetFrameworksVersion>
218218
<NuGetPackagingVersion>$(NuGetCommonVersion)</NuGetPackagingVersion>
@@ -305,4 +305,8 @@
305305
<UsingToolMicrosoftNetCompilers Condition="'$(BootstrapBuildPath)' == ''">true</UsingToolMicrosoftNetCompilers>
306306
<UseVSTestRunner>true</UseVSTestRunner>
307307
</PropertyGroup>
308+
<PropertyGroup>
309+
<!-- We should try to keep this version in sync with the version of app-local runtime in VS. -->
310+
<MicrosoftNetCoreAppPackagesVersion>6.0.6</MicrosoftNetCoreAppPackagesVersion>
311+
</PropertyGroup>
308312
</Project>

‎eng/common/init-tools-native.ps1

+3-1
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ try {
8787
$NativeTools.PSObject.Properties | ForEach-Object {
8888
$ToolName = $_.Name
8989
$ToolVersion = $_.Value
90+
$InstalledTools = @{}
9091

9192
if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) {
9293
if ($ToolVersion -eq "latest") {
@@ -111,9 +112,10 @@ try {
111112
$ToolPath = Convert-Path -Path $BinPath
112113
Write-Host "Adding $ToolName to the path ($ToolPath)..."
113114
Write-Host "##vso[task.prependpath]$ToolPath"
115+
$InstalledTools += @{ $ToolName = $ToolDirectory.FullName }
114116
}
115117
}
116-
exit 0
118+
return $InstalledTools
117119
} else {
118120
$NativeTools.PSObject.Properties | ForEach-Object {
119121
$ToolName = $_.Name

‎eng/common/native/init-compiler.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then
7171
# Set default versions
7272
if [[ -z "$majorVersion" ]]; then
7373
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
74-
if [[ "$compiler" == "clang" ]]; then versions=( 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
74+
if [[ "$compiler" == "clang" ]]; then versions=( 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
7575
elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi
7676

7777
for version in "${versions[@]}"; do

‎eng/common/tools.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ function InitializeNativeTools() {
635635
InstallDirectory = "$ToolsDir"
636636
}
637637
}
638-
if (Test-Path variable:NativeToolsOnMachine) {
638+
if ($env:NativeToolsOnMachine) {
639639
Write-Host "Variable NativeToolsOnMachine detected, enabling native tool path promotion..."
640640
$nativeArgs += @{ PathPromotion = $true }
641641
}

0 commit comments

Comments
 (0)