Skip to content

Commit 6d85f9c

Browse files
sean-mcmanussean-mcmanus
committed
Merge branch 'main' into seanmcm/1_4_0_release
2 parents 1d0a886 + 58d3a52 commit 6d85f9c

File tree

2 files changed

+25
-31
lines changed

2 files changed

+25
-31
lines changed

‎Build/loc/TranslationsImportExport.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ schedules:
1616
branches:
1717
include:
1818
- main
19+
always: true
1920

2021
pool:
2122
vmImage: 'windows-latest'

‎Extension/package.json

Lines changed: 24 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@
6363
"description": "The C++ extension uses the C++ compiler on your system to configure IntelliSense for your project. \n[Check for C++ compilers](command:C_Cpp.CheckForCompiler)",
6464
"when": "workspacePlatform == mac",
6565
"media": {
66-
"altText": "A markdown file with instructions for installing Clang on macOS.",
67-
"path": "walkthrough/installcompiler/install-clang-macos.md"
66+
"markdown": "walkthrough/installcompiler/install-clang-macos.md"
6867
}
6968
},
7069
{
@@ -73,8 +72,7 @@
7372
"description": "The C++ extension uses the C++ compiler on your system to configure IntelliSense for your project. \n[Check for C++ compilers](command:C_Cpp.CheckForCompiler)",
7473
"when": "workspacePlatform == linux",
7574
"media": {
76-
"altText": "A markdown file with instructions for installing GCC on Linux.",
77-
"path": "walkthrough/installcompiler/install-gcc-linux.md"
75+
"markdown": "walkthrough/installcompiler/install-gcc-linux.md"
7876
}
7977
},
8078
{
@@ -83,8 +81,7 @@
8381
"description": "The C++ extension uses the C++ compiler on your system to configure IntelliSense for your project. \n[Check for C++ compilers](command:C_Cpp.CheckForCompiler)",
8482
"when": "workspacePlatform == windows",
8583
"media": {
86-
"altText": "A markdown file with instructions for installing MSVC on Windows.",
87-
"path": "walkthrough/installcompiler/install-compiler-windows.md"
84+
"markdown": "walkthrough/installcompiler/install-compiler-windows.md"
8885
}
8986
},
9087
{
@@ -94,7 +91,7 @@
9491
"when": "workspaceFolderCount == 0",
9592
"media": {
9693
"altText": "A screenshot that shows a C++ project opened in the file Explorer.",
97-
"path": {
94+
"image": {
9895
"light": "walkthrough/images/cpp-folder-explorer-light.png",
9996
"dark": "walkthrough/images/cpp-folder-explorer-dark.png",
10097
"hc": "walkthrough/images/cpp-folder-explorer-hc.png"
@@ -107,7 +104,7 @@
107104
"description": "Verify important IntelliSense settings like Compiler Path, Compiler Args, IntelliSense Mode, and Include Path. \n[Open IntelliSense Configuration](command:C_Cpp.ConfigurationEditUI?-2)",
108105
"media": {
109106
"altText": "A screenshot that shows the IntelliSense Configurations UI with important settings highlighted.",
110-
"path": {
107+
"image": {
111108
"light": "walkthrough/images/intellisense-config-light.png",
112109
"dark": "walkthrough/images/intellisense-config-dark.png",
113110
"hc": "walkthrough/images/intellisense-config-hc.png"
@@ -120,8 +117,7 @@
120117
"description": "Create a default build task and debug configuration for your project. \n[Learn more](https://code.visualstudio.com/docs/cpp/config-clang-mac#_debug-helloworldcpp)",
121118
"when": "workspacePlatform == mac",
122119
"media": {
123-
"altText": "A markdown file with instructions for starting a debugging session on macOS.",
124-
"path": "walkthrough/debugconfig/run-and-debug-project-mac.md"
120+
"markdown": "walkthrough/debugconfig/run-and-debug-project-mac.md"
125121
}
126122
},
127123
{
@@ -130,8 +126,7 @@
130126
"description": "Create a default build task and debug configuration for your project. \n[Learn more](https://code.visualstudio.com/docs/cpp/config-linux#_debug-helloworldcpp)",
131127
"when": "workspacePlatform == linux",
132128
"media": {
133-
"altText": "A markdown file with instructions for starting a debugging session on Linux.",
134-
"path": "walkthrough/debugconfig/run-and-debug-project-linux.md"
129+
"markdown": "walkthrough/debugconfig/run-and-debug-project-linux.md"
135130
}
136131
},
137132
{
@@ -140,8 +135,7 @@
140135
"description": "Create a default build task and debug configuration for your project. \n[Learn more](https://code.visualstudio.com/docs/cpp/config-msvc#_debug-helloworldcpp)",
141136
"when": "workspacePlatform == windows",
142137
"media": {
143-
"altText": "A markdown file with instructions for starting a debugging session on Windows.",
144-
"path": "walkthrough/debugconfig/run-and-debug-project-windows.md"
138+
"markdown": "walkthrough/debugconfig/run-and-debug-project-windows.md"
145139
}
146140
},
147141
{
@@ -153,7 +147,7 @@
153147
],
154148
"media": {
155149
"altText": "A screenshot of the CMake Tools extension page in the Marketplace.",
156-
"path": {
150+
"image": {
157151
"light": "walkthrough/images/cmake-tools-light.png",
158152
"dark": "walkthrough/images/cmake-tools-dark.png",
159153
"hc": "walkthrough/images/cmake-tools-hc.png"
@@ -165,8 +159,7 @@
165159
"title": "Lean back and get started",
166160
"description": "Watch this series of short and practical videos about setting up C++ IntelliSense and building and debugging C++ projects. \n[Watch Tutorials](https://code.visualstudio.com/docs/cpp/introvideos-cpp)",
167161
"media": {
168-
"altText": "A screenshot with a preview of the video tutorial and a play button.",
169-
"path": "walkthrough/images/getting-started-video.png"
162+
"markdown": "walkthrough/images/getting-started-video.png"
170163
}
171164
}
172165
]
@@ -2647,7 +2640,7 @@
26472640
"runtimeDependencies": [
26482641
{
26492642
"description": "C/C++ language components (Linux / x86_64)",
2650-
"url": "https://go.microsoft.com/fwlink/?linkid=2161011",
2643+
"url": "https://go.microsoft.com/fwlink/?linkid=2164295",
26512644
"platforms": [
26522645
"linux"
26532646
],
@@ -2658,11 +2651,11 @@
26582651
"./bin/cpptools",
26592652
"./bin/cpptools-srv"
26602653
],
2661-
"integrity": "7C43AA78021C5DB8F6DE9751EC8435D2BE1137CAC861801CDFADAA4B48A42AC3"
2654+
"integrity": "2E6E25B3B9C10ECC25A5B523C413182D185F13492602CF92896C658E6959CBFA"
26622655
},
26632656
{
26642657
"description": "C/C++ language components (Linux / armhf)",
2665-
"url": "https://go.microsoft.com/fwlink/?linkid=2160914",
2658+
"url": "https://go.microsoft.com/fwlink/?linkid=2164297",
26662659
"platforms": [
26672660
"linux"
26682661
],
@@ -2673,11 +2666,11 @@
26732666
"./bin/cpptools",
26742667
"./bin/cpptools-srv"
26752668
],
2676-
"integrity": "ED83E6E0F5784323CDF42BA1EF57CDFFBF2A81D468B08C8ECF126A2D042343F2"
2669+
"integrity": "25F5776247184254D49B9FCC25D0D018AECF1D8930FC517F25C9FCC0A9E650AC"
26772670
},
26782671
{
26792672
"description": "C/C++ language components (Linux / aarch64)",
2680-
"url": "https://go.microsoft.com/fwlink/?linkid=2160915",
2673+
"url": "https://go.microsoft.com/fwlink/?linkid=2165100",
26812674
"platforms": [
26822675
"linux"
26832676
],
@@ -2688,11 +2681,11 @@
26882681
"./bin/cpptools",
26892682
"./bin/cpptools-srv"
26902683
],
2691-
"integrity": "52DD114FF466FA3542D7F98F12716E4296712986CA4908B18DCC039209B8D2CC"
2684+
"integrity": "186614524A13EC75BF68798861818D25CE82FDE293C57B725C11F62B0694EC55"
26922685
},
26932686
{
26942687
"description": "C/C++ language components (OS X)",
2695-
"url": "https://go.microsoft.com/fwlink/?linkid=2161012",
2688+
"url": "https://go.microsoft.com/fwlink/?linkid=2164296",
26962689
"platforms": [
26972690
"darwin"
26982691
],
@@ -2703,11 +2696,11 @@
27032696
"./bin/cpptools",
27042697
"./bin/cpptools-srv"
27052698
],
2706-
"integrity": "53654F3D21C5D470D3C05EA48CFB7AB3CB197344049DC55AEB07374AFECD1587"
2699+
"integrity": "8E19E1BDD95FCC80F74529E6B5C24AB761F7D84B92CF44C33DAE38A8F11F6FB5"
27072700
},
27082701
{
27092702
"description": "C/C++ language components (OS X ARM64)",
2710-
"url": "https://go.microsoft.com/fwlink/?linkid=2160918",
2703+
"url": "https://go.microsoft.com/fwlink/?linkid=2164187",
27112704
"platforms": [
27122705
"darwin"
27132706
],
@@ -2718,11 +2711,11 @@
27182711
"./bin/cpptools",
27192712
"./bin/cpptools-srv"
27202713
],
2721-
"integrity": "E00370987D321E5AB58894B95F1545B52F59ED8E548BE1CBC8393F8B63562BDE"
2714+
"integrity": "1225791C05E0DBD708D0EE9598ACBC94B742E25C7CAE92C5C89791AF924D4B96"
27222715
},
27232716
{
27242717
"description": "C/C++ language components (Windows)",
2725-
"url": "https://go.microsoft.com/fwlink/?linkid=2160913",
2718+
"url": "https://go.microsoft.com/fwlink/?linkid=2164298",
27262719
"platforms": [
27272720
"win32"
27282721
],
@@ -2734,11 +2727,11 @@
27342727
"./bin/cpptools.exe",
27352728
"./bin/cpptools-srv.exe"
27362729
],
2737-
"integrity": "970504DB40E0B54E48075C1FBCE0F34AB674DE3F1CCAD51FFA04689513CC8013"
2730+
"integrity": "8D9E008B789D13DF4175795400E9402D43D199846CEC1DC4DD1F319B4C0D5492"
27382731
},
27392732
{
27402733
"description": "C/C++ language components (Windows ARM64)",
2741-
"url": "https://go.microsoft.com/fwlink/?linkid=2160916",
2734+
"url": "https://go.microsoft.com/fwlink/?linkid=2165101",
27422735
"platforms": [
27432736
"win32"
27442737
],
@@ -2749,7 +2742,7 @@
27492742
"./bin/cpptools.exe",
27502743
"./bin/cpptools-srv.exe"
27512744
],
2752-
"integrity": "E85CF0C80B64F940F73E158966749C0A95D122907170CACECDCBB118986D0E57"
2745+
"integrity": "4B94A64721FE8D0E1F93AACBA1190A9DC00DF7225E20BF628AC57BEC6301AA7D"
27532746
},
27542747
{
27552748
"description": "ClangFormat (Linux / x86_64)",

0 commit comments

Comments
 (0)