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 #10781

Merged
merged 96 commits into from
Aug 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
376b86c
Allow anyone to opt in to FUSE
davidwengier Jul 31, 2024
7af4670
Allow anyone to opt in to FUSE (#10690)
davidwengier Jul 31, 2024
085aa32
Upgrade testing analyzers to address CG alert.
333fred Aug 6, 2024
6353caa
Manually reference Microsoft.IO.Redist 6.0.1 where needed to fix CG a…
333fred Aug 6, 2024
47438b5
Merge remote-tracking branch 'upstream/release/dev17.8' into merges/r…
333fred Aug 6, 2024
a11f5d7
Merge release/dev17.8 to release/dev17.10 (#10710)
dotnet-bot Aug 6, 2024
f65c6b6
Add simple telemetry to initialize endpoint
phil-allen-msft Aug 7, 2024
f8c1f45
Update System.Formats.Asn1 to address CG alert.
333fred Aug 6, 2024
b5c4983
Upgrade System.Security.Cryptography.Xml to avoid CG alerts.
333fred Aug 6, 2024
e817d39
PR feedback
davidwengier Aug 7, 2024
f9c15e4
Add simple telemetry to initialize endpoint (#10715)
davidwengier Aug 8, 2024
17671b6
Extract rename functionality to a separate service
davidwengier Aug 6, 2024
f388156
Cleanups and tweaks
davidwengier Aug 6, 2024
47665e0
Create a remote rename service, and dependencies, to perform the rename
davidwengier Aug 7, 2024
c1e7181
Sync the ReturnCodeActionAndRenamePathsWithPrefixedSlash flag to OOP
davidwengier Aug 7, 2024
7d514b3
Add rename endpoint
davidwengier Aug 7, 2024
fb87026
Add component rename test to validate Razor behaviour
davidwengier Aug 8, 2024
6e0bb70
Move EditMappingService, and create Remote and Lsp versions that do d…
davidwengier Aug 9, 2024
3308f4f
Add C# rename test
davidwengier Aug 9, 2024
ee44c75
Rename TryGetTextDocumentChanges to something better, and cleanup, an…
davidwengier Aug 9, 2024
ef49d71
Fix up tests because sometimes you ask Visual Studio to compile and i…
davidwengier Aug 9, 2024
1297fea
Extract some common code
davidwengier Aug 9, 2024
4bbedc6
Fix after rebase
davidwengier Aug 9, 2024
aedbb64
Add CopyTo(Span<T>) extension methods to Utilities.Shared
DustinCampbell Aug 12, 2024
027dd04
Add XML doc comments to ImmutableArray Order extensions
DustinCampbell Aug 12, 2024
45e64fb
Add ImmutableArray<T>.Unsafe() extension with in-place order methods
DustinCampbell Aug 12, 2024
4c0c279
Un-nest ComparerHelper<T> and DescendingComparer<T>
DustinCampbell Aug 12, 2024
a3c1375
Add IReadOnlyList<T> OrderAsArray extension methods
DustinCampbell Aug 12, 2024
72be234
Add IEnumerable<T> OrderAsArray extension methods
DustinCampbell Aug 12, 2024
4eb9cb7
Add tests to call OrderByArray methods through IEnumerable and IReadO…
DustinCampbell Aug 12, 2024
2464e6e
Add ImmutableArray<T>.Builder ToImmutableOrdered extension methods
DustinCampbell Aug 12, 2024
82ddac1
Merge remote-tracking branch 'upstream/release/dev17.10' into merges/…
333fred Aug 12, 2024
ff768a6
Merge release/dev17.10 to release/dev17.11 (#10711)
dotnet-bot Aug 13, 2024
b819e3f
Extract existing handler to a service
davidwengier Aug 13, 2024
512b0d1
Create OOP service and cohost endpoint
davidwengier Aug 13, 2024
2dca8f9
Merge remote-tracking branch 'upstream/release/dev17.11' into merges/…
davidwengier Aug 13, 2024
335c775
Don't copy IEnumerable elements twice
DustinCampbell Aug 13, 2024
b64bf6c
Simplify CompareHelper<T>
DustinCampbell Aug 13, 2024
194ef8c
Fix CG issue with MS.IO.Redist
jaredpar Aug 12, 2024
7db021d
more
jaredpar Aug 13, 2024
7542d94
Merge release/dev17.11 to main (#10727)
dotnet-bot Aug 13, 2024
80c19df
Merge remote-tracking branch 'upstream/release/dev17.11' into merges/…
333fred Aug 13, 2024
a01016a
Cohosting Rename (#10721)
davidwengier Aug 13, 2024
5954852
Merge release/dev17.11 to release/dev17.12 (#10731)
dotnet-bot Aug 13, 2024
77e74bd
Merge release/dev17.12 to main (#10732)
dotnet-bot Aug 13, 2024
17cbe2e
Use stable sort for the OrderAsArray extensions
DustinCampbell Aug 13, 2024
761e2c6
Remove invalid comment
DustinCampbell Aug 13, 2024
bdcd5cd
Add immutable array builder DrainToImmutableOrdered variant extensions
DustinCampbell Aug 13, 2024
795149f
Use Unsafe() extensions to implement ToImmutableOrdered* extensions
DustinCampbell Aug 13, 2024
0e33edc
Remove unnecessary type alias
DustinCampbell Aug 13, 2024
7508c52
A bit of clean up
DustinCampbell Aug 13, 2024
ee177e5
Merge remote-tracking branch 'upstream/release/dev17.12' into merges/…
davidwengier Aug 14, 2024
29658c1
Merge release/dev17.12 to main (#10734)
dotnet-bot Aug 14, 2024
0fc71be
Cleanup
davidwengier Aug 15, 2024
1616468
Remove shared service since there is no sharing happening
davidwengier Aug 15, 2024
ac4b407
Add cohost endpoints for the things that don't call Roslyn at all
davidwengier Aug 15, 2024
db5a78f
Fix parser debug helpers (#10741)
jjonescz Aug 15, 2024
2612be8
Introduce/expand several extension methods for ImmutableArray<T>, IRe…
DustinCampbell Aug 15, 2024
e6fa90c
Add co-hosting endpoint and remote service for GTD
DustinCampbell Aug 2, 2024
f364cd8
Push Razor component GTD logic down to Workspaces layer
DustinCampbell Aug 15, 2024
9223d19
Call Razor component GTD in remote service and reinvoke HTML in client
DustinCampbell Aug 15, 2024
e34dc54
Don't add already known documents to the misc files project
davidwengier Aug 16, 2024
bc0b702
Cohosting endpoints that don't call Roslyn, nor have any Razor logic …
davidwengier Aug 16, 2024
f1c3a70
PR feedback
davidwengier Aug 18, 2024
da79940
Don't add already known documents to the misc files project (#10753)
davidwengier Aug 18, 2024
4ced6b9
Support component rename from an end tag
davidwengier Aug 19, 2024
84def3b
grrrr
davidwengier Aug 19, 2024
ede6a16
Pass IDocumentSnapshot to GetDefinitionAsync instead of DocumentContext
DustinCampbell Aug 19, 2024
fd09361
Move IDocumentPositionInfoStrategy and friends to Workspaces layer
DustinCampbell Aug 19, 2024
f666b2c
Add DocumentMappingSerice to RazorDocumentServiceBase
DustinCampbell Aug 19, 2024
e69661c
Rework IDocumentPositionInfoStrategy and use correctly in co-hosted GTD
DustinCampbell Aug 19, 2024
9325817
Add tests for co-hosted GTD
DustinCampbell Aug 19, 2024
a8c3c36
Use a proper Try pattern
davidwengier Aug 19, 2024
0ff482d
Dev Container (#10751)
jaredpar Aug 19, 2024
0777649
Cohosting Support for Go to Definition (#10750)
DustinCampbell Aug 19, 2024
e165821
Support component rename from an end tag (#10762)
davidwengier Aug 20, 2024
efceb90
Allow LSP and cohosting to provide specialized methods to get a synta…
davidwengier Aug 20, 2024
5ef490f
Defer to C# for component attribute GTD in cohosting
davidwengier Aug 20, 2024
ad16b16
Add missing test case
davidwengier Aug 20, 2024
a8b4259
Directly test the component definition service in cohosting
davidwengier Aug 20, 2024
7470352
Rework how we get generated documents
davidwengier Aug 20, 2024
68650a7
Allow @@ as a fallback (#10752)
333fred Aug 20, 2024
1d3c82c
Update NOTICE.txt (#10768)
phil-allen-msft Aug 20, 2024
7d5b206
Remove code document parameter and just use document snapshot
davidwengier Aug 20, 2024
53fec86
Inject file path service into the document snapshot
davidwengier Aug 20, 2024
a3edec0
Move GetSyntaxTree to document snapshot
davidwengier Aug 21, 2024
acc84f6
Allow LSP and cohosting to provide specialized methods to get a synta…
davidwengier Aug 21, 2024
d38698f
Moving formatting service to common layer (#10761)
alexgav Aug 21, 2024
0bb4e6e
Bump Roslyn version
davidwengier Aug 21, 2024
ca93e0e
PR feedback
davidwengier Aug 21, 2024
55c3058
Merge remote-tracking branch 'upstream/main' into CohostDocumentSymbol
davidwengier Aug 21, 2024
687a473
Fix after merge
davidwengier Aug 21, 2024
2723187
Cohost Document Symbols (#10728)
davidwengier Aug 21, 2024
d7c7a32
Merge release/dev17.11 to release/dev17.12 (#10767)
dotnet-bot Aug 21, 2024
fc8332f
Merge release/dev17.12 to main (#10774)
dotnet-bot Aug 21, 2024
35871e3
Merge remote-tracking branch 'upstream/main' into merge-main
333fred Aug 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
FROM mcr.microsoft.com/dotnet/sdk:8.0

ARG DOTNET_SDK_INSTALL_URL=https://dot.net/v1/dotnet-install.sh
# Install the correct Roslyn SDK into the same directory that the base image installs the SDK in.
ENV DOTNET_INSTALL_DIR=/usr/share/dotnet

# Copy the global.json file so its available in the image before the repo is cloned
COPY global.json /tmp/

RUN cd /tmp \
&& curl --location --output dotnet-install.sh "${DOTNET_SDK_INSTALL_URL}" \
&& chmod +x dotnet-install.sh \
&& mkdir -p "${DOTNET_INSTALL_DIR}" \
&& ./dotnet-install.sh --jsonfile "./global.json" --install-dir "${DOTNET_INSTALL_DIR}" \
&& rm dotnet-install.sh

# Set up machine requirements to build the repo
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y install --no-install-recommends curl git
60 changes: 60 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
// https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/dotnetcore
{
"name": "Razor DevContainer",
"build": {
"dockerfile": "Dockerfile",
// Set the context to the workspace folder to allow us to copy files from it.
"context": ".."
},
"customizations": {
"vscode": {
"settings": {
"files.associations": {
"*.csproj": "msbuild",
"*.fsproj": "msbuild",
"*.globalconfig": "ini",
"*.manifest": "xml",
"*.nuspec": "xml",
"*.pkgdef": "ini",
"*.projitems": "msbuild",
"*.props": "msbuild",
"*.resx": "xml",
"*.rsp": "Powershell",
"*.ruleset": "xml",
"*.settings": "xml",
"*.shproj": "msbuild",
"*.slnf": "json",
"*.targets": "msbuild",
"*.vbproj": "msbuild",
"*.vsixmanifest": "xml",
"*.vstemplate": "xml",
"*.xlf": "xml",
"*.yml": "azure-pipelines"
},
// ms-dotnettools.csharp settings
"omnisharp.disableMSBuildDiagnosticWarning": true,
"omnisharp.enableEditorConfigSupport": true,
"omnisharp.enableImportCompletion": true,
"omnisharp.useModernNet": true,
"omnisharp.enableAsyncCompletion": true,
// ms-dotnettools.csdevkit settings
"dotnet.defaultSolution": "Razor.sln",
// ms-vscode.powershell settings
"powershell.promptToUpdatePowerShell": false,
"powershell.integratedConsole.showOnStartup": false,
"powershell.startAutomatically": false,
// ms-azure-devops.azure-pipelines settings
},
"extensions": [
"ms-dotnettools.csharp",
"ms-dotnettools.csdevkit",
"EditorConfig.EditorConfig",
"ms-vscode.powershell",
"tintoy.msbuild-project-tools",
"ms-azure-devops.azure-pipelines"
]
}
},
"postCreateCommand": "${containerWorkspaceFolder}/restore.sh"
}
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
},
"dotnet.defaultSolution": "Razor.sln",
"omnisharp.defaultLaunchSolution": "Razor.sln",
"files.encoding": "utf8bom"
"files.encoding": "utf8bom",
"dotnet.testWindow.disableBuildOnRefresh": true
}
73 changes: 49 additions & 24 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,52 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "ActivateDotnet",
"type": "shell",
"windows": {
"command": "echo",
"args": [
"Skipping activation on windows"
]
},
"linux": {
"command": "source",
"args": [
"activate.sh"
],
"options": {
"cwd": "${workspaceFolder}"
},
"presentation": {
"reveal": "silent"
}
},
"version": "2.0.0",
"tasks": [
{
"label": "ActivateDotnet",
"type": "shell",
"windows": {
"command": "echo",
"args": [
"Skipping activation on windows"
]
},
"linux": {
"command": "source",
"args": [
"activate.sh"
],
"options": {
"cwd": "${workspaceFolder}"
},
]
"presentation": {
"reveal": "silent"
}
},
},
{
"label": "build.sh",
"command": "./build.sh",
"type": "shell",
"args": [
],
"windows": {
"command": "${workspaceFolder}/build.cmd",
},
"problemMatcher": "$msCompile",
"group": "build"
},
{
"label": "build Rasor.Slim.slnf",
"command": "dotnet",
"type": "shell",
"args": [
"build",
"-p:RunAnalyzersDuringBuild=false",
"-p:GenerateFullPaths=true",
"Razor.Slim.slnf"
],
"problemMatcher": "$msCompile",
"group": "build"
}
]
}
8 changes: 8 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,13 @@
<PackageVersion Include="xunit.extensibility.execution" Version="$(_XunitPackageVersion)" />
<PackageVersion Include="xunit.runner.utility" Version="2.4.1" />
<PackageVersion Include="Xunit.StaFact" Version="1.2.46-alpha" />

<!--
These package references exist solely to fix component governance issues. Referencing them here
at the appropriate version, in combination with using CentralPackageTransitivePinningEnabled, will
ensure the correct version is used in all places
-->
<PackageVersion Include="Microsoft.IO.Redist" Version="6.0.1" />
<PackageVersion Include="System.Formats.Asn1" Version="8.0.1" />
</ItemGroup>
</Project>
Loading