Merge remote-tracking branch 'origin/main' into feature-DependencySolver

dependabot · Aug 22, 2024 · e63063c · e63063c
2 parents 78b3768 + a8befbe
commit e63063c
Show file tree

Hide file tree

Showing 6 changed files with 224 additions and 245 deletions.
diff --git a/nuget/top-level-only/dep-is-top-level/dep-is-top-level.csproj b/nuget/top-level-only/dep-is-top-level/dep-is-top-level.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- Newtonsoft.Json/12.0.1 is a top-level dependency and will be updated -->
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
+  </ItemGroup>
+</Project>
diff --git a/nuget/top-level-only/dep-is-transitive/dep-is-transitive.csproj b/nuget/top-level-only/dep-is-transitive/dep-is-transitive.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- Newtonsoft.Json/12.0.1 is a transitive dependency and will not be updated -->
+    <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
+  </ItemGroup>
+</Project>
diff --git a/nuget/top-level-only/top-level-only.sln b/nuget/top-level-only/top-level-only.sln
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35027.167
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dep-is-top-level", "dep-is-top-level\dep-is-top-level.csproj", "{4A3B8D8A-A585-4593-8AF3-DED05AE3C40F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dep-is-transitive", "dep-is-transitive\dep-is-transitive.csproj", "{271E533C-8A44-4572-8C18-CD65A79F8658}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4A3B8D8A-A585-4593-8AF3-DED05AE3C40F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A3B8D8A-A585-4593-8AF3-DED05AE3C40F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A3B8D8A-A585-4593-8AF3-DED05AE3C40F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4A3B8D8A-A585-4593-8AF3-DED05AE3C40F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{271E533C-8A44-4572-8C18-CD65A79F8658}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{271E533C-8A44-4572-8C18-CD65A79F8658}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{271E533C-8A44-4572-8C18-CD65A79F8658}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{271E533C-8A44-4572-8C18-CD65A79F8658}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {EE5BDEF7-1D4D-4773-9659-FC4A3846CD6D}
+	EndGlobalSection
+EndGlobal
diff --git a/tests/smoke-nuget-peer-dependencies.yaml b/tests/smoke-nuget-peer-dependencies.yaml
@@ -284,128 +284,6 @@ output:
                 Updates `Microsoft.Extensions.Logging` from 2.2.0 to 8.0.0
                 - [Release notes](https://github.com/dotnet/runtime/releases)
                 - [Commits](https://github.com/dotnet/runtime/commits/v8.0.0)
-    - type: create_pull_request
-      expect:
-        data:
-            base-commit-sha: 7dbbef7b02f40ddfa7d32fc3099caf19f370bb9b
-            dependencies:
-                - name: Microsoft.Extensions.Logging
-                  previous-requirements:
-                    - file: /nuget/peer-dependencies/project.csproj
-                      groups:
-                        - dependencies
-                      requirement: 2.2.0
-                      source: null
-                  previous-version: 2.2.0
-                  requirements:
-                    - file: /nuget/peer-dependencies/project.csproj
-                      groups:
-                        - dependencies
-                      requirement: 8.0.0
-                      source:
-                        source_url: https://github.com/dotnet/runtime
-                        type: nuget_repo
-                  version: 8.0.0
-                  directory: /nuget/peer-dependencies
-            updated-dependency-files:
-                - content: |-
-                    <Project Sdk="Microsoft.NET.Sdk">
-
-                      <PropertyGroup>
-                        <OutputType>Exe</OutputType>
-                        <TargetFramework>net6.0</TargetFramework>
-                        <ImplicitUsings>enable</ImplicitUsings>
-                        <Nullable>enable</Nullable>
-                      </PropertyGroup>
-
-                      <ItemGroup>
-                        <PackageReference Include="Microsoft.Extensions.Http" Version="2.2.0" />
-                        <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-                      </ItemGroup>
-
-                    </Project>
-                  content_encoding: utf-8
-                  deleted: false
-                  directory: /nuget/peer-dependencies
-                  name: project.csproj
-                  operation: update
-                  support_file: false
-                  type: file
-            pr-title: Bump Microsoft.Extensions.Logging from 2.2.0 to 8.0.0 in /nuget/peer-dependencies
-            pr-body: |
-                Bumps [Microsoft.Extensions.Logging](https://github.com/dotnet/runtime) from 2.2.0 to 8.0.0.
-                <details>
-                <summary>Release notes</summary>
-                <p><em>Sourced from <a href="https://github.com/dotnet/runtime/releases">Microsoft.Extensions.Logging's releases</a>.</em></p>
-                <blockquote>
-                <h2>.NET 8.0.0</h2>
-                <p><a href="https://github.com/dotnet/core/releases/tag/v8.0.0">Release</a></p>
-                <h2>What's Changed</h2>
-                <ul>
-                <li>[release/8.0-rc1] [release/8.0] Events for IL methods without IL headers by <a href="https://github.com/github-actions"><code>@github-actions</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92317">dotnet/runtime#92317</a></li>
-                <li>[release/8.0] Update dependencies from dotnet/source-build-externals by <a href="https://github.com/dotnet-maestro"><code>@dotnet-maestro</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92340">dotnet/runtime#92340</a></li>
-                <li>[release/8.0-rc1] [release/8.0] Fix wasi build. by <a href="https://github.com/github-actions"><code>@github-actions</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92368">dotnet/runtime#92368</a></li>
-                <li>[automated] Merge branch 'release/8.0-rc2' =&gt; 'release/8.0' by <a href="https://github.com/dotnet-maestro-bot"><code>@dotnet-maestro-bot</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92325">dotnet/runtime#92325</a></li>
-                <li>[release/8.0] Update dependencies from dotnet/roslyn by <a href="https://github.com/dotnet-maestro"><code>@dotnet-maestro</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92303">dotnet/runtime#92303</a></li>
-                <li>[automated] Merge branch 'release/8.0-rc1' =&gt; 'release/8.0' by <a href="https://github.com/dotnet-maestro-bot"><code>@dotnet-maestro-bot</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92374">dotnet/runtime#92374</a></li>
-                <li>[release/8.0] Bump version to GA by <a href="https://github.com/carlossanlop"><code>@carlossanlop</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92305">dotnet/runtime#92305</a></li>
-                <li>[release/8.0] Update dependencies from dotnet/source-build-externals by <a href="https://github.com/dotnet-maestro"><code>@dotnet-maestro</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92476">dotnet/runtime#92476</a></li>
-                <li>[automated] Merge branch 'release/8.0-rc2' =&gt; 'release/8.0' by <a href="https://github.com/dotnet-maestro-bot"><code>@dotnet-maestro-bot</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92401">dotnet/runtime#92401</a></li>
-                <li>[release/8.0] Update dependencies from dotnet/roslyn by <a href="https://github.com/dotnet-maestro"><code>@dotnet-maestro</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92418">dotnet/runtime#92418</a></li>
-                <li>[release/8.0] Update dependencies from dotnet/source-build-reference-packages by <a href="https://github.com/dotnet-maestro"><code>@dotnet-maestro</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92474">dotnet/runtime#92474</a></li>
-                <li>[release/8.0] Update dependencies from dnceng/internal/dotnet-optimization by <a href="https://github.com/dotnet-maestro"><code>@dotnet-maestro</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92473">dotnet/runtime#92473</a></li>
-                <li>[release/8.0] Update dependencies from dotnet/roslyn by <a href="https://github.com/dotnet-maestro"><code>@dotnet-maestro</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92488">dotnet/runtime#92488</a></li>
-                <li>[automated] Merge branch 'release/8.0-rc2' =&gt; 'release/8.0' by <a href="https://github.com/dotnet-maestro-bot"><code>@dotnet-maestro-bot</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92484">dotnet/runtime#92484</a></li>
-                <li>[release/8.0] Update dependencies from dotnet/roslyn-analyzers by <a href="https://github.com/dotnet-maestro"><code>@dotnet-maestro</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92499">dotnet/runtime#92499</a></li>
-                <li>[release/8.0] Update dependencies from dotnet/emsdk by <a href="https://github.com/dotnet-maestro"><code>@dotnet-maestro</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92532">dotnet/runtime#92532</a></li>
-                <li>[automated] Merge branch 'release/8.0-rc2' =&gt; 'release/8.0' by <a href="https://github.com/dotnet-maestro-bot"><code>@dotnet-maestro-bot</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92515">dotnet/runtime#92515</a></li>
-                <li>[release/8.0] Update dependencies from dotnet/source-build-externals by <a href="https://github.com/dotnet-maestro"><code>@dotnet-maestro</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92641">dotnet/runtime#92641</a></li>
-                <li>[release/8.0] Update dependencies from dotnet/emsdk dotnet/hotreload-utils by <a href="https://github.com/dotnet-maestro"><code>@dotnet-maestro</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92606">dotnet/runtime#92606</a></li>
-                <li>[release/8.0][wasm] Fix regressed file sizes for blazor by <a href="https://github.com/radical"><code>@radical</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92627">dotnet/runtime#92627</a></li>
-                <li>[release/8.0] JIT: Fixed containment of STOREIND of HW intrinsics ConvertTo*/Extract* by <a href="https://github.com/github-actions"><code>@github-actions</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92513">dotnet/runtime#92513</a></li>
-                <li>[release/8.0] Define bool as Interop.BOOL to prevent upper bytes setting native bool by <a href="https://github.com/github-actions"><code>@github-actions</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92681">dotnet/runtime#92681</a></li>
-                <li>[release/8.0] Make CoreCLR/NativeAOT assembly compile with .subsections_via_symbols on Apple platforms by <a href="https://github.com/github-actions"><code>@github-actions</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92544">dotnet/runtime#92544</a></li>
-                <li>[release/8.0] Fix LLVMAOT Mono runtime variant official build to produce correctly named runtime packs by <a href="https://github.com/github-actions"><code>@github-actions</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92737">dotnet/runtime#92737</a></li>
-                <li>[release/8.0] Remove all PGO assets except for the runtime PGO archive. by <a href="https://github.com/github-actions"><code>@github-actions</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92735">dotnet/runtime#92735</a></li>
-                <li>[release/8.0] Put HasNativeCodeReJITAware into GetFunctionAddress by <a href="https://github.com/github-actions"><code>@github-actions</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92665">dotnet/runtime#92665</a></li>
-                <li>[release/8.0] Update dependencies from dotnet/cecil dotnet/emsdk by <a href="https://github.com/dotnet-maestro"><code>@dotnet-maestro</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92702">dotnet/runtime#92702</a></li>
-                <li>[release/8.0][wasm] Fix Wasm.Build.Tests failing due to an old skiasharp reference by <a href="https://github.com/radical"><code>@radical</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92747">dotnet/runtime#92747</a></li>
-                <li>[release/8.0] Update dependencies from dotnet/installer by <a href="https://github.com/radical"><code>@radical</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92745">dotnet/runtime#92745</a></li>
-                <li>[release/8.0] Bring back CopyOutputSymbolsToPublishDirectory by <a href="https://github.com/github-actions"><code>@github-actions</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92369">dotnet/runtime#92369</a></li>
-                <li>[release/8.0] Update dependencies from <code>dotnet/installer</code> by <a href="https://github.com/radical"><code>@radical</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92795">dotnet/runtime#92795</a></li>
-                <li>[release/8.0] Update dependencies from dnceng/internal/dotnet-optimization by <a href="https://github.com/dotnet-maestro"><code>@dotnet-maestro</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92762">dotnet/runtime#92762</a></li>
-                <li>[release/8.0] Update dependencies from dnceng/internal/dotnet-optimization by <a href="https://github.com/dotnet-maestro"><code>@dotnet-maestro</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92816">dotnet/runtime#92816</a></li>
-                <li>[release/8.0][wasm][debugger] Support multidimensional indexing of object scheme by <a href="https://github.com/ilonatommy"><code>@ilonatommy</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92753">dotnet/runtime#92753</a></li>
-                <li>[release/8.0] [browser] Remove duplicated marshaling of return value for JSExport by <a href="https://github.com/github-actions"><code>@github-actions</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92886">dotnet/runtime#92886</a></li>
-                <li>[release/8.0] [browser][nodejs] keep runtime alive for JSExport calls by <a href="https://github.com/github-actions"><code>@github-actions</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92890">dotnet/runtime#92890</a></li>
-                <li>[release/8.0] Update dependencies from dotnet/roslyn by <a href="https://github.com/dotnet-maestro"><code>@dotnet-maestro</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92503">dotnet/runtime#92503</a></li>
-                <li>[release/8.0] Make config binding gen incremental (<a href="https://redirect.github.com/dotnet/runtime/issues/89587">#89587</a>) by <a href="https://github.com/layomia"><code>@layomia</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92730">dotnet/runtime#92730</a></li>
-                <li>[release/8.0] [wasm] Endian fix for Webcil by <a href="https://github.com/github-actions"><code>@github-actions</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92495">dotnet/runtime#92495</a></li>
-                <li>[release/8.0] Update dependencies from dotnet/source-build-externals by <a href="https://github.com/dotnet-maestro"><code>@dotnet-maestro</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92935">dotnet/runtime#92935</a></li>
-                <li>[release/8.0] Update dependencies from dotnet/cecil dotnet/hotreload-utils by <a href="https://github.com/dotnet-maestro"><code>@dotnet-maestro</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92932">dotnet/runtime#92932</a></li>
-                <li>[release/8.0][wasm] Use intended ports when running <code>DevServer</code> by <a href="https://github.com/radical"><code>@radical</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92906">dotnet/runtime#92906</a></li>
-                <li>[release/8.0] Fix deadlock in EventPipeEventDispatcher by <a href="https://github.com/github-actions"><code>@github-actions</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92912">dotnet/runtime#92912</a></li>
-                <li>[release/8.0] CI: runtime-wasm-perf: disable for PRs by <a href="https://github.com/radical"><code>@radical</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92977">dotnet/runtime#92977</a></li>
-                <li>[release/8.0] Throw when applying <code>JsonObjectHandling.Populate</code> to types with parameterized constructors. by <a href="https://github.com/github-actions"><code>@github-actions</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92947">dotnet/runtime#92947</a></li>
-                <li>[release/8.0] Use invariant culture in CBOR date encoding by <a href="https://github.com/github-actions"><code>@github-actions</code></a> in <a href="https://redirect.github.com/dotnet/runtime/pull/92924">dotnet/runtime#92924</a></li>
-                </ul>
-                <!-- raw HTML omitted -->
-                </blockquote>
-                <p>... (truncated)</p>
-                </details>
-                <details>
-                <summary>Commits</summary>
-                <ul>
-                <li>See full diff in <a href="https://github.com/dotnet/runtime/commits/v8.0.0">compare view</a></li>
-                </ul>
-                </details>
-                <br />
-            commit-message: |-
-                Bump Microsoft.Extensions.Logging in /nuget/peer-dependencies
-
-                Bumps [Microsoft.Extensions.Logging](https://github.com/dotnet/runtime) from 2.2.0 to 8.0.0.
-                - [Release notes](https://github.com/dotnet/runtime/releases)
-                - [Commits](https://github.com/dotnet/runtime/commits/v8.0.0)
     - type: mark_as_processed
       expect:
         data: