Skip to content

Commit 081a7a5

Browse files
RikkiGibsonRikkiGibson
authored
Merge pull request #41725 from RikkiGibson/lfa-inlineStatementParsing
Merge master to local-function-attributes
2 parents 74b47ab + 125f93f commit 081a7a5

File tree

475 files changed

+8456
-70439
lines changed

Some content is hidden

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

475 files changed

+8456
-70439
lines changed

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20113.6">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20118.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>ba6bfb25914e3434264352dd24ba00b406d23393</Sha>
8+
<Sha>b40d0c89c230189b4c6aeb32c0a43218b4bc3359</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<!-- Versions used by several individual references below -->
2929
<RoslynDiagnosticsNugetPackageVersion>3.0.0-beta2.20059.3+77df2220</RoslynDiagnosticsNugetPackageVersion>
3030
<CodeStyleLayerCodeAnalysisVersion>3.3.1</CodeStyleLayerCodeAnalysisVersion>
31-
<MicrosoftCodeAnalysisTestingVersion>1.0.1-beta1.20067.1</MicrosoftCodeAnalysisTestingVersion>
31+
<MicrosoftCodeAnalysisTestingVersion>1.0.1-beta1.20118.1</MicrosoftCodeAnalysisTestingVersion>
3232
<CodeStyleAnalyzerVersion>3.5.0-beta3-20078-04</CodeStyleAnalyzerVersion>
3333
<VisualStudioEditorPackagesVersion>16.4.248</VisualStudioEditorPackagesVersion>
3434
<ILToolsPackageVersion>5.0.0-alpha1.19409.1</ILToolsPackageVersion>
@@ -97,7 +97,7 @@
9797
<MicrosoftVisualStudioCodeAnalysisSdkUIVersion>15.8.27812-alpha</MicrosoftVisualStudioCodeAnalysisSdkUIVersion>
9898
<MicrosoftVisualStudioCodingConventionsVersion>1.1.20180503.2</MicrosoftVisualStudioCodingConventionsVersion>
9999
<MicrosoftVisualStudioComponentModelHostVersion>16.0.198-g52de9c2988</MicrosoftVisualStudioComponentModelHostVersion>
100-
<MicrosoftVisualStudioCompositionVersion>15.5.23</MicrosoftVisualStudioCompositionVersion>
100+
<MicrosoftVisualStudioCompositionVersion>15.6.36</MicrosoftVisualStudioCompositionVersion>
101101
<MicrosoftVisualStudioCoreUtilityVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioCoreUtilityVersion>
102102
<MicrosoftVisualStudioDebuggerUIInterfacesVersion>16.0.29431.108</MicrosoftVisualStudioDebuggerUIInterfacesVersion>
103103
<MicrosoftVisualStudioDebuggerEngineimplementationVersion>16.4.1091102-preview</MicrosoftVisualStudioDebuggerEngineimplementationVersion>

‎eng/common/tools.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ function GetDotNetInstallScript {
252252

253253
# Use curl if available, otherwise use wget
254254
if command -v curl > /dev/null; then
255-
with_retries curl "$install_script_url" -isSLv --retry 10 --create-dirs -o "$install_script" || {
255+
with_retries curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || {
256256
local exit_code=$?
257257
Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')."
258258
ExitWithExitCode $exit_code

‎eng/config/PublishData.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"version": "3.5.*",
6060
"nuget": [ "https://dotnet.myget.org/F/roslyn/api/v2/package" ],
6161
"vsix": [ "https://dotnet.myget.org/F/roslyn/vsix/upload" ],
62-
"channels": [ "dev16.5", "dev16.5p3" ],
62+
"channels": [ "dev16.5", "dev16.5p4" ],
6363
"vsBranch": "rel/d16.5",
6464
"vsMajorVersion": 16
6565
},

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
"xcopy-msbuild": "16.4.0-alpha"
88
},
99
"msbuild-sdks": {
10-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20113.6"
10+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20118.1"
1111
}
1212
}

‎src/Analyzers/CSharp/Analyzers/CSharpAnalyzers.projitems‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,7 @@
88
<PropertyGroup Label="Configuration">
99
<Import_RootNamespace>Microsoft.CodeAnalysis.CSharp.Analyzers</Import_RootNamespace>
1010
</PropertyGroup>
11+
<ItemGroup>
12+
<EmbeddedResource Include="$(MSBuildThisFileDirectory)CSharpAnalyzersResources.resx" GenerateSource="true" />
13+
</ItemGroup>
1114
</Project>

‎src/Compilers/VisualBasic/Test/CommandLine/CommandLineTestResources.resx‎ renamed to ‎src/Analyzers/CSharp/Analyzers/CSharpAnalyzersResources.resx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121-
<data name="vbc_rsp" type="System.Resources.ResXFileRef, System.Windows.Forms">
122-
<value>../../vbc/vbc.rsp;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
120+
<data name="EmptyResource" xml:space="preserve">
121+
<value>Remove this value when another is added.</value>
122+
<comment>https://github.com/Microsoft/msbuild/issues/1661</comment>
123123
</data>
124-
</root>
124+
</root>

‎src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.cs.xlf‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
3+
<file datatype="xml" source-language="en" target-language="cs" original="../CSharpAnalyzersResources.resx">
4+
<body>
5+
<trans-unit id="EmptyResource">
6+
<source>Remove this value when another is added.</source>
7+
<target state="new">Remove this value when another is added.</target>
8+
<note>https://github.com/Microsoft/msbuild/issues/1661</note>
9+
</trans-unit>
10+
</body>
11+
</file>
12+
</xliff>

‎src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.de.xlf‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
3+
<file datatype="xml" source-language="en" target-language="de" original="../CSharpAnalyzersResources.resx">
4+
<body>
5+
<trans-unit id="EmptyResource">
6+
<source>Remove this value when another is added.</source>
7+
<target state="new">Remove this value when another is added.</target>
8+
<note>https://github.com/Microsoft/msbuild/issues/1661</note>
9+
</trans-unit>
10+
</body>
11+
</file>
12+
</xliff>

‎src/Analyzers/CSharp/Analyzers/xlf/CSharpAnalyzersResources.es.xlf‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
3+
<file datatype="xml" source-language="en" target-language="es" original="../CSharpAnalyzersResources.resx">
4+
<body>
5+
<trans-unit id="EmptyResource">
6+
<source>Remove this value when another is added.</source>
7+
<target state="new">Remove this value when another is added.</target>
8+
<note>https://github.com/Microsoft/msbuild/issues/1661</note>
9+
</trans-unit>
10+
</body>
11+
</file>
12+
</xliff>

0 commit comments

Comments
 (0)