Skip to content

Commit f2bff94

Browse files
lizharemslizharems
authored
Merge pull request #1 from dotnet/main
update
2 parents d7439d3 + 3f41545 commit f2bff94

Some content is hidden

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

52 files changed

+906
-594
lines changed

‎.config/branch-merge.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"merge-flow-configurations": {
3+
// Merge any prerelease only changes to main.
4+
"prerelease": {
5+
"MergeToBranch": "main",
6+
"ExtraSwitches": "-QuietComments"
7+
},
8+
// Merge any release only changes to main.
9+
"release": {
10+
"MergeToBranch": "release",
11+
"ExtraSwitches": "-QuietComments"
12+
}
13+
}
14+
}

‎.config/snap-flow.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// ONLY THE VERSION OF THIS FILE IN THE MAIN BRANCH IS USED!
2+
{
3+
"merge-flow-configurations": {
4+
// format of this section is
5+
// "source-branch-name": {
6+
// "MergeToBranch": "target-branch-name"
7+
// },
8+
"main": {
9+
// The MergeToBranch property should be presented in the object in order the merge flow to work
10+
"MergeToBranch": "prerelease",
11+
// ExtraSwitches is an optional parameter which is accepted by the script: https://github.com/dotnet/arcade/blob/main/.github/workflows/inter-branch-merge-base.yml. Accepted values are similar to the values from the version file: https://github.com/dotnet/versions/blob/main/Maestro/subscriptions.json
12+
"ExtraSwitches": "-QuietComments"
13+
},
14+
"prerelease": {
15+
"MergeToBranch": "release",
16+
// ExtraSwitches is an optional parameter which is accepted by the script: https://github.com/dotnet/arcade/blob/main/.github/workflows/inter-branch-merge-base.yml. Accepted values are similar to the values from the version file: https://github.com/dotnet/versions/blob/main/Maestro/subscriptions.json
17+
"ExtraSwitches": "-QuietComments"
18+
}
19+
}
20+
}

‎.gitattributes

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@
22
l10n/bundle.l10n.json text eol=lf
33

44
# This is a Unix shell script, so it always use the 'lf' line ends
5-
scripts/remoteProcessPickerScript text eol=lf
5+
scripts/remoteProcessPickerScript text eol=lf
6+
7+
# This is a generated file. Set it to 'lf' so we don't get git errors when it is generated on Windows.
8+
src/razor/syntaxes/aspnetcorerazor.tmLanguage.json eol=lf

‎.github/workflows/branch-merge.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Merges any changes from release/prerelease to main (e.g. servicing changes)
2+
3+
name: Flow release/prerelease changes to main
4+
on:
5+
workflow_dispatch:
6+
schedule:
7+
- cron: '0 */3 * * *'
8+
9+
permissions:
10+
contents: write
11+
pull-requests: write
12+
13+
jobs:
14+
check-script:
15+
uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
16+
with:
17+
configuration_file_path: '.config/branch-merge.json'

‎.github/workflows/branch-snap.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Branch snap
2+
on:
3+
workflow_dispatch
4+
5+
permissions:
6+
contents: write
7+
pull-requests: write
8+
9+
jobs:
10+
check-script:
11+
uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
12+
with:
13+
configuration_file_path: '.config/snap-flow.json'
14+
15+
create-pull-request:
16+
if: github.ref == 'refs/heads/main'
17+
runs-on: ubuntu-latest
18+
steps:
19+
- name: Check out
20+
uses: actions/checkout@v2
21+
- name: Install NodeJS
22+
uses: actions/setup-node@v4
23+
with:
24+
node-version: '18.x'
25+
- name: Install dependencies
26+
run: npm ci
27+
- name: Update version.json
28+
run: npx gulp incrementVersionJson
29+
- name: Create version.json update PR
30+
uses: peter-evans/create-pull-request@v4
31+
with:
32+
token: ${{ secrets.GITHUB_TOKEN }}
33+
commit-message: Update main version
34+
title: 'Update main version'
35+
branch: merge/update-main-version

‎.vscodeignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
!.razorDevKit/**
99
!.razoromnisharp/**
1010
.rpt2_cache/**
11+
.config/**
1112
.github/**
1213
.vscode/**
1314
.vscode-test/**

‎CHANGELOG.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@
44
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
55

66
# Latest
7-
* Update Razor to 9.0.0-preview.24360.1 (PR: [#7327](https://github.com/dotnet/vscode-csharp/pull/7327))
7+
8+
# 2.39.x
9+
* Add language status bar item displaying project context for open files (PR: [#7321](https://github.com/dotnet/vscode-csharp/pull/7321), PR: [#7333](https://github.com/dotnet/vscode-csharp/pull/7333))
10+
* Add language status bar item for workspace status (C# standalone) (PR: [#7254](https://github.com/dotnet/vscode-csharp/pull/7254), PR: [#7329])https://github.com/dotnet/vscode-csharp/pull/7329))
11+
* Update Razor to 9.0.0-preview.24365.1 (PR: [#7354](https://github.com/dotnet/vscode-csharp/pull/7354))
12+
* Fix project info reading (PR: [#10623](https://github.com/dotnet/razor/pull/10623))
13+
* Fix NRE when invoking completion in empty document (PR: [#10610](https://github.com/dotnet/razor/pull/10610))
814
* Improve perf in generator cache cases (PR: [#10577](https://github.com/dotnet/razor/pull/10577))
915
* Handle InsertReplaceEdit for completion (PR: [#10563](https://github.com/dotnet/razor/pull/10563))
1016
* Use System.Text.Json for serialization (PR: [#10551](https://github.com/dotnet/razor/pull/10551))
@@ -32,8 +38,10 @@
3238
* Avoid re-running all codeaction requests at low priority (PR: [#74083](https://github.com/dotnet/roslyn/pull/74083))
3339
* Reduce time spent in ConflictResolver.Session.GetNodesOrTokensToCheckForConflicts (PR: [#74101](https://github.com/dotnet/roslyn/pull/74101))
3440
* Avoid allocations in AbstractSyntaxIndex<>.GetIndexAsync( PR: [#74075](https://github.com/dotnet/roslyn/pull/74075))
35-
* Bump xamltools to 17.12.35103.251 (PR: [#7309](https://github.com/dotnet/vscode-csharp/pull/7309))
41+
* Bump xamltools to 17.12.35112.24 (PR: [#7309](https://github.com/dotnet/vscode-csharp/pull/7334))
3642
* Fixed issue with Exception type related to https://github.com/microsoft/vscode-dotnettools/issues/1247
43+
* Fixed Hot Reload not working on some Android device models: https://github.com/microsoft/vscode-dotnettools/issues/1241
44+
3745

3846
# 2.38.16
3947
* Start localizing additional strings (PR: [#7305](https://github.com/dotnet/vscode-csharp/pull/7305))

‎gulpfile.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ require('./tasks/backcompatTasks');
99
require('./tasks/localizationTasks');
1010
require('./tasks/createTagsTasks');
1111
require('./tasks/debuggerTasks');
12+
require('./tasks/snapTasks');

0 commit comments

Comments
 (0)