From dc3e4193623be13a7cc28327eaf3a609e15239f5 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 18 Feb 2021 17:30:22 +0100 Subject: [PATCH 01/11] Remove duplicated ILLink PackageReference The Arcade.SDK already package refrences the ILLink package. The duplicate reference in illink.targets caused SDK errors as the Arcade reference has IsImplicitlyDefined set which doesn't allow an additional reference with the same identity. Also, as the ILLink package already exposes the path to the assembly via its props file, using that instead of manually constructing the path to the assembly. The SDK target version update is required as the sequencing of the ILLink.props file was wrong and is required for this change. This isn't considered a breaking change, as the SDK's minimum required version isn't changed. --- Directory.Build.props | 4 ++-- eng/Version.Details.xml | 2 +- eng/illink.targets | 16 ++-------------- eng/testing/linker/project.csproj.template | 12 +----------- global.json | 4 ++-- ...CreateRuntimeRootILLinkDescriptorFile.targets | 8 ++------ 6 files changed, 10 insertions(+), 36 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 62a5c97bb10d4d..5352c2d99bfcef 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -38,8 +38,8 @@ $(MajorVersion).$(MinorVersion) - 5.0 - 5.0 + 6.0 + 6.0 .NETCoreApp $(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppCurrentVersion) net$(NetCoreAppCurrentVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c5f2a5fedf93da..a6bc7468d6f864 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,7 +6,7 @@ - + https://github.com/dotnet/arcade 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe diff --git a/eng/illink.targets b/eng/illink.targets index 4d48845507ab86..6dbc6e1e531c8a 100644 --- a/eng/illink.targets +++ b/eng/illink.targets @@ -14,21 +14,9 @@ - - - - $(MSBuildProjectDirectory)\ILLink\ - $([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_NET_ILLink_Tasks)', 'tools')) - $(ILLinkTasksDir)net5.0/ILLink.Tasks.dll - $(ILLinkTasksDir)net472/ILLink.Tasks.dll $(IntermediateOutputPath)$(TargetName)$(TargetExt) $(IntermediateOutputPath)$(TargetName).pdb $(IntermediateOutputPath)PreTrim/ @@ -122,7 +110,7 @@ - + - + diff --git a/eng/testing/linker/project.csproj.template b/eng/testing/linker/project.csproj.template index eddb438480c727..6bf7c0172a586b 100644 --- a/eng/testing/linker/project.csproj.template +++ b/eng/testing/linker/project.csproj.template @@ -28,21 +28,11 @@ - - - <_ILLinkTasksDirectoryRoot>$(PkgMicrosoft_NET_ILLink_Tasks)\tools\ - <_ILLinkTasksTFM>net5.0 - <_ILLinkTasksDirectory>$(_ILLinkTasksDirectoryRoot)$(_ILLinkTasksTFM)\ - $(_ILLinkTasksDirectory)ILLink.Tasks.dll - - + IsImplicitlyDefined="true" /> diff --git a/global.json b/global.json index ae674f097fc637..dc3b9050b89322 100644 --- a/global.json +++ b/global.json @@ -5,7 +5,7 @@ "rollForward": "major" }, "tools": { - "dotnet": "5.0.100" + "dotnet": "6.0.100-preview.2.21118.7" }, "native-tools": { "cmake": "3.16.4", @@ -13,7 +13,7 @@ }, "msbuild-sdks": { "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21105.12", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21105.12", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21118.2", "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21105.12", "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21105.12", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", diff --git a/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets b/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets index e12999eccd7325..c36b1c57ab82fa 100644 --- a/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets +++ b/src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets @@ -11,10 +11,6 @@ <_CortypeFilePath Condition=" '$(_CortypeFilePath)' == '' ">$(MSBuildThisFileDirectory)..\inc\cortypeinfo.h <_RexcepFilePath Condition=" '$(_RexcepFilePath)' == '' ">$(MSBuildThisFileDirectory)..\vm\rexcep.h <_ILLinkDescriptorsIntermediatePath>$(IntermediateOutputPath)ILLink.Descriptors.Combined.xml - <_ILLinkTasksToolsDir>$(PkgMicrosoft_NET_ILLink_Tasks)/tools - <_ILLinkTasksDir>$(_ILLinkTasksToolsDir)/net472/ - <_ILLinkTasksDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(_ILLinkTasksToolsDir)/net5.0/ - <_ILLinkTasksPath>$(_ILLinkTasksDir)ILLink.Tasks.dll @@ -30,7 +26,7 @@ of child processes, and attach a debugger to msbuild. After that you can set a bp on the exception you are seeing. --> - + - + From 558c6099505cc200d9d97d37a55658367a90c139 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Sat, 20 Feb 2021 21:37:15 +0100 Subject: [PATCH 02/11] Update arcade dependencies --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 22 +++++++++++----------- global.json | 8 ++++---- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6bc7468d6f864..7b2d4d50b3291d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,23 +10,23 @@ https://github.com/dotnet/arcade 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe - + https://github.com/dotnet/arcade 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe - + https://github.com/dotnet/arcade 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe - + https://github.com/dotnet/arcade 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe - + https://github.com/dotnet/arcade 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe - + https://github.com/dotnet/arcade 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe @@ -34,39 +34,39 @@ https://github.com/dotnet/arcade 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe - + https://github.com/dotnet/arcade 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe - + https://github.com/dotnet/arcade 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe - + https://github.com/dotnet/arcade 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe - + https://github.com/dotnet/arcade 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe - + https://github.com/dotnet/arcade 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe - + https://github.com/dotnet/arcade 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe - + https://github.com/dotnet/arcade 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe - + https://github.com/dotnet/arcade 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe - + https://github.com/dotnet/arcade 938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe diff --git a/eng/Versions.props b/eng/Versions.props index 6c9f88c92ef4a6..81218dd3a2a30a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,18 +49,18 @@ 3.8.0-4.20503.2 3.8.0 - 6.0.0-beta.21105.12 - 6.0.0-beta.21105.12 - 6.0.0-beta.21105.12 - 6.0.0-beta.21105.12 - 6.0.0-beta.21105.12 - 6.0.0-beta.21105.12 + 6.0.0-beta.21120.1 + 6.0.0-beta.21120.1 + 6.0.0-beta.21120.1 + 6.0.0-beta.21120.1 + 6.0.0-beta.21120.1 + 6.0.0-beta.21120.1 2.5.1-beta.21105.12 - 6.0.0-beta.21105.12 - 6.0.0-beta.21105.12 - 6.0.0-beta.21105.12 - 6.0.0-beta.21105.12 - 6.0.0-beta.21105.12 + 6.0.0-beta.21120.1 + 6.0.0-beta.21120.1 + 6.0.0-beta.21120.1 + 6.0.0-beta.21120.1 + 6.0.0-beta.21120.1 5.9.0-preview.2 diff --git a/global.json b/global.json index dc3b9050b89322..30ebd1f4152b0c 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21105.12", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21118.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21105.12", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21105.12", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21120.1", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21120.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21120.1", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21120.1", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "6.0.0-preview.2.21115.2", "Microsoft.Build.NoTargets": "2.0.17", From 19d8823be3d46864f547ecdd9a9bba7f4dcee1d8 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Sun, 21 Feb 2021 13:09:02 +0100 Subject: [PATCH 03/11] Remove NuGet pack tasks pkgref --- src/libraries/Directory.Build.targets | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets index cffc3e6ca52939..86c50d3b24ee78 100644 --- a/src/libraries/Directory.Build.targets +++ b/src/libraries/Directory.Build.targets @@ -128,11 +128,6 @@ - - - - - From b4ba1fdcf9b45c874459c6b6e5fadf343f7d441f Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 23 Feb 2021 11:59:20 +0100 Subject: [PATCH 04/11] Add mega hack workaround --- eng/Tools.props | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/eng/Tools.props b/eng/Tools.props index 1a9804dbaf6925..32ff51a560f241 100644 --- a/eng/Tools.props +++ b/eng/Tools.props @@ -18,4 +18,14 @@ + + + + <_BuildTasksPackagingNewtonsoftDependency>$(NuGetPackageRoot)microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\tools\netcoreapp3.1\Newtonsoft.Json.dll + + + + + From 6d6a6b64b2f57799ddc98ef34924da1f4b65fe15 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 23 Feb 2021 14:24:06 +0100 Subject: [PATCH 05/11] Remove KnownFrameworkReference items --- eng/targetingpacks.targets | 4 ++-- .../SupportFiles/Directory.Build.targets | 19 ---------------- .../Assets/TestUtils/TestProjects.targets | 22 +------------------ .../frameworkSettings/net6.0/settings.targets | 15 ++++--------- 4 files changed, 7 insertions(+), 53 deletions(-) diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets index cbd1cdd3aa5947..209d29b38a3089 100644 --- a/eng/targetingpacks.targets +++ b/eng/targetingpacks.targets @@ -15,7 +15,7 @@ LatestRuntimeFrameworkVersion="$(ProductVersion)" RuntimeFrameworkName="$(SharedFrameworkName)" RuntimePackNamePatterns="$(SharedFrameworkName).Runtime.**RID**" - RuntimePackRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;ios-arm64;ios-arm;ios-x64;ios-x86;tvos-arm64;tvos-x64;android-arm64;android-arm;android-x64;android-x86;browser-wasm" + RuntimePackRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;ios-arm64;ios-arm;ios-x64;ios-x86;tvos-arm64;tvos-x64;maccatalyst-x64;maccatalyst-arm64;android-arm64;android-arm;android-x64;android-x86;browser-wasm;osx-arm64" TargetFramework="$(NetCoreAppCurrent)" TargetingPackName="$(SharedFrameworkName).Ref" TargetingPackVersion="$(ProductVersion)" @@ -23,7 +23,7 @@ - - - - - - diff --git a/src/installer/tests/Assets/TestUtils/TestProjects.targets b/src/installer/tests/Assets/TestUtils/TestProjects.targets index b6f1b073a9688d..eed11dd848dd6c 100644 --- a/src/installer/tests/Assets/TestUtils/TestProjects.targets +++ b/src/installer/tests/Assets/TestUtils/TestProjects.targets @@ -3,29 +3,9 @@ This file is imported by the test projects from the artifacts dir or the src/tests dir. It provides basic info needed for restore and build with the vanilla SDK. --> - - 6.0 - + - - - - - diff --git a/src/libraries/pkg/test/frameworkSettings/net6.0/settings.targets b/src/libraries/pkg/test/frameworkSettings/net6.0/settings.targets index 963688564b767a..a8fa34134f4350 100644 --- a/src/libraries/pkg/test/frameworkSettings/net6.0/settings.targets +++ b/src/libraries/pkg/test/frameworkSettings/net6.0/settings.targets @@ -2,17 +2,10 @@ $(MicrosoftNETCoreAppVersion) - - + + + + \ No newline at end of file From 1e94df5d924337a8c0154b708f136236fde94536 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 23 Feb 2021 17:57:07 +0100 Subject: [PATCH 06/11] Don't hardcode SDK value in helix submission... --- src/tests/Common/helixpublishwitharcade.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/Common/helixpublishwitharcade.proj b/src/tests/Common/helixpublishwitharcade.proj index 3df88871acc69d..2fb397b3d92c15 100644 --- a/src/tests/Common/helixpublishwitharcade.proj +++ b/src/tests/Common/helixpublishwitharcade.proj @@ -94,7 +94,7 @@ true runtime - 5.0.0 + $(BundledNETCoreAppPackageVersion) $(HelixRuntimeRid) From e5cd041e684fb232c9c69b3e2ff28775156eaed3 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 23 Feb 2021 20:52:28 +0100 Subject: [PATCH 07/11] Update runtimeConfiguration.targets --- eng/testing/runtimeConfiguration.targets | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/eng/testing/runtimeConfiguration.targets b/eng/testing/runtimeConfiguration.targets index d69182992c7b30..c0d75ebd9fcfae 100644 --- a/eng/testing/runtimeConfiguration.targets +++ b/eng/testing/runtimeConfiguration.targets @@ -9,23 +9,5 @@ true $(MSBuildThisFileDirectory)netfx.exe.config - - $(TargetPath).config - - - - - - - \ No newline at end of file + From 045d714203b9728247e4c2b7d731e411a04bbddc Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Wed, 24 Feb 2021 11:06:19 -0800 Subject: [PATCH 08/11] Fix double publishing error in mobile tests --- eng/testing/tests.mobile.targets | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets index b4e7fb22dfa962..74f4b64e1dd6e7 100644 --- a/eng/testing/tests.mobile.targets +++ b/eng/testing/tests.mobile.targets @@ -228,7 +228,15 @@ <_runnerFilesToPublish Include="$(AppleTestRunnerDir)*" Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'" /> <_runnerFilesToPublish Include="$(WasmTestRunnerDir)*" Condition="'$(TargetOS)' == 'Browser'" /> - + + <_resolvedFilesToPublishToFileName Include="@(ResolvedFileToPublish -> '%(FileName)%(Extension)')" /> + + <_runnerFilesToPublishToFileName Include="@(_runnerFilesToPublish -> '%(FileName)%(Extension)')"> + %(Identity) + + <_runnerFilesToPublishToFileName Remove="@(_resolvedFilesToPublishToFileName)" /> + + From 6e05103fda08b33d780ee85ca07761b86ad039cb Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 24 Feb 2021 21:40:30 +0100 Subject: [PATCH 09/11] Set DotNetCliVersion to right version for aspnetcoreruntime --- src/libraries/sendtohelixhelp.proj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj index 2ab4f527fda57f..12318d40d561ea 100644 --- a/src/libraries/sendtohelixhelp.proj +++ b/src/libraries/sendtohelixhelp.proj @@ -49,6 +49,9 @@ $(TestRunNamePrefix)$(Scenario)- $(WaitForWorkItemCompletion) + + + 6.0.0-preview.2.21117.17 From abeb5819a94c92bc53d26ddac44cd39c223547a5 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 25 Feb 2021 01:13:14 +0100 Subject: [PATCH 10/11] Update sendtohelixhelp.proj --- src/libraries/sendtohelixhelp.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj index 12318d40d561ea..cbe420dcf3121c 100644 --- a/src/libraries/sendtohelixhelp.proj +++ b/src/libraries/sendtohelixhelp.proj @@ -51,7 +51,7 @@ $(WaitForWorkItemCompletion) - 6.0.0-preview.2.21117.17 + 6.0.0-preview.1.21103.6 From 6b9bd8ba5615e3e7c8b3092aeb623af67a0b4110 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 25 Feb 2021 02:51:58 +0100 Subject: [PATCH 11/11] Update sendtohelixhelp.proj --- src/libraries/sendtohelixhelp.proj | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj index cbe420dcf3121c..72f36e7baa17c0 100644 --- a/src/libraries/sendtohelixhelp.proj +++ b/src/libraries/sendtohelixhelp.proj @@ -49,9 +49,6 @@ $(TestRunNamePrefix)$(Scenario)- $(WaitForWorkItemCompletion) - - - 6.0.0-preview.1.21103.6 @@ -291,4 +288,12 @@ + + + + + 6.0.0-preview.1.21103.6 + +