Skip to content

Commit ec20606

Browse files
committed
Merge branch 'main' into dev/arkalyan/snap-0807
2 parents 484b73b + 6922fb5 commit ec20606

37 files changed

+1985
-424
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
blank_issues_enabled: true
22
contact_links:
33
- name: Issue with Razor (Blazor) tooling
4-
url: https://github.com/dotnet/razor-tooling/issues/new/choose
5-
about: Please open issues relating to the Razor tooling in dotnet/razor-tooling.
4+
url: https://github.com/dotnet/razor/issues/new/choose
5+
about: Please open issues relating to the Razor tooling in dotnet/razor.

.vscode/launch.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,9 @@
286286
"updatePackageDependencies"
287287
],
288288
"env": {
289-
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/6301924acc5020d6545f4573bbb70b88/razorlanguageserver-linux-arm64-7.0.0-preview.23301.2.zip,https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/4e07791acfef2a373dbe497ab2477d55/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23301.2.zip,https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/28003bc9d9c7fdfc288dd113be8fe64d/razorlanguageserver-linux-musl-x64-7.0.0-preview.23301.2.zip,https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/c22da9d1dbcbf7fd50bd893d845414d7/razorlanguageserver-linux-x64-7.0.0-preview.23301.2.zip,https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/4be79e180c7421f9234ffdbed655a83c/razorlanguageserver-osx-arm64-7.0.0-preview.23301.2.zip,https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/814246e6af4cf35db8151d0ee0e82021/razorlanguageserver-osx-x64-7.0.0-preview.23301.2.zip,https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/0b1fb7614fbe7a9a9cd2c5470c8865fa/razorlanguageserver-win-arm64-7.0.0-preview.23301.2.zip,https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/c51fc9fae3f6fa2b1992df6dd16f50d2/razorlanguageserver-win-x64-7.0.0-preview.23301.2.zip,https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/17ba6e72f65b30a6ddd68dade60343e8/razorlanguageserver-win-x86-7.0.0-preview.23301.2.zip",
290-
"NEW_DEPS_VERSION": "7.0.0-preview.23301.2"
289+
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/0b5b703dafc66d517ace9324e293f9aa/razorlanguageserver-linux-arm64-7.0.0-preview.23405.1.zip,https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/c1c045b721fdf40c190ee10368127a4a/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23405.1.zip,https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/90a1b16b52d8dd8b98830aa196d16b31/razorlanguageserver-linux-musl-x64-7.0.0-preview.23405.1.zip,https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/22c9d8ca5e32a811ae620d10b0f16600/razorlanguageserver-linux-x64-7.0.0-preview.23405.1.zip,https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/f5ac44bbec4ca39f238492db24613411/razorlanguageserver-osx-arm64-7.0.0-preview.23405.1.zip,https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/a0d3f3a01f1ebd902841b1540ef6c539/razorlanguageserver-osx-x64-7.0.0-preview.23405.1.zip,https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/6d8a1f682e858b3e13d3836cab18df37/razorlanguageserver-win-arm64-7.0.0-preview.23405.1.zip,https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/a04e8be09ea48c4e9e75b8e8fd93cd82/razorlanguageserver-win-x64-7.0.0-preview.23405.1.zip,https://download.visualstudio.microsoft.com/download/pr/c3182341-48da-4baf-922d-b8a55ec705d4/15b67c9b4e30357c37f57069f1abca19/razorlanguageserver-win-x86-7.0.0-preview.23405.1.zip",
290+
"NEW_DEPS_VERSION": "7.0.0-preview.23405.1",
291+
"NEW_DEPS_ID": "Razor"
291292
},
292293
"cwd": "${workspaceFolder}"
293294
}

azure-pipelines-official.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pr: none
88

99
variables:
1010
- name: prereleaseFlag
11-
value: ''
11+
value: '--prerelease'
1212

1313
stages:
1414
- stage: Build

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pr:
1515

1616
variables:
1717
- name: prereleaseFlag
18-
value: ''
18+
value: '--prerelease'
1919

2020
stages:
2121
- stage: Build

