Skip to content

Commit 1881071

Browse files
dotnet-maestro[bot]carlossanlop
dotnet-maestro[bot]
and
carlossanlop
authored
[release/8.0] Update dependencies from dotnet/roslyn (#92149)
* Update dependencies from https://github.com/dotnet/roslyn build 20230915.1 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.8.0-3.23462.10 -> To Version 4.8.0-3.23465.1 * Update dependencies from https://github.com/dotnet/roslyn build 20230915.2 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.8.0-3.23462.10 -> To Version 4.8.0-3.23465.2 * Update dependencies from https://github.com/dotnet/roslyn build 20230915.4 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.8.0-3.23462.10 -> To Version 4.8.0-3.23465.4 * Update dependencies from https://github.com/dotnet/roslyn build 20230915.5 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.8.0-3.23462.10 -> To Version 4.8.0-3.23465.5 * Use InterceptorsPreviewNamespaces instead of the InterceptorsPreview feature * Update dependencies from https://github.com/dotnet/roslyn build 20230918.1 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.8.0-3.23462.10 -> To Version 4.8.0-3.23468.1 * Bring back removed lines * Add CSharpParseOption InterceptorsPreviewNamespaces feature to GeneratorTests.Helpers.cs * Add TODO comment to remove feature * Update dependencies from https://github.com/dotnet/roslyn build 20230918.3 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.8.0-3.23462.10 -> To Version 4.8.0-3.23468.3 * Update dependencies from https://github.com/dotnet/roslyn build 20230918.4 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.8.0-3.23462.10 -> To Version 4.8.0-3.23468.4 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
1 parent c38ca78 commit 1881071

File tree

7 files changed

+21
-10
lines changed

7 files changed

+21
-10
lines changed

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -358,18 +358,18 @@
358358
<Uri>https://github.com/dotnet/runtime-assets</Uri>
359359
<Sha>99168dcff56809205e7ef8530d1256f3a07fab1f</Sha>
360360
</Dependency>
361-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-3.23462.10">
361+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-3.23468.4">
362362
<Uri>https://github.com/dotnet/roslyn</Uri>
363-
<Sha>1b7a6f807cb8ce709048debae6b771f4705a697a</Sha>
363+
<Sha>a19fe34b7266ab7638a12c2b54748d89d35a21a7</Sha>
364364
</Dependency>
365-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.8.0-3.23462.10">
365+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.8.0-3.23468.4">
366366
<Uri>https://github.com/dotnet/roslyn</Uri>
367-
<Sha>1b7a6f807cb8ce709048debae6b771f4705a697a</Sha>
367+
<Sha>a19fe34b7266ab7638a12c2b54748d89d35a21a7</Sha>
368368
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
369369
</Dependency>
370-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-3.23462.10">
370+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-3.23468.4">
371371
<Uri>https://github.com/dotnet/roslyn</Uri>
372-
<Sha>1b7a6f807cb8ce709048debae6b771f4705a697a</Sha>
372+
<Sha>a19fe34b7266ab7638a12c2b54748d89d35a21a7</Sha>
373373
</Dependency>
374374
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.23464.2">
375375
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
4343
they do not break the local dev experience.
4444
-->
45-
<MicrosoftCodeAnalysisCSharpVersion>4.8.0-3.23462.10</MicrosoftCodeAnalysisCSharpVersion>
46-
<MicrosoftCodeAnalysisVersion>4.8.0-3.23462.10</MicrosoftCodeAnalysisVersion>
47-
<MicrosoftNetCompilersToolsetVersion>4.8.0-3.23462.10</MicrosoftNetCompilersToolsetVersion>
45+
<MicrosoftCodeAnalysisCSharpVersion>4.8.0-3.23468.4</MicrosoftCodeAnalysisCSharpVersion>
46+
<MicrosoftCodeAnalysisVersion>4.8.0-3.23468.4</MicrosoftCodeAnalysisVersion>
47+
<MicrosoftNetCompilersToolsetVersion>4.8.0-3.23468.4</MicrosoftNetCompilersToolsetVersion>
4848
</PropertyGroup>
4949
<!--
5050
For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn.

‎src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/GeneratorTests.Helpers.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,10 @@ private static async Task VerifyAgainstBaselineUsingFile(
137137
IEnumerable<Assembly>? references = null)
138138
{
139139
using var workspace = RoslynTestUtils.CreateTestWorkspace();
140-
CSharpParseOptions parseOptions = new CSharpParseOptions(langVersion).WithFeatures(new[] { new KeyValuePair<string, string>("InterceptorsPreview", "") });
140+
CSharpParseOptions parseOptions = new CSharpParseOptions(langVersion).WithFeatures(new[] {
141+
new KeyValuePair<string, string>("InterceptorsPreview", ""),
142+
new KeyValuePair<string, string>("InterceptorsPreviewNamespaces", "Microsoft.Extensions.Configuration.Binder.SourceGeneration")
143+
});
141144

142145
Project proj = RoslynTestUtils.CreateTestProject(workspace, references ?? s_compilationAssemblyRefs, langVersion: langVersion)
143146
.WithCompilationOptions(new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary).WithNullableContextOptions(NullableContextOptions.Annotations))

‎src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Microsoft.Extensions.Configuration.Binder.SourceGeneration.Tests.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<!-- Type not supported; property on type not suppported -->
66
<NoWarn>SYSLIB1100,SYSLIB1101</NoWarn>
77
<Features>$(Features);InterceptorsPreview</Features>
8+
<!-- TODO: Remove InterceptorsPreview feature after 8.0 RC2 SDK is used for build -->
9+
<InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.Extensions.Configuration.Binder.SourceGeneration</InterceptorsPreviewNamespaces>
810
<EnableConfigurationBindingGenerator>true</EnableConfigurationBindingGenerator>
911
</PropertyGroup>
1012

‎src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
55
<EnableDefaultItems>true</EnableDefaultItems>
66
<Features>$(Features);InterceptorsPreview</Features>
7+
<!-- TODO: Remove InterceptorsPreview feature after 8.0 RC2 SDK is used for build -->
8+
<InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.Extensions.Configuration.Binder.SourceGeneration</InterceptorsPreviewNamespaces>
79
<EnableConfigurationBindingGenerator>true</EnableConfigurationBindingGenerator>
810
<IsPackable>true</IsPackable>
911
<PackageDescription>Configuration support for Microsoft.Extensions.Logging.</PackageDescription>

‎src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<IncludePlatformAttributes>true</IncludePlatformAttributes>
99
<IsPackable>true</IsPackable>
1010
<Features>$(Features);InterceptorsPreview</Features>
11+
<!-- TODO: Remove InterceptorsPreview feature after 8.0 RC2 SDK is used for build -->
12+
<InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.Extensions.Configuration.Binder.SourceGeneration</InterceptorsPreviewNamespaces>
1113
<EnableConfigurationBindingGenerator>true</EnableConfigurationBindingGenerator>
1214
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
1315
<PackageDescription>Console logger provider implementation for Microsoft.Extensions.Logging.</PackageDescription>

‎src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkMinimum)</TargetFrameworks>
55
<DefineConstants>$(DefineConstants);BUILDING_SOURCE_GENERATOR_TESTS;ROSLYN4_0_OR_GREATER;ROSLYN4_4_OR_GREATER</DefineConstants>
66
<Features>$(Features);InterceptorsPreview</Features>
7+
<!-- TODO: Remove InterceptorsPreview feature after 8.0 RC2 SDK is used for build -->
8+
<InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.Extensions.Configuration.Binder.SourceGeneration</InterceptorsPreviewNamespaces>
79
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
810
<EnableConfigurationBindingGenerator>true</EnableConfigurationBindingGenerator>
911
</PropertyGroup>

0 commit comments

Comments
 (0)