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

[release/8.0] Update dependencies from dotnet/roslyn #92149

Merged
merged 12 commits into from
Sep 19, 2023
Merged

[release/8.0] Update dependencies from dotnet/roslyn #92149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
64c60e1
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 15, 2023
08ef104
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 15, 2023
d9d50c6
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 16, 2023
b8cb5dc
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 16, 2023
de991dd
Use InterceptorsPreviewNamespaces instead of the InterceptorsPreview …
carlossanlop Sep 18, 2023
c418166
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 18, 2023
05832b1
Bring back removed lines
carlossanlop Sep 18, 2023
827d829
Add CSharpParseOption InterceptorsPreviewNamespaces feature to Genera…
carlossanlop Sep 18, 2023
33971d6
Add TODO comment to remove feature
carlossanlop Sep 18, 2023
d359868
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 19, 2023
891bc05
Update dependencies from https://github.com/dotnet/roslyn build 20230…
dotnet-maestro[bot] Sep 19, 2023
258665c
Merge branch 'release/8.0' into darc-release/8.0-721ff3c5-df31-4a0e-8…
carlossanlop Sep 19, 2023
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
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,18 +358,18 @@
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>99168dcff56809205e7ef8530d1256f3a07fab1f</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-3.23462.10">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-3.23468.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>1b7a6f807cb8ce709048debae6b771f4705a697a</Sha>
<Sha>a19fe34b7266ab7638a12c2b54748d89d35a21a7</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis" Version="4.8.0-3.23462.10">
<Dependency Name="Microsoft.CodeAnalysis" Version="4.8.0-3.23468.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>1b7a6f807cb8ce709048debae6b771f4705a697a</Sha>
<Sha>a19fe34b7266ab7638a12c2b54748d89d35a21a7</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-3.23462.10">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-3.23468.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>1b7a6f807cb8ce709048debae6b771f4705a697a</Sha>
<Sha>a19fe34b7266ab7638a12c2b54748d89d35a21a7</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23464.2">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
they do not break the local dev experience.
-->
<MicrosoftCodeAnalysisCSharpVersion>4.8.0-3.23462.10</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisVersion>4.8.0-3.23462.10</MicrosoftCodeAnalysisVersion>
<MicrosoftNetCompilersToolsetVersion>4.8.0-3.23462.10</MicrosoftNetCompilersToolsetVersion>
<MicrosoftCodeAnalysisCSharpVersion>4.8.0-3.23468.4</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisVersion>4.8.0-3.23468.4</MicrosoftCodeAnalysisVersion>
<MicrosoftNetCompilersToolsetVersion>4.8.0-3.23468.4</MicrosoftNetCompilersToolsetVersion>
</PropertyGroup>
<!--
For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn.
Expand Down
5 changes: 4 additions & 1 deletion ...oft.Extensions.Configuration.Binder/tests/SourceGenerationTests/GeneratorTests.Helpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,10 @@ private static async Task VerifyAgainstBaselineUsingFile(
IEnumerable<Assembly>? references = null)
{
using var workspace = RoslynTestUtils.CreateTestWorkspace();
CSharpParseOptions parseOptions = new CSharpParseOptions(langVersion).WithFeatures(new[] { new KeyValuePair<string, string>("InterceptorsPreview", "") });
CSharpParseOptions parseOptions = new CSharpParseOptions(langVersion).WithFeatures(new[] {
new KeyValuePair<string, string>("InterceptorsPreview", ""),
new KeyValuePair<string, string>("InterceptorsPreviewNamespaces", "Microsoft.Extensions.Configuration.Binder.SourceGeneration")
});

Project proj = RoslynTestUtils.CreateTestProject(workspace, references ?? s_compilationAssemblyRefs, langVersion: langVersion)
.WithCompilationOptions(new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary).WithNullableContextOptions(NullableContextOptions.Annotations))
Expand Down
2 changes: 2 additions & 0 deletions ...ceGenerationTests/Microsoft.Extensions.Configuration.Binder.SourceGeneration.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
<!-- Type not supported; property on type not suppported -->
<NoWarn>SYSLIB1100,SYSLIB1101</NoWarn>
<Features>$(Features);InterceptorsPreview</Features>
<!-- TODO: Remove InterceptorsPreview feature after 8.0 RC2 SDK is used for build -->
<InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.Extensions.Configuration.Binder.SourceGeneration</InterceptorsPreviewNamespaces>
carlossanlop marked this conversation as resolved.
Show resolved Hide resolved
<EnableConfigurationBindingGenerator>true</EnableConfigurationBindingGenerator>
</PropertyGroup>

Expand Down
2 changes: 2 additions & 0 deletions ...ft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
<Features>$(Features);InterceptorsPreview</Features>
<!-- TODO: Remove InterceptorsPreview feature after 8.0 RC2 SDK is used for build -->
<InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.Extensions.Configuration.Binder.SourceGeneration</InterceptorsPreviewNamespaces>
carlossanlop marked this conversation as resolved.
Show resolved Hide resolved
<EnableConfigurationBindingGenerator>true</EnableConfigurationBindingGenerator>
<IsPackable>true</IsPackable>
<PackageDescription>Configuration support for Microsoft.Extensions.Logging.</PackageDescription>
Expand Down
2 changes: 2 additions & 0 deletions ...ries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<IncludePlatformAttributes>true</IncludePlatformAttributes>
<IsPackable>true</IsPackable>
<Features>$(Features);InterceptorsPreview</Features>
<!-- TODO: Remove InterceptorsPreview feature after 8.0 RC2 SDK is used for build -->
<InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.Extensions.Configuration.Binder.SourceGeneration</InterceptorsPreviewNamespaces>
carlossanlop marked this conversation as resolved.
Show resolved Hide resolved
<EnableConfigurationBindingGenerator>true</EnableConfigurationBindingGenerator>
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
<PackageDescription>Console logger provider implementation for Microsoft.Extensions.Logging.</PackageDescription>
Expand Down
2 changes: 2 additions & 0 deletions ...nTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkMinimum)</TargetFrameworks>
<DefineConstants>$(DefineConstants);BUILDING_SOURCE_GENERATOR_TESTS;ROSLYN4_0_OR_GREATER;ROSLYN4_4_OR_GREATER</DefineConstants>
<Features>$(Features);InterceptorsPreview</Features>
<!-- TODO: Remove InterceptorsPreview feature after 8.0 RC2 SDK is used for build -->
<InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.Extensions.Configuration.Binder.SourceGeneration</InterceptorsPreviewNamespaces>
carlossanlop marked this conversation as resolved.
Show resolved Hide resolved
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
<EnableConfigurationBindingGenerator>true</EnableConfigurationBindingGenerator>
</PropertyGroup>
Expand Down
Loading