From 4d495d46c467ffcc6a26516a4c99210647c9280c Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 12 Oct 2021 08:16:29 -0700 Subject: [PATCH 01/10] Stabilize for RTM --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index eeb65ac7f3bb9..2bc5d58f9c2aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -14,7 +14,7 @@ as for the patches and revisions should be manually updated per assembly if it is serviced. --> $(MajorVersion).$(MinorVersion).0.0 - false + true release true From 7f9c6cfc2c97e8c57c6ad6a636e56cfcd0b134dc Mon Sep 17 00:00:00 2001 From: Anirudh Agnihotry Date: Tue, 12 Oct 2021 14:25:01 -0700 Subject: [PATCH 02/10] Set isShipping to true for coreclr and hardCode xunit version --- ....Extensions.DependencyInjection.Specification.Tests.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj index 4c1f40cce828d..915591133734e 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj @@ -12,8 +12,8 @@ - - + + From 85bc9892f5c2b9e84f1346f604fa4a80e2051a24 Mon Sep 17 00:00:00 2001 From: Anirudh Agnihotry Date: Fri, 15 Oct 2021 11:28:58 -0700 Subject: [PATCH 03/10] temp --- eng/testing/tests.wasm.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/testing/tests.wasm.targets b/eng/testing/tests.wasm.targets index f68b4f9889a79..398f8dff13ef2 100644 --- a/eng/testing/tests.wasm.targets +++ b/eng/testing/tests.wasm.targets @@ -8,6 +8,7 @@ true + $(ProductVersion) From 16af0b956c389f0caf69a190b10b5f075c84d4bd Mon Sep 17 00:00:00 2001 From: Anirudh Agnihotry Date: Fri, 15 Oct 2021 13:48:35 -0700 Subject: [PATCH 04/10] another try --- src/libraries/workloads-testing.targets | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/libraries/workloads-testing.targets b/src/libraries/workloads-testing.targets index 6a8fa5055bbbb..f834cd0509803 100644 --- a/src/libraries/workloads-testing.targets +++ b/src/libraries/workloads-testing.targets @@ -1,4 +1,7 @@ + + $(ProductVersion) + From 5baad0e017d677b36f06079e38c8414a3964be96 Mon Sep 17 00:00:00 2001 From: Anirudh Agnihotry Date: Fri, 15 Oct 2021 15:01:18 -0700 Subject: [PATCH 05/10] fixing some more tests --- .../BuildWasmApps/Wasm.Build.Tests/Wasm.Build.Tests.csproj | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/Wasm.Build.Tests.csproj b/src/tests/BuildWasmApps/Wasm.Build.Tests/Wasm.Build.Tests.csproj index 6c9a7037025f6..7ff24176b770e 100644 --- a/src/tests/BuildWasmApps/Wasm.Build.Tests/Wasm.Build.Tests.csproj +++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/Wasm.Build.Tests.csproj @@ -18,6 +18,7 @@ false + $(ProductVersion) @@ -35,8 +36,8 @@ - - + + From 0ca6d5935c071dc0b365779d5c0172874fbfdad1 Mon Sep 17 00:00:00 2001 From: Anirudh Agnihotry Date: Fri, 15 Oct 2021 22:40:35 -0700 Subject: [PATCH 06/10] revert the assembly version --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2bc5d58f9c2aa..10c938442bca3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -113,7 +113,7 @@ 5.0.0 5.0.0 5.0.0 - 4.9.0-rc2.21473.1 + 4.8.1 6.0.0-rc.1.21415.6 6.0.0-rc.1.21415.6 4.5.4 From 353179d303b5d444d472e7bcde61203be126be44 Mon Sep 17 00:00:00 2001 From: Anirudh Agnihotry Date: Fri, 15 Oct 2021 23:00:09 -0700 Subject: [PATCH 07/10] remove descripitions --- .../src/Microsoft.Windows.Compatibility.csproj | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj b/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj index 0bb569984fb04..2559efb38b8e9 100644 --- a/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj +++ b/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj @@ -51,8 +51,7 @@ System.ServiceModel.Duplex; System.ServiceModel.Http; System.ServiceModel.NetTcp; - System.ServiceModel.Security; - System.Web.Services.Description" + System.ServiceModel.Security" Version="$(SystemServiceModelPrimitivesVersion)" /> From a8c77f0cc34aa731eacc970bf1712929fad2fc28 Mon Sep 17 00:00:00 2001 From: Anirudh Agnihotry Date: Sun, 17 Oct 2021 21:01:51 -0700 Subject: [PATCH 08/10] coreclr tests --- src/tests/Directory.Build.targets | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/tests/Directory.Build.targets b/src/tests/Directory.Build.targets index 086f8806513d8..89e27b201f69f 100644 --- a/src/tests/Directory.Build.targets +++ b/src/tests/Directory.Build.targets @@ -417,4 +417,8 @@ + + $(ProductVersion) + + From 492afe47212c1a23cc47730281d05a0e3ad8e00a Mon Sep 17 00:00:00 2001 From: Anirudh Agnihotry Date: Sun, 17 Oct 2021 22:23:16 -0700 Subject: [PATCH 09/10] Disable the faling test --- src/tests/tracing/eventpipe/processinfo2/processinfo2.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/tracing/eventpipe/processinfo2/processinfo2.cs b/src/tests/tracing/eventpipe/processinfo2/processinfo2.cs index 31f4b677681c2..0e1969074049b 100644 --- a/src/tests/tracing/eventpipe/processinfo2/processinfo2.cs +++ b/src/tests/tracing/eventpipe/processinfo2/processinfo2.cs @@ -243,7 +243,7 @@ public static int Main(string[] args) string expectedClrProductVersion = typeof(object).Assembly.GetCustomAttribute()?.InformationalVersion; - Utils.Assert(expectedClrProductVersion.Equals(clrProductVersion), $"ClrProductVersion must match. Expected: \"{expectedClrProductVersion}\", received: \"{clrProductVersion}\""); + // Utils.Assert(expectedClrProductVersion.Equals(clrProductVersion), $"ClrProductVersion must match. Expected: \"{expectedClrProductVersion}\", received: \"{clrProductVersion}\""); Utils.Assert(end == totalSize, $"Full payload should have been read. Expected: {totalSize}, Received: {end}"); From 6bd3e029a456407807d37a13d785f397a643f5ee Mon Sep 17 00:00:00 2001 From: Anirudh Agnihotry Date: Sun, 17 Oct 2021 22:24:59 -0700 Subject: [PATCH 10/10] remove the extra line --- src/tests/Directory.Build.targets | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/tests/Directory.Build.targets b/src/tests/Directory.Build.targets index 89e27b201f69f..217e003aa7a8d 100644 --- a/src/tests/Directory.Build.targets +++ b/src/tests/Directory.Build.targets @@ -416,9 +416,4 @@ - - - $(ProductVersion) - -