Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge master to master-vs-deps #51558

Merged
8 commits merged into from
Mar 1, 2021
Merged

Merge master to master-vs-deps #51558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0b3ee6f
Update ConvertConcatenationToInterpolatedStringTests to the new test …
sharwell Feb 26, 2021
6337502
Fix failure to set value text for interpolated strings
sharwell Feb 26, 2021
835d117
Fix errors in test inputs
sharwell Feb 26, 2021
cd34c75
Support constant interpolated strings
sharwell Feb 26, 2021
d1f0412
Cleanup MEF attributes
sharwell Feb 27, 2021
34cb747
Enable nullable reference types
sharwell Feb 28, 2021
b2f18d3
Merge pull request #51517 from sharwell/constants
sharwell Mar 1, 2021
478adbc
Update dependencies from https://github.com/dotnet/roslyn build 20210…
dotnet-maestro[bot] Mar 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4957a6f3dd5f6fd1ca9ff06f9c50402f2e3b17e8</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.10.0-2.21122.2">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.10.0-2.21151.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>686f13c61b1e26071ae89e107b0a3407a6b93a74</Sha>
<Sha>c933ed58c3edd70916d2fd676db49c40035b5cac</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21118.7">
<Uri>https://github.com/dotnet/arcade</Uri>
Expand Down
5 changes: 1 addition & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</MajorVersion>
<MinorVersion>
</MinorVersion>
<MicrosoftNetCompilersToolsetVersion>3.10.0-2.21122.2</MicrosoftNetCompilersToolsetVersion>
<MicrosoftNetCompilersToolsetVersion>3.10.0-2.21151.4</MicrosoftNetCompilersToolsetVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Versions used by several individual references below -->
Expand Down Expand Up @@ -246,15 +246,12 @@
<xunitrunnerwpfVersion>1.0.51</xunitrunnerwpfVersion>
<xunitrunnervisualstudioVersion>$(xunitVersion)</xunitrunnervisualstudioVersion>
<xunitextensibilityexecutionVersion>$(xunitVersion)</xunitextensibilityexecutionVersion>

<runtimeWinX64MicrosoftNETCoreILAsmPackageVersion>$(ILAsmPackageVersion)</runtimeWinX64MicrosoftNETCoreILAsmPackageVersion>
<runtimeLinuxX64MicrosoftNETCoreILAsmPackageVersion>$(ILAsmPackageVersion)</runtimeLinuxX64MicrosoftNETCoreILAsmPackageVersion>
<runtimeOSXX64MicrosoftNETCoreILAsmPackageVersion>$(ILAsmPackageVersion)</runtimeOSXX64MicrosoftNETCoreILAsmPackageVersion>

<runtimeWinX64MicrosoftNETCoreILDAsmPackageVersion>$(ILDAsmPackageVersion)</runtimeWinX64MicrosoftNETCoreILDAsmPackageVersion>
<runtimeLinuxX64MicrosoftNETCoreILDAsmPackageVersion>$(ILDAsmPackageVersion)</runtimeLinuxX64MicrosoftNETCoreILDAsmPackageVersion>
<runtimeOSXX64MicrosoftNETCoreILDAsmPackageVersion>$(ILDAsmPackageVersion)</runtimeOSXX64MicrosoftNETCoreILDAsmPackageVersion>

<!--
NOTE: The following dependencies have been identified as particularly problematic to update.
If you bump their versions, you must push your changes to a dev branch in dotnet/roslyn and
Expand Down
Loading