diff options
| author | Jeremy Koritzinsky <jekoritz@microsoft.com> | 2022-03-03 04:07:43 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-03 04:07:43 +0300 |
| commit | 1e529bcbb641db19b1b9cc28a2213f8f90ef36a7 (patch) | |
| tree | 27c4138d251b196529d0265f6d3e3e12739a5c8c /eng | |
| parent | 1d60246366fb9e3de61e0a519b7813c4fcffd157 (diff) | |
Update Roslyn and use new step tracking API in incremental tests. (#63978)
Diffstat (limited to 'eng')
| -rw-r--r-- | eng/Versions.props | 25 | ||||
| -rwxr-xr-x | eng/formatting/format.sh | 1 |
2 files changed, 17 insertions, 9 deletions
diff --git a/eng/Versions.props b/eng/Versions.props index 08785bb49e7..9a19144b0ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,20 +22,27 @@ <LastReleasedStableAssemblyVersion>$(AssemblyVersion)</LastReleasedStableAssemblyVersion> <UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers> </PropertyGroup> + <!-- + For source generator support we need to target multiple versions of Rolsyn in order to be able to run on older versions of Roslyn. + We pin these versions as we need to match them exactly for any scenarios that run Roslyn on .NET Framework, like Visual Studio. + --> <PropertyGroup> - <!-- For source generator support we need to target multiple versions of Rolsyn in order to be able to run on older versions of Roslyn --> - <MicrosoftCodeAnalysisCSharpWorkspacesVersion_3_11>3.11.0</MicrosoftCodeAnalysisCSharpWorkspacesVersion_3_11> - <MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.0.1</MicrosoftCodeAnalysisCSharpWorkspacesVersion> - <MicrosoftCodeAnalysisVersion>4.0.1</MicrosoftCodeAnalysisVersion> + <MicrosoftCodeAnalysisVersion_3_11>3.11.0</MicrosoftCodeAnalysisVersion_3_11> + <MicrosoftCodeAnalysisVersion_4_0>4.0.1</MicrosoftCodeAnalysisVersion_4_0> </PropertyGroup> <PropertyGroup> <!-- Code analysis dependencies --> - <MicrosoftCodeAnalysisAnalyzersVersion>3.3.2</MicrosoftCodeAnalysisAnalyzersVersion> - <MicrosoftCodeAnalysisCSharpCodeStyleVersion>4.0.1</MicrosoftCodeAnalysisCSharpCodeStyleVersion> - <MicrosoftCodeAnalysisCSharpVersion>4.0.1</MicrosoftCodeAnalysisCSharpVersion> + <MicrosoftCodeAnalysisAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisAnalyzersVersion> + <MicrosoftCodeAnalysisCSharpCodeStyleVersion>4.2.0-2.22128.1</MicrosoftCodeAnalysisCSharpCodeStyleVersion> + <MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.2.0-2.22128.1</MicrosoftCodeAnalysisCSharpWorkspacesVersion> + <MicrosoftCodeAnalysisCSharpVersion>4.2.0-2.22128.1</MicrosoftCodeAnalysisCSharpVersion> <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22119.1</MicrosoftCodeAnalysisNetAnalyzersVersion> - <!-- TODO: Remove pinned compiler version once arcade supplies runtime with a compiler capable of handling !! --> - <MicrosoftNetCompilersToolsetVersion>4.2.0-2.22105.4</MicrosoftNetCompilersToolsetVersion> + <MicrosoftCodeAnalysisVersion>4.2.0-2.22128.1</MicrosoftCodeAnalysisVersion> + <!-- + TODO: Remove pinned compiler version once arcade supplies runtime with a compiler capable of handling !! + and has https://github.com/dotnet/roslyn/pull/59776 + --> + <MicrosoftNetCompilersToolsetVersion>4.2.0-2.22128.1</MicrosoftNetCompilersToolsetVersion> <!-- SDK dependencies --> <MicrosoftDotNetCompatibilityVersion>2.0.0-alpha.1.21525.11</MicrosoftDotNetCompatibilityVersion> <!-- Arcade dependencies --> diff --git a/eng/formatting/format.sh b/eng/formatting/format.sh index 077bbd750fe..ac044fef440 100755 --- a/eng/formatting/format.sh +++ b/eng/formatting/format.sh @@ -14,6 +14,7 @@ if [ -n "$NATIVE_FILES" ]; then # Add back the modified files to staging echo "$NATIVE_FILES" | xargs git add fi + if [ -n "$MANAGED_FILES" ]; then # Format all selected files echo "$MANAGED_FILES" | cat | xargs | sed -e 's/ /,/g' | dotnet format --no-restore --include - |