From c3c700080727e17697170e031b091eb8c46fbad2 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 25 Aug 2023 10:45:13 -0500 Subject: [PATCH 1/4] Fix SB ref assembly issue for System.ComponentModel.Composition --- eng/Version.Details.xml | 5 +++++ eng/Versions.props | 1 - .../Microsoft.TestPlatform.CLI.csproj | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 421292df61..34365fe2e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -28,6 +28,11 @@ https://github.com/nuget/nuget.client 4ba7bfa82f894ec32a554ca8d2df143675c85735 + + + https://github.com/dotnet/corefx + 30ab651fcb4354552bd4891619a0bdd81e0ebdbf + diff --git a/eng/Versions.props b/eng/Versions.props index 6e613d8f98..f8d32b4ec1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,6 @@ 3.3.3 3.3.4-beta1.21554.2 1.5.0 - 7.0.0 4.5.0 4.5.5 4.3.4 diff --git a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj index 7654642a99..48fda235ad 100644 --- a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj +++ b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj @@ -7,7 +7,6 @@ Microsoft.TestPlatform.CLI.sourcebuild.nuspec - $(SystemComponentModelCompositionForSourceBuildVersion) From a1c00370b73d7934a77f71ddfaa75b4114be3375 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 30 Aug 2023 09:38:55 -0500 Subject: [PATCH 2/4] Update dependency to 7.0.0 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34365fe2e6..11f63a3509 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ 4ba7bfa82f894ec32a554ca8d2df143675c85735 - - https://github.com/dotnet/corefx - 30ab651fcb4354552bd4891619a0bdd81e0ebdbf + + https://github.com/dotnet/runtime + d099f075e45d2aa6007a22b71b45a08758559f80 diff --git a/eng/Versions.props b/eng/Versions.props index f8d32b4ec1..ad615a448f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ 3.3.3 3.3.4-beta1.21554.2 1.5.0 - 4.5.0 + 7.0.0 4.5.5 4.3.4 1.6.0 From b7dbf6f1e6169f2b6a230c2f5c38f254a273a379 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 30 Aug 2023 09:53:14 -0500 Subject: [PATCH 3/4] Revert "Update dependency to 7.0.0" This reverts commit a1c00370b73d7934a77f71ddfaa75b4114be3375. --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 11f63a3509..34365fe2e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ 4ba7bfa82f894ec32a554ca8d2df143675c85735 - - https://github.com/dotnet/runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + + https://github.com/dotnet/corefx + 30ab651fcb4354552bd4891619a0bdd81e0ebdbf diff --git a/eng/Versions.props b/eng/Versions.props index ad615a448f..f8d32b4ec1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ 3.3.3 3.3.4-beta1.21554.2 1.5.0 - 7.0.0 + 4.5.0 4.5.5 4.3.4 1.6.0 From 39988904f05dd98ef85b86b878c1ab0f4c496664 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 30 Aug 2023 14:11:32 -0500 Subject: [PATCH 4/4] Add prebuilts to baseline --- eng/SourceBuildPrebuiltBaseline.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index b2b6933946..987c2d8b1c 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -3,7 +3,17 @@ + + + + + + + + + +