Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
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
6 changes: 3 additions & 3 deletions eng/Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@
<PackageVersion Include="Microsoft.VisualBasic" Version="10.3.0" />
<PackageVersion Include="Microsoft.DiaSymReader" Version="$(MicrosoftDiaSymReaderVersion)" />
<PackageVersion Include="Microsoft.DiaSymReader.Native" Version="17.0.0-beta1.21524.1" />
<PackageVersion Include="Microsoft.DiaSymReader.PortablePdb" Version="1.7.0-beta-21528-01" />
<PackageVersion Include="Microsoft.DiaSymReader.PortablePdb" Version="2.0.0-beta-26059-01" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationVersion)" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingVersion)" />
Expand Down Expand Up @@ -256,8 +256,8 @@
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing" Version="$(MicrosoftCodeAnalysisTestingVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing" Version="$(MicrosoftCodeAnalysisTestingVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing" Version="$(MicrosoftCodeAnalysisTestingVersion)" />
<PackageVersion Include="Microsoft.DiaSymReader.Converter" Version="1.1.0-beta2-26119-01" />
<PackageVersion Include="Microsoft.DiaSymReader.Converter.Xml" Version="1.1.0-beta2-26119-01" />
<PackageVersion Include="Microsoft.DiaSymReader.Converter" Version="1.1.0-beta2-26372-02" />
<PackageVersion Include="Microsoft.DiaSymReader.Converter.Xml" Version="1.1.0-beta2-26372-02" />
<PackageVersion Include="Microsoft.Metadata.Visualizer" Version="2.0.0-beta1.25425.3" />
<PackageVersion Include="Microsoft.ILVerification" Version="9.0.7" />
<PackageVersion Include="Microsoft.NETCore.Platforms" Version="5.0.0" />
Expand Down
54 changes: 27 additions & 27 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,41 +10,41 @@ This file should be imported by eng/Versions.props
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26379.2</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetXliffTasksPackageVersion>10.0.0-beta.26379.2</MicrosoftDotNetXliffTasksPackageVersion>
<!-- dotnet-dotnet dependencies -->
<MicrosoftBclAsyncInterfacesPackageVersion>10.0.8</MicrosoftBclAsyncInterfacesPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>10.0.8</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.8</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>10.0.8</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>10.0.8</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>10.0.8</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
<MicrosoftExtensionsLoggingConsolePackageVersion>10.0.8</MicrosoftExtensionsLoggingConsolePackageVersion>
<MicrosoftExtensionsOptionsPackageVersion>10.0.8</MicrosoftExtensionsOptionsPackageVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionPackageVersion>10.0.8</MicrosoftExtensionsOptionsConfigurationExtensionPackageVersion>
<MicrosoftExtensionsPrimitivesPackageVersion>10.0.8</MicrosoftExtensionsPrimitivesPackageVersion>
<SystemCollectionsImmutablePackageVersion>10.0.8</SystemCollectionsImmutablePackageVersion>
Comment thread
ViktorHofer marked this conversation as resolved.
<MicrosoftBclAsyncInterfacesPackageVersion>10.0.10</MicrosoftBclAsyncInterfacesPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>10.0.10</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.10</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>10.0.10</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>10.0.10</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>10.0.10</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
<MicrosoftExtensionsLoggingConsolePackageVersion>10.0.10</MicrosoftExtensionsLoggingConsolePackageVersion>
<MicrosoftExtensionsOptionsPackageVersion>10.0.10</MicrosoftExtensionsOptionsPackageVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionPackageVersion>10.0.10</MicrosoftExtensionsOptionsConfigurationExtensionPackageVersion>
<MicrosoftExtensionsPrimitivesPackageVersion>10.0.10</MicrosoftExtensionsPrimitivesPackageVersion>
<SystemCollectionsImmutablePackageVersion>10.0.10</SystemCollectionsImmutablePackageVersion>
<SystemCommandLinePackageVersion>3.0.0-preview.6.26324.102</SystemCommandLinePackageVersion>
<SystemComponentModelCompositionPackageVersion>10.0.8</SystemComponentModelCompositionPackageVersion>
<SystemCompositionPackageVersion>10.0.8</SystemCompositionPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.8</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>10.0.8</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemDiagnosticsEventLogPackageVersion>10.0.8</SystemDiagnosticsEventLogPackageVersion>
<SystemIOHashingPackageVersion>10.0.8</SystemIOHashingPackageVersion>
<SystemIOPipelinesPackageVersion>10.0.8</SystemIOPipelinesPackageVersion>
<SystemReflectionMetadataPackageVersion>10.0.8</SystemReflectionMetadataPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.8</SystemResourcesExtensionsPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>10.0.8</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.8</SystemSecurityPermissionsPackageVersion>
<SystemTextEncodingsWebPackageVersion>10.0.8</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>10.0.8</SystemTextJsonPackageVersion>
<SystemThreadingTasksDataflowPackageVersion>10.0.8</SystemThreadingTasksDataflowPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.8</SystemWindowsExtensionsPackageVersion>
<SystemComponentModelCompositionPackageVersion>10.0.10</SystemComponentModelCompositionPackageVersion>
<SystemCompositionPackageVersion>10.0.10</SystemCompositionPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.10</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>10.0.10</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemDiagnosticsEventLogPackageVersion>10.0.10</SystemDiagnosticsEventLogPackageVersion>
<SystemIOHashingPackageVersion>10.0.10</SystemIOHashingPackageVersion>
<SystemIOPipelinesPackageVersion>10.0.10</SystemIOPipelinesPackageVersion>
<SystemReflectionMetadataPackageVersion>10.0.10</SystemReflectionMetadataPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.10</SystemResourcesExtensionsPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>10.0.10</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.10</SystemSecurityPermissionsPackageVersion>
<SystemTextEncodingsWebPackageVersion>10.0.10</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>10.0.10</SystemTextJsonPackageVersion>
<SystemThreadingTasksDataflowPackageVersion>10.0.10</SystemThreadingTasksDataflowPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.10</SystemWindowsExtensionsPackageVersion>
<!-- dotnet-roslyn dependencies -->
<MicrosoftCodeAnalysisPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisAnalyzersPackageVersion>
<MicrosoftCodeAnalysisAnalyzerUtilitiesPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisAnalyzerUtilitiesPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>5.10.0-1.26365.3</MicrosoftNetCompilersToolsetPackageVersion>
<RoslynDiagnosticsAnalyzersPackageVersion>5.10.0-1.26365.3</RoslynDiagnosticsAnalyzersPackageVersion>
<!-- dotnet-symreader dependencies -->
<MicrosoftDiaSymReaderPackageVersion>2.0.0</MicrosoftDiaSymReaderPackageVersion>
<MicrosoftDiaSymReaderPackageVersion>2.2.10</MicrosoftDiaSymReaderPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
56 changes: 28 additions & 28 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,104 +12,104 @@
<Sha>1d4910780fe728cf5affade170fe51fc8f96f9fb</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="10.0.8">
<Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="10.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.8">
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.8">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.8">
<Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.8">
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="10.0.8">
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="10.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="10.0.8">
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="10.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Options.ConfigurationExtension" Version="10.0.8">
<Dependency Name="Microsoft.Extensions.Options.ConfigurationExtension" Version="10.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Options" Version="10.0.8">
<Dependency Name="Microsoft.Extensions.Options" Version="10.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Primitives" Version="10.0.8">
<Dependency Name="Microsoft.Extensions.Primitives" Version="10.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
</Dependency>
<Dependency Name="System.Collections.Immutable" Version="10.0.8">
<Dependency Name="System.Collections.Immutable" Version="10.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.Composition" Version="10.0.8">
<Dependency Name="System.ComponentModel.Composition" Version="10.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="10.0.8">
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="10.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
</Dependency>
<Dependency Name="System.IO.Hashing" Version="10.0.8">
<Dependency Name="System.IO.Hashing" Version="10.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
</Dependency>
<Dependency Name="System.IO.Pipelines" Version="10.0.8">
<Dependency Name="System.IO.Pipelines" Version="10.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="10.0.8">
<Dependency Name="System.Resources.Extensions" Version="10.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.8">
<Dependency Name="System.Text.Encodings.Web" Version="10.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
</Dependency>
<!-- Note: When updating SystemTextJsonVersion ensure that the version is no higher than what is used by MSBuild in VS (would lead to NGEN failures on insertion). -->
<Dependency Name="System.Text.Json" Version="10.0.8">
<Dependency Name="System.Text.Json" Version="10.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
</Dependency>
<Dependency Name="System.Threading.Tasks.Dataflow" Version="10.0.8">
<Dependency Name="System.Threading.Tasks.Dataflow" Version="10.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
</Dependency>
<Dependency Name="System.Reflection.Metadata" Version="10.0.8">
<Dependency Name="System.Reflection.Metadata" Version="10.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.8">
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.8">
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="10.0.8">
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="10.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="10.0.8">
<Dependency Name="System.Security.Permissions" Version="10.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="10.0.8">
<Dependency Name="System.Windows.Extensions" Version="10.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
</Dependency>
Expand All @@ -123,9 +123,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c5d54a9de6e0e20a85e37fa3576a37235276772b</Sha>
</Dependency>
<Dependency Name="Microsoft.DiaSymReader" Version="2.0.0">
<Dependency Name="Microsoft.DiaSymReader" Version="2.2.10">
<Uri>https://github.com/dotnet/symreader</Uri>
<Sha>27e584661980ee6d82c419a2a471ae505b7d122e</Sha>
<Sha>8655fee9aae40ba74257255cbcd1f05edc2f48fa</Sha>
</Dependency>
Comment thread
Copilot marked this conversation as resolved.
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.10.0-1.26365.3">
<Uri>https://github.com/dotnet/roslyn</Uri>
Expand All @@ -137,7 +137,7 @@
</Dependency>
<!-- Entries below are necessary for source-build. This allows the packages to be retrieved from previously-source-built
artifacts and flow in as dependencies of the packages produced by roslyn. -->
<Dependency Name="System.Composition" Version="10.0.8">
<Dependency Name="System.Composition" Version="10.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
</Dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12107,7 +12107,7 @@ public void MissingCompilerAssembly()
result = ProcessUtilities.Run(cscPath, arguments: "/nologo /t:library unknown.cs", workingDirectory: dir.Path);
Assert.Equal(1, result.ExitCode);
AssertEx.Equal(
$"Could not load file or assembly '{typeof(ImmutableArray).Assembly.FullName.Replace(".8", ".0")}' or one of its dependencies. The system cannot find the file specified.",
$"Could not load file or assembly '{typeof(ImmutableArray).Assembly.FullName.Replace(".10", ".0")}' or one of its dependencies. The system cannot find the file specified.",
result.Output.Trim());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9733,7 +9733,7 @@ End Module
result = ProcessUtilities.Run(vbcPath, arguments:="/nologo /t:library unknown.vb", workingDirectory:=dir.Path)
Assert.Equal(1, result.ExitCode)
AssertEx.Equal(
$"Could not load file or assembly '{GetType(ImmutableArray).Assembly.FullName.Replace(".8", ".0")}' or one of its dependencies. The system cannot find the file specified.",
$"Could not load file or assembly '{GetType(ImmutableArray).Assembly.FullName.Replace(".10", ".0")}' or one of its dependencies. The system cannot find the file specified.",
result.Output.Trim())
End Sub

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
using System.Reflection;
using System.Reflection.Metadata;
using System.Runtime.CompilerServices;
#if !NET
using System.Runtime.InteropServices;
#endif
using System.Threading;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.EditAndContinue;
Expand Down Expand Up @@ -87,13 +89,20 @@ public override void Dispose()
_stream.Dispose();

var symReader = Interlocked.Exchange(ref _symReader, null);
if (symReader != null && Marshal.IsComObject(symReader))
{
#if NET
// On .NET the reader is a source-generated COM object, which is released by
// disposing it. Marshal.ReleaseComObject is not supported for such objects (SYSLIB1099).
if (symReader != null)
{
Debug.Assert(OperatingSystem.IsWindows());
#endif
((IDisposable)symReader).Dispose();
}
Comment thread
ViktorHofer marked this conversation as resolved.
#else
if (symReader != null && Marshal.IsComObject(symReader))
{
Marshal.ReleaseComObject(symReader);
}
#endif
}
}

Expand Down
Loading