azure-pipelines/loc.yml

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
trigger: none
2+
pr: none
3+
4+
parameters:
5+
- name: publishLocalizationFile
6+
type: boolean
7+
default: true
8+
9+
variables:
10+
# Variable group contains the PAT to LOC
11+
- group: OneLocBuildVariables
12+
13+
stages:
14+
- stage: LocalizationStage
15+
condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
16+
jobs:
17+
- job: Localization
18+
pool:
19+
name: NetCore1ESPool-Internal
20+
demands: ImageOverride -equals windows.vs2022preview.amd64
21+
steps:
22+
- task: NodeTool@0
23+
displayName: 'Install Node.js 18.x'
24+
inputs:
25+
# Octokit client needs 18.x to have 'fetch' function.
26+
versionSpec: '18.x'
27+
- checkout: self
28+
clean: true
29+
submodules: true
30+
fetchTags: false
31+
fetchDepth: 0
32+
- pwsh: |
33+
npm install
34+
npm install -g @vscode/l10n-dev
35+
npm install -g gulp
36+
displayName: 'Install tools'
37+
- pwsh: npm run compile
38+
displayName: 'Compile'
39+
- pwsh: npm run l10nDevGenerateLocalizationBundle
40+
displayName: 'Generate bundle.l10.json'
41+
- pwsh: npm run l10nDevGenerateXlf
42+
displayName: 'Generate xlf files from bundle.10n.json'
43+
- task: OneLocBuild@2
44+
env:
45+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
46+
inputs:
47+
locProj: loc/LocProject.json
48+
outDir: '$(Build.SourcesDirectory)/loc'
49+
isCreatePrSelected: false
50+
patVariable: $(dn-bot-ceapex-package-r)
51+
packageSourceAuth: patAuth
52+
lclSource: lclFilesfromPackage
53+
LclPackageId: 'LCL-JUNO-PROD-VSCODECS'
54+
- pwsh: npm run l10nDevImportXlf
55+
displayName: 'Import xlf to json.'
56+
- pwsh: gulp 'publish localization content' --userName dotnet-bot --email [email protected] --commitSha $(Build.SourceVersion) --targetRemoteRepo vscode-csharp --baseBranch 'main'
57+
displayName: 'Create PR in GitHub.'
58+
env:
59+
GitHubPAT: $(BotAccount-dotnet-bot-repo-PAT)
60+
- task: PublishBuildArtifacts@1
61+
displayName: 'Publish Localization Files'
62+
inputs:
63+
PathtoPublish: '$(Build.SourcesDirectory)/loc'
64+
PublishLocation: Container
65+
ArtifactName: Loc
66+
condition: ${{ parameters.publishLocalizationFile }}
67+
- task: PublishBuildArtifacts@1
68+
displayName: 'Publish l10n file'
69+
inputs:
70+
PathtoPublish: '$(Build.SourcesDirectory)/l10n'
71+
PublishLocation: Container
72+
ArtifactName: l10n
73+
condition: ${{ parameters.publishLocalizationFile }}

gulpfile.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import * as packageDependencyUpdater from './src/tools/updatePackageDependencies
1010
require('./tasks/testTasks');
1111
require('./tasks/offlinePackagingTasks');
1212
require('./tasks/backcompatTasks');
13+
require('./tasks/localizationTasks');
1314

1415
// Disable warning about wanting an async function
1516
// tslint:disable-next-line

