diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 227c61421aa..d8307b47bd4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,80 +10,80 @@ 05b4fdac346e01716abda4c92fcf0b7880e73792 - + https://github.com/dotnet/roslyn 3fc97de0f151e67a0b8ee2840edb04b49fbc623f - + https://github.com/dotnet/roslyn 3fc97de0f151e67a0b8ee2840edb04b49fbc623f - + https://github.com/dotnet/roslyn 3fc97de0f151e67a0b8ee2840edb04b49fbc623f - + https://github.com/dotnet/roslyn 3fc97de0f151e67a0b8ee2840edb04b49fbc623f - + https://github.com/dotnet/roslyn 3fc97de0f151e67a0b8ee2840edb04b49fbc623f - + https://github.com/dotnet/roslyn 3fc97de0f151e67a0b8ee2840edb04b49fbc623f - + https://github.com/dotnet/roslyn 3fc97de0f151e67a0b8ee2840edb04b49fbc623f - + https://github.com/dotnet/roslyn 3fc97de0f151e67a0b8ee2840edb04b49fbc623f - + https://github.com/dotnet/roslyn 3fc97de0f151e67a0b8ee2840edb04b49fbc623f - + https://github.com/dotnet/roslyn 3fc97de0f151e67a0b8ee2840edb04b49fbc623f - + https://github.com/dotnet/roslyn 3fc97de0f151e67a0b8ee2840edb04b49fbc623f - + https://github.com/dotnet/roslyn 3fc97de0f151e67a0b8ee2840edb04b49fbc623f - + https://github.com/dotnet/roslyn 3fc97de0f151e67a0b8ee2840edb04b49fbc623f - + https://github.com/dotnet/roslyn 3fc97de0f151e67a0b8ee2840edb04b49fbc623f - + https://github.com/dotnet/roslyn 3fc97de0f151e67a0b8ee2840edb04b49fbc623f - + https://github.com/dotnet/roslyn 3fc97de0f151e67a0b8ee2840edb04b49fbc623f - + https://github.com/dotnet/roslyn 3fc97de0f151e67a0b8ee2840edb04b49fbc623f - + https://github.com/dotnet/roslyn 3fc97de0f151e67a0b8ee2840edb04b49fbc623f - + https://github.com/dotnet/roslyn 3fc97de0f151e67a0b8ee2840edb04b49fbc623f diff --git a/eng/Versions.props b/eng/Versions.props index f1f970ff591..1921a38501e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,25 +56,25 @@ 6.0.2-servicing.22064.6 6.0.1 8.0.0-alpha.1.23214.4 - 4.7.0-2.23227.6 - 4.7.0-2.23227.6 - 4.7.0-2.23227.6 - 4.7.0-2.23227.6 - 4.7.0-2.23227.6 - 4.7.0-2.23227.6 - 4.7.0-2.23227.6 - 4.7.0-2.23227.6 - 4.7.0-2.23227.6 - 4.7.0-2.23227.6 - 4.7.0-2.23227.6 - 4.7.0-2.23227.6 - 4.7.0-2.23227.6 - 4.7.0-2.23227.6 - 4.7.0-2.23227.6 - 4.7.0-2.23227.6 - 4.7.0-2.23227.6 - 4.7.0-2.23227.6 - 4.7.0-2.23227.6 + 4.7.0-2.23253.2 + 4.7.0-2.23253.2 + 4.7.0-2.23253.2 + 4.7.0-2.23253.2 + 4.7.0-2.23253.2 + 4.7.0-2.23253.2 + 4.7.0-2.23253.2 + 4.7.0-2.23253.2 + 4.7.0-2.23253.2 + 4.7.0-2.23253.2 + 4.7.0-2.23253.2 + 4.7.0-2.23253.2 + 4.7.0-2.23253.2 + 4.7.0-2.23253.2 + 4.7.0-2.23253.2 + 4.7.0-2.23253.2 + 4.7.0-2.23253.2 + 4.7.0-2.23253.2 + 4.7.0-2.23253.2 8.0.0-beta.23218.3 1.0.0-beta.23218.1 @@ -92,9 +92,9 @@ 17.5.101-preview-0002 1.1.2-beta1.22512.1 - 17.5.33422.76 - 17.6.76-preview - 17.6.15-preview + 17.6.35829 + 17.6.252 + 17.6.22 6.0.0 @@ -129,18 +129,18 @@ $(MicrosoftVisualStudioShellPackagesVersion) $(MicrosoftVisualStudioShellPackagesVersion) $(MicrosoftVisualStudioShellPackagesVersion) - 17.5.24 - 16.6.15 + 17.6.10-preview + 17.6.44 $(MicrosoftVisualStudioPackagesVersion) $(MicrosoftVisualStudioPackagesVersion) $(MicrosoftVisualStudioPackagesVersion) - 17.5.21 + 17.6.40 16.10.0-preview-1-31008-014 - 17.0.71 + 17.6.11 $(Tooling_HtmlEditorPackageVersion) $(Tooling_HtmlEditorPackageVersion) $(Tooling_HtmlEditorPackageVersion) @@ -149,13 +149,13 @@ 1.3.8 1.0.15 4.16.0 - 13.0.1 + 13.0.3 2.9.112 4.8.0 0.19.5 $(OmniSharpExtensionsLanguageServerPackageVersion) 1.39.1 - 2.14.24 + 2.15.26 4.3.0 3.3.4 $(Tooling_MicrosoftCodeAnalysisAnalyzersPackageVersion) @@ -182,7 +182,7 @@ 6.0.0 6.0.0-preview.7.21377.19 4.10.0 - 13.0.1 + 13.0.3 6.0.0 5.0.0 6.0.0 diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Microsoft.AspNetCore.Razor.LanguageServer.Test.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Microsoft.AspNetCore.Razor.LanguageServer.Test.csproj index 88afd82fab0..95952677b82 100644 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Microsoft.AspNetCore.Razor.LanguageServer.Test.csproj +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Microsoft.AspNetCore.Razor.LanguageServer.Test.csproj @@ -40,6 +40,7 @@ packages dependencies. We reference them here directly in order to do so, and set ExcludeAssets and PrivateAssets so the references have no other affect on build etc. --> + diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Mef/ExportProviderCache.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Mef/ExportProviderCache.cs index ae14bd718da..2b2a62815a7 100644 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Mef/ExportProviderCache.cs +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common/Mef/ExportProviderCache.cs @@ -279,7 +279,7 @@ private sealed class SimpleAssemblyLoader : IAssemblyLoader public Assembly LoadAssembly(AssemblyName assemblyName) => Assembly.Load(assemblyName); - public Assembly LoadAssembly(string assemblyFullName, string codeBasePath) + public Assembly LoadAssembly(string assemblyFullName, string? codeBasePath) { var assemblyName = new AssemblyName(assemblyFullName); if (!string.IsNullOrEmpty(codeBasePath))