Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main to tokenizer branch #10872

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
327 commits
Select commit Hold shift + click to select a range
204efc4
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Aug 12, 2024
718cea3
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 14, 2024
9e63e09
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 15, 2024
f38b165
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 15, 2024
c2894e2
Add a numeric version to document snapshot, and increment it automati…
davidwengier Jun 21, 2024
546a349
Remove document version cache
davidwengier Jun 21, 2024
032f7ca
Semantic tokens tweaks
davidwengier Jun 24, 2024
97be219
Fix tests
davidwengier Jun 24, 2024
162c7d5
Remove unused parameter
davidwengier Aug 9, 2024
186a134
Remove VersionedDocumentContext and the separate methods to create one
davidwengier Aug 12, 2024
4fe2eff
Expand testing slightly
davidwengier Aug 12, 2024
061347e
Minor logging cleanup
davidwengier Aug 12, 2024
6a166de
Remove unused using
davidwengier Aug 12, 2024
374e85c
Don't allow virtual documents to go back in time
davidwengier Aug 16, 2024
b05dd12
Failed to perform coherency update for one or more dependencies.
dotnet-maestro[bot] Aug 16, 2024
b81f3eb
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 17, 2024
e5cff02
Failed to perform coherency update for one or more dependencies.
dotnet-maestro[bot] Aug 18, 2024
af13ebd
PR feedback - sorta
davidwengier Aug 19, 2024
3bffce3
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Aug 19, 2024
80d1ed3
Merge CodeRenderingContext and DefaultCodeRenderingContext
DustinCampbell Aug 9, 2024
0e1774a
Clean up CodeRenderingContext a bit
DustinCampbell Aug 9, 2024
86e05ee
Pool scope stack in CodeRenderingContext
DustinCampbell Aug 9, 2024
635695f
Pool line pragmas in CodeRenderingContext
DustinCampbell Aug 9, 2024
7ba4179
Pool ancestor stack in CodeRenderingContext
DustinCampbell Aug 9, 2024
25acc07
Merge RazorCSharpDocument and DefaultRazorCSharpDocument
DustinCampbell Aug 9, 2024
d00b1ff
Switch CodeRenderingContext.LinePragmas to an ImmutableArray
DustinCampbell Aug 9, 2024
89204d4
Clean up callers of RazorCSharpDocument.Create(...)
DustinCampbell Aug 9, 2024
c755804
Swap RazorCSharpDocument.Create methods for constructors
DustinCampbell Aug 9, 2024
ff63a4e
Use pooled ImmutableArray builder for CodeRenderingContext diagnostics
DustinCampbell Aug 9, 2024
90f90ef
Switch RazorCSharpDocument.Diagnostics to an ImmutableArray
DustinCampbell Aug 9, 2024
5072db4
Clean up pooled objects in CodeRenderingContext
DustinCampbell Aug 9, 2024
34507da
Avoid extra allocations in IntermediateNodeExtensions.GetAllDiagnostics
DustinCampbell Aug 10, 2024
7ac711b
Remove ItemCollection from CodeRenderingContext
DustinCampbell Aug 12, 2024
03e2d07
Merge RazorCodeGenerationOptionsBuilder and DefaultRazorCodeGeneratio…
DustinCampbell Aug 14, 2024
972691b
Merge RazorCodeGenerationOptions and DefaultRazorCodeGenerationOptions
DustinCampbell Aug 14, 2024
dd11c5e
Clean up RazorCodeGenerationOptions a bit
DustinCampbell Aug 14, 2024
96adc42
Collapse RazorCodeGenerationOptions boolean fields to a flags enum
DustinCampbell Aug 14, 2024
28bfd61
Use SuppressUniqueIds exclusively from RazorCodeGenerationOptions
DustinCampbell Aug 14, 2024
1eb601c
Push NewLine setting into RazorCodeGenerationOptions
DustinCampbell Aug 14, 2024
7a9f32e
Pass RazorSourceDocument into CodeRenderingContext rather than RazorC…
DustinCampbell Aug 14, 2024
6593264
Clean up and enable nullability for CodeRenderingContext and DefaultD…
DustinCampbell Aug 14, 2024
80ae134
PR Feedback
davidwengier Aug 20, 2024
0c2504b
Merge remote-tracking branch 'upstream/main' into dev/dawengie/SelfVe…
davidwengier Aug 20, 2024
caac599
Fix after merge
davidwengier Aug 20, 2024
b58f180
Fix goofy whitespace
DustinCampbell Aug 20, 2024
934fea8
Add comments explaining the aggressive inlining behavior of EnumExten…
DustinCampbell Aug 20, 2024
97ac536
Move add usings helper code down to the workspaces layer
davidwengier Aug 21, 2024
8984db9
Combine back into one on type formatting pass
davidwengier Aug 21, 2024
fba3f1e
Rename some methods
davidwengier Aug 21, 2024
2c39c20
Random bits of cleanup before some bigger moves
davidwengier Aug 21, 2024
e45f094
Make it more explicit that we only do code action formatting for C#
davidwengier Aug 21, 2024
a702716
Be SUPER specific about our APIs, what they accept, and what they return
davidwengier Aug 21, 2024
b477b4a
Merge remote-tracking branch 'upstream/main' into dev/dawengie/SelfVe…
davidwengier Aug 21, 2024
e56b85e
Pass Html edits into the formatting service, so that the service does…
davidwengier Aug 21, 2024
3f57810
Get HtmlFormatter from DI
davidwengier Aug 21, 2024
38868db
Minor cleanup
davidwengier Aug 21, 2024
ca142be
Move HtmlFormattingPass down
davidwengier Aug 21, 2024
a9eaef6
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 21, 2024
3458aba
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Aug 21, 2024
ceb0613
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 21, 2024
1143900
Formalize Razor formatting options so we can have a single RazorForma…
davidwengier Aug 21, 2024
2165fcb
One last minor cleanup
davidwengier Aug 22, 2024
d635754
Be explicit about formatting passes
davidwengier Aug 22, 2024
4e12117
Move files to their own folder
davidwengier Aug 22, 2024
6f1c6ef
Remove unnecessary base class
davidwengier Aug 22, 2024
f74150d
Separate html formatting passes, so we can remove the IsFormatOnType …
davidwengier Aug 22, 2024
ef44f4f
Separate out the files in the Html formatter passes.
davidwengier Aug 22, 2024
45b8495
List -> PooledArrayBuilder
davidwengier Aug 22, 2024
5caa48f
Remove Kind property from FormattingResult
davidwengier Aug 22, 2024
fa4e8ef
Remove FormattingResult since it's now useless
davidwengier Aug 22, 2024
3b2ba30
We can't tell the client which version we're applying edits for, beca…
davidwengier Aug 22, 2024
ec191f8
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 22, 2024
6970dee
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 22, 2024
3423142
Remove ItemCollection from CodeRenderingContext (#10764)
DustinCampbell Aug 22, 2024
4124ce4
Remove unused parameter
davidwengier Aug 22, 2024
d031cc6
Merge branch 'main' into darc-main-a925341a-a0ef-49f7-bc6e-6525c5d13555
dibarbet Aug 22, 2024
587e72a
Simple PR feedback
davidwengier Aug 23, 2024
6622a0f
Missed the readonly bit
davidwengier Aug 23, 2024
3b79428
Merge remote-tracking branch 'upstream/main' into FormattingLayering
davidwengier Aug 23, 2024
2157169
More PR feedback
davidwengier Aug 23, 2024
79d0c3c
Failed to perform coherency update for one or more dependencies.
dotnet-maestro[bot] Aug 23, 2024
b5e50df
[release/dev17.11] Update dependencies from dotnet/arcade (#10552)
dibarbet Aug 23, 2024
e841c0e
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 24, 2024
286b3e1
Failed to perform coherency update for one or more dependencies.
dotnet-maestro[bot] Aug 25, 2024
aeca1e4
Don't crash because another team has a bad assumption
davidwengier Aug 26, 2024
cdcef8e
Force "Insert Spaces" to be true for Razor documents
davidwengier Aug 26, 2024
5ca9964
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Aug 26, 2024
aa024eb
[FUSE] Provide intellisense for @inject directives (#10771)
chsienki Aug 26, 2024
038f7fc
Localized file check-in by OneLocBuild Task: Build definition ID 262:…
dotnet-bot Aug 26, 2024
fff39dc
Localized file check-in by OneLocBuild Task: Build definition ID 262:…
dotnet-bot Aug 26, 2024
e7db6bc
Update configs for 17.12p3 snap
dibarbet Aug 26, 2024
156f016
Fix Formatting and On Enter integration tests (#10788)
davidwengier Aug 26, 2024
8ff61a0
Update configs for 17.12p3 snap (#10792)
dibarbet Aug 27, 2024
fe31c90
Snap for 17.12 P2 (#10793)
dibarbet Aug 27, 2024
8cebb29
Remove debug.fails
davidwengier Aug 27, 2024
19134c2
PR feedback
davidwengier Aug 27, 2024
75dcf45
Merge release/dev17.12 to main (#10794)
dotnet-bot Aug 27, 2024
0499664
Localized file check-in by OneLocBuild Task: Build definition ID 262:…
davidwengier Aug 27, 2024
1ea1552
Self-versioned documents (#10747)
davidwengier Aug 27, 2024
d7b76ad
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 27, 2024
b6eb03f
Merge RazorSyntaxTree and DefaultRazorSyntaxTree
DustinCampbell Aug 26, 2024
a7e5bf9
Prefer constructor over Create method
DustinCampbell Aug 26, 2024
965d3e8
Add (Drain)ToImmutableOrdered* methods to PooledArrayBuilder<T>
DustinCampbell Aug 26, 2024
6045ef2
Suppress unique ids (#10791)
chsienki Aug 27, 2024
2476b63
Refactor tests to share ordering test data
DustinCampbell Aug 26, 2024
8cba235
Clean up RazorSyntaxTree.Diagnostics computation
DustinCampbell Aug 26, 2024
33ad4fb
Enable nullability for RazorSyntaxTree
DustinCampbell Aug 26, 2024
e98f5e8
Switch RazorSyntaxTree.Diagnostics to an ImmutableArray<RazorDiagnostic>
DustinCampbell Aug 26, 2024
0df9f25
Rework ErrorSink
DustinCampbell Aug 26, 2024
aa0d7a7
Clean up ParserContext and use pooled collections
DustinCampbell Aug 27, 2024
69d4b10
Create RazorSyntaxTree with ImmutableArray<RazorDiagnostic>
DustinCampbell Aug 27, 2024
fcf0de8
Remove unused ErrorSink method
DustinCampbell Aug 27, 2024
ac1ea08
Prefer collection expression over ToList()
DustinCampbell Aug 27, 2024
73fb2df
Remove PooledArrayBuilder<RazorDiagnostic> from ComputeAllDiagnostics
DustinCampbell Aug 27, 2024
7ed43a1
[main] Update dependencies from dotnet/arcade (#10605)
dibarbet Aug 27, 2024
5a4e0a7
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Aug 27, 2024
0dc0f6e
[release/dev17.12] Update dependencies from dotnet/arcade (#10799)
dibarbet Aug 27, 2024
79c46c0
Merge remote-tracking branch 'upstream/release/dev17.11' into merges/…
dibarbet Aug 27, 2024
d0be044
Merge release/dev17.12 to main (#10801)
dotnet-bot Aug 27, 2024
da86194
Merge release/dev17.11 to release/dev17.12 (#10785)
dotnet-bot Aug 27, 2024
a530667
Merge release/dev17.12 to main (#10803)
dotnet-bot Aug 28, 2024
4b69790
Write out comments when there would be 4 or more consecutive tildes
davidwengier Aug 28, 2024
5bc3489
Add integration test that proves the crash is fixed
davidwengier Aug 28, 2024
e516052
Improve integration tests
davidwengier Aug 28, 2024
eba6a6a
Test for some edges just in case
davidwengier Aug 28, 2024
acb9a8e
Update compiler test baselines
davidwengier Aug 28, 2024
6cc8ce5
Fix tooling test inputs
davidwengier Aug 28, 2024
1de43a0
Remove stale TODO
davidwengier Aug 28, 2024
39942a2
When undoing provisional completion, don't accidentally delete a huge…
davidwengier Aug 28, 2024
54533a5
Simplify integration test to increase reliability because our formatt…
davidwengier Aug 28, 2024
ec671db
Fix find all references calls to Roslyn
davidwengier Aug 28, 2024
8e11180
Fix provisional completion corrupting generated C# documents (#10806)
phil-allen-msft Aug 28, 2024
f35b6c6
Change UseConsolidatedMvcViews to default to true (#10795)
chsienki Aug 28, 2024
5eb9d0c
Fix find all references calls to Roslyn (#10807)
phil-allen-msft Aug 28, 2024
27a338b
Global namespace component bind (#10798)
chsienki Aug 28, 2024
562be1a
Merge release/dev17.12 to main (#10809)
dotnet-bot Aug 28, 2024
b650cee
Cleanup and rename files to bring them to modern standards
davidwengier Aug 28, 2024
a05f9e6
Pass virtual document version through, and validate
davidwengier Aug 29, 2024
744e9e3
Fix integration tests to validate the change
davidwengier Aug 29, 2024
ebe3878
Update existing tests
davidwengier Aug 29, 2024
1f45c70
Write out JS comments when there would be 4 or more consecutive tilde…
davidwengier Aug 29, 2024
12f5194
Cohosting OnAutoInsert endpoint (#10776)
alexgav Aug 29, 2024
e1f6fba
Fix setting breakpoints with self versioned documents (#10811)
davidwengier Aug 29, 2024
d0e2a57
Merge remote-tracking branch 'upstream/main' into FormattingLayering
davidwengier Aug 29, 2024
ee83a6b
Fixes after merge
davidwengier Aug 29, 2024
21c7674
Re-architect formatting to prepare for cohosting (and for fun!) (#10778)
davidwengier Aug 30, 2024
8dc0e5a
Bump WebTools and remove legacy CLaSP package
davidwengier Aug 30, 2024
a657d5c
Bump WebTools and remove legacy CLaSP package (#10815)
davidwengier Aug 30, 2024
4d4e9ab
Update PublishData after VS snap
dibarbet Aug 30, 2024
3ca4497
Update PublishData.json
dibarbet Aug 30, 2024
f01a5a8
Update PublishData after VS snap (#10817)
dibarbet Aug 30, 2024
18c3107
Skip flaky test
davidwengier Sep 1, 2024
cb0ae13
Move trigger characters and logic to the formatting service
davidwengier Sep 2, 2024
3da875b
Create remote formatting service that delegates to the Razor formatti…
davidwengier Sep 2, 2024
2a26624
Fix a bug from a previous PR
davidwengier Sep 2, 2024
90c7b47
Move WebTools calling code to a shared layer
davidwengier Sep 2, 2024
2cbbdf5
Create cohosting endpoints
davidwengier Sep 2, 2024
6c3b12b
Turn off the old endpoints
davidwengier Sep 2, 2024
a336b7f
Create basic tests
davidwengier Sep 2, 2024
55c51a3
Apply suggestions from code review
davidwengier Sep 2, 2024
4a96692
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Sep 2, 2024
8bddfe9
Skip flaky test (#10821)
davidwengier Sep 2, 2024
56128c3
Refactor out spell check endpoints to services, and clean up a little
davidwengier Aug 29, 2024
4a44a99
Create cohost spell check endpoints and services
davidwengier Sep 2, 2024
391f322
Test
davidwengier Sep 2, 2024
a7cd940
Cohost go to implementation
davidwengier Sep 3, 2024
1e82de7
Add failing test, and add verification to existing tests
davidwengier Sep 3, 2024
f867a03
Remap Html uris if we get them
davidwengier Sep 3, 2024
277c780
Clarify [EventHandler] tag helper discovery logic and avoid exception
DustinCampbell Sep 3, 2024
abc48b3
Test that the DrainToImmutableOrdered* methods actually drain
DustinCampbell Sep 3, 2024
5c0677a
Ensure PooledArrayBuilder<T> resets capacity of builder after drain
DustinCampbell Sep 3, 2024
277663c
Clarify [EventHandler] tag helper discovery logic and avoid exception…
DustinCampbell Sep 3, 2024
467ff24
PR feedback
davidwengier Sep 4, 2024
d9e380b
Rename service
davidwengier Sep 4, 2024
84c2983
Whitespace
davidwengier Sep 4, 2024
915c4c3
Remap Html uris in cohost Go To Def (#10826)
davidwengier Sep 4, 2024
074043b
Remove IsImportDocument
davidwengier Sep 4, 2024
7107165
Remove GetRelatedDocuments from IProjectSnapshot
davidwengier Sep 4, 2024
4ec65fb
[main] Update dependencies from dotnet/arcade (#10816)
dotnet-maestro[bot] Sep 4, 2024
41acbde
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Sep 4, 2024
187962c
[release/dev17.10] Update dependencies from dotnet/arcade (#10529)
dotnet-maestro[bot] Sep 4, 2024
90b1855
Change RazorSyntaxTree.Diagnostics from an IReadOnlyList<RazorDiagnos…
DustinCampbell Sep 4, 2024
de7eddc
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Sep 4, 2024
cb2fd72
Merge branch 'release/dev17.11' into merges/release/dev17.10-to-relea…
davidwengier Sep 4, 2024
976f723
Merge branch 'release/dev17.12' into merges/release/dev17.11-to-relea…
davidwengier Sep 4, 2024
460ae5b
Merge branch 'main' into darc-main-a925341a-a0ef-49f7-bc6e-6525c5d13555
davidwengier Sep 4, 2024
1d04db3
Merge release/dev17.11 to release/dev17.12 (#10832)
dotnet-bot Sep 4, 2024
148d71a
Fix LF line-ending auto format bug (#10802)
jordi1215 Sep 4, 2024
6718dbc
[main] Update dependencies from dotnet/source-build-reference-package…
davidwengier Sep 4, 2024
42cc39e
PR Feedback
davidwengier Sep 4, 2024
d6f6a52
Merge release/dev17.10 to release/dev17.11 (#10833)
dotnet-bot Sep 4, 2024
fbf8c8e
Remove some things from `IProjectSnapshot` for cohostings benefit (#1…
davidwengier Sep 5, 2024
7d8be8e
Most PR feedback
davidwengier Sep 5, 2024
a795f32
Merge remote-tracking branch 'upstream/main' into CohostFormatting
davidwengier Sep 5, 2024
d87ad01
Move initialization logic
davidwengier Sep 5, 2024
b7cd05e
Remove unused parameter
davidwengier Sep 5, 2024
4dcc2c4
Merge remote-tracking branch 'upstream/main' into CohostSpellCheck
davidwengier Sep 5, 2024
c5b9ab8
Merge release/dev17.11 to release/dev17.12 (#10840)
dotnet-bot Sep 5, 2024
e0b2935
PR Feedback
davidwengier Sep 5, 2024
9b339ba
Cohost formatting (#10822)
davidwengier Sep 5, 2024
dde7fe8
Ensure type arguments are `global::` qualified (#10834)
jjonescz Sep 5, 2024
fdda4bb
CodeQL suppressions (#10845)
jaredpar Sep 5, 2024
459e9d6
Merge release/dev17.12 to main (#10841)
dotnet-bot Sep 6, 2024
d37da8b
Bump to real Roslyn version
davidwengier Sep 6, 2024
b69b08c
PR Feedback
davidwengier Sep 6, 2024
6e12161
Bump to real Roslyn version
davidwengier Sep 6, 2024
054f9ee
Merge remote-tracking branch 'upstream/main' into CohostGoToImplement…
davidwengier Sep 6, 2024
f7681c2
Fix build
davidwengier Sep 6, 2024
70f110d
Fix test
davidwengier Sep 6, 2024
49e727b
Cohost Go To Implementation (#10824)
davidwengier Sep 6, 2024
a3ee54d
Merge remote-tracking branch 'upstream/main' into CohostSpellCheck
davidwengier Sep 6, 2024
9678b91
Merge release/dev17.12 to main (#10847)
dotnet-bot Sep 6, 2024
3442176
Remove unused private members
davidwengier Sep 6, 2024
b0d5d3e
Dial diagnosis up to warning
davidwengier Sep 6, 2024
daa1f01
Suppress
davidwengier Sep 6, 2024
07e1382
Cohost Spell Check (#10825)
davidwengier Sep 6, 2024
9386c8c
Merge remote-tracking branch 'upstream/main' into MinFix
davidwengier Sep 6, 2024
cc5b5a5
One more, after the merge
davidwengier Sep 6, 2024
e8eede8
Move GetLanguageKind(...) implementation methods to a helper class
DustinCampbell Sep 4, 2024
f575ad0
Add and use RazorCodeDocument.GetLanguageKind(...) extension method
DustinCampbell Sep 4, 2024
ae81c66
Fix up tests that mocked IDocumentMappingService.GetLanguageKind(...)
DustinCampbell Sep 5, 2024
ed8e62b
Remove IDocumentMappingService.GetLanguageKind(...)
DustinCampbell Sep 5, 2024
5105d1b
Update GetLanguageKind(...) tests and move to Workspaces.Test
DustinCampbell Sep 6, 2024
e9cd0b2
OnAutoInsert Cohosting Tests (#10829)
alexgav Sep 6, 2024
6186646
Remove flaky test
davidwengier Sep 7, 2024
b0cd007
Remove flaky test (#10854)
davidwengier Sep 9, 2024
f6da71d
Convert TextEdit to TextChange
davidwengier Sep 5, 2024
add718d
Get all consuming code compiling again
davidwengier Sep 6, 2024
fb2a2bd
Fix broken tests
davidwengier Sep 8, 2024
b275b91
Rename some variables etc.
davidwengier Sep 8, 2024
caa7ca0
Rename some methods to Try... pattern
davidwengier Sep 8, 2024
f89e7f6
Extract common code to helper method
davidwengier Sep 8, 2024
4e9bf4d
Use pooled collections in a few more spots
davidwengier Sep 8, 2024
aec9af4
Remove some more usage of LSP types, and simplify ranges to line numbers
davidwengier Sep 9, 2024
b268c61
IEnumarable to ImmutableArray
davidwengier Sep 9, 2024
4aeb519
Convert HtmlFormatter to ImmutableArray<TextChange>
davidwengier Sep 9, 2024
04f2ca6
Create a helper method and revert change to shared code, just in case
davidwengier Sep 9, 2024
6478625
Use ImmutableArray in SourceTextDiffer too
davidwengier Sep 9, 2024
d185785
PR Feedback
davidwengier Sep 9, 2024
98421fa
Fix auto insert service after merge from main
davidwengier Sep 9, 2024
308833d
Remove unused private members (#10848)
davidwengier Sep 9, 2024
baabd8d
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Sep 9, 2024
29c7302
Remove IDocumentMappingService.GetLanguageKind(...) and make it an ex…
DustinCampbell Sep 9, 2024
4f1a297
PR Feedback
davidwengier Sep 10, 2024
f9e09f5
[main] Update dependencies from dotnet/source-build-reference-package…
davidwengier Sep 10, 2024
ef0054c
Merge remote-tracking branch 'upstream/main' into FormattingTextChange
davidwengier Sep 10, 2024
05e317f
Fix after merge
davidwengier Sep 10, 2024
2511efe
Switch formatting engine over to using `TextChange` instead of `TextE…
davidwengier Sep 10, 2024
d7d4932
Merge remote-tracking branch 'upstream/main' into features/roslyn-tok…
333fred Sep 10, 2024
0ea44ba
Reimplement IDispoasable in test clases.
333fred Sep 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ dotnet_separate_import_directive_groups = false
# IDE0005 - Remove unnecessary imports
dotnet_diagnostic.IDE0005.severity = warning

# IDE0052 - Private member can be removed
dotnet_diagnostic.IDE0052.severity = warning

# IDE0046: If expression can be simplified
dotnet_style_prefer_conditional_expression_over_return = false:silent

Expand Down
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
here should be _ prefixed to indicate that they are not meant to be used outside this file.
-->
<PropertyGroup>
<_MicrosoftWebToolsPackageVersion>17.9.67-preview-0001</_MicrosoftWebToolsPackageVersion>
<_MicrosoftWebToolsPackageVersion>17.11.11-preview-0001</_MicrosoftWebToolsPackageVersion>
<_MicrosoftVisualStudioShellPackagesVersion>17.11.39721</_MicrosoftVisualStudioShellPackagesVersion>
<_MicrosoftVisualStudioPackagesVersion>17.11.191</_MicrosoftVisualStudioPackagesVersion>
<_VisualStudioLanguageServerProtocolVersion>17.12.1-preview</_VisualStudioLanguageServerProtocolVersion>
Expand Down
2 changes: 1 addition & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
Expand Down
88 changes: 44 additions & 44 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,87 +6,87 @@
<Sha>839cdfb0ecca5e0be3dbccd926e7651ef50fdf10</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.24304.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.0-alpha.1.24455.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>9ae78a4e6412926d19ba97cfed159bf9de70b538</Sha>
<Sha>ad3c9aa85596f42c6a483233c50fab8cee8c412a</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-2.24419.3">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.24454.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>0ec44d9775c80a6861b811d8af637ee36e3315e1</Sha>
<Sha>9f86520c46f67d2a8a59af189f8fd87e35c574bb</Sha>
</Dependency>
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="4.12.0-2.24419.3">
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="4.12.0-3.24454.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>0ec44d9775c80a6861b811d8af637ee36e3315e1</Sha>
<Sha>9f86520c46f67d2a8a59af189f8fd87e35c574bb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor" Version="4.12.0-2.24419.3">
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor" Version="4.12.0-3.24454.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>0ec44d9775c80a6861b811d8af637ee36e3315e1</Sha>
<Sha>9f86520c46f67d2a8a59af189f8fd87e35c574bb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.12.0-2.24419.3">
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.12.0-3.24454.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>0ec44d9775c80a6861b811d8af637ee36e3315e1</Sha>
<Sha>9f86520c46f67d2a8a59af189f8fd87e35c574bb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-2.24419.3">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.24454.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>0ec44d9775c80a6861b811d8af637ee36e3315e1</Sha>
<Sha>9f86520c46f67d2a8a59af189f8fd87e35c574bb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="4.12.0-2.24419.3">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="4.12.0-3.24454.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>0ec44d9775c80a6861b811d8af637ee36e3315e1</Sha>
<Sha>9f86520c46f67d2a8a59af189f8fd87e35c574bb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-2.24419.3">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-3.24454.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>0ec44d9775c80a6861b811d8af637ee36e3315e1</Sha>
<Sha>9f86520c46f67d2a8a59af189f8fd87e35c574bb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-2.24419.3">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-3.24454.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>0ec44d9775c80a6861b811d8af637ee36e3315e1</Sha>
<Sha>9f86520c46f67d2a8a59af189f8fd87e35c574bb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="4.12.0-2.24419.3">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="4.12.0-3.24454.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>0ec44d9775c80a6861b811d8af637ee36e3315e1</Sha>
<Sha>9f86520c46f67d2a8a59af189f8fd87e35c574bb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="4.12.0-2.24419.3">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="4.12.0-3.24454.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>0ec44d9775c80a6861b811d8af637ee36e3315e1</Sha>
<Sha>9f86520c46f67d2a8a59af189f8fd87e35c574bb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="4.12.0-2.24419.3">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="4.12.0-3.24454.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>0ec44d9775c80a6861b811d8af637ee36e3315e1</Sha>
<Sha>9f86520c46f67d2a8a59af189f8fd87e35c574bb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="4.12.0-2.24419.3">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="4.12.0-3.24454.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>0ec44d9775c80a6861b811d8af637ee36e3315e1</Sha>
<Sha>9f86520c46f67d2a8a59af189f8fd87e35c574bb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="4.12.0-2.24419.3">
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="4.12.0-3.24454.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>0ec44d9775c80a6861b811d8af637ee36e3315e1</Sha>
<Sha>9f86520c46f67d2a8a59af189f8fd87e35c574bb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.12.0-2.24419.3">
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.12.0-3.24454.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>0ec44d9775c80a6861b811d8af637ee36e3315e1</Sha>
<Sha>9f86520c46f67d2a8a59af189f8fd87e35c574bb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.12.0-2.24419.3">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.12.0-3.24454.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>0ec44d9775c80a6861b811d8af637ee36e3315e1</Sha>
<Sha>9f86520c46f67d2a8a59af189f8fd87e35c574bb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-2.24419.3">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-3.24454.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>0ec44d9775c80a6861b811d8af637ee36e3315e1</Sha>
<Sha>9f86520c46f67d2a8a59af189f8fd87e35c574bb</Sha>
</Dependency>
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="4.12.0-2.24419.3">
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="4.12.0-3.24454.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>0ec44d9775c80a6861b811d8af637ee36e3315e1</Sha>
<Sha>9f86520c46f67d2a8a59af189f8fd87e35c574bb</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="4.12.0-2.24419.3">
<Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="4.12.0-3.24454.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>0ec44d9775c80a6861b811d8af637ee36e3315e1</Sha>
<Sha>9f86520c46f67d2a8a59af189f8fd87e35c574bb</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-2.24419.3">
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-3.24454.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>0ec44d9775c80a6861b811d8af637ee36e3315e1</Sha>
<Sha>9f86520c46f67d2a8a59af189f8fd87e35c574bb</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
</ProductDependencies>
Expand All @@ -96,14 +96,14 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24352.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24453.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944</Sha>
<Sha>dd332f2d4e21daa8b79f84251ab156af9a0b11b2</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24352.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24453.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944</Sha>
<Sha>dd332f2d4e21daa8b79f84251ab156af9a0b11b2</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
Expand Down
44 changes: 22 additions & 22 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
imported. This OK because we want to just have an obvious salt for a local build.
-->
<PropertyGroup>
<VsixVersionPrefix>17.12.2</VsixVersionPrefix>
<VsixVersionPrefix>17.12.3</VsixVersionPrefix>
<AddinMajorVersion>17.12</AddinMajorVersion>
<AddinVersion>$(AddinMajorVersion)</AddinVersion>
<AddinVersion Condition="'$(OfficialBuildId)' != ''">$(AddinVersion).$(OfficialBuildId)</AddinVersion>
Expand All @@ -49,29 +49,29 @@
<PropertyGroup Label="Automated">
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>6.0.2-servicing.22064.6</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>6.0.1</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>9.0.0-alpha.1.24304.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
<MicrosoftSourceBuildIntermediatearcadePackageVersion>9.0.0-beta.24352.2</MicrosoftSourceBuildIntermediatearcadePackageVersion>
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>10.0.0-alpha.1.24455.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
<MicrosoftSourceBuildIntermediatearcadePackageVersion>9.0.0-beta.24453.1</MicrosoftSourceBuildIntermediatearcadePackageVersion>
<MicrosoftDotNetXliffTasksPackageVersion>1.0.0-beta.23475.1</MicrosoftDotNetXliffTasksPackageVersion>
<MicrosoftSourceBuildIntermediatexlifftasksPackageVersion>1.0.0-beta.23475.1</MicrosoftSourceBuildIntermediatexlifftasksPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.12.0-2.24419.3</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>4.12.0-2.24419.3</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>4.12.0-2.24419.3</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
<MicrosoftCodeAnalysisCommonPackageVersion>4.12.0-2.24419.3</MicrosoftCodeAnalysisCommonPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-2.24419.3</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>4.12.0-2.24419.3</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-2.24419.3</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-2.24419.3</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>4.12.0-2.24419.3</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>4.12.0-2.24419.3</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>4.12.0-2.24419.3</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>4.12.0-2.24419.3</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>4.12.0-2.24419.3</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
<MicrosoftCodeAnalysisTestUtilitiesPackageVersion>4.12.0-2.24419.3</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>4.12.0-2.24419.3</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.12.0-2.24419.3</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-2.24419.3</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftSourceBuildIntermediateroslynPackageVersion>4.12.0-2.24419.3</MicrosoftSourceBuildIntermediateroslynPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>4.12.0-2.24419.3</MicrosoftVisualStudioLanguageServicesPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.12.0-3.24454.5</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>4.12.0-3.24454.5</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>4.12.0-3.24454.5</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
<MicrosoftCodeAnalysisCommonPackageVersion>4.12.0-3.24454.5</MicrosoftCodeAnalysisCommonPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-3.24454.5</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>4.12.0-3.24454.5</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-3.24454.5</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-3.24454.5</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>4.12.0-3.24454.5</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>4.12.0-3.24454.5</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>4.12.0-3.24454.5</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>4.12.0-3.24454.5</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>4.12.0-3.24454.5</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
<MicrosoftCodeAnalysisTestUtilitiesPackageVersion>4.12.0-3.24454.5</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>4.12.0-3.24454.5</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.12.0-3.24454.5</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-3.24454.5</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftSourceBuildIntermediateroslynPackageVersion>4.12.0-3.24454.5</MicrosoftSourceBuildIntermediateroslynPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>4.12.0-3.24454.5</MicrosoftVisualStudioLanguageServicesPackageVersion>
<!--
Exception - Microsoft.Extensions.ObjectPool and System.Collections.Immutable packages are not updated by automation,
but are present in Version.Details.xml for source-build PVP flow. See the comment in Version.Details.xml for more information.
Expand Down
2 changes: 1 addition & 1 deletion eng/common/SetupNugetSources.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ if ($dotnet31Source -ne $null) {
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
}

$dotnetVersions = @('5','6','7','8')
$dotnetVersions = @('5','6','7','8','9')

foreach ($dotnetVersion in $dotnetVersions) {
$feedPrefix = "dotnet" + $dotnetVersion;
Expand Down
2 changes: 1 addition & 1 deletion eng/common/SetupNugetSources.sh
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ if [ "$?" == "0" ]; then
PackageSources+=('dotnet3.1-internal-transport')
fi

DotNetVersions=('5' '6' '7' '8')
DotNetVersions=('5' '6' '7' '8' '9')

for DotNetVersion in ${DotNetVersions[@]} ; do
FeedPrefix="dotnet${DotNetVersion}";
Expand Down
5 changes: 0 additions & 5 deletions eng/common/core-templates/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,6 @@ parameters:
artifactPublishSteps: []
runAsPublic: false

# Sbom related params
enableSbom: true
PackageVersion: 9.0.0
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'

# 1es specific parameters
is1ESPipeline: ''

Expand Down
Loading
Loading