Skip to content

[msbuild] Copy partial app manifests to build server if they exists on Windows. Fixes #15267. - #15328

Merged
rolfbjarne merged 4 commits into
dotnet:mainfrom
rolfbjarne:xvs-partial-app-manifest
Jul 11, 2022
Merged

[msbuild] Copy partial app manifests to build server if they exists on Windows. Fixes #15267.#15328
rolfbjarne merged 4 commits into
dotnet:mainfrom
rolfbjarne:xvs-partial-app-manifest

Conversation

@rolfbjarne

Copy link
Copy Markdown
Member

The exclusion of partial app manifests happened here, but the commit doesn't explain why:

f4a4b23#diff-178de6110858688b9f7c2e8e57a873f5ac9498b355a456bfc18547ab2df876bc

It's certainly wrong if the partial app manifest is a part of the project, but
this exclusion might be because partial app manifests might be added as a part
of the build as well.

So change the logic to copy partial app manifests from Windows if they exist
there.

Fixes #15267.

â€Ķn Windows. Fixes dotnet#15267.

The exclusion of partial app manifests happened here, but the commit doesn't explain why:

dotnet@f4a4b23#diff-178de6110858688b9f7c2e8e57a873f5ac9498b355a456bfc18547ab2df876bc

It's certainly wrong if the partial app manifest is a part of the project, but
this exclusion might be because partial app manifests might be added as a part
of the build as well.

So change the logic to copy partial app manifests from Windows if they exist
there.

Fixes dotnet#15267.
@rolfbjarne rolfbjarne added the bug If an issue is a bug or a pull request a bug fix label Jun 22, 2022
@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

ðŸ’ŧ [PR Build] Tests on macOS Mac Catalina (10.15) passed ðŸ’ŧ

✅ All tests on macOS Mac Catalina (10.15) passed.

Pipeline on Agent
Hash: 072cb326443b19e249cde19a567ef79666d2f716 [PR build]

@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

✅ API diff for current PR / commit

Legacy Xamarin (No breaking changes)
  • iOS (no change detected)
  • tvOS (no change detected)
  • watchOS (no change detected)
  • macOS (no change detected)
NET (empty diffs)
  • iOS: (empty diff detected)
  • tvOS: (empty diff detected)
  • MacCatalyst: (empty diff detected)
  • macOS: (empty diff detected)

✅ API diff vs stable

Legacy Xamarin (No breaking changes)
.NET (No breaking changes)
Legacy Xamarin (stable) vs .NET

✅ Generator diff

Generator diff is empty

Pipeline on Agent
Hash: 072cb326443b19e249cde19a567ef79666d2f716 [PR build]

@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

