diff --git a/NuGet.config b/NuGet.config index 77e1a82935c3..52f8c9735c20 100644 --- a/NuGet.config +++ b/NuGet.config @@ -33,7 +33,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f0e37765a242..c441a2414099 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,18 +48,18 @@ abfa03c97f4175d4d209435cd0e71f558e36c3fd - + https://github.com/dotnet/msbuild - 708a8d62057df145da46cbc5a7bc8342c55e9c56 + be26b4c6697f551c822129cc1534297e921ca298 - + https://github.com/dotnet/msbuild - 708a8d62057df145da46cbc5a7bc8342c55e9c56 + be26b4c6697f551c822129cc1534297e921ca298 - + https://github.com/dotnet/msbuild - 708a8d62057df145da46cbc5a7bc8342c55e9c56 + be26b4c6697f551c822129cc1534297e921ca298 https://github.com/dotnet/fsharp @@ -75,119 +75,119 @@ 6a6de7dccf80a4a7247f0d67aa5df0062d460edb - + https://github.com/dotnet/roslyn - d83f0cc401672efe5afd5e9db4be43e9e06c5935 + d7e010bbe5b1d37837417fc5e79ecb2fd9b7b487 - + https://github.com/dotnet/roslyn - d83f0cc401672efe5afd5e9db4be43e9e06c5935 + d7e010bbe5b1d37837417fc5e79ecb2fd9b7b487 - + https://github.com/dotnet/roslyn - d83f0cc401672efe5afd5e9db4be43e9e06c5935 + d7e010bbe5b1d37837417fc5e79ecb2fd9b7b487 - + https://github.com/dotnet/roslyn - d83f0cc401672efe5afd5e9db4be43e9e06c5935 + d7e010bbe5b1d37837417fc5e79ecb2fd9b7b487 - + https://github.com/dotnet/roslyn - d83f0cc401672efe5afd5e9db4be43e9e06c5935 + d7e010bbe5b1d37837417fc5e79ecb2fd9b7b487 - + https://github.com/dotnet/roslyn - d83f0cc401672efe5afd5e9db4be43e9e06c5935 + d7e010bbe5b1d37837417fc5e79ecb2fd9b7b487 - + https://github.com/dotnet/roslyn - d83f0cc401672efe5afd5e9db4be43e9e06c5935 + d7e010bbe5b1d37837417fc5e79ecb2fd9b7b487 - + https://github.com/dotnet/aspnetcore - a0db11ba7c3ae217e9745976056f10cb2a7dafde + ddbe91c4561f25d9dbfdfc746459e5a474e09bf6 - + https://github.com/dotnet/aspnetcore - a0db11ba7c3ae217e9745976056f10cb2a7dafde + ddbe91c4561f25d9dbfdfc746459e5a474e09bf6 - + https://github.com/nuget/nuget.client - 4cda842cae2c3e26ed4d0bd0b1d1ad0d7775599c + 4514d6022f0b46e4ae72d72eb5173e3b804cc014 - + https://github.com/nuget/nuget.client - 4cda842cae2c3e26ed4d0bd0b1d1ad0d7775599c + 4514d6022f0b46e4ae72d72eb5173e3b804cc014 - + https://github.com/nuget/nuget.client - 4cda842cae2c3e26ed4d0bd0b1d1ad0d7775599c + 4514d6022f0b46e4ae72d72eb5173e3b804cc014 - + https://github.com/nuget/nuget.client - 4cda842cae2c3e26ed4d0bd0b1d1ad0d7775599c + 4514d6022f0b46e4ae72d72eb5173e3b804cc014 - + https://github.com/nuget/nuget.client - 4cda842cae2c3e26ed4d0bd0b1d1ad0d7775599c + 4514d6022f0b46e4ae72d72eb5173e3b804cc014 - + https://github.com/nuget/nuget.client - 4cda842cae2c3e26ed4d0bd0b1d1ad0d7775599c + 4514d6022f0b46e4ae72d72eb5173e3b804cc014 - + https://github.com/nuget/nuget.client - 4cda842cae2c3e26ed4d0bd0b1d1ad0d7775599c + 4514d6022f0b46e4ae72d72eb5173e3b804cc014 - + https://github.com/nuget/nuget.client - 4cda842cae2c3e26ed4d0bd0b1d1ad0d7775599c + 4514d6022f0b46e4ae72d72eb5173e3b804cc014 - + https://github.com/nuget/nuget.client - 4cda842cae2c3e26ed4d0bd0b1d1ad0d7775599c + 4514d6022f0b46e4ae72d72eb5173e3b804cc014 - + https://github.com/nuget/nuget.client - 4cda842cae2c3e26ed4d0bd0b1d1ad0d7775599c + 4514d6022f0b46e4ae72d72eb5173e3b804cc014 - + https://github.com/nuget/nuget.client - 4cda842cae2c3e26ed4d0bd0b1d1ad0d7775599c + 4514d6022f0b46e4ae72d72eb5173e3b804cc014 - + https://github.com/nuget/nuget.client - 4cda842cae2c3e26ed4d0bd0b1d1ad0d7775599c + 4514d6022f0b46e4ae72d72eb5173e3b804cc014 - + https://github.com/nuget/nuget.client - 4cda842cae2c3e26ed4d0bd0b1d1ad0d7775599c + 4514d6022f0b46e4ae72d72eb5173e3b804cc014 - + https://github.com/nuget/nuget.client - 4cda842cae2c3e26ed4d0bd0b1d1ad0d7775599c + 4514d6022f0b46e4ae72d72eb5173e3b804cc014 - + https://github.com/nuget/nuget.client - 4cda842cae2c3e26ed4d0bd0b1d1ad0d7775599c + 4514d6022f0b46e4ae72d72eb5173e3b804cc014 - + https://github.com/nuget/nuget.client - 4cda842cae2c3e26ed4d0bd0b1d1ad0d7775599c + 4514d6022f0b46e4ae72d72eb5173e3b804cc014 - + https://github.com/microsoft/vstest - 5672d0f0d9433a9e2d97b9b7575fb2cc48579519 + 55ce07a655084d06c1ccf069c2b246b91410bb67 - + https://github.com/microsoft/vstest - 5672d0f0d9433a9e2d97b9b7575fb2cc48579519 + 55ce07a655084d06c1ccf069c2b246b91410bb67 - + https://github.com/microsoft/vstest - 5672d0f0d9433a9e2d97b9b7575fb2cc48579519 + 55ce07a655084d06c1ccf069c2b246b91410bb67 https://github.com/dotnet/runtime @@ -209,70 +209,70 @@ https://github.com/dotnet/runtime f8c110b8003d68cc635add4ca791d6cf2e645561 - + https://github.com/dotnet/windowsdesktop - 6e289685efdd769c16eaef518f04dd1b09115496 + eac22ba63db112b839f576fb4fa98d93539eb0e4 https://github.com/dotnet/windowsdesktop 0c003a14ab4baa5f5bf256575ae94f4fd88b45b7 - + https://github.com/dotnet/windowsdesktop - 6e289685efdd769c16eaef518f04dd1b09115496 + eac22ba63db112b839f576fb4fa98d93539eb0e4 https://github.com/dotnet/windowsdesktop 0c003a14ab4baa5f5bf256575ae94f4fd88b45b7 - + https://github.com/dotnet/wpf - 64711b42f9fb529168104df5590973b962fb973b + 1e31f6720dd6d006c7cca92373539d21e96a0700 - + https://github.com/dotnet/aspnetcore - a0db11ba7c3ae217e9745976056f10cb2a7dafde + ddbe91c4561f25d9dbfdfc746459e5a474e09bf6 - + https://github.com/dotnet/aspnetcore - a0db11ba7c3ae217e9745976056f10cb2a7dafde + ddbe91c4561f25d9dbfdfc746459e5a474e09bf6 - + https://github.com/dotnet/aspnetcore - a0db11ba7c3ae217e9745976056f10cb2a7dafde + ddbe91c4561f25d9dbfdfc746459e5a474e09bf6 - + https://github.com/dotnet/aspnetcore - a0db11ba7c3ae217e9745976056f10cb2a7dafde + ddbe91c4561f25d9dbfdfc746459e5a474e09bf6 - + https://github.com/dotnet/aspnetcore - a0db11ba7c3ae217e9745976056f10cb2a7dafde + ddbe91c4561f25d9dbfdfc746459e5a474e09bf6 - + https://github.com/dotnet/aspnetcore - a0db11ba7c3ae217e9745976056f10cb2a7dafde + ddbe91c4561f25d9dbfdfc746459e5a474e09bf6 - + https://github.com/dotnet/aspnetcore - a0db11ba7c3ae217e9745976056f10cb2a7dafde + ddbe91c4561f25d9dbfdfc746459e5a474e09bf6 - + https://github.com/dotnet/aspnetcore - a0db11ba7c3ae217e9745976056f10cb2a7dafde + ddbe91c4561f25d9dbfdfc746459e5a474e09bf6 - + https://github.com/dotnet/aspnetcore - a0db11ba7c3ae217e9745976056f10cb2a7dafde + ddbe91c4561f25d9dbfdfc746459e5a474e09bf6 - + https://github.com/dotnet/aspnetcore - a0db11ba7c3ae217e9745976056f10cb2a7dafde + ddbe91c4561f25d9dbfdfc746459e5a474e09bf6 - + https://github.com/dotnet/aspnetcore - a0db11ba7c3ae217e9745976056f10cb2a7dafde + ddbe91c4561f25d9dbfdfc746459e5a474e09bf6 https://github.com/dotnet/razor @@ -287,38 +287,38 @@ https://github.com/dotnet/razor e5829d96c376650e66e91e7e47d1f6be19453c2d - + https://github.com/dotnet/aspnetcore - a0db11ba7c3ae217e9745976056f10cb2a7dafde + ddbe91c4561f25d9dbfdfc746459e5a474e09bf6 - + https://github.com/dotnet/aspnetcore - a0db11ba7c3ae217e9745976056f10cb2a7dafde + ddbe91c4561f25d9dbfdfc746459e5a474e09bf6 - + https://github.com/dotnet/aspnetcore - a0db11ba7c3ae217e9745976056f10cb2a7dafde + ddbe91c4561f25d9dbfdfc746459e5a474e09bf6 - + https://github.com/dotnet/aspnetcore - a0db11ba7c3ae217e9745976056f10cb2a7dafde + ddbe91c4561f25d9dbfdfc746459e5a474e09bf6 https://github.com/dotnet/xdt 9a1c3e1b7f0c8763d4c96e593961a61a72679a7b - + https://github.com/dotnet/roslyn-analyzers - 7e4877c40535652d7d44a238ea48b03f47f63e29 + 4efa61a52f2da7fb047359a5fca3b333b260f3b8 - + https://github.com/dotnet/roslyn-analyzers - 7e4877c40535652d7d44a238ea48b03f47f63e29 + 4efa61a52f2da7fb047359a5fca3b333b260f3b8 - + https://github.com/dotnet/roslyn-analyzers - 7e4877c40535652d7d44a238ea48b03f47f63e29 + 4efa61a52f2da7fb047359a5fca3b333b260f3b8 diff --git a/eng/Versions.props b/eng/Versions.props index 07ca60e9178b..8e7a9ffe60fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,26 +65,26 @@ - 6.8.0-preview.1.74 - 6.8.0-preview.1.74 + 6.8.0-preview.1.75 + 6.8.0-preview.1.75 6.0.0-rc.278 - 6.8.0-preview.1.74 - 6.8.0-preview.1.74 - 6.8.0-preview.1.74 - 6.8.0-preview.1.74 - 6.8.0-preview.1.74 - 6.8.0-preview.1.74 - 6.8.0-preview.1.74 - 6.8.0-preview.1.74 - 6.8.0-preview.1.74 + 6.8.0-preview.1.75 + 6.8.0-preview.1.75 + 6.8.0-preview.1.75 + 6.8.0-preview.1.75 + 6.8.0-preview.1.75 + 6.8.0-preview.1.75 + 6.8.0-preview.1.75 + 6.8.0-preview.1.75 + 6.8.0-preview.1.75 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) - 17.8.0-preview-23421-06 - 17.8.0-preview-23421-06 - 17.8.0-preview-23421-06 + 17.8.0-preview-23424-02 + 17.8.0-preview-23424-02 + 17.8.0-preview-23424-02 @@ -98,12 +98,12 @@ - 9.0.0-preview.23422.1 - 3.11.0-beta1.23422.1 + 9.0.0-preview.23424.1 + 3.11.0-beta1.23424.1 - 17.8.0-preview-23423-01 + 17.8.0-preview-23425-03 - 4.8.0-2.23423.10 - 4.8.0-2.23423.10 - 4.8.0-2.23423.10 - 4.8.0-2.23423.10 - 4.8.0-2.23423.10 - 4.8.0-2.23423.10 - 4.8.0-2.23423.10 + 4.8.0-2.23424.9 + 4.8.0-2.23424.9 + 4.8.0-2.23424.9 + 4.8.0-2.23424.9 + 4.8.0-2.23424.9 + 4.8.0-2.23424.9 + 4.8.0-2.23424.9 $(MicrosoftNetCompilersToolsetPackageVersion) - 9.0.0-alpha.1.23422.17 - 9.0.0-alpha.1.23422.17 - 9.0.0-alpha.1.23422.17 - 9.0.0-alpha.1.23422.17 - 9.0.0-alpha.1.23422.17 - 9.0.0-alpha.1.23422.17 - 9.0.0-alpha.1.23422.17 + 9.0.0-alpha.1.23425.5 + 9.0.0-alpha.1.23425.5 + 9.0.0-alpha.1.23425.5 + 9.0.0-alpha.1.23425.5 + 9.0.0-alpha.1.23425.5 + 9.0.0-alpha.1.23425.5 + 9.0.0-alpha.1.23425.5 @@ -162,7 +162,7 @@ - 9.0.0-alpha.1.23423.1 + 9.0.0-alpha.1.23425.3 diff --git a/src/Assets/TestProjects/KitchenSink/TestApp/TestApp.csproj b/src/Assets/TestProjects/KitchenSink/TestApp/TestApp.csproj index 09b6985ab8fa..7b79d9bd7d6d 100644 --- a/src/Assets/TestProjects/KitchenSink/TestApp/TestApp.csproj +++ b/src/Assets/TestProjects/KitchenSink/TestApp/TestApp.csproj @@ -41,6 +41,7 @@ false 2 9 + true <_UseManagedNtlm>true diff --git a/src/BuiltInTools/BrowserRefresh/BlazorHotReload.js b/src/BuiltInTools/BrowserRefresh/BlazorHotReload.js index c811f4461f02..089b3095ee2f 100644 --- a/src/BuiltInTools/BrowserRefresh/BlazorHotReload.js +++ b/src/BuiltInTools/BrowserRefresh/BlazorHotReload.js @@ -3,12 +3,7 @@ export function receiveHotReload() { } export async function receiveHotReloadAsync() { - const cache = window.sessionStorage.getItem('blazor-webassembly-cache'); - let headers; - if (cache) { - headers = { 'if-none-match' : cache.etag }; - } - const response = await fetch('/_framework/blazor-hotreload', { headers }); + const response = await fetch('/_framework/blazor-hotreload'); if (response.status === 200) { const deltas = await response.json(); if (deltas) { diff --git a/src/BuiltInTools/BrowserRefresh/WebSocketScriptInjection.js b/src/BuiltInTools/BrowserRefresh/WebSocketScriptInjection.js index 4b13c4a52b6a..7e9888999d76 100644 --- a/src/BuiltInTools/BrowserRefresh/WebSocketScriptInjection.js +++ b/src/BuiltInTools/BrowserRefresh/WebSocketScriptInjection.js @@ -124,7 +124,7 @@ setTimeout(async function () { styleElement.parentNode.insertBefore(newElement, styleElement.nextSibling); } - function applyBlazorDeltas(serverSecret, deltas, sendErrorToClient) { + async function applyBlazorDeltas(serverSecret, deltas, sendErrorToClient) { if (sharedSecret && (serverSecret != sharedSecret.encodedSharedSecret)) { // Validate the shared secret if it was specified. It might be unspecified in older versions of VS // that do not support this feature as yet. @@ -143,16 +143,15 @@ setTimeout(async function () { console.warn(error); applyError = error; } - }); + }); } - fetch('/_framework/blazor-hotreload', { method: 'post', headers: { 'content-type': 'application/json' }, body: JSON.stringify(deltas) }) - .then(response => { - if (response.status == 200) { - const etag = response.headers['etag']; - window.sessionStorage.setItem('blazor-webassembly-cache', { etag, deltas }); - } - }); + try { + await fetch('/_framework/blazor-hotreload', { method: 'post', headers: { 'content-type': 'application/json' }, body: JSON.stringify(deltas) }); + } catch (error) { + console.warn(error); + applyError = error; + } if (applyError) { sendDeltaNotApplied(sendErrorToClient ? applyError : undefined); diff --git a/src/Microsoft.DotNet.ApiSymbolExtensions/SymbolExtensions.cs b/src/Microsoft.DotNet.ApiSymbolExtensions/SymbolExtensions.cs index 0c84b12ec9e4..025cf0d8d853 100644 --- a/src/Microsoft.DotNet.ApiSymbolExtensions/SymbolExtensions.cs +++ b/src/Microsoft.DotNet.ApiSymbolExtensions/SymbolExtensions.cs @@ -14,6 +14,7 @@ static SymbolExtensions() { // This is the default format for symbol.ToDisplayString; SymbolDisplayFormat format = SymbolDisplayFormat.CSharpErrorMessageFormat; + format = format.WithMemberOptions(format.MemberOptions | SymbolDisplayMemberOptions.IncludeType); DisplayFormat = format.WithParameterOptions(format.ParameterOptions | SymbolDisplayParameterOptions.IncludeExtensionThis); diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets index 20cc00db7299..f347c22d7ab5 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets @@ -653,6 +653,10 @@ Copyright (c) .NET Foundation. All rights reserved. Condition="'$(ThreadPoolMaxThreads)' != ''" Value="$(ThreadPoolMaxThreads)" /> + + null; + public delegate void SampleEventHandler(object sender, EventArgs e); + public event SampleEventHandler E; + } +} +"; + string rightSyntax = @" +using System; + +namespace CompatTests +{ + public class First + { + public delegate void SampleEventHandler(object sender, EventArgs e); + + public int S; + public string Prop { get; set; } + public bool M() => false; + public delegate void SampleEventHandler1(object sender, EventArgs e); + public event SampleEventHandler1 E; + } +} +"; + IAssemblySymbol left = SymbolFactory.GetAssemblyFromSyntax(leftSyntax); + IAssemblySymbol right = SymbolFactory.GetAssemblyFromSyntax(rightSyntax); + ApiComparer differ = new(s_ruleFactory); + + IEnumerable differences = differ.GetDifferences(left, right); + + Assert.Equal(new[] + { + CompatDifference.CreateWithDefaultMetadata(DiagnosticIds.MemberMustExist, string.Empty, DifferenceType.Removed, "F:CompatTests.First.S"), + // CompatTests.First.Prop.set isn't reported as the return types match: 'void'. + CompatDifference.CreateWithDefaultMetadata(DiagnosticIds.MemberMustExist, string.Empty, DifferenceType.Removed, "M:CompatTests.First.get_Prop"), + CompatDifference.CreateWithDefaultMetadata(DiagnosticIds.MemberMustExist, string.Empty, DifferenceType.Removed, "M:CompatTests.First.M") + // CompatTests.First.E_add and CompatTests.First.E_remove aren't reported as the symbol's DisplayString doesn't include the parameter type. + }, differences); + } } } diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs index 10f46af98cde..e597bdb37eff 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs @@ -88,6 +88,7 @@ public void It_publishes_the_project_correctly(string targetFramework, string[] ""System.Threading.Thread.EnableAutoreleasePool"": false, ""System.Threading.ThreadPool.MinThreads"": 2, ""System.Threading.ThreadPool.MaxThreads"": 9, + ""System.Threading.ThreadPool.UseWindowsThreadPool"": true, ""System.Xml.XmlResolver.IsNetworkingEnabledByDefault"": false, ""extraProperty"": true },