l10n/bundle.l10n.json

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
{
2+
"Cannot load Razor language server because the directory was not found: '{0}'": "Cannot load Razor language server because the directory was not found: '{0}'",
3+
"Could not find '{0}' in or above '{1}'.": "Could not find '{0}' in or above '{1}'.",
4+
"Invalid trace setting for Razor language server. Defaulting to '{0}'": "Invalid trace setting for Razor language server. Defaulting to '{0}'",
5+
"Could not find Razor Language Server executable within directory '{0}'": "Could not find Razor Language Server executable within directory '{0}'",
6+
"Server failed to start after retrying 5 times.": "Server failed to start after retrying 5 times.",
7+
"Razor Language Server failed to start unexpectedly, please check the 'Razor Log' and report an issue.": "Razor Language Server failed to start unexpectedly, please check the 'Razor Log' and report an issue.",
8+
"Tried to send requests while server is not started.": "Tried to send requests while server is not started.",
9+
"Tried to bind on request logic while server is not started.": "Tried to bind on request logic while server is not started.",
10+
"Tried to bind on notification logic while server is not started.": "Tried to bind on notification logic while server is not started.",
11+
"Cannot stop Razor Language Server as it is already stopped.": "Cannot stop Razor Language Server as it is already stopped.",
12+
"Razor Language Server failed to stop correctly, please check the 'Razor Log' and report an issue.": "Razor Language Server failed to stop correctly, please check the 'Razor Log' and report an issue.",
13+
"Would you like to restart the Razor Language Server to enable the Razor trace configuration change?": "Would you like to restart the Razor Language Server to enable the Razor trace configuration change?",
14+
"Restart": "Restart",
15+
"Razor HTML Preview": "Razor HTML Preview",
16+
"Unexpected error when attaching to HTML preview window.": "Unexpected error when attaching to HTML preview window.",
17+
"Razor HTML copied to clipboard": "Razor HTML copied to clipboard",
18+
"Report a Razor issue": "Report a Razor issue",
19+
"Host document file path": "Host document file path",
20+
"Virtual document file path": "Virtual document file path",
21+
"Copy Html": "Copy Html",
22+
"Token cancellation requested: {0}": "Token cancellation requested: {0}",
23+
"Synchronization timed out": "Synchronization timed out",
24+
"Report Razor Issue": "Report Razor Issue",
25+
"Unexpected error when attaching to report Razor issue window.": "Unexpected error when attaching to report Razor issue window.",
26+
"You must first start the data collection before copying.": "You must first start the data collection before copying.",
27+
"Razor issue copied to clipboard": "Razor issue copied to clipboard",
28+
"Razor issue data collection started. Reproduce the issue then press \"Stop\"": "Razor issue data collection started. Reproduce the issue then press \"Stop\"",
29+
"You must first start the data collection before stopping.": "You must first start the data collection before stopping.",
30+
"Razor issue data collection stopped. Copying issue content...": "Razor issue data collection stopped. Copying issue content...",
31+
"Start": "Start",
32+
"Press {0}": "Press {0}",
33+
"Perform the actions (or no action) that resulted in your Razor issue": "Perform the actions (or no action) that resulted in your Razor issue",
34+
"Stop": "Stop",
35+
"Click {0}. This will copy all relevant issue information.": "Click {0}. This will copy all relevant issue information.",
36+
"Go to GitHub": "Go to GitHub",
37+
"{0}, paste your issue contents as the body of the issue. Don't forget to fill out any details left unfilled.": "{0}, paste your issue contents as the body of the issue. Don't forget to fill out any details left unfilled.",
38+
"Privacy Alert! The contents copied to your clipboard may contain personal data. Prior to posting to GitHub, please remove any personal data which should not be publicly viewable.": "Privacy Alert! The contents copied to your clipboard may contain personal data. Prior to posting to GitHub, please remove any personal data which should not be publicly viewable.",
39+
"Copy issue content again": "Copy issue content again",
40+
"Cannot start collecting Razor logs when {0} is set to {1}. Please set {0} to {2} and then reload your VSCode environment and re-run the report Razor issue command.": "Cannot start collecting Razor logs when {0} is set to {1}. Please set {0} to {2} and then reload your VSCode environment and re-run the report Razor issue command.",
41+
"Non Razor file as active document": "Non Razor file as active document",
42+
"Could not determine CSharp content": "Could not determine CSharp content",
43+
"Could not determine Html content": "Could not determine Html content",
44+
"A valid dotnet installation could not be found: {0}": "A valid dotnet installation could not be found: {0}",
45+
"Is this a Bug or Feature request?": "Is this a Bug or Feature request?",
46+
"Bug": "Bug",
47+
"Steps to reproduce": "Steps to reproduce",
48+
"Please fill in this section": "Please fill in this section",
49+
"Description of the problem": "Description of the problem",
50+
"Expected behavior": "Expected behavior",
51+
"Actual behavior": "Actual behavior",
52+
"Logs": "Logs",
53+
"OmniSharp": "OmniSharp",
54+
"Razor": "Razor",
55+
"Expand": "Expand",
56+
"Workspace information": "Workspace information",
57+
"Razor document": "Razor document",
58+
"Projected CSharp document": "Projected CSharp document",
59+
"Projected Html document": "Projected Html document",
60+
"Machine information": "Machine information",
61+
"Razor.VSCode version": "Razor.VSCode version",
62+
"VSCode version": "VSCode version",
63+
"Extensions": "Extensions",
64+
"Projected CSharp as seen by extension": "Projected CSharp as seen by extension",
65+
"Unable to resolve VSCode's version of CSharp": "Unable to resolve VSCode's version of CSharp",
66+
"Projected Html as seen by extension": "Projected Html as seen by extension",
67+
"Unable to resolve VSCode's version of Html": "Unable to resolve VSCode's version of Html",
68+
"Unable to find Razor extension version.": "Unable to find Razor extension version.",
69+
"Extension": "Extension",
70+
"Author": "Author",
71+
"Version": "Version",
72+
"Razor C# Preview": "Razor C# Preview",
73+
"Unexpected error when attaching to C# preview window.": "Unexpected error when attaching to C# preview window.",
74+
"Razor C# copied to clipboard": "Razor C# copied to clipboard",
75+
"Copy C#": "Copy C#",
76+
"Unexpected completion trigger kind: {0}": "Unexpected completion trigger kind: {0}",
77+
"1 reference": "1 reference",
78+
"{0} references": "{0} references",
79+
"Run and Debug: auto-detection found {0} for a launch browser": "Run and Debug: auto-detection found {0} for a launch browser",
80+
"There was an unexpected error while launching your debugging session. Check the console for helpful logs and visit the debugging docs for more info.": "There was an unexpected error while launching your debugging session. Check the console for helpful logs and visit the debugging docs for more info.",
81+
"View Debug Docs": "View Debug Docs",
82+
"Ignore": "Ignore",
83+
"Run and Debug: A valid browser is not installed": "Run and Debug: A valid browser is not installed",
84+
"Restart Language Server": "Restart Language Server"
85+
}

loc/LocProject.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"Projects": [
3+
{
4+
"LanguageSet": "VS_Main_Languages",
5+
"LocItems": [
6+
{
7+
"SourceFile": "./loc/vscode-csharp.xlf",
8+
"CopyOption": "LangIDOnName",
9+
"OutputPath": "./loc/"
10+
}
11+
]
12+
}
13+
]
14+
}

0 commit comments

Comments
 (0)