diff --git a/Directory.Build.props b/Directory.Build.props index 993d5f48bf..469817cb74 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -20,7 +20,7 @@ $(BuildArchitecture) x64 - false + true + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 388c51938b..b187220228 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,20 +22,20 @@ c01a538851a8ab1a1fbeb2e6243f391fff7587b4 aspnet-xdt - + https://github.com/mono/linker - 863b5502cc43b1c75b5a93ac395899f8d8b5f0a4 + e792d61a0ead2f6422b4c9af651c1128d978d454 linker - + https://github.com/dotnet/runtime - 38017c3935de95d0335bac04f4901ddfc2718656 + cf258a14b70ad9069470a108f13765e0e5988f51 runtime runtime-portable - + https://github.com/dotnet/templating - da62f3656cac0ac4bfb6b012bc072b3499f78e6c + 31980633108a1bef00c798136fcd30a873c90fa3 https://github.com/dotnet/test-templates @@ -46,22 +46,22 @@ https://github.com/dotnet/command-line-api afd010ba8cb3cbd714c734465d1a5de1ee133e2d - + https://github.com/dotnet/roslyn - 90e570d763637c4d0d30524674a64b07bb885994 + 4c195c3ac1974edcefa76774d7a59a2350ec55fa - - https://github.com/microsoft/msbuild - a55ce4fbb09e1ff104c815ab5b5c7609c4251e81 + + https://github.com/dotnet/msbuild + 126527ff107ae93fed10af675506c56d046aa5a3 - + https://github.com/NuGet/NuGet.Client - 3501ddedc274ac10d4b135856b7593a6bb8a72f1 + 830c8be45dbbccd411ecf6080abff0c2c98079cf nuget-client - + https://github.com/dotnet/sdk - 394fae2553937858c8f05a6158613dcc7f821fba + 0cdbf80b4176ba4b979bdfc7b630b884f656072f sdk @@ -79,22 +79,22 @@ https://github.com/dotnet/xliff-tasks a52f3d7fb58470749ee4035fbbcb7e63c78b0459 - + https://github.com/dotnet/aspnetcore - ecdcc752d4639061c2c49727ee77a1039bbbca22 + 371a26f07b23ad77c636332c2dfc0cbd1d8137ba aspnetcore - + https://github.com/dotnet/fsharp - 068ebd3c599bc5a47163a18b8b90d2fe5517186e + da6be68280c89131cdba2045525b80890401defd - + https://github.com/microsoft/vstest - 0c0fafa64de5c73981e7c40a99d7363f57635f60 + b195e2589980861425b331e73a859252c3f2b71a - + https://github.com/dotnet/installer - 473d1b592e8c281f03dcc4024c04c7c188e99c03 + 5044b938294b7b920a5a4393a5f0f8b7b1750548 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 6ad9157c8a..1b25da0671 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,6 +8,6 @@ 1.0.0-beta.20521.1 - 0.1.0-5.0.100-bootstrap.12 + 0.1.0-5.0.100-bootstrap.13 diff --git a/patches/aspnetcore/0004-Exclude-some-projects-from-source-build.patch b/patches/aspnetcore/0004-Exclude-some-projects-from-source-build.patch index f2277f2963..d1e1db89cb 100644 --- a/patches/aspnetcore/0004-Exclude-some-projects-from-source-build.patch +++ b/patches/aspnetcore/0004-Exclude-some-projects-from-source-build.patch @@ -12,7 +12,7 @@ index 86dbc3c929..908fa251c7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -16,9 +16,11 @@ - false + false true true + true @@ -20,9 +20,9 @@ index 86dbc3c929..908fa251c7 100644 true false + true - + +- $(VSRedistCommonAspNetCoreSharedFrameworkx6450PackageVersion) +- $(MicrosoftNETCoreAppInternalPackageVersion) ++ $(MicrosoftAspNetCoreAppRefPackageVersion) ++ $(MicrosoftNETCoreAppRefPackageVersion) + $(MicrosoftWindowsDesktopAppPackageVersion) + + +-- +1.8.3.1 + diff --git a/patches/nuget-client/0002-Pin-newtonsoft-json-to-a-specific-version.patch b/patches/nuget-client/0002-Pin-newtonsoft-json-to-a-specific-version.patch index 363df98b9a..df61ee1419 100644 --- a/patches/nuget-client/0002-Pin-newtonsoft-json-to-a-specific-version.patch +++ b/patches/nuget-client/0002-Pin-newtonsoft-json-to-a-specific-version.patch @@ -14,11 +14,11 @@ index a5fa8b5f6..7ceec6b95 100644 @@ -1,7 +1,7 @@ - 16.5.0-preview-19606-01 + 16.6.0 - 9.0.1 + 9.0.1 4.3.0 - 16.4.280 + 16.6.255 16.6.30107.105 -- 2.18.0 diff --git a/patches/nuget-client/0005-Remove-unneeded-feeds.patch b/patches/nuget-client/0005-Remove-unneeded-feeds.patch index 6a53ea9be7..e007a5f38b 100644 --- a/patches/nuget-client/0005-Remove-unneeded-feeds.patch +++ b/patches/nuget-client/0005-Remove-unneeded-feeds.patch @@ -11,16 +11,16 @@ diff --git a/NuGet.Config b/NuGet.Config index fed206f92..245eea2b9 100644 --- a/NuGet.Config +++ b/NuGet.Config -@@ -7,9 +7,7 @@ +@@ -4,9 +4,7 @@ + + + +- +- - + + -- - -- - - - -- 2.18.0 diff --git a/patches/roslyn/0003-Get-rid-of-analyzers.patch b/patches/roslyn/0003-Get-rid-of-analyzers.patch deleted file mode 100644 index 7d1ee43a5a..0000000000 --- a/patches/roslyn/0003-Get-rid-of-analyzers.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 626139dcbde2e48ad272221fab585dc9600ac6c2 Mon Sep 17 00:00:00 2001 -From: adaggarwal -Date: Fri, 22 Nov 2019 16:56:41 +0000 -Subject: [PATCH 3/5] Get rid of analyzers - ---- - eng/targets/Settings.props | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/eng/targets/Settings.props b/eng/targets/Settings.props -index 78c1cc18922..77ae8cfb268 100644 ---- a/eng/targets/Settings.props -+++ b/eng/targets/Settings.props -@@ -146,13 +146,13 @@ - - - -- -+ - - - - - -- -+ - - - --- -2.18.0 - diff --git a/patches/roslyn/0007-Don-t-use-Humanizer-in-source-build.patch b/patches/roslyn/0007-Don-t-use-Humanizer-in-source-build.patch deleted file mode 100644 index 7ed2e9e98d..0000000000 --- a/patches/roslyn/0007-Don-t-use-Humanizer-in-source-build.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 934071a675a089b67625ab9670d951981c0f4b7c Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Thu, 24 Sep 2020 13:45:50 -0500 -Subject: [PATCH 7/7] Don't use Humanizer in source-build. - ---- - .../Microsoft.CodeAnalysis.CSharp.CodeStyle.csproj | 2 +- - .../Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj | 4 ++-- - .../Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj | 4 ++-- - .../Microsoft.CodeAnalysis.CSharp.Workspaces.csproj | 4 ++-- - .../Compiler/CSharp/Extensions/SemanticModelExtensions.cs | 6 +++--- - 5 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/src/CodeStyle/CSharp/Analyzers/Microsoft.CodeAnalysis.CSharp.CodeStyle.csproj b/src/CodeStyle/CSharp/Analyzers/Microsoft.CodeAnalysis.CSharp.CodeStyle.csproj -index 2c7af08b354..18a263ff52a 100644 ---- a/src/CodeStyle/CSharp/Analyzers/Microsoft.CodeAnalysis.CSharp.CodeStyle.csproj -+++ b/src/CodeStyle/CSharp/Analyzers/Microsoft.CodeAnalysis.CSharp.CodeStyle.csproj -@@ -9,7 +9,7 @@ - Microsoft.CodeAnalysis.CSharp.CodeStyle.NewNameSinceWeReferenceTheAnalyzersAndNuGetCannotFigureItOut - - -- -+ - - - -diff --git a/src/CodeStyle/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj b/src/CodeStyle/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj -index 4ce5a872393..0ef4d309c9d 100644 ---- a/src/CodeStyle/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj -+++ b/src/CodeStyle/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj -@@ -36,7 +36,7 @@ - - - -- -+ - - - -@@ -55,4 +55,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj -index f41ffaa6a77..ad68fda9fea 100644 ---- a/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj -+++ b/src/Features/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Features.csproj -@@ -64,9 +64,9 @@ - - - -- -+ - - - - -- -\ No newline at end of file -+ -diff --git a/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj b/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj -index 097e06a5d12..eb316fc7d36 100644 ---- a/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj -+++ b/src/Workspaces/CSharp/Portable/Microsoft.CodeAnalysis.CSharp.Workspaces.csproj -@@ -20,7 +20,7 @@ - - - -- -+ - - - -@@ -60,4 +60,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Extensions/SemanticModelExtensions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Extensions/SemanticModelExtensions.cs -index 900b94ea7ac..82f25d6d9b1 100644 ---- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Extensions/SemanticModelExtensions.cs -+++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Extensions/SemanticModelExtensions.cs -@@ -6,7 +6,6 @@ - using System.Collections.Immutable; - using System.Linq; - using System.Threading; --using Humanizer; - using Microsoft.CodeAnalysis; - using Microsoft.CodeAnalysis.CSharp.Syntax; - using Microsoft.CodeAnalysis.Shared.Extensions; -@@ -234,7 +233,7 @@ private static bool CanBindToken(SyntaxToken token) - else if (current.Parent is ForEachStatementSyntax foreachStatement && - foreachStatement.Expression == expression) - { -- return foreachStatement.Identifier.ValueText.ToCamelCase().Pluralize(); -+ return foreachStatement.Identifier.ValueText.ToCamelCase(); - } - else - { -@@ -260,7 +259,8 @@ private static bool CanBindToken(SyntaxToken token) - var pluralize = Pluralize(semanticModel, type); - - var parameterName = type.CreateParameterName(capitalize); -- return pluralize ? parameterName.Pluralize() : parameterName; -+ // return pluralize ? parameterName.Pluralize() : parameterName; -+ return parameterName; - } - - private static bool Pluralize(SemanticModel semanticModel, ITypeSymbol type) --- -2.18.0 - diff --git a/patches/roslyn/0010-Re-enable-CodeStyle-for-source-build.patch b/patches/roslyn/0010-Re-enable-CodeStyle-for-source-build.patch new file mode 100644 index 0000000000..151a4f66eb --- /dev/null +++ b/patches/roslyn/0010-Re-enable-CodeStyle-for-source-build.patch @@ -0,0 +1,28 @@ +From 8cb4b8e9b6a16364f67b07b77d1a487026ab54b5 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Wed, 28 Oct 2020 21:17:33 +0000 +Subject: [PATCH] Re-enable CodeStyle for source-build + +Add back building of CodeStyle projects for source-build. Upstream fix +is at https://github.com/dotnet/roslyn/pull/48999. + +--- + src/CodeStyle/Directory.Build.props | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CodeStyle/Directory.Build.props b/src/CodeStyle/Directory.Build.props +index 0991c17..3722c4d 100644 +--- a/src/CodeStyle/Directory.Build.props ++++ b/src/CodeStyle/Directory.Build.props +@@ -1,7 +1,7 @@ + + + +- true ++ false + + + true +-- +1.8.3.1 + diff --git a/patches/runtime/0002-do-not-fail-on-test-chmod.patch b/patches/runtime/0002-do-not-fail-on-test-chmod.patch deleted file mode 100644 index 0242bd6728..0000000000 --- a/patches/runtime/0002-do-not-fail-on-test-chmod.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 521ab62a78b4fcfcb5709502f0b5619b11f9c7d8 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Fri, 15 May 2020 16:02:54 +0000 -Subject: [PATCH 03/15] do not fail on test chmod - ---- - src/libraries/restore/runtime/runtime.depproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libraries/restore/runtime/runtime.depproj b/src/libraries/restore/runtime/runtime.depproj -index 3179312c073..b88c71fa8df 100644 ---- a/src/libraries/restore/runtime/runtime.depproj -+++ b/src/libraries/restore/runtime/runtime.depproj -@@ -52,7 +52,7 @@ - SkipUnchangedFiles="true" - UseHardlinksIfPossible="$(UseHardlink)" /> - -- -+ - - - -Date: Wed, 2 Sep 2020 07:24:30 -0500 -Subject: [PATCH 12/13] Add UsingToolNetFrameworkReferenceAssemblies. - ---- - src/libraries/restore/runtime/runtime.depproj | 1 + - 1 files changed, 1 insertions(+) - -diff --git a/src/libraries/restore/runtime/runtime.depproj b/src/libraries/restore/runtime/runtime.depproj -index 3441fe9399b..36e4bacdef2 100644 ---- a/src/libraries/restore/runtime/runtime.depproj -+++ b/src/libraries/restore/runtime/runtime.depproj -@@ -20,6 +20,7 @@ - Exclude here so that when building with the 2.x SDK we don't place it in the test shared framework. - This can be removed once we have a new SDK --> - -+ - - - --- -2.18.0 - diff --git a/patches/runtime/0021-Do-not-define-X509_new-as-local_X509_new.patch b/patches/runtime/0021-Do-not-define-X509_new-as-local_X509_new.patch deleted file mode 100644 index f02c89e50a..0000000000 --- a/patches/runtime/0021-Do-not-define-X509_new-as-local_X509_new.patch +++ /dev/null @@ -1,42 +0,0 @@ -From e806e54c80c86075cefc14e59963b98613cb5450 Mon Sep 17 00:00:00 2001 -From: Omair Majid -Date: Mon, 5 Oct 2020 12:12:27 -0400 -Subject: [PATCH] Do not define X509_new as local_X509_new - -This was only being done for OpenSSL 1.0. X509_new is actually available -to use in OpenSSL 1.0 and doesn't need to be re-defined: -https://www.openssl.org/docs/man1.0.2/man3/X509_new.html. That document -even says: "X509_new() and X509_free() are available in all versions of -SSLeay and OpenSSL". - -The current libraries code doesn't contain an implementation of -local_X509_new. If we define X509_new as local_X509_new, it breaks the -build when it's being compiled non-portable against OpenSSL 1.0. See -https://github.com/dotnet/runtime/issues/42991 for complete details. - -I was able to reproduce this on Fedora 29 when building using OpenSSL -1.0 headers. The error doesn't happen when building using OpenSSL 1.1, -since X509_new is never re-defined. - -Fixes: #42991 - -Upstream PR: https://github.com/dotnet/runtime/pull/43039 ---- - .../Unix/System.Security.Cryptography.Native/opensslshim.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/libraries/Native/Unix/System.Security.Cryptography.Native/opensslshim.h b/src/libraries/Native/Unix/System.Security.Cryptography.Native/opensslshim.h -index 0e0543b1409..0bfdde872bf 100644 ---- a/src/libraries/Native/Unix/System.Security.Cryptography.Native/opensslshim.h -+++ b/src/libraries/Native/Unix/System.Security.Cryptography.Native/opensslshim.h -@@ -1092,7 +1092,6 @@ FOR_ALL_OPENSSL_FUNCTIONS - #define SSL_is_init_finished local_SSL_is_init_finished - #define X509_CRL_get0_nextUpdate local_X509_CRL_get0_nextUpdate - #define X509_NAME_get0_der local_X509_NAME_get0_der --#define X509_new local_X509_new - #define X509_PUBKEY_get0_param local_X509_PUBKEY_get0_param - #define X509_STORE_CTX_get0_cert local_X509_STORE_CTX_get0_cert - #define X509_STORE_CTX_get0_chain local_X509_STORE_CTX_get0_chain --- -2.25.2 - diff --git a/patches/runtime/0022-Merge-pull-request-42269-from-ViktorHofer-sdkupdate-.patch b/patches/runtime/0022-Merge-pull-request-42269-from-ViktorHofer-sdkupdate-.patch deleted file mode 100644 index 4644b57287..0000000000 --- a/patches/runtime/0022-Merge-pull-request-42269-from-ViktorHofer-sdkupdate-.patch +++ /dev/null @@ -1,1228 +0,0 @@ -From dbfc81661b601c92a3fec164a80d910f0a62911c Mon Sep 17 00:00:00 2001 -From: Viktor Hofer -Date: Tue, 15 Sep 2020 23:52:33 +0200 -Subject: [PATCH] Merge pull request #42269 from ViktorHofer/sdkupdate-RC2 - -[release/5.0-rc2] - Update SDK to final P8/RC1 and unpin compiler version -Conflicts: - src/libraries/externals.csproj ---- - Directory.Build.props | 3 - - eng/Configurations.props | 2 + - eng/Versions.props | 2 - - eng/depProj.common.targets | 5 - - eng/depProj.targets | 156 --------------------- - eng/restore/repoRestore.targets | 9 +- - global.json | 8 +- - .../Runtime/InteropServices/Marshal.CoreCLR.cs | 6 +- - src/coreclr/tests/issues.targets | 5 + - src/libraries/Directory.Build.props | 3 +- - src/libraries/Directory.Build.targets | 2 +- - .../RuntimeBinder/ComInterop/ComRuntimeHelpers.cs | 4 +- - .../System.Formats.Cbor.Tests.DataModel.fsproj | 4 +- - .../Windows/WebSockets/HttpWebSocket.Windows.cs | 2 + - .../src/System/Diagnostics/Tracing/EventCounter.cs | 2 +- - src/libraries/externals.csproj | 94 +++++++++++++ - .../frameworkSettings/netcore50/settings.targets | 5 + - .../portable-net45+win8+wp8+wpa81/settings.targets | 7 + - .../portable-net45+win8+wpa81/settings.targets | 7 + - .../portable-net45+win8/settings.targets | 7 + - .../portable45-net45+win8/settings.targets | 7 + - .../portable46-net451+win81/settings.targets | 7 + - .../netcoreapp/DisableVerifyClosure.targets | 7 + - src/libraries/pkg/test/packageTest.targets | 2 + - src/libraries/pkg/test/project.csproj.template | 2 + - src/libraries/pretest.proj | 18 +-- - src/libraries/restore/Directory.Build.props | 23 --- - src/libraries/restore/Directory.Build.targets | 7 - - .../restore/runtime/Directory.Build.props | 7 - - src/libraries/restore/runtime/runtime.depproj | 110 --------------- - .../UnmanagedCallersOnly/InvalidCSharp.ilproj | 8 ++ - .../UnmanagedCallersOnly/InvalidCallbacks.il | 75 ++++++++++ - .../UnmanagedCallersOnlyTest.cs | 54 +++---- - .../UnmanagedCallersOnlyTest.csproj | 2 +- - .../JIT/Directed/tailcall/mutual_recursion.fsproj | 2 +- - 35 files changed, 289 insertions(+), 375 deletions(-) - delete mode 100644 eng/depProj.common.targets - delete mode 100644 eng/depProj.targets - create mode 100644 src/libraries/externals.csproj - create mode 100644 src/libraries/pkg/test/frameworkSettings/netcore50/settings.targets - create mode 100644 src/libraries/pkg/test/frameworkSettings/portable-net45+win8+wp8+wpa81/settings.targets - create mode 100644 src/libraries/pkg/test/frameworkSettings/portable-net45+win8+wpa81/settings.targets - create mode 100644 src/libraries/pkg/test/frameworkSettings/portable-net45+win8/settings.targets - create mode 100644 src/libraries/pkg/test/frameworkSettings/portable45-net45+win8/settings.targets - create mode 100644 src/libraries/pkg/test/frameworkSettings/portable46-net451+win81/settings.targets - create mode 100644 src/libraries/pkg/test/packageSettings/System.Utf8String.Experimental/netcoreapp/DisableVerifyClosure.targets - delete mode 100644 src/libraries/restore/Directory.Build.props - delete mode 100644 src/libraries/restore/Directory.Build.targets - delete mode 100644 src/libraries/restore/runtime/Directory.Build.props - delete mode 100644 src/libraries/restore/runtime/runtime.depproj - create mode 100644 src/tests/Interop/UnmanagedCallersOnly/InvalidCSharp.ilproj - create mode 100644 src/tests/Interop/UnmanagedCallersOnly/InvalidCallbacks.il - -diff --git a/Directory.Build.props b/Directory.Build.props -index b580851..db2a42a 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -108,9 +108,6 @@ - Properties - - $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) -- -- -- false - - - -diff --git a/eng/Configurations.props b/eng/Configurations.props -index 3d123f8..532b746 100644 ---- a/eng/Configurations.props -+++ b/eng/Configurations.props -@@ -68,5 +68,7 @@ - true - - true -+ -+ false - - -diff --git a/eng/Versions.props b/eng/Versions.props -index 07fa462..6fcbcfe 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -48,8 +48,6 @@ - - - -- -- 3.8.0-2.20403.2 - - 5.0.0-beta.20431.1 - 5.0.0-beta.20431.1 -diff --git a/eng/depProj.common.targets b/eng/depProj.common.targets -deleted file mode 100644 -index b6d7360..0000000 ---- a/eng/depProj.common.targets -+++ /dev/null -@@ -1,5 +0,0 @@ -- -- -- -- -- -diff --git a/eng/depProj.targets b/eng/depProj.targets -deleted file mode 100644 -index 7cb63b0..0000000 ---- a/eng/depProj.targets -+++ /dev/null -@@ -1,156 +0,0 @@ -- -- -- -- -- -- -- -- true -- -- false -- -- false -- false -- -- -- -- ReferenceCopyLocalPaths -- -- -- false -- -- -- None -- -- -- true -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- PreserveNewest -- %(NuGetDeploy.SubFolder)%(FileName)%(Extension) -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- <_nuGetDeploy Include="@($(NuGetDeploySourceItem))"/> -- <_nuGetDeployByFileName Include="@(_nuGetDeploy->'%(FileName)')"> -- %(Identity) -- -- -- <_nuGetDeployByFileNameToRemove Include="@(_nuGetDeployByFileName)" Exclude="@(FileToInclude)" Condition="'@(FileToInclude)' != ''" /> -- <_filteredNuGetDeployByFileName Include="@(_nuGetDeployByFileName)" Exclude="@(_nuGetDeployByFileNameToRemove);@(FileToExclude)" /> -- -- <_nuGetDeployByPackageId Include="@(_filteredNuGetDeployByFileName->'%(NuGetPackageId)')" /> -- -- <_nuGetDeployByPackageIdToRemove Include="@(_nuGetDeployByPackageId)" Exclude="@(PackageToInclude)" Condition="'@(PackageToInclude)' != ''" /> -- <_filteredNuGetDeployByPackageId Include="@(_nuGetDeployByPackageId)" Exclude="@(_nuGetDeployByPackageIdToRemove);@(PackageToExclude)" /> -- -- -- -- -- -- -- -- -- -- -- -- -diff --git a/eng/restore/repoRestore.targets b/eng/restore/repoRestore.targets -index a430b67..d350ef5 100644 ---- a/eng/restore/repoRestore.targets -+++ b/eng/restore/repoRestore.targets -@@ -1,7 +1,7 @@ - - - -- Unknown -+ Unknown - - - -@@ -21,12 +21,9 @@ - Hack workaround for not restoring each project. Instead, we turn off all the targets - that require a `project.assets.json`, since ours will be empty anyway. - --> -- -- -+ - -- -+ - -- - - -diff --git a/global.json b/global.json -index 18a166d..9e5f3f4 100644 ---- a/global.json -+++ b/global.json -@@ -1,11 +1,11 @@ - { - "sdk": { -- "version": "5.0.100-preview.8.20362.3", -+ "version": "5.0.100-preview.8.20417.9", - "allowPrerelease": true, - "rollForward": "major" - }, - "tools": { -- "dotnet": "5.0.100-preview.8.20362.3" -+ "dotnet": "5.0.100-rc.1.20454.5" - }, - "native-tools": { - "cmake": "3.14.5", -@@ -18,7 +18,7 @@ - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20431.1", - "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", - "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", -- "Microsoft.Build.NoTargets": "1.0.53", -- "Microsoft.Build.Traversal": "2.0.52" -+ "Microsoft.Build.NoTargets": "2.0.1", -+ "Microsoft.Build.Traversal": "2.1.1" - } - } -diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.CoreCLR.cs b/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.CoreCLR.cs -index e81335a..b7da71c 100644 ---- a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.CoreCLR.cs -+++ b/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.CoreCLR.cs -@@ -729,7 +729,7 @@ public static unsafe int QueryInterface(IntPtr pUnk, ref Guid iid, out IntPtr pp - fixed (Guid* pIID = &iid) - fixed (IntPtr* p = &ppv) - { -- return ((delegate * stdcall )(*(*(void***)pUnk + 0 /* IUnknown.QueryInterface slot */)))(pUnk, pIID, p); -+ return ((delegate* unmanaged)(*(*(void***)pUnk + 0 /* IUnknown.QueryInterface slot */)))(pUnk, pIID, p); - } - } - -@@ -739,7 +739,7 @@ public static unsafe int AddRef(IntPtr pUnk) - if (pUnk == IntPtr.Zero) - throw new ArgumentNullException(nameof(pUnk)); - -- return ((delegate * stdcall )(*(*(void***)pUnk + 1 /* IUnknown.AddRef slot */)))(pUnk); -+ return ((delegate* unmanaged)(*(*(void***)pUnk + 1 /* IUnknown.AddRef slot */)))(pUnk); - } - - [SupportedOSPlatform("windows")] -@@ -748,7 +748,7 @@ public static unsafe int Release(IntPtr pUnk) - if (pUnk == IntPtr.Zero) - throw new ArgumentNullException(nameof(pUnk)); - -- return ((delegate * stdcall )(*(*(void***)pUnk + 2 /* IUnknown.Release slot */)))(pUnk); -+ return ((delegate* unmanaged)(*(*(void***)pUnk + 2 /* IUnknown.Release slot */)))(pUnk); - } - - [SupportedOSPlatform("windows")] -diff --git a/src/coreclr/tests/issues.targets b/src/coreclr/tests/issues.targets -index 7dc5be5..93e4127 100644 ---- a/src/coreclr/tests/issues.targets -+++ b/src/coreclr/tests/issues.targets -@@ -2719,4 +2719,9 @@ - - - -+ -+ -+ https://github.com/dotnet/runtime/issues/41519 -+ -+ - -diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props -index 023ee93..74d1771 100644 ---- a/src/libraries/Directory.Build.props -+++ b/src/libraries/Directory.Build.props -@@ -13,7 +13,6 @@ - $(RepositoryEngineeringDir)BeforeTargetFrameworkInference.targets - $([System.Text.RegularExpressions.Regex]::IsMatch($(MSBuildProjectDirectory), 'src%24')) - true -- $(RepositoryEngineeringDir)depProj.common.targets - $(LibrariesProjectRoot)OSGroups.json - false - -@@ -287,7 +286,7 @@ - - - -- true -+ true - - - -diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets -index f171304..0ee2ea6 100644 ---- a/src/libraries/Directory.Build.targets -+++ b/src/libraries/Directory.Build.targets -@@ -268,7 +268,7 @@ - - -- -+ - - -diff --git a/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ComInterop/ComRuntimeHelpers.cs b/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ComInterop/ComRuntimeHelpers.cs -index 0814a30..475c2c5 100644 ---- a/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ComInterop/ComRuntimeHelpers.cs -+++ b/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ComInterop/ComRuntimeHelpers.cs -@@ -262,7 +262,7 @@ public static object GetObjectForVariant(Variant variant) - // This method is intended for use through reflection and should only be used directly by IUnknownReleaseNotZero - public static unsafe int IUnknownRelease(IntPtr interfacePointer) - { -- return ((delegate* stdcall)(*(*(void***)interfacePointer + 2 /* IUnknown.Release slot */)))(interfacePointer); -+ return ((delegate* unmanaged)(*(*(void***)interfacePointer + 2 /* IUnknown.Release slot */)))(interfacePointer); - } - - // This method is intended for use through reflection and should not be used directly -@@ -291,7 +291,7 @@ public static void IUnknownReleaseNotZero(IntPtr interfacePointer) - fixed (ExcepInfo* pExcepInfo = &excepInfo) - fixed (uint* pArgErr = &argErr) - { -- var pfnIDispatchInvoke = (delegate* stdcall ) -+ var pfnIDispatchInvoke = (delegate* unmanaged) - (*(*(void***)dispatchPointer + 6 /* IDispatch.Invoke slot */)); - - int hresult = pfnIDispatchInvoke(dispatchPointer, -diff --git a/src/libraries/System.Formats.Cbor/tests/CborDocument/System.Formats.Cbor.Tests.DataModel.fsproj b/src/libraries/System.Formats.Cbor/tests/CborDocument/System.Formats.Cbor.Tests.DataModel.fsproj -index 94a84cc..d534e09 100644 ---- a/src/libraries/System.Formats.Cbor/tests/CborDocument/System.Formats.Cbor.Tests.DataModel.fsproj -+++ b/src/libraries/System.Formats.Cbor/tests/CborDocument/System.Formats.Cbor.Tests.DataModel.fsproj -@@ -2,6 +2,8 @@ - - - $(NetCoreAppCurrent) -+ -+ $(NetCoreAppCurrent) - - - -@@ -13,4 +15,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/src/libraries/System.Net.HttpListener/src/System/Net/Windows/WebSockets/HttpWebSocket.Windows.cs b/src/libraries/System.Net.HttpListener/src/System/Net/Windows/WebSockets/HttpWebSocket.Windows.cs -index 18c1787..6eb7bd0 100644 ---- a/src/libraries/System.Net.HttpListener/src/System/Net/Windows/WebSockets/HttpWebSocket.Windows.cs -+++ b/src/libraries/System.Net.HttpListener/src/System/Net/Windows/WebSockets/HttpWebSocket.Windows.cs -@@ -3,6 +3,7 @@ - - using System.Collections.Generic; - using System.Diagnostics; -+using System.Diagnostics.CodeAnalysis; - using System.Globalization; - using System.IO; - using System.Runtime.CompilerServices; -@@ -197,6 +198,7 @@ internal static void ThrowIfConnectionAborted(Stream connection, bool read) - } - } - -+ [DoesNotReturn] - internal static void ThrowPlatformNotSupportedException_WSPC() - { - throw new PlatformNotSupportedException(SR.net_WebSockets_UnsupportedPlatform); -diff --git a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventCounter.cs b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventCounter.cs -index 54660aa..9d14c88 100644 ---- a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventCounter.cs -+++ b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventCounter.cs -@@ -42,7 +42,7 @@ public EventCounter(string name, EventSource eventSource) : base(name, eventSour - { - bufferedValues[i] = UnusedBufferSlotValue; - } -- Volatile.Write(ref _bufferedValues, bufferedValues); -+ _bufferedValues = bufferedValues; - - Publish(); - } -diff --git a/src/libraries/externals.csproj b/src/libraries/externals.csproj -new file mode 100644 -index 0000000..3c79111 ---- /dev/null -+++ b/src/libraries/externals.csproj -@@ -0,0 +1,94 @@ -+ -+ -+ -+ $(PackageRID) -+ true -+ $(NetCoreAppCurrent) -+ -+ false -+ true -+ false -+ true -+ true -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ true -+ -+ false -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/src/libraries/pkg/test/frameworkSettings/netcore50/settings.targets b/src/libraries/pkg/test/frameworkSettings/netcore50/settings.targets -new file mode 100644 -index 0000000..b54cf42 ---- /dev/null -+++ b/src/libraries/pkg/test/frameworkSettings/netcore50/settings.targets -@@ -0,0 +1,5 @@ -+ -+ -+ 10.0.0 -+ -+ -\ No newline at end of file -diff --git a/src/libraries/pkg/test/frameworkSettings/portable-net45+win8+wp8+wpa81/settings.targets b/src/libraries/pkg/test/frameworkSettings/portable-net45+win8+wp8+wpa81/settings.targets -new file mode 100644 -index 0000000..72095ad ---- /dev/null -+++ b/src/libraries/pkg/test/frameworkSettings/portable-net45+win8+wp8+wpa81/settings.targets -@@ -0,0 +1,7 @@ -+ -+ -+ .NETPortable -+ v4.5 -+ Profile259 -+ -+ -\ No newline at end of file -diff --git a/src/libraries/pkg/test/frameworkSettings/portable-net45+win8+wpa81/settings.targets b/src/libraries/pkg/test/frameworkSettings/portable-net45+win8+wpa81/settings.targets -new file mode 100644 -index 0000000..77255b7 ---- /dev/null -+++ b/src/libraries/pkg/test/frameworkSettings/portable-net45+win8+wpa81/settings.targets -@@ -0,0 +1,7 @@ -+ -+ -+ .NETPortable -+ v4.5 -+ Profile111 -+ -+ -\ No newline at end of file -diff --git a/src/libraries/pkg/test/frameworkSettings/portable-net45+win8/settings.targets b/src/libraries/pkg/test/frameworkSettings/portable-net45+win8/settings.targets -new file mode 100644 -index 0000000..e488ebf ---- /dev/null -+++ b/src/libraries/pkg/test/frameworkSettings/portable-net45+win8/settings.targets -@@ -0,0 +1,7 @@ -+ -+ -+ .NETPortable -+ v4.5 -+ Profile7 -+ -+ -\ No newline at end of file -diff --git a/src/libraries/pkg/test/frameworkSettings/portable45-net45+win8/settings.targets b/src/libraries/pkg/test/frameworkSettings/portable45-net45+win8/settings.targets -new file mode 100644 -index 0000000..e488ebf ---- /dev/null -+++ b/src/libraries/pkg/test/frameworkSettings/portable45-net45+win8/settings.targets -@@ -0,0 +1,7 @@ -+ -+ -+ .NETPortable -+ v4.5 -+ Profile7 -+ -+ -\ No newline at end of file -diff --git a/src/libraries/pkg/test/frameworkSettings/portable46-net451+win81/settings.targets b/src/libraries/pkg/test/frameworkSettings/portable46-net451+win81/settings.targets -new file mode 100644 -index 0000000..463ffc6 ---- /dev/null -+++ b/src/libraries/pkg/test/frameworkSettings/portable46-net451+win81/settings.targets -@@ -0,0 +1,7 @@ -+ -+ -+ .NETPortable -+ v4.6 -+ Profile44 -+ -+ -\ No newline at end of file -diff --git a/src/libraries/pkg/test/packageSettings/System.Utf8String.Experimental/netcoreapp/DisableVerifyClosure.targets b/src/libraries/pkg/test/packageSettings/System.Utf8String.Experimental/netcoreapp/DisableVerifyClosure.targets -new file mode 100644 -index 0000000..a5776c4 ---- /dev/null -+++ b/src/libraries/pkg/test/packageSettings/System.Utf8String.Experimental/netcoreapp/DisableVerifyClosure.targets -@@ -0,0 +1,7 @@ -+ -+ -+ -+ false -+ -+ -\ No newline at end of file -diff --git a/src/libraries/pkg/test/packageTest.targets b/src/libraries/pkg/test/packageTest.targets -index 4aa0b3e..53f608f 100644 ---- a/src/libraries/pkg/test/packageTest.targets -+++ b/src/libraries/pkg/test/packageTest.targets -@@ -3,6 +3,8 @@ - - <_targetFrameworkVersionIndex>$(TargetFramework.IndexOfAny(".-0123456789")) - <_targetFrameworkIdentifier Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(TargetFramework.SubString(0, $(_targetFrameworkVersionIndex))) -+ -+ <_targetFrameworkIdentifier Condition="'$(_targetFrameworkIdentifier)' == 'net' and !$(TargetFramework.StartsWith('net4'))">netcoreapp - $(MSBuildThisFileDirectory)tools\ - - -diff --git a/src/libraries/pkg/test/project.csproj.template b/src/libraries/pkg/test/project.csproj.template -index d78e153..dec755e 100644 ---- a/src/libraries/pkg/test/project.csproj.template -+++ b/src/libraries/pkg/test/project.csproj.template -@@ -5,6 +5,8 @@ - {RIDs} - {PackageId} - {PackageVersion} -+ -+ false - - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\support - -diff --git a/src/libraries/pretest.proj b/src/libraries/pretest.proj -index 5cd55be..a2b807d 100644 ---- a/src/libraries/pretest.proj -+++ b/src/libraries/pretest.proj -@@ -8,22 +8,22 @@ - - - - -- -- -+ -+ - - - - - - -- - - - -@@ -48,7 +48,7 @@ - - -@@ -63,7 +63,7 @@ - - -@@ -78,7 +78,7 @@ - - - -@@ -117,7 +117,7 @@ - - -diff --git a/src/libraries/restore/Directory.Build.props b/src/libraries/restore/Directory.Build.props -deleted file mode 100644 -index 4cc2380..0000000 ---- a/src/libraries/restore/Directory.Build.props -+++ /dev/null -@@ -1,23 +0,0 @@ -- -- -- -- -- -- $([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(TargetFramework)-$(TargetFrameworkSuffix)-$(Configuration)')) -- $([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(TargetFramework)-$(Configuration)')) -- $(IntermediateOutputPath) -- $(RestoreOutputPath)/project.assets.json -- $(IntermediateOutputPath) -- -- true -- false -- -- -- -- -- -- Build -- -- -- -diff --git a/src/libraries/restore/Directory.Build.targets b/src/libraries/restore/Directory.Build.targets -deleted file mode 100644 -index 785efcc..0000000 ---- a/src/libraries/restore/Directory.Build.targets -+++ /dev/null -@@ -1,7 +0,0 @@ -- -- -- -- -- true -- -- -diff --git a/src/libraries/restore/runtime/Directory.Build.props b/src/libraries/restore/runtime/Directory.Build.props -deleted file mode 100644 -index dacf9d9..0000000 ---- a/src/libraries/restore/runtime/Directory.Build.props -+++ /dev/null -@@ -1,7 +0,0 @@ -- -- -- external.$(MSBuildProjectName) -- -- -- -- -\ No newline at end of file -diff --git a/src/libraries/restore/runtime/runtime.depproj b/src/libraries/restore/runtime/runtime.depproj -deleted file mode 100644 -index 942e0fe..0000000 ---- a/src/libraries/restore/runtime/runtime.depproj -+++ /dev/null -@@ -1,110 +0,0 @@ -- -- -- $(PackageRID) -- $(NoWarn);NU1603;NU1605 -- true -- false -- true -- false -- $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- hostfxr -- libhostfxr -- hostpolicy -- libhostpolicy -- -- true -- -- false -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- $([System.Text.RegularExpressions.Regex]::Replace('$(TargetFrameworks)', '-[^;]+', '')) -- -- -- -diff --git a/src/tests/Interop/UnmanagedCallersOnly/InvalidCSharp.ilproj b/src/tests/Interop/UnmanagedCallersOnly/InvalidCSharp.ilproj -new file mode 100644 -index 0000000..b7b8b4d ---- /dev/null -+++ b/src/tests/Interop/UnmanagedCallersOnly/InvalidCSharp.ilproj -@@ -0,0 +1,8 @@ -+ -+ -+ library -+ -+ -+ -+ -+ -\ No newline at end of file -diff --git a/src/tests/Interop/UnmanagedCallersOnly/InvalidCallbacks.il b/src/tests/Interop/UnmanagedCallersOnly/InvalidCallbacks.il -new file mode 100644 -index 0000000..bd39136 ---- /dev/null -+++ b/src/tests/Interop/UnmanagedCallersOnly/InvalidCallbacks.il -@@ -0,0 +1,75 @@ -+// Licensed to the .NET Foundation under one or more agreements. -+// The .NET Foundation licenses this file to you under the MIT license. -+ -+.assembly extern System.Runtime { } -+.assembly extern System.Runtime.InteropServices { } -+ -+.assembly InvalidCSharp { } -+ -+.class public auto ansi beforefieldinit InvalidCSharp.GenericClass`1 -+ extends System.Object -+{ -+ .method public hidebysig static -+ void CallbackMethod ( -+ int32 n -+ ) cil managed preservesig -+ { -+ .custom instance void [System.Runtime.InteropServices]System.Runtime.InteropServices.UnmanagedCallersOnlyAttribute::.ctor() = ( -+ 01 00 00 00 -+ ) -+ .maxstack 8 -+ IL_0000: ldstr "Functions with attribute UnmanagedCallersOnlyAttribute within a generic type are invalid" -+ IL_0005: newobj instance void [System.Runtime]System.Exception::.ctor(string) -+ IL_000a: throw -+ } -+ -+ .method public hidebysig specialname rtspecialname -+ instance void .ctor () cil managed -+ { -+ .maxstack 8 -+ IL_0000: ldarg.0 -+ IL_0001: call instance void [System.Runtime]System.Object::.ctor() -+ IL_0006: ret -+ } -+} -+ -+.class public auto ansi beforefieldinit InvalidCSharp.Callbacks -+ extends [System.Runtime]System.Object -+{ -+ .method public hidebysig static -+ int32 CallbackMethodGeneric ( -+ !!T arg -+ ) cil managed preservesig -+ { -+ .custom instance void [System.Runtime.InteropServices]System.Runtime.InteropServices.UnmanagedCallersOnlyAttribute::.ctor() = ( -+ 01 00 00 00 -+ ) -+ .maxstack 8 -+ IL_0000: ldstr "Functions with attribute UnmanagedCallersOnlyAttribute cannot have generic arguments" -+ IL_0005: newobj instance void [System.Runtime]System.Exception::.ctor(string) -+ IL_000a: throw -+ } -+ -+ .method public hidebysig -+ instance int32 CallbackNonStatic ( -+ int32 val -+ ) cil managed preservesig -+ { -+ .custom instance void [System.Runtime.InteropServices]System.Runtime.InteropServices.UnmanagedCallersOnlyAttribute::.ctor() = ( -+ 01 00 00 00 -+ ) -+ .maxstack 8 -+ IL_0000: ldstr "Instance functions with attribute UnmanagedCallersOnlyAttribute are invalid" -+ IL_0005: newobj instance void [System.Runtime]System.Exception::.ctor(string) -+ IL_000a: throw -+ } -+ -+ .method public hidebysig specialname rtspecialname -+ instance void .ctor () cil managed -+ { -+ .maxstack 8 -+ IL_0000: ldarg.0 -+ IL_0001: call instance void [System.Runtime]System.Object::.ctor() -+ IL_0006: ret -+ } -+} -diff --git a/src/tests/Interop/UnmanagedCallersOnly/UnmanagedCallersOnlyTest.cs b/src/tests/Interop/UnmanagedCallersOnly/UnmanagedCallersOnlyTest.cs -index 68d700c..0a2b530 100644 ---- a/src/tests/Interop/UnmanagedCallersOnly/UnmanagedCallersOnlyTest.cs -+++ b/src/tests/Interop/UnmanagedCallersOnly/UnmanagedCallersOnlyTest.cs -@@ -3,9 +3,9 @@ - using System; - using System.Collections.Generic; - using System.Diagnostics; --using System.Runtime.CompilerServices; - using System.Reflection; - using System.Reflection.Emit; -+using System.Runtime.CompilerServices; - using System.Runtime.InteropServices; - using System.Threading; - using TestLibrary; -@@ -35,6 +35,20 @@ public static class UnmanagedCallersOnlyDll - public static extern int PInvokeMarkedWithUnmanagedCallersOnly(int n); - } - -+ private const string InvalidCSharpAssemblyName = "InvalidCSharp"; -+ -+ public static Type GetCallbacksType() -+ { -+ var asm = Assembly.Load(InvalidCSharpAssemblyName); -+ return asm.GetType("InvalidCSharp.Callbacks"); -+ } -+ -+ public static Type GetGenericClassOfIntType() -+ { -+ var asm = Assembly.Load(InvalidCSharpAssemblyName); -+ return asm.GetType("InvalidCSharp.GenericClass`1").MakeGenericType(typeof(int)); -+ } -+ - private delegate int IntNativeMethodInvoker(); - private delegate void NativeMethodInvoker(); - -@@ -338,12 +352,6 @@ void CallAsDelegate() - } - } - -- [UnmanagedCallersOnly] -- public int CallbackNonStatic(int val) -- { -- Assert.Fail($"Instance functions with attribute {nameof(UnmanagedCallersOnlyAttribute)} are invalid"); -- return -1; -- } - - public static void NegativeTest_NonStaticMethod() - { -@@ -354,7 +362,7 @@ void TestUnmanagedCallersOnlyNonStatic() - { - .locals init ([0] native int ptr) - nop -- ldftn int CallbackNonStatic(int) -+ ldftn int GetCallbacksType().CallbackNonStatic(int) - stloc.0 - - ldloc.0 -@@ -371,7 +379,7 @@ .locals init ([0] native int ptr) - il.Emit(OpCodes.Nop); - - // Get native function pointer of the callback -- il.Emit(OpCodes.Ldftn, typeof(Program).GetMethod(nameof(CallbackNonStatic))); -+ il.Emit(OpCodes.Ldftn, GetCallbacksType().GetMethod("CallbackNonStatic")); - il.Emit(OpCodes.Stloc_0); - il.Emit(OpCodes.Ldloc_0); - -@@ -436,13 +444,6 @@ .locals init ([0] native int ptr) - Assert.Throws(() => { testNativeMethod(); }); - } - -- [UnmanagedCallersOnly] -- public static int CallbackMethodGeneric(T arg) -- { -- Assert.Fail($"Functions with attribute {nameof(UnmanagedCallersOnlyAttribute)} cannot have generic arguments"); -- return -1; -- } -- - public static void NegativeTest_NonInstantiatedGenericArguments() - { - Console.WriteLine($"Running {nameof(NegativeTest_NonInstantiatedGenericArguments)}..."); -@@ -452,7 +453,7 @@ void TestUnmanagedCallersOnlyNonInstGenericArguments() - { - .locals init ([0] native int ptr) - IL_0000: nop -- IL_0001: ldftn void CallbackMethodGeneric(T) -+ IL_0001: ldftn void InvalidCSharp.Callbacks.CallbackMethodGeneric(T) - IL_0007: stloc.0 - IL_0008: ret - } -@@ -463,7 +464,7 @@ .locals init ([0] native int ptr) - il.Emit(OpCodes.Nop); - - // Get native function pointer of the callback -- il.Emit(OpCodes.Ldftn, typeof(Program).GetMethod(nameof(CallbackMethodGeneric))); -+ il.Emit(OpCodes.Ldftn, GetCallbacksType().GetMethod("CallbackMethodGeneric")); - il.Emit(OpCodes.Stloc_0); - - il.Emit(OpCodes.Ret); -@@ -482,7 +483,7 @@ void TestUnmanagedCallersOnlyInstGenericArguments() - { - .locals init ([0] native int ptr) - nop -- ldftn void CallbackMethodGeneric(int) -+ ldftn void InvalidCSharp.Callbacks.CallbackMethodGeneric(int) - stloc.0 - - ldloc.0 -@@ -499,7 +500,7 @@ .locals init ([0] native int ptr) - il.Emit(OpCodes.Nop); - - // Get native function pointer of the instantiated generic callback -- il.Emit(OpCodes.Ldftn, typeof(Program).GetMethod(nameof(CallbackMethodGeneric)).MakeGenericMethod(new [] { typeof(int) })); -+ il.Emit(OpCodes.Ldftn, GetCallbacksType().GetMethod("CallbackMethodGeneric").MakeGenericMethod(new [] { typeof(int) })); - il.Emit(OpCodes.Stloc_0); - il.Emit(OpCodes.Ldloc_0); - -@@ -515,15 +516,6 @@ .locals init ([0] native int ptr) - Assert.Throws(() => { testNativeMethod(); }); - } - -- public class GenericClass -- { -- [UnmanagedCallersOnly] -- public static void CallbackMethod(int n) -- { -- Assert.Fail($"Functions with attribute {nameof(UnmanagedCallersOnlyAttribute)} within a generic type are invalid"); -- } -- } -- - public static void NegativeTest_FromInstantiatedGenericClass() - { - Console.WriteLine($"Running {nameof(NegativeTest_FromInstantiatedGenericClass)}..."); -@@ -533,7 +525,7 @@ void TestUnmanagedCallersOnlyInstGenericType() - { - .locals init ([0] native int ptr) - nop -- ldftn int GenericClass::CallbackMethod(int) -+ ldftn int InvalidCSharp.GenericClass::CallbackMethod(int) - stloc.0 - - ldloc.0 -@@ -550,7 +542,7 @@ .locals init ([0] native int ptr) - il.Emit(OpCodes.Nop); - - // Get native function pointer of the callback from the instantiated generic class. -- il.Emit(OpCodes.Ldftn, typeof(GenericClass).GetMethod(nameof(GenericClass.CallbackMethod))); -+ il.Emit(OpCodes.Ldftn, GetGenericClassOfIntType().GetMethod("CallbackMethod")); - il.Emit(OpCodes.Stloc_0); - il.Emit(OpCodes.Ldloc_0); - -diff --git a/src/tests/Interop/UnmanagedCallersOnly/UnmanagedCallersOnlyTest.csproj b/src/tests/Interop/UnmanagedCallersOnly/UnmanagedCallersOnlyTest.csproj -index a8c1862..170fac3 100644 ---- a/src/tests/Interop/UnmanagedCallersOnly/UnmanagedCallersOnlyTest.csproj -+++ b/src/tests/Interop/UnmanagedCallersOnly/UnmanagedCallersOnlyTest.csproj -@@ -1,7 +1,6 @@ - - - Exe -- 1 - - - -@@ -10,5 +9,6 @@ - - - -+ - - -diff --git a/src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj b/src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj -index 0a9d97a..eb084ad 100644 ---- a/src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj -+++ b/src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj -@@ -7,7 +7,7 @@ - True - True - True -- netcoreapp3.1 -+ $(NetCoreAppCurrent) - - - --- -1.8.3.1 - diff --git a/patches/runtime/0022-build-commons.sh-check-for-OpenSSL-1.1-on-macOS-4303.patch b/patches/runtime/0022-build-commons.sh-check-for-OpenSSL-1.1-on-macOS-4303.patch deleted file mode 100644 index de674f5f58..0000000000 --- a/patches/runtime/0022-build-commons.sh-check-for-OpenSSL-1.1-on-macOS-4303.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f15b55a17f4285279d20d30ce2ad5d487ebd770e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= -Date: Mon, 5 Oct 2020 19:04:13 +0200 -Subject: [PATCH] build-commons.sh: check for OpenSSL 1.1 on macOS (#43037) - -We're installing openssl@1.1 from Homebrew so we should check that version. -It looks like CI Macs don't set the /usr/local/opt/openssl symlink anymore. - -Upstream PR: https://github.com/dotnet/runtime/pull/43037 ---- - eng/native/build-commons.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/native/build-commons.sh b/eng/native/build-commons.sh -index 2e94d68fe69..dc1641f5a49 100755 ---- a/eng/native/build-commons.sh -+++ b/eng/native/build-commons.sh -@@ -55,7 +55,7 @@ check_prereqs() - if ! pkg-config openssl ; then - # We export the proper PKG_CONFIG_PATH where openssl was installed by Homebrew - # It's important to _export_ it since build-commons.sh is sourced by other scripts such as build-native.sh -- export PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig -+ export PKG_CONFIG_PATH=/usr/local/opt/openssl@1.1/lib/pkgconfig - # We try again with the PKG_CONFIG_PATH in place, if pkg-config still can't find OpenSSL, exit with an error, cmake won't find OpenSSL either - pkg-config openssl || { echo >&2 "Please install openssl before running this script, see https://github.com/dotnet/runtime/blob/master/docs/workflow/requirements/macos-requirements.md"; exit 1; } - fi --- -2.25.2 - diff --git a/patches/runtime/0026-Pin-System.Security.Cryptography.Cng-to-single-versi.patch b/patches/runtime/0026-Pin-System.Security.Cryptography.Cng-to-single-versi.patch new file mode 100644 index 0000000000..7db1ba5a6e --- /dev/null +++ b/patches/runtime/0026-Pin-System.Security.Cryptography.Cng-to-single-versi.patch @@ -0,0 +1,30 @@ +From c1322c37dac74e51e0bef7e35edf2db05fa97869 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Fri, 30 Oct 2020 16:25:21 +0000 +Subject: [PATCH] Pin System.Security.Cryptography.Cng to single version + +If System.Security.Cryptography.Cng is restored using the PVP +version (5.0.0), this causes conflicts later in the restore which +results in an error: + An item with the same key has already been added. + Key: (System.Security.Cryptography.Cng, 5.0.0) +--- + .../src/System.Security.Cryptography.Pkcs.csproj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj +index 3fd055e..18ab0e2 100644 +--- a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj ++++ b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj +@@ -639,7 +639,7 @@ + + + +- ++ + + + +-- +1.8.3.1 + diff --git a/patches/sdk/0013-Add-TargetFrameworkMoniker-for-sdks.csproj.patch b/patches/sdk/0013-Add-TargetFrameworkMoniker-for-sdks.csproj.patch deleted file mode 100644 index 074775690c..0000000000 --- a/patches/sdk/0013-Add-TargetFrameworkMoniker-for-sdks.csproj.patch +++ /dev/null @@ -1,24 +0,0 @@ -From ef1f4c25840a851a723288f8f008f99e8934c6ef Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Thu, 8 Oct 2020 22:00:42 +0000 -Subject: [PATCH] Add TargetFrameworkMoniker for sdks.csproj - ---- - src/Layout/redist/targets/sdks/sdks.csproj | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Layout/redist/targets/sdks/sdks.csproj b/src/Layout/redist/targets/sdks/sdks.csproj -index 6b16447..1daeba7 100644 ---- a/src/Layout/redist/targets/sdks/sdks.csproj -+++ b/src/Layout/redist/targets/sdks/sdks.csproj -@@ -4,6 +4,7 @@ - - Library - net5.0 -+ .NETCoreApp,Version=v5.0 - false - - --- -1.8.3.1 - diff --git a/repos/aspnetcore.proj b/repos/aspnetcore.proj index 9a183c3bd3..c1a3b6bfe3 100644 --- a/repos/aspnetcore.proj +++ b/repos/aspnetcore.proj @@ -21,9 +21,6 @@ $(BuildCommandArgs) /p:MicrosoftNetFrameworkReferenceAssembliesVersion=1.0.0 - - $(BuildCommandArgs) /p:MicrosoftNETCoreAppRefPackageVersion=5.0.0-rc.1.20451.14 true diff --git a/repos/linker.proj b/repos/linker.proj index 597c528bfe..61a524c16e 100644 --- a/repos/linker.proj +++ b/repos/linker.proj @@ -20,7 +20,7 @@ $(BuildPackagesCommandArgs) $(ProjectDirectory)src/ILLink.Tasks/ILLink.Tasks.csproj $(DotNetCliToolDir)dotnet $(BuildPackagesCommandArgs) - $(ProjectDirectory)artifacts/packages/illink_$(Configuration)/Shipping/ + $(ProjectDirectory)artifacts/packages/illink_$(Configuration)/NonShipping/ false $(ProjectDirectory)/NuGet.config diff --git a/repos/runtime.proj b/repos/runtime.proj index 7fe0220f6a..6cb3e80ab1 100644 --- a/repos/runtime.proj +++ b/repos/runtime.proj @@ -12,5 +12,12 @@ + + + + + + + diff --git a/smoke-testNuGet.Config b/smoke-testNuGet.Config index 1559c1e675..10efd7a56e 100644 --- a/smoke-testNuGet.Config +++ b/smoke-testNuGet.Config @@ -3,6 +3,12 @@ + + + + + + diff --git a/tools-local/prebuilt-baseline-offline.xml b/tools-local/prebuilt-baseline-offline.xml index 574dc1e01a..84a2454466 100644 --- a/tools-local/prebuilt-baseline-offline.xml +++ b/tools-local/prebuilt-baseline-offline.xml @@ -4,28 +4,32 @@ src/ApplicationInsights-dotnet.53b80940842204f78708a538628288ff5d741a1d/ src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/ src/xdt.c01a538851a8ab1a1fbeb2e6243f391fff7587b4/ - src/aspnetcore.ecdcc752d4639061c2c49727ee77a1039bbbca22/ + src/aspnetcore.371a26f07b23ad77c636332c2dfc0cbd1d8137ba/ src/cliCommandLineParser.0e89c2116ad28e404ba56c14d1c3f938caa25a01/ src/command-line-api.afd010ba8cb3cbd714c734465d1a5de1ee133e2d/ src/common.6e37cdfe96ac8b06a923242120169fafacd720e6/ - src/fsharp.068ebd3c599bc5a47163a18b8b90d2fe5517186e/ - src/installer.473d1b592e8c281f03dcc4024c04c7c188e99c03/ + src/cssparser.d6d86bcd8c162b1ae22ef00955ff748d028dd0ee/ + src/diagnostics.47296ca69bb66180c132f3b16667f904dfc7c6c7/ + src/fsharp.da6be68280c89131cdba2045525b80890401defd/ + src/installer.5044b938294b7b920a5a4393a5f0f8b7b1750548/ src/known-good-tests./ src/known-good./ - src/linker.863b5502cc43b1c75b5a93ac395899f8d8b5f0a4/ - src/msbuild.a55ce4fbb09e1ff104c815ab5b5c7609c4251e81/ + src/linker.e792d61a0ead2f6422b4c9af651c1128d978d454/ + src/msbuild.126527ff107ae93fed10af675506c56d046aa5a3/ src/netcorecli-fsc/ src/Newtonsoft.Json.cac0690ad133c5e166ce5642dc71175791404fad/ src/Newtonsoft.Json.e43dae94c26f0c30e9095327a3a9eac87193923d/ - src/NuGet.Client.3501ddedc274ac10d4b135856b7593a6bb8a72f1/ + src/NuGet.Client.830c8be45dbbccd411ecf6080abff0c2c98079cf/ src/package-source-build/ - src/roslyn.90e570d763637c4d0d30524674a64b07bb885994/ - src/runtime.38017c3935de95d0335bac04f4901ddfc2718656/ - src/runtime.38017c3935de95d0335bac04f4901ddfc2718656/ - src/sdk.394fae2553937858c8f05a6158613dcc7f821fba/ + src/roslyn.4c195c3ac1974edcefa76774d7a59a2350ec55fa/ + src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/ + src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/ + src/sdk.0cdbf80b4176ba4b979bdfc7b630b884f656072f/ src/sourcelink.f175b06862f889474b689a57527e489101c774cc/ - src/templating.da62f3656cac0ac4bfb6b012bc072b3499f78e6c/ - src/vstest.0c0fafa64de5c73981e7c40a99d7363f57635f60/ + src/symreader.f8a3ba85aed339fb8d08ca26f3876b28c32d58ee/ + src/templating.31980633108a1bef00c798136fcd30a873c90fa3/ + src/test-templates.956e14dedd3a3ac981b320d66c6d389387a2954a/ + src/vstest.b195e2589980861425b331e73a859252c3f2b71a/ src/xliff-tasks.a52f3d7fb58470749ee4035fbbcb7e63c78b0459/ Tools/ tools-local/tasks/ @@ -35,6 +39,7 @@ + @@ -43,8 +48,8 @@ - - + + @@ -54,6 +59,7 @@ + @@ -78,12 +84,8 @@ - - - - - + @@ -109,6 +111,7 @@ + @@ -125,43 +128,35 @@ - + - - - + + - - - - - - - + + - - - + - + - - - + + + - - - + + + - - + + @@ -215,12 +210,7 @@ - - - - - - + @@ -233,6 +223,7 @@ + @@ -250,49 +241,41 @@ - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - + @@ -301,8 +284,7 @@ - - + @@ -311,20 +293,16 @@ - - - - + - @@ -345,10 +323,11 @@ + - + \ No newline at end of file diff --git a/tools-local/prebuilt-baseline-online.xml b/tools-local/prebuilt-baseline-online.xml old mode 100644 new mode 100755 index c0fe0c9e24..192ba7185f --- a/tools-local/prebuilt-baseline-online.xml +++ b/tools-local/prebuilt-baseline-online.xml @@ -4,32 +4,32 @@ artifacts/src/ApplicationInsights-dotnet.53b80940842204f78708a538628288ff5d741a1d/ artifacts/src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/ artifacts/src/xdt.c01a538851a8ab1a1fbeb2e6243f391fff7587b4/ - artifacts/src/aspnetcore.ecdcc752d4639061c2c49727ee77a1039bbbca22/ + artifacts/src/aspnetcore.371a26f07b23ad77c636332c2dfc0cbd1d8137ba/ artifacts/src/cliCommandLineParser.0e89c2116ad28e404ba56c14d1c3f938caa25a01/ artifacts/src/command-line-api.afd010ba8cb3cbd714c734465d1a5de1ee133e2d/ artifacts/src/common.6e37cdfe96ac8b06a923242120169fafacd720e6/ artifacts/src/cssparser.d6d86bcd8c162b1ae22ef00955ff748d028dd0ee/ artifacts/src/diagnostics.47296ca69bb66180c132f3b16667f904dfc7c6c7/ - artifacts/src/fsharp.068ebd3c599bc5a47163a18b8b90d2fe5517186e/ - artifacts/src/installer.473d1b592e8c281f03dcc4024c04c7c188e99c03/ + artifacts/src/fsharp.da6be68280c89131cdba2045525b80890401defd/ + artifacts/src/installer.5044b938294b7b920a5a4393a5f0f8b7b1750548/ artifacts/src/known-good-tests./ artifacts/src/known-good./ - artifacts/src/linker.863b5502cc43b1c75b5a93ac395899f8d8b5f0a4/ - artifacts/src/msbuild.a55ce4fbb09e1ff104c815ab5b5c7609c4251e81/ + artifacts/src/linker.e792d61a0ead2f6422b4c9af651c1128d978d454/ + artifacts/src/msbuild.126527ff107ae93fed10af675506c56d046aa5a3/ src/netcorecli-fsc/ artifacts/src/Newtonsoft.Json.cac0690ad133c5e166ce5642dc71175791404fad/ artifacts/src/Newtonsoft.Json.e43dae94c26f0c30e9095327a3a9eac87193923d/ - artifacts/src/NuGet.Client.3501ddedc274ac10d4b135856b7593a6bb8a72f1/ + artifacts/src/NuGet.Client.830c8be45dbbccd411ecf6080abff0c2c98079cf/ src/package-source-build/ - artifacts/src/roslyn.90e570d763637c4d0d30524674a64b07bb885994/ - artifacts/src/runtime.38017c3935de95d0335bac04f4901ddfc2718656/ - artifacts/src/runtime.38017c3935de95d0335bac04f4901ddfc2718656/ - artifacts/src/sdk.394fae2553937858c8f05a6158613dcc7f821fba/ + artifacts/src/roslyn.4c195c3ac1974edcefa76774d7a59a2350ec55fa/ + artifacts/src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/ + artifacts/src/runtime.cf258a14b70ad9069470a108f13765e0e5988f51/ + artifacts/src/sdk.0cdbf80b4176ba4b979bdfc7b630b884f656072f/ artifacts/src/sourcelink.f175b06862f889474b689a57527e489101c774cc/ artifacts/src/symreader.f8a3ba85aed339fb8d08ca26f3876b28c32d58ee/ - artifacts/src/templating.da62f3656cac0ac4bfb6b012bc072b3499f78e6c/ + artifacts/src/templating.31980633108a1bef00c798136fcd30a873c90fa3/ artifacts/src/test-templates.956e14dedd3a3ac981b320d66c6d389387a2954a/ - artifacts/src/vstest.0c0fafa64de5c73981e7c40a99d7363f57635f60/ + artifacts/src/vstest.b195e2589980861425b331e73a859252c3f2b71a/ artifacts/src/xliff-tasks.a52f3d7fb58470749ee4035fbbcb7e63c78b0459/ Tools/ tools-local/tasks/ @@ -43,15 +43,19 @@ + + + + @@ -67,37 +71,38 @@ + - - - + + + - + - + - + - - - + + + - - - + + + - - + + @@ -118,8 +123,7 @@ - - + @@ -157,7 +161,7 @@ - + @@ -204,7 +208,6 @@ - @@ -303,7 +306,7 @@ - + @@ -332,7 +335,7 @@ - + @@ -433,7 +436,7 @@ - + @@ -453,7 +456,7 @@ - + @@ -525,11 +528,12 @@ - + + - - + + @@ -573,4 +577,4 @@ - + \ No newline at end of file