📚 [PR Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent XAMBOT-1174.Monterey'
Hash: 072cb326443b19e249cde19a567ef79666d2f716 [PR build]

@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

❌ [PR Build] Tests on macOS M1 - Mac Big Sur (11.5) failed ❌

Failed tests are:

  • monotouch-test

Pipeline on Agent
Hash: 072cb326443b19e249cde19a567ef79666d2f716 [PR build]

@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

❌ [CI Build] Tests failed on VSTS: simulator tests iOS ❌

Tests failed on VSTS: simulator tests iOS.

Test results

1 tests failed, 147 tests passed.

Failed tests

  • introspection/watchOS 32-bits - simulator/Debug: Crashed

Pipeline on Agent XAMBOT-1109.Monterey'
Merge 072cb32 into 9ff8a6b

@rolfbjarne

Copy link
Copy Markdown
Member Author

Test failure is unrelated (https://github.com/xamarin/maccore/issues/2558).

@emaf

emaf commented Jun 23, 2022

Copy link
Copy Markdown
Contributor

@rolfbjarne I think the intention was to exclude the partial app manifest generated by some other task. The problem is that file in Windows is empty, so we were replacing the real one in the Mac by the empty one from Windows.

The code you changed will be executed on Windows, and items that go through that code will exist there. The problem is it won't discriminate between empty and non-empty partial app manifests. I think we should check if it's an empty file instead of if it exists.

@rolfbjarne

Copy link
Copy Markdown
Member Author

@emaf ok, changed to only copy non-empty files now.

@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

ðŸ”Ĩ [PR Build] Build failed ðŸ”Ĩ

Build failed for the job 'Detect API changes'

Pipeline on Agent
Hash: [PR build]

@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

ðŸ”Ĩ [PR Build] Build failed ðŸ”Ĩ

Build failed for the job 'Build packages'

Pipeline on Agent
Hash: [PR build]

@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

ðŸ”Ĩ Unable to find the contents for the comment: D:\a\1\s\change-detection\results\gh-comment.md does not exist :fire

Pipeline on Agent
Hash: 985b52d363d08d46231c02d41a3e0ed912ece75d [PR build]

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

2 similar comments
@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

1 similar comment
@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

✅ API diff for current PR / commit

Legacy Xamarin (No breaking changes)
  • iOS (no change detected)
  • tvOS (no change detected)
  • watchOS (no change detected)
  • macOS (no change detected)
NET (empty diffs)
  • iOS: (empty diff detected)
  • tvOS: (empty diff detected)
  • MacCatalyst: (empty diff detected)
  • macOS: (empty diff detected)

✅ API diff vs stable

Legacy Xamarin (No breaking changes)
.NET (No breaking changes)
Legacy Xamarin (stable) vs .NET

✅ Generator diff

Generator diff is empty

Pipeline on Agent
Hash: a3fcab683742b8f8d7929e92566db10a2c225dbc [PR build]

@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

ðŸ’ŧ [PR Build] Tests on macOS Mac Catalina (10.15) passed ðŸ’ŧ

✅ All tests on macOS Mac Catalina (10.15) passed.

Pipeline on Agent
Hash: a3fcab683742b8f8d7929e92566db10a2c225dbc [PR build]

@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

📚 [PR Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent XAMBOT-1033.Monterey
Hash: a3fcab683742b8f8d7929e92566db10a2c225dbc [PR build]

@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

❌ [PR Build] Tests on macOS M1 - Mac Big Sur (11.5) failed ❌

Failed tests are:

  • xammac_tests
  • monotouch-test

Pipeline on Agent
Hash: a3fcab683742b8f8d7929e92566db10a2c225dbc [PR build]

@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

ðŸ”Ĩ [CI Build] Test results ðŸ”Ĩ

Test results

❌ Tests failed on VSTS: simulator tests

0 tests crashed, 5 tests failed, 218 tests passed.

Failures

❌ monotouch tests

4 tests failed, 19 tests passed.
Details
  • monotouch-test/Mac Catalyst [dotnet]/Debug [dotnet]: Failed (Test run failed.
    Tests run: 2758 Passed: 2647 Inconclusive: 9 Failed: 1 Ignored: 110)
  • monotouch-test/iOS Unified 64-bits - simulator/Debug (LinkSdk): Failed
  • monotouch-test/iOS Unified 64-bits - simulator/Debug (static registrar): Failed
  • monotouch-test/iOS Unified 64-bits - simulator/Release (all optimizations): Failed

Html Report (VSDrops) Download

❌ mtouch tests

1 tests failed, 0 tests passed.
Details
  • MTouch tests/NUnit: Failed (Execution failed with exit code 19)

Html Report (VSDrops) Download

Successes

✅ bcl: All 69 tests passed. Html Report (VSDrops) Download
✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests: All 1 tests passed. Html Report (VSDrops) Download
✅ fsharp: All 7 tests passed. Html Report (VSDrops) Download
✅ framework: All 8 tests passed. Html Report (VSDrops) Download
✅ generator: All 2 tests passed. Html Report (VSDrops) Download
✅ interdependent_binding_projects: All 7 tests passed. Html Report (VSDrops) Download
✅ install_source: All 1 tests passed. Html Report (VSDrops) Download
✅ introspection: All 8 tests passed. Html Report (VSDrops) Download
✅ linker: All 65 tests passed. Html Report (VSDrops) Download
✅ mac_binding_project: All 1 tests passed. Html Report (VSDrops) Download
✅ mmp: All 2 tests passed. Html Report (VSDrops) Download
✅ mononative: All 12 tests passed. Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. Html Report (VSDrops) Download
✅ xammac: All 3 tests passed. Html Report (VSDrops) Download
✅ xcframework: All 8 tests passed. Html Report (VSDrops) Download
✅ xtro: All 2 tests passed. Html Report (VSDrops) Download

Pipeline on Agent
Hash: [PR build]

@rolfbjarne

Copy link
Copy Markdown
Member Author

Test failures are unrelated (#15422 and #15423)

@rolfbjarne
rolfbjarne merged commit 1f1c03b into dotnet:main Jul 11, 2022
@rolfbjarne
rolfbjarne deleted the xvs-partial-app-manifest branch July 11, 2022 18:39
@rolfbjarne

Copy link
Copy Markdown
Member Author

/sudo backport release/6.0.3xx

1 similar comment
@rolfbjarne

Copy link
Copy Markdown
Member Author

/sudo backport release/6.0.3xx

@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

Backport Job to branch release/6.0.3xx Created! The magic is happening here

@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

Backport Job to branch release/6.0.3xx Created! The magic is happening here

@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

Hooray! Backport succeeded! Please see https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=6397035 for more details.

@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

Oh no! Backport failed! Please see https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=6397037 for more details.

@rolfbjarne

Copy link
Copy Markdown
Member Author

/sudo backport release/6.0.4xx

@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

Backport Job to branch release/6.0.4xx Created! The magic is happening here

@vs-mobiletools-engineering-service2

Copy link
Copy Markdown
Collaborator

Hooray! Backport succeeded! Please see https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=6401202 for more details.

rolfbjarne added a commit that referenced this pull request Jul 14, 2022
â€Ķr if they exists on Windows. Fixes #15267. (#15467)

The exclusion of partial app manifests happened here, but the commit doesn't explain why:

f4a4b23#diff-178de6110858688b9f7c2e8e57a873f5ac9498b355a456bfc18547ab2df876bc

It's certainly wrong if the partial app manifest is a part of the project, but
this exclusion might be because partial app manifests might be added as a part
of the build as well.

So change the logic to copy partial app manifests from Windows if they exist
there and they're not empty.

Fixes #15267.


Backport of #15328

Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
rolfbjarne added a commit that referenced this pull request Jul 14, 2022
â€Ķr if they exists on Windows. Fixes #15267. (#15460)

The exclusion of partial app manifests happened here, but the commit doesn't explain why:

f4a4b23#diff-178de6110858688b9f7c2e8e57a873f5ac9498b355a456bfc18547ab2df876bc

It's certainly wrong if the partial app manifest is a part of the project, but
this exclusion might be because partial app manifests might be added as a part
of the build as well.

So change the logic to copy partial app manifests from Windows if they exist
there and they're not empty.

Fixes #15267.

Backport of #15328

Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug If an issue is a bug or a pull request a bug fix

Projects

None yet

Development

Successfully merging this pull request may close these issues.

PartialAppManifest compile error (Windows)

8 participants