From 7475e5f079178568d70b90fdec43b335211be92e Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Wed, 19 Oct 2022 09:30:54 +0100 Subject: [PATCH 1/3] Update ubuntu version for backport action --- .github/workflows/backport.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 26801ebbe8c..837ef32ab2c 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -7,7 +7,7 @@ on: jobs: backport: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 name: Backport steps: - name: Backport From bfcd3b141ebd33cfb325b8d50d62d5aa9c79f9ba Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Wed, 19 Oct 2022 10:27:06 +0100 Subject: [PATCH 2/3] Fixes for dev and ci build inconsistencies --- .ci/packages.lock.json | 9 +--- .github/workflows/integration-jobs.yml | 2 +- Directory.Build.props | 5 +-- build/scripts/packages.lock.json | 6 --- build/scripts/scripts.fsproj | 2 +- global.json | 2 +- src/ApiGenerator/packages.lock.json | 6 --- src/DocGenerator/packages.lock.json | 6 --- .../packages.lock.json | 20 --------- src/Elasticsearch.Net/packages.lock.json | 26 ------------ src/Nest.JsonNetSerializer/packages.lock.json | 20 --------- src/Nest/packages.lock.json | 20 --------- tests/Tests.Benchmarking/packages.lock.json | 37 +++++++--------- .../Tests.ClusterLauncher/packages.lock.json | 42 +++++++++---------- tests/Tests.Configuration/packages.lock.json | 6 --- tests/Tests.Core/Tests.Core.csproj | 4 +- tests/Tests.Core/packages.lock.json | 12 ++---- tests/Tests.Domain/packages.lock.json | 6 --- tests/Tests.Reproduce/packages.lock.json | 42 +++++++++---------- tests/Tests.ScratchPad/packages.lock.json | 37 +++++++--------- tests/Tests.YamlRunner/packages.lock.json | 6 --- .../RequestResponseApiTestBase.cs | 2 +- tests/Tests/packages.lock.json | 41 ++++++++---------- 23 files changed, 103 insertions(+), 256 deletions(-) diff --git a/.ci/packages.lock.json b/.ci/packages.lock.json index a6e52a8511f..be166602150 100644 --- a/.ci/packages.lock.json +++ b/.ci/packages.lock.json @@ -1,13 +1,6 @@ { "version": 1, "dependencies": { - ".NETCoreApp,Version=v5.0": { - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.0-preview.2, )", - "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" - } - } + ".NETCoreApp,Version=v5.0": {} } } \ No newline at end of file diff --git a/.github/workflows/integration-jobs.yml b/.github/workflows/integration-jobs.yml index bf3ed585365..3891be6e526 100644 --- a/.github/workflows/integration-jobs.yml +++ b/.github/workflows/integration-jobs.yml @@ -41,7 +41,7 @@ jobs: '7.14.2', '7.15.2', '7.16.3', - '7.17.0', + '7.17.7', 'latest-7' ] diff --git a/Directory.Build.props b/Directory.Build.props index 78c1d56df56..0bafbf6075c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -34,6 +34,7 @@ $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat)) true + true true true @@ -43,9 +44,5 @@ 002400000480000094000000060200000024000052534131000400000100010025d3a22bf3781ba85067374ad832dfcba3c4fa8dd89227e36121ba17b2c33ad6b6ce03e45e562050a031e2ff7fe12cff9060a50acbc6a0eef9ef32dc258d90f874b2e76b581938071ccc4b4d98204d1d6ca7a1988d7a211f9fc98efd808cf85f61675b11007d0eb0461dc86a968d6af8ebba7e6b540303b54f1c1f5325c252be - - - - \ No newline at end of file diff --git a/build/scripts/packages.lock.json b/build/scripts/packages.lock.json index 18ed6b4a71f..00f1c9a0cc3 100644 --- a/build/scripts/packages.lock.json +++ b/build/scripts/packages.lock.json @@ -84,12 +84,6 @@ "resolved": "5.0.0", "contentHash": "iHoYXA0VaSQUONGENB1aVafjDDZDZpwu39MtaRCTrmwFW/cTcK0b2yKNVYneFHJMc3ChtsSoM9lNtJ1dYXkHfA==" }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.0-preview.2, )", - "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" - }, "Newtonsoft.Json": { "type": "Direct", "requested": "[13.0.1, )", diff --git a/build/scripts/scripts.fsproj b/build/scripts/scripts.fsproj index 8acc43bcd8a..6b96b221c44 100644 --- a/build/scripts/scripts.fsproj +++ b/build/scripts/scripts.fsproj @@ -34,7 +34,7 @@ make-release-notes.yml - + diff --git a/global.json b/global.json index cbd9f2c6a6a..8b93427c3e7 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { "version": "5.0.408", - "rollForward": "latestFeature", + "rollForward": "latestPatch", "allowPrerelease": false }, "version": "7.17.4", diff --git a/src/ApiGenerator/packages.lock.json b/src/ApiGenerator/packages.lock.json index 294ff8359d3..f97794994d8 100644 --- a/src/ApiGenerator/packages.lock.json +++ b/src/ApiGenerator/packages.lock.json @@ -21,12 +21,6 @@ "Microsoft.CodeAnalysis.Common": "[3.1.0-beta3-final]" } }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.0-preview.2, )", - "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" - }, "Newtonsoft.Json": { "type": "Direct", "requested": "[13.0.1, )", diff --git a/src/DocGenerator/packages.lock.json b/src/DocGenerator/packages.lock.json index d3278b08678..115472739f1 100644 --- a/src/DocGenerator/packages.lock.json +++ b/src/DocGenerator/packages.lock.json @@ -113,12 +113,6 @@ "NETStandard.Library": "1.6.1" } }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.0-preview.2, )", - "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" - }, "Newtonsoft.Json": { "type": "Direct", "requested": "[13.0.1, )", diff --git a/src/Elasticsearch.Net.VirtualizedCluster/packages.lock.json b/src/Elasticsearch.Net.VirtualizedCluster/packages.lock.json index 0f727a35f8a..610f8c117e2 100644 --- a/src/Elasticsearch.Net.VirtualizedCluster/packages.lock.json +++ b/src/Elasticsearch.Net.VirtualizedCluster/packages.lock.json @@ -8,15 +8,6 @@ "resolved": "4.0.0", "contentHash": "PCgUb5I1DIe0GsBZ2fPXr/tOgph9Gh6yoHcpsFxNmTvyOQFXxyOcjM7wPs8ylakPNdFYBUs9YeF2Wsx6K/nEDQ==" }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.0-preview.2, )", - "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.0-preview.2" - } - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -37,11 +28,6 @@ "resolved": "4.6.0", "contentHash": "kxn3M2rnAGy5N5DgcIwcE8QTePWU/XiYcQVzn9HqTls2NKluVzVSmVWRjK7OUPWbljCXuZxHyhEz9kPRIQeXow==" }, - "Microsoft.NETFramework.ReferenceAssemblies.net461": { - "type": "Transitive", - "resolved": "1.0.0-preview.2", - "contentHash": "59D9ISjzCpfHG41r5x4BNZNNOCmE2o5YX8vcdOwsqfxOA0+6vQnxZrYq8KtthUU2JSvC13g941rSr5GRaNQOJg==" - }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -98,12 +84,6 @@ "resolved": "4.0.0", "contentHash": "PCgUb5I1DIe0GsBZ2fPXr/tOgph9Gh6yoHcpsFxNmTvyOQFXxyOcjM7wPs8ylakPNdFYBUs9YeF2Wsx6K/nEDQ==" }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.0-preview.2, )", - "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/Elasticsearch.Net/packages.lock.json b/src/Elasticsearch.Net/packages.lock.json index 706fa667369..443bd593a1e 100644 --- a/src/Elasticsearch.Net/packages.lock.json +++ b/src/Elasticsearch.Net/packages.lock.json @@ -14,15 +14,6 @@ "resolved": "4.6.0", "contentHash": "kxn3M2rnAGy5N5DgcIwcE8QTePWU/XiYcQVzn9HqTls2NKluVzVSmVWRjK7OUPWbljCXuZxHyhEz9kPRIQeXow==" }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.0-preview.2, )", - "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.0-preview.2" - } - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -65,11 +56,6 @@ "resolved": "1.0.0", "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" }, - "Microsoft.NETFramework.ReferenceAssemblies.net461": { - "type": "Transitive", - "resolved": "1.0.0-preview.2", - "contentHash": "59D9ISjzCpfHG41r5x4BNZNNOCmE2o5YX8vcdOwsqfxOA0+6vQnxZrYq8KtthUU2JSvC13g941rSr5GRaNQOJg==" - }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -99,12 +85,6 @@ "resolved": "4.6.0", "contentHash": "kxn3M2rnAGy5N5DgcIwcE8QTePWU/XiYcQVzn9HqTls2NKluVzVSmVWRjK7OUPWbljCXuZxHyhEz9kPRIQeXow==" }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.0-preview.2, )", - "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -293,12 +273,6 @@ "resolved": "4.6.0", "contentHash": "kxn3M2rnAGy5N5DgcIwcE8QTePWU/XiYcQVzn9HqTls2NKluVzVSmVWRjK7OUPWbljCXuZxHyhEz9kPRIQeXow==" }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.0-preview.2, )", - "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/Nest.JsonNetSerializer/packages.lock.json b/src/Nest.JsonNetSerializer/packages.lock.json index 1ddeb806e8b..de74f9de9f5 100644 --- a/src/Nest.JsonNetSerializer/packages.lock.json +++ b/src/Nest.JsonNetSerializer/packages.lock.json @@ -8,15 +8,6 @@ "resolved": "4.0.0", "contentHash": "PCgUb5I1DIe0GsBZ2fPXr/tOgph9Gh6yoHcpsFxNmTvyOQFXxyOcjM7wPs8ylakPNdFYBUs9YeF2Wsx6K/nEDQ==" }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.0-preview.2, )", - "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.0-preview.2" - } - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -43,11 +34,6 @@ "resolved": "4.6.0", "contentHash": "kxn3M2rnAGy5N5DgcIwcE8QTePWU/XiYcQVzn9HqTls2NKluVzVSmVWRjK7OUPWbljCXuZxHyhEz9kPRIQeXow==" }, - "Microsoft.NETFramework.ReferenceAssemblies.net461": { - "type": "Transitive", - "resolved": "1.0.0-preview.2", - "contentHash": "59D9ISjzCpfHG41r5x4BNZNNOCmE2o5YX8vcdOwsqfxOA0+6vQnxZrYq8KtthUU2JSvC13g941rSr5GRaNQOJg==" - }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -110,12 +96,6 @@ "resolved": "4.0.0", "contentHash": "PCgUb5I1DIe0GsBZ2fPXr/tOgph9Gh6yoHcpsFxNmTvyOQFXxyOcjM7wPs8ylakPNdFYBUs9YeF2Wsx6K/nEDQ==" }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.0-preview.2, )", - "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/Nest/packages.lock.json b/src/Nest/packages.lock.json index 0f727a35f8a..610f8c117e2 100644 --- a/src/Nest/packages.lock.json +++ b/src/Nest/packages.lock.json @@ -8,15 +8,6 @@ "resolved": "4.0.0", "contentHash": "PCgUb5I1DIe0GsBZ2fPXr/tOgph9Gh6yoHcpsFxNmTvyOQFXxyOcjM7wPs8ylakPNdFYBUs9YeF2Wsx6K/nEDQ==" }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.0-preview.2, )", - "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.0-preview.2" - } - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -37,11 +28,6 @@ "resolved": "4.6.0", "contentHash": "kxn3M2rnAGy5N5DgcIwcE8QTePWU/XiYcQVzn9HqTls2NKluVzVSmVWRjK7OUPWbljCXuZxHyhEz9kPRIQeXow==" }, - "Microsoft.NETFramework.ReferenceAssemblies.net461": { - "type": "Transitive", - "resolved": "1.0.0-preview.2", - "contentHash": "59D9ISjzCpfHG41r5x4BNZNNOCmE2o5YX8vcdOwsqfxOA0+6vQnxZrYq8KtthUU2JSvC13g941rSr5GRaNQOJg==" - }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -98,12 +84,6 @@ "resolved": "4.0.0", "contentHash": "PCgUb5I1DIe0GsBZ2fPXr/tOgph9Gh6yoHcpsFxNmTvyOQFXxyOcjM7wPs8ylakPNdFYBUs9YeF2Wsx6K/nEDQ==" }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.0-preview.2, )", - "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/tests/Tests.Benchmarking/packages.lock.json b/tests/Tests.Benchmarking/packages.lock.json index 90762474014..60eaf97cb65 100644 --- a/tests/Tests.Benchmarking/packages.lock.json +++ b/tests/Tests.Benchmarking/packages.lock.json @@ -40,12 +40,6 @@ "LibGit2Sharp.NativeBinaries": "[1.0.245]" } }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.0-preview.2, )", - "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" - }, "BenchmarkDotNet.Annotations": { "type": "Transitive", "resolved": "0.12.0", @@ -194,8 +188,8 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "16.5.0", - "contentHash": "PM5YLtyN45EyUGePJpaNogndlaQPrMgQQXHKMhMESC6KfSVvt+j7+dxBi8NYC6X6dZVysf7ngwhSW3wwvPJRSQ==" + "resolved": "17.2.0", + "contentHash": "MsKhJmwIfHxNDbTIlgQy29UpWSWPpbZOQPhQ7xalRy+ABnl8/neFHZGzSP3XlpW2dKAXHTFrtIcKzW/kopY2Bg==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -219,11 +213,11 @@ }, "Microsoft.NET.Test.Sdk": { "type": "Transitive", - "resolved": "16.5.0", - "contentHash": "yHZOhVSPuGqgHi+KhHiAZqNY08avkQraXKvgKgDU8c/ztmGzw7gmukkv49EaTq6T3xmp4XroWk3gAlbJHMxl8w==", + "resolved": "17.2.0", + "contentHash": "kYmkDYbcDd+jNvmMH4TMtgHjsUYbIsWENM2VcjB0X7TawXbehL5I8OIsu2TgFS/nQCgZE94InrqMxrm7WDy+Lw==", "dependencies": { - "Microsoft.CodeCoverage": "16.5.0", - "Microsoft.TestPlatform.TestHost": "16.5.0" + "Microsoft.CodeCoverage": "17.2.0", + "Microsoft.TestPlatform.TestHost": "17.2.0" } }, "Microsoft.NETCore.Platforms": { @@ -238,18 +232,19 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "16.5.0", - "contentHash": "NnLFxmFBCAS6kye2JFszD5WKgj4Zve5KX/R0mhYwh6BVnSeybI2unRnjEPtLyY3CAVhwrY4bh/8LNFtslAcGZg==", + "resolved": "17.2.0", + "contentHash": "7j1KYDHLhU98XnCEbECMncXLydI9fNiFLcFsiBsP3lV6EkHOaj5kTPAWHYkKnPGRC9TbZUboSQq8rWI4dTQsxg==", "dependencies": { - "NuGet.Frameworks": "5.0.0" + "NuGet.Frameworks": "5.11.0", + "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "16.5.0", - "contentHash": "ytGymboQIvjNX5pLC0yp/Bz9sGDHqSnLQgBRtd4VrqOUgKmmcfxMYZ6p0TBZgAT1oijdC6xqUZ7rl8mbaaXTJw==", + "resolved": "17.2.0", + "contentHash": "bI67J+hers241h7eD2eecS02p9CbKcQDIeoRvO4FgMlTWg2ZTzc0D3uWLYr5U+K5x9O1pNmyMoMDbYIeWY/TWw==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "16.5.0", + "Microsoft.TestPlatform.ObjectModel": "17.2.0", "Newtonsoft.Json": "9.0.1" } }, @@ -279,8 +274,8 @@ }, "NuGet.Frameworks": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "c5JVjuVAm4f7E9Vj+v09Z9s2ZsqFDjBpcsyS3M9xRo0bEdm/LVZSzLxxNvfvAwRiiE8nwe1h2G4OwiwlzFKXlA==" + "resolved": "5.11.0", + "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" }, "Nullean.VsTest.Pretty.TestLogger": { "type": "Transitive", @@ -1417,7 +1412,7 @@ "Elastic.Elasticsearch.Xunit": "0.2.6", "FluentAssertions": "5.10.3", "JunitXml.TestLogger": "2.1.78", - "Microsoft.NET.Test.Sdk": "16.5.0", + "Microsoft.NET.Test.Sdk": "17.2.0", "NEST.JsonNetSerializer": "7.0.0", "Nullean.VsTest.Pretty.TestLogger": "0.3.0", "Proc": "0.6.1", diff --git a/tests/Tests.ClusterLauncher/packages.lock.json b/tests/Tests.ClusterLauncher/packages.lock.json index a7d0de91cc6..c5ccf41c231 100644 --- a/tests/Tests.ClusterLauncher/packages.lock.json +++ b/tests/Tests.ClusterLauncher/packages.lock.json @@ -2,12 +2,6 @@ "version": 1, "dependencies": { ".NETCoreApp,Version=v5.0": { - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.0-preview.2, )", - "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" - }, "Bogus": { "type": "Transitive", "resolved": "22.1.2", @@ -73,8 +67,8 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "16.5.0", - "contentHash": "PM5YLtyN45EyUGePJpaNogndlaQPrMgQQXHKMhMESC6KfSVvt+j7+dxBi8NYC6X6dZVysf7ngwhSW3wwvPJRSQ==" + "resolved": "17.2.0", + "contentHash": "MsKhJmwIfHxNDbTIlgQy29UpWSWPpbZOQPhQ7xalRy+ABnl8/neFHZGzSP3XlpW2dKAXHTFrtIcKzW/kopY2Bg==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -83,11 +77,11 @@ }, "Microsoft.NET.Test.Sdk": { "type": "Transitive", - "resolved": "16.5.0", - "contentHash": "yHZOhVSPuGqgHi+KhHiAZqNY08avkQraXKvgKgDU8c/ztmGzw7gmukkv49EaTq6T3xmp4XroWk3gAlbJHMxl8w==", + "resolved": "17.2.0", + "contentHash": "kYmkDYbcDd+jNvmMH4TMtgHjsUYbIsWENM2VcjB0X7TawXbehL5I8OIsu2TgFS/nQCgZE94InrqMxrm7WDy+Lw==", "dependencies": { - "Microsoft.CodeCoverage": "16.5.0", - "Microsoft.TestPlatform.TestHost": "16.5.0" + "Microsoft.CodeCoverage": "17.2.0", + "Microsoft.TestPlatform.TestHost": "17.2.0" } }, "Microsoft.NETCore.Platforms": { @@ -102,18 +96,19 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "16.5.0", - "contentHash": "NnLFxmFBCAS6kye2JFszD5WKgj4Zve5KX/R0mhYwh6BVnSeybI2unRnjEPtLyY3CAVhwrY4bh/8LNFtslAcGZg==", + "resolved": "17.2.0", + "contentHash": "7j1KYDHLhU98XnCEbECMncXLydI9fNiFLcFsiBsP3lV6EkHOaj5kTPAWHYkKnPGRC9TbZUboSQq8rWI4dTQsxg==", "dependencies": { - "NuGet.Frameworks": "5.0.0" + "NuGet.Frameworks": "5.11.0", + "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "16.5.0", - "contentHash": "ytGymboQIvjNX5pLC0yp/Bz9sGDHqSnLQgBRtd4VrqOUgKmmcfxMYZ6p0TBZgAT1oijdC6xqUZ7rl8mbaaXTJw==", + "resolved": "17.2.0", + "contentHash": "bI67J+hers241h7eD2eecS02p9CbKcQDIeoRvO4FgMlTWg2ZTzc0D3uWLYr5U+K5x9O1pNmyMoMDbYIeWY/TWw==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "16.5.0", + "Microsoft.TestPlatform.ObjectModel": "17.2.0", "Newtonsoft.Json": "9.0.1" } }, @@ -149,8 +144,8 @@ }, "NuGet.Frameworks": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "c5JVjuVAm4f7E9Vj+v09Z9s2ZsqFDjBpcsyS3M9xRo0bEdm/LVZSzLxxNvfvAwRiiE8nwe1h2G4OwiwlzFKXlA==" + "resolved": "5.11.0", + "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" }, "Nullean.VsTest.Pretty.TestLogger": { "type": "Transitive", @@ -513,6 +508,11 @@ "System.Runtime": "4.3.0" } }, + "System.Reflection.Metadata": { + "type": "Transitive", + "resolved": "1.6.0", + "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" + }, "System.Reflection.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -891,7 +891,7 @@ "Elastic.Elasticsearch.Xunit": "0.2.6", "FluentAssertions": "5.10.3", "JunitXml.TestLogger": "2.1.78", - "Microsoft.NET.Test.Sdk": "16.5.0", + "Microsoft.NET.Test.Sdk": "17.2.0", "NEST.JsonNetSerializer": "7.0.0", "Nullean.VsTest.Pretty.TestLogger": "0.3.0", "Proc": "0.6.1", diff --git a/tests/Tests.Configuration/packages.lock.json b/tests/Tests.Configuration/packages.lock.json index 0cfbf72d5eb..9ca52739d60 100644 --- a/tests/Tests.Configuration/packages.lock.json +++ b/tests/Tests.Configuration/packages.lock.json @@ -13,12 +13,6 @@ "System.Net.Http": "4.3.1" } }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.0-preview.2, )", - "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" - }, "NETStandard.Library": { "type": "Direct", "requested": "[2.0.3, )", diff --git a/tests/Tests.Core/Tests.Core.csproj b/tests/Tests.Core/Tests.Core.csproj index 73c1333c40f..834e1b93753 100644 --- a/tests/Tests.Core/Tests.Core.csproj +++ b/tests/Tests.Core/Tests.Core.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 True @@ -15,7 +15,7 @@ - + diff --git a/tests/Tests.Core/packages.lock.json b/tests/Tests.Core/packages.lock.json index aa8bec2a949..d57d07e7e65 100644 --- a/tests/Tests.Core/packages.lock.json +++ b/tests/Tests.Core/packages.lock.json @@ -38,15 +38,9 @@ }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[16.5.0, )", - "resolved": "16.5.0", - "contentHash": "yHZOhVSPuGqgHi+KhHiAZqNY08avkQraXKvgKgDU8c/ztmGzw7gmukkv49EaTq6T3xmp4XroWk3gAlbJHMxl8w==" - }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.0-preview.2, )", - "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" + "requested": "[17.2.0, )", + "resolved": "17.2.0", + "contentHash": "kYmkDYbcDd+jNvmMH4TMtgHjsUYbIsWENM2VcjB0X7TawXbehL5I8OIsu2TgFS/nQCgZE94InrqMxrm7WDy+Lw==" }, "NETStandard.Library": { "type": "Direct", diff --git a/tests/Tests.Domain/packages.lock.json b/tests/Tests.Domain/packages.lock.json index 58bb9fa5582..43f12985836 100644 --- a/tests/Tests.Domain/packages.lock.json +++ b/tests/Tests.Domain/packages.lock.json @@ -19,12 +19,6 @@ "System.Net.Http": "4.3.1" } }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.0-preview.2, )", - "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" - }, "NETStandard.Library": { "type": "Direct", "requested": "[2.0.3, )", diff --git a/tests/Tests.Reproduce/packages.lock.json b/tests/Tests.Reproduce/packages.lock.json index 96f9237c807..3702cc16145 100644 --- a/tests/Tests.Reproduce/packages.lock.json +++ b/tests/Tests.Reproduce/packages.lock.json @@ -2,12 +2,6 @@ "version": 1, "dependencies": { ".NETCoreApp,Version=v5.0": { - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.0-preview.2, )", - "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" - }, "System.Reactive": { "type": "Direct", "requested": "[3.1.1, )", @@ -101,8 +95,8 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "16.5.0", - "contentHash": "PM5YLtyN45EyUGePJpaNogndlaQPrMgQQXHKMhMESC6KfSVvt+j7+dxBi8NYC6X6dZVysf7ngwhSW3wwvPJRSQ==" + "resolved": "17.2.0", + "contentHash": "MsKhJmwIfHxNDbTIlgQy29UpWSWPpbZOQPhQ7xalRy+ABnl8/neFHZGzSP3XlpW2dKAXHTFrtIcKzW/kopY2Bg==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -111,11 +105,11 @@ }, "Microsoft.NET.Test.Sdk": { "type": "Transitive", - "resolved": "16.5.0", - "contentHash": "yHZOhVSPuGqgHi+KhHiAZqNY08avkQraXKvgKgDU8c/ztmGzw7gmukkv49EaTq6T3xmp4XroWk3gAlbJHMxl8w==", + "resolved": "17.2.0", + "contentHash": "kYmkDYbcDd+jNvmMH4TMtgHjsUYbIsWENM2VcjB0X7TawXbehL5I8OIsu2TgFS/nQCgZE94InrqMxrm7WDy+Lw==", "dependencies": { - "Microsoft.CodeCoverage": "16.5.0", - "Microsoft.TestPlatform.TestHost": "16.5.0" + "Microsoft.CodeCoverage": "17.2.0", + "Microsoft.TestPlatform.TestHost": "17.2.0" } }, "Microsoft.NETCore.Platforms": { @@ -130,18 +124,19 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "16.5.0", - "contentHash": "NnLFxmFBCAS6kye2JFszD5WKgj4Zve5KX/R0mhYwh6BVnSeybI2unRnjEPtLyY3CAVhwrY4bh/8LNFtslAcGZg==", + "resolved": "17.2.0", + "contentHash": "7j1KYDHLhU98XnCEbECMncXLydI9fNiFLcFsiBsP3lV6EkHOaj5kTPAWHYkKnPGRC9TbZUboSQq8rWI4dTQsxg==", "dependencies": { - "NuGet.Frameworks": "5.0.0" + "NuGet.Frameworks": "5.11.0", + "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "16.5.0", - "contentHash": "ytGymboQIvjNX5pLC0yp/Bz9sGDHqSnLQgBRtd4VrqOUgKmmcfxMYZ6p0TBZgAT1oijdC6xqUZ7rl8mbaaXTJw==", + "resolved": "17.2.0", + "contentHash": "bI67J+hers241h7eD2eecS02p9CbKcQDIeoRvO4FgMlTWg2ZTzc0D3uWLYr5U+K5x9O1pNmyMoMDbYIeWY/TWw==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "16.5.0", + "Microsoft.TestPlatform.ObjectModel": "17.2.0", "Newtonsoft.Json": "9.0.1" } }, @@ -228,8 +223,8 @@ }, "NuGet.Frameworks": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "c5JVjuVAm4f7E9Vj+v09Z9s2ZsqFDjBpcsyS3M9xRo0bEdm/LVZSzLxxNvfvAwRiiE8nwe1h2G4OwiwlzFKXlA==" + "resolved": "5.11.0", + "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" }, "Nullean.VsTest.Pretty.TestLogger": { "type": "Transitive", @@ -838,6 +833,11 @@ "System.Runtime": "4.3.0" } }, + "System.Reflection.Metadata": { + "type": "Transitive", + "resolved": "1.6.0", + "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" + }, "System.Reflection.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -1307,7 +1307,7 @@ "Elastic.Elasticsearch.Xunit": "0.2.6", "FluentAssertions": "5.10.3", "JunitXml.TestLogger": "2.1.78", - "Microsoft.NET.Test.Sdk": "16.5.0", + "Microsoft.NET.Test.Sdk": "17.2.0", "NEST.JsonNetSerializer": "7.0.0", "Nullean.VsTest.Pretty.TestLogger": "0.3.0", "Proc": "0.6.1", diff --git a/tests/Tests.ScratchPad/packages.lock.json b/tests/Tests.ScratchPad/packages.lock.json index af8453ffdcc..848a07cfe9b 100644 --- a/tests/Tests.ScratchPad/packages.lock.json +++ b/tests/Tests.ScratchPad/packages.lock.json @@ -25,12 +25,6 @@ "System.ValueTuple": "4.5.0" } }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.0-preview.2, )", - "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" - }, "System.Diagnostics.DiagnosticSource": { "type": "Direct", "requested": "[5.0.0, )", @@ -177,8 +171,8 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "16.5.0", - "contentHash": "PM5YLtyN45EyUGePJpaNogndlaQPrMgQQXHKMhMESC6KfSVvt+j7+dxBi8NYC6X6dZVysf7ngwhSW3wwvPJRSQ==" + "resolved": "17.2.0", + "contentHash": "MsKhJmwIfHxNDbTIlgQy29UpWSWPpbZOQPhQ7xalRy+ABnl8/neFHZGzSP3XlpW2dKAXHTFrtIcKzW/kopY2Bg==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -217,11 +211,11 @@ }, "Microsoft.NET.Test.Sdk": { "type": "Transitive", - "resolved": "16.5.0", - "contentHash": "yHZOhVSPuGqgHi+KhHiAZqNY08avkQraXKvgKgDU8c/ztmGzw7gmukkv49EaTq6T3xmp4XroWk3gAlbJHMxl8w==", + "resolved": "17.2.0", + "contentHash": "kYmkDYbcDd+jNvmMH4TMtgHjsUYbIsWENM2VcjB0X7TawXbehL5I8OIsu2TgFS/nQCgZE94InrqMxrm7WDy+Lw==", "dependencies": { - "Microsoft.CodeCoverage": "16.5.0", - "Microsoft.TestPlatform.TestHost": "16.5.0" + "Microsoft.CodeCoverage": "17.2.0", + "Microsoft.TestPlatform.TestHost": "17.2.0" } }, "Microsoft.NETCore.Platforms": { @@ -236,18 +230,19 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "16.5.0", - "contentHash": "NnLFxmFBCAS6kye2JFszD5WKgj4Zve5KX/R0mhYwh6BVnSeybI2unRnjEPtLyY3CAVhwrY4bh/8LNFtslAcGZg==", + "resolved": "17.2.0", + "contentHash": "7j1KYDHLhU98XnCEbECMncXLydI9fNiFLcFsiBsP3lV6EkHOaj5kTPAWHYkKnPGRC9TbZUboSQq8rWI4dTQsxg==", "dependencies": { - "NuGet.Frameworks": "5.0.0" + "NuGet.Frameworks": "5.11.0", + "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "16.5.0", - "contentHash": "ytGymboQIvjNX5pLC0yp/Bz9sGDHqSnLQgBRtd4VrqOUgKmmcfxMYZ6p0TBZgAT1oijdC6xqUZ7rl8mbaaXTJw==", + "resolved": "17.2.0", + "contentHash": "bI67J+hers241h7eD2eecS02p9CbKcQDIeoRvO4FgMlTWg2ZTzc0D3uWLYr5U+K5x9O1pNmyMoMDbYIeWY/TWw==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "16.5.0", + "Microsoft.TestPlatform.ObjectModel": "17.2.0", "Newtonsoft.Json": "9.0.1" } }, @@ -277,8 +272,8 @@ }, "NuGet.Frameworks": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "c5JVjuVAm4f7E9Vj+v09Z9s2ZsqFDjBpcsyS3M9xRo0bEdm/LVZSzLxxNvfvAwRiiE8nwe1h2G4OwiwlzFKXlA==" + "resolved": "5.11.0", + "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" }, "Nullean.VsTest.Pretty.TestLogger": { "type": "Transitive", @@ -1423,7 +1418,7 @@ "Elastic.Elasticsearch.Xunit": "0.2.6", "FluentAssertions": "5.10.3", "JunitXml.TestLogger": "2.1.78", - "Microsoft.NET.Test.Sdk": "16.5.0", + "Microsoft.NET.Test.Sdk": "17.2.0", "NEST.JsonNetSerializer": "7.0.0", "Nullean.VsTest.Pretty.TestLogger": "0.3.0", "Proc": "0.6.1", diff --git a/tests/Tests.YamlRunner/packages.lock.json b/tests/Tests.YamlRunner/packages.lock.json index 87238554cb3..9748cfca887 100644 --- a/tests/Tests.YamlRunner/packages.lock.json +++ b/tests/Tests.YamlRunner/packages.lock.json @@ -27,12 +27,6 @@ "FSharp.Core": "4.3.4" } }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.0-preview.2, )", - "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" - }, "Newtonsoft.Json": { "type": "Direct", "requested": "[13.0.1, )", diff --git a/tests/Tests/Framework/EndpointTests/RequestResponseApiTestBase.cs b/tests/Tests/Framework/EndpointTests/RequestResponseApiTestBase.cs index 038aeffacb5..ab80a36dcda 100644 --- a/tests/Tests/Framework/EndpointTests/RequestResponseApiTestBase.cs +++ b/tests/Tests/Framework/EndpointTests/RequestResponseApiTestBase.cs @@ -58,7 +58,7 @@ protected RequestResponseApiTestBase(TCluster cluster, EndpointUsage usage) : ba protected static string RandomString() => Guid.NewGuid().ToString("N").Substring(0, 8); protected string U(string s) => Uri.EscapeDataString(s); - protected string Q(string s) => Uri.EscapeUriString(s); + protected string Q(string s) => Uri.EscapeDataString(s); protected T ExtendedValue(string key) where T : class => UniqueValues.ExtendedValue(key); diff --git a/tests/Tests/packages.lock.json b/tests/Tests/packages.lock.json index 350eb8e8485..578d9f5142b 100644 --- a/tests/Tests/packages.lock.json +++ b/tests/Tests/packages.lock.json @@ -23,12 +23,6 @@ "resolved": "4.7.0", "contentHash": "6Bf2qzSCaJoP6tTfO+a5muUS7QbyJANqSut73zQvwQ9It5P0ITz9VKseeia2ofco30c55EQ0jA2wf2+A2gpGnw==" }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.0-preview.2, )", - "resolved": "1.0.0-preview.2", - "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==" - }, "Newtonsoft.Json": { "type": "Direct", "requested": "[13.0.1, )", @@ -189,8 +183,8 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "16.5.0", - "contentHash": "PM5YLtyN45EyUGePJpaNogndlaQPrMgQQXHKMhMESC6KfSVvt+j7+dxBi8NYC6X6dZVysf7ngwhSW3wwvPJRSQ==" + "resolved": "17.2.0", + "contentHash": "MsKhJmwIfHxNDbTIlgQy29UpWSWPpbZOQPhQ7xalRy+ABnl8/neFHZGzSP3XlpW2dKAXHTFrtIcKzW/kopY2Bg==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -199,11 +193,11 @@ }, "Microsoft.NET.Test.Sdk": { "type": "Transitive", - "resolved": "16.5.0", - "contentHash": "yHZOhVSPuGqgHi+KhHiAZqNY08avkQraXKvgKgDU8c/ztmGzw7gmukkv49EaTq6T3xmp4XroWk3gAlbJHMxl8w==", + "resolved": "17.2.0", + "contentHash": "kYmkDYbcDd+jNvmMH4TMtgHjsUYbIsWENM2VcjB0X7TawXbehL5I8OIsu2TgFS/nQCgZE94InrqMxrm7WDy+Lw==", "dependencies": { - "Microsoft.CodeCoverage": "16.5.0", - "Microsoft.TestPlatform.TestHost": "16.5.0" + "Microsoft.CodeCoverage": "17.2.0", + "Microsoft.TestPlatform.TestHost": "17.2.0" } }, "Microsoft.NETCore.Platforms": { @@ -218,18 +212,19 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "16.5.0", - "contentHash": "NnLFxmFBCAS6kye2JFszD5WKgj4Zve5KX/R0mhYwh6BVnSeybI2unRnjEPtLyY3CAVhwrY4bh/8LNFtslAcGZg==", + "resolved": "17.2.0", + "contentHash": "7j1KYDHLhU98XnCEbECMncXLydI9fNiFLcFsiBsP3lV6EkHOaj5kTPAWHYkKnPGRC9TbZUboSQq8rWI4dTQsxg==", "dependencies": { - "NuGet.Frameworks": "5.0.0" + "NuGet.Frameworks": "5.11.0", + "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "16.5.0", - "contentHash": "ytGymboQIvjNX5pLC0yp/Bz9sGDHqSnLQgBRtd4VrqOUgKmmcfxMYZ6p0TBZgAT1oijdC6xqUZ7rl8mbaaXTJw==", + "resolved": "17.2.0", + "contentHash": "bI67J+hers241h7eD2eecS02p9CbKcQDIeoRvO4FgMlTWg2ZTzc0D3uWLYr5U+K5x9O1pNmyMoMDbYIeWY/TWw==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "16.5.0", + "Microsoft.TestPlatform.ObjectModel": "17.2.0", "Newtonsoft.Json": "9.0.1" } }, @@ -311,8 +306,8 @@ }, "NuGet.Frameworks": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "c5JVjuVAm4f7E9Vj+v09Z9s2ZsqFDjBpcsyS3M9xRo0bEdm/LVZSzLxxNvfvAwRiiE8nwe1h2G4OwiwlzFKXlA==" + "resolved": "5.11.0", + "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q==" }, "Nullean.VsTest.Pretty.TestLogger": { "type": "Transitive", @@ -882,8 +877,8 @@ }, "System.Reflection.Metadata": { "type": "Transitive", - "resolved": "1.5.0", - "contentHash": "423hF/x1/1/aBT6hjgrp8RH2zdKOd1iTujlHisSesTW/cgv1ixUitfk23ZknVzItMm6jnwp9CBwI2P3r9jpitw==" + "resolved": "1.6.0", + "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" }, "System.Reflection.Primitives": { "type": "Transitive", @@ -1360,7 +1355,7 @@ "Elastic.Elasticsearch.Xunit": "0.2.6", "FluentAssertions": "5.10.3", "JunitXml.TestLogger": "2.1.78", - "Microsoft.NET.Test.Sdk": "16.5.0", + "Microsoft.NET.Test.Sdk": "17.2.0", "NEST.JsonNetSerializer": "7.0.0", "Nullean.VsTest.Pretty.TestLogger": "0.3.0", "Proc": "0.6.1", From e997ffe715fd841cb467096295b4a568bdf60705 Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Wed, 19 Oct 2022 10:35:50 +0100 Subject: [PATCH 3/3] Fix reference assemblies --- .ci/packages.lock.json | 9 ++++++- Directory.Build.props | 5 ++++ build/scripts/packages.lock.json | 6 +++++ src/ApiGenerator/packages.lock.json | 6 +++++ src/DocGenerator/packages.lock.json | 6 +++++ .../packages.lock.json | 20 ++++++++++++++ src/Elasticsearch.Net/packages.lock.json | 26 +++++++++++++++++++ src/Nest.JsonNetSerializer/packages.lock.json | 20 ++++++++++++++ src/Nest/packages.lock.json | 20 ++++++++++++++ tests/Tests.Benchmarking/packages.lock.json | 6 +++++ .../Tests.ClusterLauncher/packages.lock.json | 6 +++++ tests/Tests.Configuration/packages.lock.json | 6 +++++ tests/Tests.Core/packages.lock.json | 6 +++++ tests/Tests.Domain/packages.lock.json | 6 +++++ tests/Tests.Reproduce/packages.lock.json | 6 +++++ tests/Tests.ScratchPad/packages.lock.json | 6 +++++ tests/Tests.YamlRunner/packages.lock.json | 6 +++++ tests/Tests/packages.lock.json | 6 +++++ 18 files changed, 171 insertions(+), 1 deletion(-) diff --git a/.ci/packages.lock.json b/.ci/packages.lock.json index be166602150..593b775ea05 100644 --- a/.ci/packages.lock.json +++ b/.ci/packages.lock.json @@ -1,6 +1,13 @@ { "version": 1, "dependencies": { - ".NETCoreApp,Version=v5.0": {} + ".NETCoreApp,Version=v5.0": { + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==" + } + } } } \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index 0bafbf6075c..6106e18de17 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -45,4 +45,9 @@ 002400000480000094000000060200000024000052534131000400000100010025d3a22bf3781ba85067374ad832dfcba3c4fa8dd89227e36121ba17b2c33ad6b6ce03e45e562050a031e2ff7fe12cff9060a50acbc6a0eef9ef32dc258d90f874b2e76b581938071ccc4b4d98204d1d6ca7a1988d7a211f9fc98efd808cf85f61675b11007d0eb0461dc86a968d6af8ebba7e6b540303b54f1c1f5325c252be + + + + + \ No newline at end of file diff --git a/build/scripts/packages.lock.json b/build/scripts/packages.lock.json index 00f1c9a0cc3..d16acacd293 100644 --- a/build/scripts/packages.lock.json +++ b/build/scripts/packages.lock.json @@ -84,6 +84,12 @@ "resolved": "5.0.0", "contentHash": "iHoYXA0VaSQUONGENB1aVafjDDZDZpwu39MtaRCTrmwFW/cTcK0b2yKNVYneFHJMc3ChtsSoM9lNtJ1dYXkHfA==" }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==" + }, "Newtonsoft.Json": { "type": "Direct", "requested": "[13.0.1, )", diff --git a/src/ApiGenerator/packages.lock.json b/src/ApiGenerator/packages.lock.json index f97794994d8..664765e7634 100644 --- a/src/ApiGenerator/packages.lock.json +++ b/src/ApiGenerator/packages.lock.json @@ -21,6 +21,12 @@ "Microsoft.CodeAnalysis.Common": "[3.1.0-beta3-final]" } }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==" + }, "Newtonsoft.Json": { "type": "Direct", "requested": "[13.0.1, )", diff --git a/src/DocGenerator/packages.lock.json b/src/DocGenerator/packages.lock.json index 115472739f1..4217b8295bc 100644 --- a/src/DocGenerator/packages.lock.json +++ b/src/DocGenerator/packages.lock.json @@ -113,6 +113,12 @@ "NETStandard.Library": "1.6.1" } }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==" + }, "Newtonsoft.Json": { "type": "Direct", "requested": "[13.0.1, )", diff --git a/src/Elasticsearch.Net.VirtualizedCluster/packages.lock.json b/src/Elasticsearch.Net.VirtualizedCluster/packages.lock.json index 610f8c117e2..45360ac9f46 100644 --- a/src/Elasticsearch.Net.VirtualizedCluster/packages.lock.json +++ b/src/Elasticsearch.Net.VirtualizedCluster/packages.lock.json @@ -8,6 +8,15 @@ "resolved": "4.0.0", "contentHash": "PCgUb5I1DIe0GsBZ2fPXr/tOgph9Gh6yoHcpsFxNmTvyOQFXxyOcjM7wPs8ylakPNdFYBUs9YeF2Wsx6K/nEDQ==" }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3" + } + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -28,6 +37,11 @@ "resolved": "4.6.0", "contentHash": "kxn3M2rnAGy5N5DgcIwcE8QTePWU/XiYcQVzn9HqTls2NKluVzVSmVWRjK7OUPWbljCXuZxHyhEz9kPRIQeXow==" }, + "Microsoft.NETFramework.ReferenceAssemblies.net461": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA==" + }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -84,6 +98,12 @@ "resolved": "4.0.0", "contentHash": "PCgUb5I1DIe0GsBZ2fPXr/tOgph9Gh6yoHcpsFxNmTvyOQFXxyOcjM7wPs8ylakPNdFYBUs9YeF2Wsx6K/nEDQ==" }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/Elasticsearch.Net/packages.lock.json b/src/Elasticsearch.Net/packages.lock.json index 443bd593a1e..8441634d42a 100644 --- a/src/Elasticsearch.Net/packages.lock.json +++ b/src/Elasticsearch.Net/packages.lock.json @@ -14,6 +14,15 @@ "resolved": "4.6.0", "contentHash": "kxn3M2rnAGy5N5DgcIwcE8QTePWU/XiYcQVzn9HqTls2NKluVzVSmVWRjK7OUPWbljCXuZxHyhEz9kPRIQeXow==" }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3" + } + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -56,6 +65,11 @@ "resolved": "1.0.0", "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" }, + "Microsoft.NETFramework.ReferenceAssemblies.net461": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA==" + }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -85,6 +99,12 @@ "resolved": "4.6.0", "contentHash": "kxn3M2rnAGy5N5DgcIwcE8QTePWU/XiYcQVzn9HqTls2NKluVzVSmVWRjK7OUPWbljCXuZxHyhEz9kPRIQeXow==" }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -273,6 +293,12 @@ "resolved": "4.6.0", "contentHash": "kxn3M2rnAGy5N5DgcIwcE8QTePWU/XiYcQVzn9HqTls2NKluVzVSmVWRjK7OUPWbljCXuZxHyhEz9kPRIQeXow==" }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/Nest.JsonNetSerializer/packages.lock.json b/src/Nest.JsonNetSerializer/packages.lock.json index de74f9de9f5..64dee9b36db 100644 --- a/src/Nest.JsonNetSerializer/packages.lock.json +++ b/src/Nest.JsonNetSerializer/packages.lock.json @@ -8,6 +8,15 @@ "resolved": "4.0.0", "contentHash": "PCgUb5I1DIe0GsBZ2fPXr/tOgph9Gh6yoHcpsFxNmTvyOQFXxyOcjM7wPs8ylakPNdFYBUs9YeF2Wsx6K/nEDQ==" }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3" + } + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -34,6 +43,11 @@ "resolved": "4.6.0", "contentHash": "kxn3M2rnAGy5N5DgcIwcE8QTePWU/XiYcQVzn9HqTls2NKluVzVSmVWRjK7OUPWbljCXuZxHyhEz9kPRIQeXow==" }, + "Microsoft.NETFramework.ReferenceAssemblies.net461": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA==" + }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -96,6 +110,12 @@ "resolved": "4.0.0", "contentHash": "PCgUb5I1DIe0GsBZ2fPXr/tOgph9Gh6yoHcpsFxNmTvyOQFXxyOcjM7wPs8ylakPNdFYBUs9YeF2Wsx6K/nEDQ==" }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/src/Nest/packages.lock.json b/src/Nest/packages.lock.json index 610f8c117e2..45360ac9f46 100644 --- a/src/Nest/packages.lock.json +++ b/src/Nest/packages.lock.json @@ -8,6 +8,15 @@ "resolved": "4.0.0", "contentHash": "PCgUb5I1DIe0GsBZ2fPXr/tOgph9Gh6yoHcpsFxNmTvyOQFXxyOcjM7wPs8ylakPNdFYBUs9YeF2Wsx6K/nEDQ==" }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3" + } + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", @@ -28,6 +37,11 @@ "resolved": "4.6.0", "contentHash": "kxn3M2rnAGy5N5DgcIwcE8QTePWU/XiYcQVzn9HqTls2NKluVzVSmVWRjK7OUPWbljCXuZxHyhEz9kPRIQeXow==" }, + "Microsoft.NETFramework.ReferenceAssemblies.net461": { + "type": "Transitive", + "resolved": "1.0.3", + "contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA==" + }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", @@ -84,6 +98,12 @@ "resolved": "4.0.0", "contentHash": "PCgUb5I1DIe0GsBZ2fPXr/tOgph9Gh6yoHcpsFxNmTvyOQFXxyOcjM7wPs8ylakPNdFYBUs9YeF2Wsx6K/nEDQ==" }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.0.0, )", diff --git a/tests/Tests.Benchmarking/packages.lock.json b/tests/Tests.Benchmarking/packages.lock.json index 60eaf97cb65..930eeb381b7 100644 --- a/tests/Tests.Benchmarking/packages.lock.json +++ b/tests/Tests.Benchmarking/packages.lock.json @@ -40,6 +40,12 @@ "LibGit2Sharp.NativeBinaries": "[1.0.245]" } }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==" + }, "BenchmarkDotNet.Annotations": { "type": "Transitive", "resolved": "0.12.0", diff --git a/tests/Tests.ClusterLauncher/packages.lock.json b/tests/Tests.ClusterLauncher/packages.lock.json index c5ccf41c231..1b701b7a8ac 100644 --- a/tests/Tests.ClusterLauncher/packages.lock.json +++ b/tests/Tests.ClusterLauncher/packages.lock.json @@ -2,6 +2,12 @@ "version": 1, "dependencies": { ".NETCoreApp,Version=v5.0": { + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==" + }, "Bogus": { "type": "Transitive", "resolved": "22.1.2", diff --git a/tests/Tests.Configuration/packages.lock.json b/tests/Tests.Configuration/packages.lock.json index 9ca52739d60..cad93c75820 100644 --- a/tests/Tests.Configuration/packages.lock.json +++ b/tests/Tests.Configuration/packages.lock.json @@ -13,6 +13,12 @@ "System.Net.Http": "4.3.1" } }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==" + }, "NETStandard.Library": { "type": "Direct", "requested": "[2.0.3, )", diff --git a/tests/Tests.Core/packages.lock.json b/tests/Tests.Core/packages.lock.json index d57d07e7e65..8e4112f8e92 100644 --- a/tests/Tests.Core/packages.lock.json +++ b/tests/Tests.Core/packages.lock.json @@ -42,6 +42,12 @@ "resolved": "17.2.0", "contentHash": "kYmkDYbcDd+jNvmMH4TMtgHjsUYbIsWENM2VcjB0X7TawXbehL5I8OIsu2TgFS/nQCgZE94InrqMxrm7WDy+Lw==" }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==" + }, "NETStandard.Library": { "type": "Direct", "requested": "[2.0.3, )", diff --git a/tests/Tests.Domain/packages.lock.json b/tests/Tests.Domain/packages.lock.json index 43f12985836..c103d6a39cd 100644 --- a/tests/Tests.Domain/packages.lock.json +++ b/tests/Tests.Domain/packages.lock.json @@ -19,6 +19,12 @@ "System.Net.Http": "4.3.1" } }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==" + }, "NETStandard.Library": { "type": "Direct", "requested": "[2.0.3, )", diff --git a/tests/Tests.Reproduce/packages.lock.json b/tests/Tests.Reproduce/packages.lock.json index 3702cc16145..45e89a935f1 100644 --- a/tests/Tests.Reproduce/packages.lock.json +++ b/tests/Tests.Reproduce/packages.lock.json @@ -2,6 +2,12 @@ "version": 1, "dependencies": { ".NETCoreApp,Version=v5.0": { + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==" + }, "System.Reactive": { "type": "Direct", "requested": "[3.1.1, )", diff --git a/tests/Tests.ScratchPad/packages.lock.json b/tests/Tests.ScratchPad/packages.lock.json index 848a07cfe9b..a2fc819ba78 100644 --- a/tests/Tests.ScratchPad/packages.lock.json +++ b/tests/Tests.ScratchPad/packages.lock.json @@ -25,6 +25,12 @@ "System.ValueTuple": "4.5.0" } }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==" + }, "System.Diagnostics.DiagnosticSource": { "type": "Direct", "requested": "[5.0.0, )", diff --git a/tests/Tests.YamlRunner/packages.lock.json b/tests/Tests.YamlRunner/packages.lock.json index 9748cfca887..282004cdfe8 100644 --- a/tests/Tests.YamlRunner/packages.lock.json +++ b/tests/Tests.YamlRunner/packages.lock.json @@ -27,6 +27,12 @@ "FSharp.Core": "4.3.4" } }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==" + }, "Newtonsoft.Json": { "type": "Direct", "requested": "[13.0.1, )", diff --git a/tests/Tests/packages.lock.json b/tests/Tests/packages.lock.json index 578d9f5142b..da8d0873194 100644 --- a/tests/Tests/packages.lock.json +++ b/tests/Tests/packages.lock.json @@ -23,6 +23,12 @@ "resolved": "4.7.0", "contentHash": "6Bf2qzSCaJoP6tTfO+a5muUS7QbyJANqSut73zQvwQ9It5P0ITz9VKseeia2ofco30c55EQ0jA2wf2+A2gpGnw==" }, + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.3, )", + "resolved": "1.0.3", + "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==" + }, "Newtonsoft.Json": { "type": "Direct", "requested": "[13.0.1, )",