From 2e3dea607d8081e4d2d7dc0abe4ba475c975411c Mon Sep 17 00:00:00 2001 From: "Brett V. Forsgren" Date: Wed, 27 Nov 2024 11:20:54 -0700 Subject: [PATCH] update smoke tests to use new reported file ordering --- .../compatible-version/project/project.csproj | 2 +- ...moke-nuget-central-package-management.yaml | 4 +-- tests/smoke-nuget-compatible-version.yaml | 1 - tests/smoke-nuget-dirs-proj.yaml | 7 ++-- tests/smoke-nuget-lockfile.yaml | 34 +++++++++---------- tests/smoke-nuget-potential-downgrade.yaml | 4 +-- tests/smoke-nuget-props-and-targets.yaml | 2 +- tests/smoke-nuget-transitive-pinning.yaml | 2 +- tests/smoke-nuget-version-property.yaml | 2 +- 9 files changed, 28 insertions(+), 30 deletions(-) diff --git a/nuget/compatible-version/project/project.csproj b/nuget/compatible-version/project/project.csproj index b5f395cd..60ee85fa 100644 --- a/nuget/compatible-version/project/project.csproj +++ b/nuget/compatible-version/project/project.csproj @@ -8,7 +8,7 @@ - + diff --git a/tests/smoke-nuget-central-package-management.yaml b/tests/smoke-nuget-central-package-management.yaml index 27b9d014..06981cca 100644 --- a/tests/smoke-nuget-central-package-management.yaml +++ b/tests/smoke-nuget-central-package-management.yaml @@ -34,8 +34,8 @@ output: source: null version: 13.0.1 dependency_files: - - /nuget/central-package-management/project.csproj - /nuget/central-package-management/Directory.Packages.props + - /nuget/central-package-management/project.csproj - type: create_pull_request expect: data: @@ -72,7 +72,7 @@ output: content_encoding: utf-8 deleted: false directory: /nuget/central-package-management - name: Directory.Packages.props + name: Directory.Packages.props operation: update support_file: false type: file diff --git a/tests/smoke-nuget-compatible-version.yaml b/tests/smoke-nuget-compatible-version.yaml index 38fcfbd1..3be75e3a 100644 --- a/tests/smoke-nuget-compatible-version.yaml +++ b/tests/smoke-nuget-compatible-version.yaml @@ -52,7 +52,6 @@ output: requirements: [] version: 6.10.0 dependency_files: - - /nuget/compatible-version/library/library.csproj - /nuget/compatible-version/project/project.csproj - type: create_pull_request expect: diff --git a/tests/smoke-nuget-dirs-proj.yaml b/tests/smoke-nuget-dirs-proj.yaml index 7068a120..afd81c88 100644 --- a/tests/smoke-nuget-dirs-proj.yaml +++ b/tests/smoke-nuget-dirs-proj.yaml @@ -39,9 +39,8 @@ output: source: null version: 6.1.0 dependency_files: - - /nuget/dirs-proj/dirs.proj - - /nuget/dirs-proj/project2/project.csproj - /nuget/dirs-proj/project1/project.csproj + - /nuget/dirs-proj/project2/project.csproj - type: create_pull_request expect: data: @@ -96,7 +95,7 @@ output: content_encoding: utf-8 deleted: false directory: /nuget/dirs-proj - name: project2/project.csproj + name: project1/project.csproj operation: update support_file: false type: file @@ -118,7 +117,7 @@ output: content_encoding: utf-8 deleted: false directory: /nuget/dirs-proj - name: project1/project.csproj + name: project2/project.csproj operation: update support_file: false type: file diff --git a/tests/smoke-nuget-lockfile.yaml b/tests/smoke-nuget-lockfile.yaml index 25bfc417..921c4feb 100644 --- a/tests/smoke-nuget-lockfile.yaml +++ b/tests/smoke-nuget-lockfile.yaml @@ -37,8 +37,8 @@ output: source: null version: 1.0.1 dependency_files: - - /nuget/lock-file/project.csproj - /nuget/lock-file/packages.lock.json + - /nuget/lock-file/project.csproj - type: create_pull_request expect: data: @@ -63,22 +63,6 @@ output: version: 1.0.2 directory: /nuget/lock-file updated-dependency-files: - - content: |- - - - net8.0 - - - - - - content_encoding: utf-8 - deleted: false - directory: /nuget/lock-file - name: project.csproj - operation: update - support_file: false - type: file - content: |- { "version": 1, @@ -108,6 +92,22 @@ output: operation: update support_file: false type: file + - content: |- + + + net8.0 + + + + + + content_encoding: utf-8 + deleted: false + directory: /nuget/lock-file + name: project.csproj + operation: update + support_file: false + type: file pr-title: Bump Newtonsoft.Json.Bson from 1.0.1 to 1.0.2 in /nuget/lock-file pr-body: | Bumps [Newtonsoft.Json.Bson](https://github.com/JamesNK/Newtonsoft.Json.Bson) from 1.0.1 to 1.0.2. diff --git a/tests/smoke-nuget-potential-downgrade.yaml b/tests/smoke-nuget-potential-downgrade.yaml index be62f045..e6e6acfb 100644 --- a/tests/smoke-nuget-potential-downgrade.yaml +++ b/tests/smoke-nuget-potential-downgrade.yaml @@ -279,9 +279,9 @@ output: requirements: [] version: 1.4.13 dependency_files: - - /nuget/potential-downgrade/project.csproj - - /nuget/potential-downgrade/Directory.Packages.props - /nuget/potential-downgrade/Directory.Build.props + - /nuget/potential-downgrade/Directory.Packages.props + - /nuget/potential-downgrade/project.csproj - type: create_pull_request expect: data: diff --git a/tests/smoke-nuget-props-and-targets.yaml b/tests/smoke-nuget-props-and-targets.yaml index 7a9ff858..25a8cf9e 100644 --- a/tests/smoke-nuget-props-and-targets.yaml +++ b/tests/smoke-nuget-props-and-targets.yaml @@ -45,9 +45,9 @@ output: source: null version: 6.1.0 dependency_files: - - /nuget/props-and-targets/project.csproj - /nuget/props-and-targets/Directory.Build.props - /nuget/props-and-targets/Directory.Build.targets + - /nuget/props-and-targets/project.csproj - type: create_pull_request expect: data: diff --git a/tests/smoke-nuget-transitive-pinning.yaml b/tests/smoke-nuget-transitive-pinning.yaml index 52670b75..8075be6f 100644 --- a/tests/smoke-nuget-transitive-pinning.yaml +++ b/tests/smoke-nuget-transitive-pinning.yaml @@ -71,8 +71,8 @@ output: requirements: [] version: 5.0.1 dependency_files: - - /nuget/transitive-pinning/project.csproj - /nuget/transitive-pinning/Directory.Packages.props + - /nuget/transitive-pinning/project.csproj - type: create_pull_request expect: data: diff --git a/tests/smoke-nuget-version-property.yaml b/tests/smoke-nuget-version-property.yaml index 11614f36..2423d274 100644 --- a/tests/smoke-nuget-version-property.yaml +++ b/tests/smoke-nuget-version-property.yaml @@ -34,8 +34,8 @@ output: source: null version: 13.0.1 dependency_files: - - /nuget/version-property/project.csproj - /nuget/version-property/Packages.props + - /nuget/version-property/project.csproj - type: create_pull_request expect: data: