From 304e8451d23e19795ef77a8ac291260bdd86d637 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Mon, 24 Apr 2023 17:07:51 +0000 Subject: [PATCH 1/9] First pass at prebuilts --- NuGet.config | 1 + eng/SourceBuildPrebuiltBaseline.xml | 2 +- eng/Version.Details.xml | 54 ++++++++++++++--------------- eng/Versions.props | 4 +-- 4 files changed, 30 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index 69668687ca..f519a75093 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,6 +16,7 @@ + diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index c1b6dfbf05..bcb1b40df7 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -1,5 +1,5 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ba3d86bc4..8dfff21ae6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,6 +14,21 @@ 5ce78f66d89ea529e459abddb129ab36cb5bd936 + + https://github.com/dotnet/source-build-externals + d1db09ce5c5a2aeab37d01336765861c0283f76f + + + + https://github.com/dotnet/source-build-reference-packages + 13c96423adba681296bda86bdbe24631a9b5e9bc + + + + https://github.com/dotnet/runtime + 053e17a0daf4be907db34d64fc51bc133c284fae + + @@ -21,33 +36,10 @@ 469dcc0cbcba5221727c8a5b9eec4a478e24a780 - - https://github.com/dotnet/arcade - 469dcc0cbcba5221727c8a5b9eec4a478e24a780 - - - https://github.com/dotnet/arcade - 469dcc0cbcba5221727c8a5b9eec4a478e24a780 - - - https://github.com/dotnet/arcade - 469dcc0cbcba5221727c8a5b9eec4a478e24a780 - - - https://github.com/dotnet/arcade - 469dcc0cbcba5221727c8a5b9eec4a478e24a780 - - - https://github.com/dotnet/arcade-services - cd705029f2675970b42f9273ae359d0926c5e815 - - + https://github.com/dotnet/roslyn - 4b309dc5400e39a2eea09d82077737c1df5f347a - - - https://github.com/dotnet/sourcelink - afa9aa7032f810ad91d84857b95ad1d071192afa + 50bd09a9eefdf9bc3653dbf6d9624b31a023c7c0 + https://github.com/dotnet/symreader-converter @@ -57,9 +49,15 @@ https://github.com/dotnet/symreader-converter c5ba7c88f92e2dde156c324a8c8edc04d9fa4fe0 - + https://github.com/dotnet/xliff-tasks - f5321d0c7b3f5e6103440fc017253bcdb50a0a26 + b7fb98b199d0b1b6188da4f4bf4f5accddac98d4 + + + + https://github.com/dotnet/sourcelink + 3f43bf1b2dead2cb51f20dc47f6dfd7981248820 + diff --git a/eng/Versions.props b/eng/Versions.props index 6abd782c13..ad7514edeb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,7 +21,7 @@ $(MicrosoftBuildPackageVersion) 3.8.0-3.20427.2 0.2.0-preview.23211.1 - 3.0.0-preview4-27615-11 + 8.0.0-preview.4.23210.1 2.0.0 17.4.0-beta.22478.3 17.7.1-beta.23228.3 @@ -39,7 +39,7 @@ 17.6.33617.297 17.6.33617.297 17.4.2116 - 4.6.0-1.final + 4.6.0-1.23107.10 From cdd70c4db8e71e4cba297315bb22b8915879b442 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Tue, 25 Apr 2023 15:57:23 +0000 Subject: [PATCH 2/9] Known prebuilts --- eng/SourceBuildPrebuiltBaseline.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index bcb1b40df7..34be774d3e 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -1,5 +1,9 @@ + + + + From 59adf971fa2c2e76626c1862c6b1bb52ddfd08de Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Tue, 25 Apr 2023 21:55:18 +0000 Subject: [PATCH 3/9] vstest prebuilts --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8dfff21ae6..fdc56bd73f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,9 +19,9 @@ d1db09ce5c5a2aeab37d01336765861c0283f76f - + https://github.com/dotnet/source-build-reference-packages - 13c96423adba681296bda86bdbe24631a9b5e9bc + 4bf273ec25cc3983d6a5991cf0a4aa082cb255a5 From 4829685993a380c5c0e53e01a0b97249ee6d9d5f Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Tue, 25 Apr 2023 22:35:14 +0000 Subject: [PATCH 4/9] Update dependencies --- eng/SourceBuildPrebuiltBaseline.xml | 2 +- eng/Version.Details.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 34be774d3e..dcb54e4475 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -3,7 +3,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fdc56bd73f..47fb7d6486 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,14 +49,14 @@ https://github.com/dotnet/symreader-converter c5ba7c88f92e2dde156c324a8c8edc04d9fa4fe0 - + https://github.com/dotnet/xliff-tasks - b7fb98b199d0b1b6188da4f4bf4f5accddac98d4 + f35dcbb16190810eb88b103fb1f2cd48a3a76cf0 - + https://github.com/dotnet/sourcelink - 3f43bf1b2dead2cb51f20dc47f6dfd7981248820 + 47c52dd2ebf9edfd40abdcff999c13eb461f6ce2 From 32c8bef435aabac0173466d1539e5079200b6c47 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Thu, 27 Apr 2023 16:35:46 +0000 Subject: [PATCH 5/9] Use stable version of Microsoft.Extensions.DependencyModel --- eng/Version.Details.xml | 5 ----- eng/Versions.props | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 47fb7d6486..12bb4aad05 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -24,11 +24,6 @@ 4bf273ec25cc3983d6a5991cf0a4aa082cb255a5 - - https://github.com/dotnet/runtime - 053e17a0daf4be907db34d64fc51bc133c284fae - - diff --git a/eng/Versions.props b/eng/Versions.props index ad7514edeb..4691c21ebb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,7 +21,7 @@ $(MicrosoftBuildPackageVersion) 3.8.0-3.20427.2 0.2.0-preview.23211.1 - 8.0.0-preview.4.23210.1 + 6.0.0 2.0.0 17.4.0-beta.22478.3 17.7.1-beta.23228.3 From 102d3703c021f85f285a37c1b60403d3e78bfba2 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Thu, 27 Apr 2023 17:05:56 +0000 Subject: [PATCH 6/9] Update package verion in SourceBuildPrebuiltBaseline.xml --- eng/SourceBuildPrebuiltBaseline.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index dcb54e4475..efe6db8375 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -3,7 +3,7 @@ - + From a28b15d21b273b2a9a4c378ef022e960345800c9 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Thu, 27 Apr 2023 11:00:53 -0700 Subject: [PATCH 7/9] Fix Windows build - dependency downgrade --- eng/Versions.props | 1 + .../Microsoft.TestPlatform.TestHostProvider.csproj | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4691c21ebb..c984796d54 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,6 +35,7 @@ 4.5.5 4.3.4 1.6.0 + 6.0.0 4.3.2 17.6.33617.297 17.6.33617.297 diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj b/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj index 6f4c86bc63..977df02dd0 100644 --- a/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj +++ b/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj @@ -26,7 +26,7 @@ - + From 438899b940e22a043000ebc21f4c29f96ac2e5b4 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Fri, 28 Apr 2023 18:51:35 +0000 Subject: [PATCH 8/9] Remove prebuilt exclusion for Microsoft.CodeCoverage.IO --- eng/SourceBuildPrebuiltBaseline.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index efe6db8375..35edc82529 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -3,7 +3,6 @@ - From 5368305d1065d0ef086ee92ffb15be8235265cf9 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Wed, 3 May 2023 16:13:37 +0000 Subject: [PATCH 9/9] Revert Microsoft.Extensions.DependencyModel dependency to 3.0.0-preview4-27615-11 --- eng/SourceBuildPrebuiltBaseline.xml | 1 + eng/Version.Details.xml | 4 ++-- eng/Versions.props | 3 +-- .../Microsoft.TestPlatform.TestHostProvider.csproj | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 35edc82529..a76c88ab3c 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -4,5 +4,6 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 12bb4aad05..387d9128e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,9 +19,9 @@ d1db09ce5c5a2aeab37d01336765861c0283f76f - + https://github.com/dotnet/source-build-reference-packages - 4bf273ec25cc3983d6a5991cf0a4aa082cb255a5 + 08e096e0c5e9b1c5afd936301d4ecb929caebb1b diff --git a/eng/Versions.props b/eng/Versions.props index c984796d54..e430486885 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,7 +21,7 @@ $(MicrosoftBuildPackageVersion) 3.8.0-3.20427.2 0.2.0-preview.23211.1 - 6.0.0 + 3.0.0-preview4-27615-11 2.0.0 17.4.0-beta.22478.3 17.7.1-beta.23228.3 @@ -35,7 +35,6 @@ 4.5.5 4.3.4 1.6.0 - 6.0.0 4.3.2 17.6.33617.297 17.6.33617.297 diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj b/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj index 977df02dd0..6f4c86bc63 100644 --- a/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj +++ b/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj @@ -26,7 +26,7 @@ - +